diff --git a/11649.async.js b/11649.async.js
index c17861b2df..7715645689 100644
--- a/11649.async.js
+++ b/11649.async.js
@@ -1256,8 +1256,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1544,8 +1544,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/76980.async.js b/27627.async.js
similarity index 82%
rename from 76980.async.js
rename to 27627.async.js
index b218905628..1c5cb3d61a 100644
--- a/76980.async.js
+++ b/27627.async.js
@@ -1,15 +1,16 @@
 "use strict";
-(self["webpackChunk"] = self["webpackChunk"] || []).push([[76980],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[27627],{
 
-/***/ 76980:
-/*!*********************************************************!*\
-  !*** ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs ***!
-  \*********************************************************/
+/***/ 27627:
+/*!********************************************************!*\
+  !*** ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs ***!
+  \********************************************************/
 /***/ (function(__unused_webpack___webpack_module__, __webpack_exports__, __webpack_require__) {
 
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
-/* harmony export */   Z: function() { return /* binding */ Hls; }
+/* harmony export */   ZP: function() { return /* binding */ Hls; }
 /* harmony export */ });
+/* unused harmony exports AbrController, AttrList, AudioStreamController, AudioTrackController, BasePlaylistController, BaseSegment, BaseStreamController, BufferController, CMCDController, CapLevelController, ChunkMetadata, ContentSteeringController, DateRange, EMEController, ErrorActionFlags, ErrorController, ErrorDetails, ErrorTypes, Events, FPSController, Fragment, Hls, HlsSkip, HlsUrlParameters, KeySystemFormats, KeySystems, Level, LevelDetails, LevelKey, LoadStats, MetadataSchema, NetworkErrorAction, Part, PlaylistLevelType, SubtitleStreamController, SubtitleTrackController, TimelineController, getMediaSource, isMSESupported, isSupported */
 function getDefaultExportFromCjs (x) {
 	return x && x.__esModule && Object.prototype.hasOwnProperty.call(x, 'default') ? x['default'] : x;
 }
@@ -188,26 +189,40 @@ var urlToolkit = {exports: {}};
 
 var urlToolkitExports = urlToolkit.exports;
 
-function ownKeys(object, enumerableOnly) {
-  var keys = Object.keys(object);
+function ownKeys(e, r) {
+  var t = Object.keys(e);
   if (Object.getOwnPropertySymbols) {
-    var symbols = Object.getOwnPropertySymbols(object);
-    enumerableOnly && (symbols = symbols.filter(function (sym) {
-      return Object.getOwnPropertyDescriptor(object, sym).enumerable;
-    })), keys.push.apply(keys, symbols);
-  }
-  return keys;
-}
-function _objectSpread2(target) {
-  for (var i = 1; i < arguments.length; i++) {
-    var source = null != arguments[i] ? arguments[i] : {};
-    i % 2 ? ownKeys(Object(source), !0).forEach(function (key) {
-      _defineProperty(target, key, source[key]);
-    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(target, Object.getOwnPropertyDescriptors(source)) : ownKeys(Object(source)).forEach(function (key) {
-      Object.defineProperty(target, key, Object.getOwnPropertyDescriptor(source, key));
+    var o = Object.getOwnPropertySymbols(e);
+    r && (o = o.filter(function (r) {
+      return Object.getOwnPropertyDescriptor(e, r).enumerable;
+    })), t.push.apply(t, o);
+  }
+  return t;
+}
+function _objectSpread2(e) {
+  for (var r = 1; r < arguments.length; r++) {
+    var t = null != arguments[r] ? arguments[r] : {};
+    r % 2 ? ownKeys(Object(t), !0).forEach(function (r) {
+      _defineProperty(e, r, t[r]);
+    }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) {
+      Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r));
     });
   }
-  return target;
+  return e;
+}
+function _toPrimitive(t, r) {
+  if ("object" != typeof t || !t) return t;
+  var e = t[Symbol.toPrimitive];
+  if (void 0 !== e) {
+    var i = e.call(t, r || "default");
+    if ("object" != typeof i) return i;
+    throw new TypeError("@@toPrimitive must return a primitive value.");
+  }
+  return ("string" === r ? String : Number)(t);
+}
+function _toPropertyKey(t) {
+  var i = _toPrimitive(t, "string");
+  return "symbol" == typeof i ? i : String(i);
 }
 function _defineProperty(obj, key, value) {
   key = _toPropertyKey(key);
@@ -237,20 +252,6 @@ function _extends() {
   };
   return _extends.apply(this, arguments);
 }
-function _toPrimitive(input, hint) {
-  if (typeof input !== "object" || input === null) return input;
-  var prim = input[Symbol.toPrimitive];
-  if (prim !== undefined) {
-    var res = prim.call(input, hint || "default");
-    if (typeof res !== "object") return res;
-    throw new TypeError("@@toPrimitive must return a primitive value.");
-  }
-  return (hint === "string" ? String : Number)(input);
-}
-function _toPropertyKey(arg) {
-  var key = _toPrimitive(arg, "string");
-  return typeof key === "symbol" ? key : String(key);
-}
 
 // https://caniuse.com/mdn-javascript_builtins_number_isfinite
 const isFiniteNumber = Number.isFinite || function (value) {
@@ -312,12 +313,14 @@ let Events = /*#__PURE__*/function (Events) {
   Events["FRAG_CHANGED"] = "hlsFragChanged";
   Events["FPS_DROP"] = "hlsFpsDrop";
   Events["FPS_DROP_LEVEL_CAPPING"] = "hlsFpsDropLevelCapping";
+  Events["MAX_AUTO_LEVEL_UPDATED"] = "hlsMaxAutoLevelUpdated";
   Events["ERROR"] = "hlsError";
   Events["DESTROYING"] = "hlsDestroying";
   Events["KEY_LOADING"] = "hlsKeyLoading";
   Events["KEY_LOADED"] = "hlsKeyLoaded";
   Events["LIVE_BACK_BUFFER_REACHED"] = "hlsLiveBackBufferReached";
   Events["BACK_BUFFER_REACHED"] = "hlsBackBufferReached";
+  Events["STEERING_MANIFEST_LOADED"] = "hlsSteeringManifestLoaded";
   return Events;
 }({});
 
@@ -413,7 +416,7 @@ function exportLoggerFunctions(debugConfig, ...functions) {
 }
 function enableLogs(debugConfig, id) {
   // check that console is available
-  if (self.console && debugConfig === true || typeof debugConfig === 'object') {
+  if (typeof console === 'object' && debugConfig === true || typeof debugConfig === 'object') {
     exportLoggerFunctions(debugConfig,
     // Remove out from list here to hard-disable a log-level
     // 'trace',
@@ -421,7 +424,7 @@ function enableLogs(debugConfig, id) {
     // Some browsers don't allow to use bind on console object anyway
     // fallback to default if needed
     try {
-      exportedLogger.log(`Debug logs enabled for "${id}" in hls.js version ${"1.4.14"}`);
+      exportedLogger.log(`Debug logs enabled for "${id}" in hls.js version ${"1.5.1"}`);
     } catch (e) {
       exportedLogger = fakeLogger;
     }
@@ -440,15 +443,10 @@ class AttrList {
     if (typeof attrs === 'string') {
       attrs = AttrList.parseAttrList(attrs);
     }
-    for (const attr in attrs) {
-      if (attrs.hasOwnProperty(attr)) {
-        if (attr.substring(0, 2) === 'X-') {
-          this.clientAttrs = this.clientAttrs || [];
-          this.clientAttrs.push(attr);
-        }
-        this[attr] = attrs[attr];
-      }
-    }
+    _extends(this, attrs);
+  }
+  get clientAttrs() {
+    return Object.keys(this).filter(attr => attr.substring(0, 2) === 'X-');
   }
   decimalInteger(attrName) {
     const intValue = parseInt(this[attrName], 10);
@@ -627,17 +625,14 @@ var ElementaryStreamTypes = {
   AUDIOVIDEO: "audiovideo"
 };
 class BaseSegment {
-  // baseurl is the URL to the playlist
-
-  // relurl is the portion of the URL that comes from inside the playlist.
-
-  // Holds the types of data this fragment supports
-
   constructor(baseurl) {
     this._byteRange = null;
     this._url = null;
+    // baseurl is the URL to the playlist
     this.baseurl = void 0;
+    // relurl is the portion of the URL that comes from inside the playlist.
     this.relurl = void 0;
+    // Holds the types of data this fragment supports
     this.elementaryStreams = {
       [ElementaryStreamTypes.AUDIO]: null,
       [ElementaryStreamTypes.VIDEO]: null,
@@ -649,14 +644,13 @@ class BaseSegment {
   // setByteRange converts a EXT-X-BYTERANGE attribute into a two element array
   setByteRange(value, previous) {
     const params = value.split('@', 2);
-    const byteRange = [];
+    let start;
     if (params.length === 1) {
-      byteRange[0] = previous ? previous.byteRangeEndOffset : 0;
+      start = (previous == null ? void 0 : previous.byteRangeEndOffset) || 0;
     } else {
-      byteRange[0] = parseInt(params[1]);
+      start = parseInt(params[1]);
     }
-    byteRange[1] = parseInt(params[0]) + byteRange[0];
-    this._byteRange = byteRange;
+    this._byteRange = [start, parseInt(params[0]) + start];
   }
   get byteRange() {
     if (!this._byteRange) {
@@ -687,62 +681,62 @@ class BaseSegment {
  * Object representing parsed data from an HLS Segment. Found in {@link hls.js#LevelDetails.fragments}.
  */
 class Fragment extends BaseSegment {
-  // EXTINF has to be present for a m3u8 to be considered valid
-
-  // sn notates the sequence number for a segment, and if set to a string can be 'initSegment'
-
-  // levelkeys are the EXT-X-KEY tags that apply to this segment for decryption
-  // core difference from the private field _decryptdata is the lack of the initialized IV
-  // _decryptdata will set the IV for this segment based on the segment number in the fragment
-  // A string representing the fragment type
-  // A reference to the loader. Set while the fragment is loading, and removed afterwards. Used to abort fragment loading
-  // A reference to the key loader. Set while the key is loading, and removed afterwards. Used to abort key loading
-  // The level/track index to which the fragment belongs
-  // The continuity counter of the fragment
-  // The starting Presentation Time Stamp (PTS) of the fragment. Set after transmux complete.
-  // The ending Presentation Time Stamp (PTS) of the fragment. Set after transmux complete.
-  // The starting Decode Time Stamp (DTS) of the fragment. Set after transmux complete.
-  // The ending Decode Time Stamp (DTS) of the fragment. Set after transmux complete.
-  // The start time of the fragment, as listed in the manifest. Updated after transmux complete.
-  // Set by `updateFragPTSDTS` in level-helper
-  // The maximum starting Presentation Time Stamp (audio/video PTS) of the fragment. Set after transmux complete.
-  // The minimum ending Presentation Time Stamp (audio/video PTS) of the fragment. Set after transmux complete.
-  // Load/parse timing information
-  // A flag indicating whether the segment was downloaded in order to test bitrate, and was not buffered
-  // #EXTINF  segment title
-  // The Media Initialization Section for this segment
-  // Fragment is the last fragment in the media playlist
-  // Fragment is marked by an EXT-X-GAP tag indicating that it does not contain media data and should not be loaded
   constructor(type, baseurl) {
     super(baseurl);
     this._decryptdata = null;
     this.rawProgramDateTime = null;
     this.programDateTime = null;
     this.tagList = [];
+    // EXTINF has to be present for a m3u8 to be considered valid
     this.duration = 0;
+    // sn notates the sequence number for a segment, and if set to a string can be 'initSegment'
     this.sn = 0;
+    // levelkeys are the EXT-X-KEY tags that apply to this segment for decryption
+    // core difference from the private field _decryptdata is the lack of the initialized IV
+    // _decryptdata will set the IV for this segment based on the segment number in the fragment
     this.levelkeys = void 0;
+    // A string representing the fragment type
     this.type = void 0;
+    // A reference to the loader. Set while the fragment is loading, and removed afterwards. Used to abort fragment loading
     this.loader = null;
+    // A reference to the key loader. Set while the key is loading, and removed afterwards. Used to abort key loading
     this.keyLoader = null;
+    // The level/track index to which the fragment belongs
     this.level = -1;
+    // The continuity counter of the fragment
     this.cc = 0;
+    // The starting Presentation Time Stamp (PTS) of the fragment. Set after transmux complete.
     this.startPTS = void 0;
+    // The ending Presentation Time Stamp (PTS) of the fragment. Set after transmux complete.
     this.endPTS = void 0;
+    // The starting Decode Time Stamp (DTS) of the fragment. Set after transmux complete.
     this.startDTS = void 0;
+    // The ending Decode Time Stamp (DTS) of the fragment. Set after transmux complete.
     this.endDTS = void 0;
+    // The start time of the fragment, as listed in the manifest. Updated after transmux complete.
     this.start = 0;
+    // Set by `updateFragPTSDTS` in level-helper
     this.deltaPTS = void 0;
+    // The maximum starting Presentation Time Stamp (audio/video PTS) of the fragment. Set after transmux complete.
     this.maxStartPTS = void 0;
+    // The minimum ending Presentation Time Stamp (audio/video PTS) of the fragment. Set after transmux complete.
     this.minEndPTS = void 0;
+    // Load/parse timing information
     this.stats = new LoadStats();
-    this.urlId = 0;
+    // Init Segment bytes (unset for media segments)
     this.data = void 0;
+    // A flag indicating whether the segment was downloaded in order to test bitrate, and was not buffered
     this.bitrateTest = false;
+    // #EXTINF  segment title
     this.title = null;
+    // The Media Initialization Section for this segment
     this.initSegment = null;
+    // Fragment is the last fragment in the media playlist
     this.endList = void 0;
+    // Fragment is marked by an EXT-X-GAP tag indicating that it does not contain media data and should not be loaded
     this.gap = void 0;
+    // Deprecated
+    this.urlId = 0;
     this.type = type;
   }
   get decryptdata() {
@@ -885,8 +879,6 @@ const DEFAULT_TARGET_DURATION = 10;
  * Object representing parsed data from an HLS Media Playlist. Found in {@link hls.js#Level.details}.
  */
 class LevelDetails {
-  // Manifest reload synchronization
-
   constructor(baseUrl) {
     this.PTSKnown = false;
     this.alignedSliding = false;
@@ -903,6 +895,7 @@ class LevelDetails {
     this.updated = true;
     this.advanced = true;
     this.availabilityDelay = void 0;
+    // Manifest reload synchronization
     this.misses = 0;
     this.startCC = 0;
     this.startSN = 0;
@@ -1056,6 +1049,9 @@ function strToUtf8array(str) {
   return Uint8Array.from(unescape(encodeURIComponent(str)), c => c.charCodeAt(0));
 }
 
+/** returns `undefined` is `self` is missing, e.g. in node */
+const optionalSelf = typeof self !== 'undefined' ? self : undefined;
+
 /**
  * @see https://developer.mozilla.org/en-US/docs/Web/API/Navigator/requestMediaKeySystemAccess
  */
@@ -1099,7 +1095,6 @@ function keySystemIdToKeySystemDomain(systemId) {
     //   return KeySystems.CLEARKEY;
   }
 }
-
 function keySystemDomainToKeySystemFormat(keySystem) {
   switch (keySystem) {
     case KeySystems.FAIRPLAY:
@@ -1123,8 +1118,8 @@ function getKeySystemsForConfig(config) {
   }
   return keySystemsToAttempt;
 }
-const requestMediaKeySystemAccess = function () {
-  if (typeof self !== 'undefined' && self.navigator && self.navigator.requestMediaKeySystemAccess) {
+const requestMediaKeySystemAccess = function (_optionalSelf$navigat) {
+  if (optionalSelf != null && (_optionalSelf$navigat = optionalSelf.navigator) != null && _optionalSelf$navigat.requestMediaKeySystemAccess) {
     return self.navigator.requestMediaKeySystemAccess.bind(self.navigator);
   } else {
     return null;
@@ -1155,8 +1150,8 @@ function getSupportedMediaKeySystemConfigurations(keySystem, audioCodecs, videoC
 function createMediaKeySystemConfigurations(initDataTypes, audioCodecs, videoCodecs, drmSystemOptions) {
   const baseConfig = {
     initDataTypes: initDataTypes,
-    persistentState: drmSystemOptions.persistentState || 'not-allowed',
-    distinctiveIdentifier: drmSystemOptions.distinctiveIdentifier || 'not-allowed',
+    persistentState: drmSystemOptions.persistentState || 'optional',
+    distinctiveIdentifier: drmSystemOptions.distinctiveIdentifier || 'optional',
     sessionTypes: drmSystemOptions.sessionTypes || [drmSystemOptions.sessionType || 'temporary'],
     audioCapabilities: audioCodecs.map(codec => ({
       contentType: `audio/mp4; codecs="${codec}"`,
@@ -1578,6 +1573,19 @@ function writeUint32(buffer, offset, value) {
   buffer[offset + 3] = value & 0xff;
 }
 
+// Find "moof" box
+function hasMoofData(data) {
+  const end = data.byteLength;
+  for (let i = 0; i < end;) {
+    const size = readUint32(data, i);
+    if (size > 8 && data[i + 4] === 0x6d && data[i + 5] === 0x6f && data[i + 6] === 0x6f && data[i + 7] === 0x66) {
+      return true;
+    }
+    i = size > 1 ? i + size : end;
+  }
+  return false;
+}
+
 // Find the data for a box specified by its path
 function findBox(data, path) {
   const results = [];
@@ -1701,13 +1709,11 @@ function parseInitSegment(initSegment) {
     const tkhd = findBox(trak, ['tkhd'])[0];
     if (tkhd) {
       let version = tkhd[0];
-      let index = version === 0 ? 12 : 20;
-      const trackId = readUint32(tkhd, index);
+      const trackId = readUint32(tkhd, version === 0 ? 12 : 20);
       const mdhd = findBox(trak, ['mdia', 'mdhd'])[0];
       if (mdhd) {
         version = mdhd[0];
-        index = version === 0 ? 12 : 20;
-        const timescale = readUint32(mdhd, index);
+        const timescale = readUint32(mdhd, version === 0 ? 12 : 20);
         const hdlr = findBox(trak, ['mdia', 'hdlr'])[0];
         if (hdlr) {
           const hdlrType = bin2str(hdlr.subarray(8, 12));
@@ -1718,26 +1724,15 @@ function parseInitSegment(initSegment) {
           if (type) {
             // Parse codec details
             const stsd = findBox(trak, ['mdia', 'minf', 'stbl', 'stsd'])[0];
-            let codec;
-            if (stsd) {
-              codec = bin2str(stsd.subarray(12, 16));
-              // TODO: Parse codec details to be able to build MIME type.
-              // stsd.start += 8;
-              // const codecBox = findBox(stsd, [codec])[0];
-              // if (codecBox) {
-              //   TODO: Codec parsing support for avc1, mp4a, hevc, av01...
-              // }
-            }
-
+            const stsdData = parseStsd(stsd);
             result[trackId] = {
               timescale,
               type
             };
-            result[type] = {
+            result[type] = _objectSpread2({
               timescale,
-              id: trackId,
-              codec
-            };
+              id: trackId
+            }, stsdData);
           }
         }
       }
@@ -1756,6 +1751,169 @@ function parseInitSegment(initSegment) {
   });
   return result;
 }
+function parseStsd(stsd) {
+  const sampleEntries = stsd.subarray(8);
+  const sampleEntriesEnd = sampleEntries.subarray(8 + 78);
+  const fourCC = bin2str(sampleEntries.subarray(4, 8));
+  let codec = fourCC;
+  const encrypted = fourCC === 'enca' || fourCC === 'encv';
+  if (encrypted) {
+    const encBox = findBox(sampleEntries, [fourCC])[0];
+    const encBoxChildren = encBox.subarray(fourCC === 'enca' ? 28 : 78);
+    const sinfs = findBox(encBoxChildren, ['sinf']);
+    sinfs.forEach(sinf => {
+      const schm = findBox(sinf, ['schm'])[0];
+      if (schm) {
+        const scheme = bin2str(schm.subarray(4, 8));
+        if (scheme === 'cbcs' || scheme === 'cenc') {
+          const frma = findBox(sinf, ['frma'])[0];
+          if (frma) {
+            // for encrypted content codec fourCC will be in frma
+            codec = bin2str(frma);
+          }
+        }
+      }
+    });
+  }
+  switch (codec) {
+    case 'avc1':
+    case 'avc2':
+    case 'avc3':
+    case 'avc4':
+      {
+        // extract profile + compatibility + level out of avcC box
+        const avcCBox = findBox(sampleEntriesEnd, ['avcC'])[0];
+        codec += '.' + toHex(avcCBox[1]) + toHex(avcCBox[2]) + toHex(avcCBox[3]);
+        break;
+      }
+    case 'mp4a':
+      {
+        const codecBox = findBox(sampleEntries, [fourCC])[0];
+        const esdsBox = findBox(codecBox.subarray(28), ['esds'])[0];
+        if (esdsBox && esdsBox.length > 12) {
+          let i = 4;
+          // ES Descriptor tag
+          if (esdsBox[i++] !== 0x03) {
+            break;
+          }
+          i = skipBERInteger(esdsBox, i);
+          i += 2; // skip es_id;
+          const flags = esdsBox[i++];
+          if (flags & 0x80) {
+            i += 2; // skip dependency es_id
+          }
+          if (flags & 0x40) {
+            i += esdsBox[i++]; // skip URL
+          }
+          // Decoder config descriptor
+          if (esdsBox[i++] !== 0x04) {
+            break;
+          }
+          i = skipBERInteger(esdsBox, i);
+          const objectType = esdsBox[i++];
+          if (objectType === 0x40) {
+            codec += '.' + toHex(objectType);
+          } else {
+            break;
+          }
+          i += 12;
+          // Decoder specific info
+          if (esdsBox[i++] !== 0x05) {
+            break;
+          }
+          i = skipBERInteger(esdsBox, i);
+          const firstByte = esdsBox[i++];
+          let audioObjectType = (firstByte & 0xf8) >> 3;
+          if (audioObjectType === 31) {
+            audioObjectType += 1 + ((firstByte & 0x7) << 3) + ((esdsBox[i] & 0xe0) >> 5);
+          }
+          codec += '.' + audioObjectType;
+        }
+        break;
+      }
+    case 'hvc1':
+    case 'hev1':
+      {
+        const hvcCBox = findBox(sampleEntriesEnd, ['hvcC'])[0];
+        const profileByte = hvcCBox[1];
+        const profileSpace = ['', 'A', 'B', 'C'][profileByte >> 6];
+        const generalProfileIdc = profileByte & 0x1f;
+        const profileCompat = readUint32(hvcCBox, 2);
+        const tierFlag = (profileByte & 0x20) >> 5 ? 'H' : 'L';
+        const levelIDC = hvcCBox[12];
+        const constraintIndicator = hvcCBox.subarray(6, 12);
+        codec += '.' + profileSpace + generalProfileIdc;
+        codec += '.' + profileCompat.toString(16).toUpperCase();
+        codec += '.' + tierFlag + levelIDC;
+        let constraintString = '';
+        for (let i = constraintIndicator.length; i--;) {
+          const byte = constraintIndicator[i];
+          if (byte || constraintString) {
+            const encodedByte = byte.toString(16).toUpperCase();
+            constraintString = '.' + encodedByte + constraintString;
+          }
+        }
+        codec += constraintString;
+        break;
+      }
+    case 'dvh1':
+    case 'dvhe':
+      {
+        const dvcCBox = findBox(sampleEntriesEnd, ['dvcC'])[0];
+        const profile = dvcCBox[2] >> 1 & 0x7f;
+        const level = dvcCBox[2] << 5 & 0x20 | dvcCBox[3] >> 3 & 0x1f;
+        codec += '.' + addLeadingZero(profile) + '.' + addLeadingZero(level);
+        break;
+      }
+    case 'vp09':
+      {
+        const vpcCBox = findBox(sampleEntriesEnd, ['vpcC'])[0];
+        const profile = vpcCBox[4];
+        const level = vpcCBox[5];
+        const bitDepth = vpcCBox[6] >> 4 & 0x0f;
+        codec += '.' + addLeadingZero(profile) + '.' + addLeadingZero(level) + '.' + addLeadingZero(bitDepth);
+        break;
+      }
+    case 'av01':
+      {
+        const av1CBox = findBox(sampleEntriesEnd, ['av1C'])[0];
+        const profile = av1CBox[1] >>> 5;
+        const level = av1CBox[1] & 0x1f;
+        const tierFlag = av1CBox[2] >>> 7 ? 'H' : 'M';
+        const highBitDepth = (av1CBox[2] & 0x40) >> 6;
+        const twelveBit = (av1CBox[2] & 0x20) >> 5;
+        const bitDepth = profile === 2 && highBitDepth ? twelveBit ? 12 : 10 : highBitDepth ? 10 : 8;
+        const monochrome = (av1CBox[2] & 0x10) >> 4;
+        const chromaSubsamplingX = (av1CBox[2] & 0x08) >> 3;
+        const chromaSubsamplingY = (av1CBox[2] & 0x04) >> 2;
+        const chromaSamplePosition = av1CBox[2] & 0x03;
+        // TODO: parse color_description_present_flag
+        // default it to BT.709/limited range for now
+        // more info https://aomediacodec.github.io/av1-isobmff/#av1codecconfigurationbox-syntax
+        const colorPrimaries = 1;
+        const transferCharacteristics = 1;
+        const matrixCoefficients = 1;
+        const videoFullRangeFlag = 0;
+        codec += '.' + profile + '.' + addLeadingZero(level) + tierFlag + '.' + addLeadingZero(bitDepth) + '.' + monochrome + '.' + chromaSubsamplingX + chromaSubsamplingY + chromaSamplePosition + '.' + addLeadingZero(colorPrimaries) + '.' + addLeadingZero(transferCharacteristics) + '.' + addLeadingZero(matrixCoefficients) + '.' + videoFullRangeFlag;
+        break;
+      }
+  }
+  return {
+    codec,
+    encrypted
+  };
+}
+function skipBERInteger(bytes, i) {
+  const limit = i + 5;
+  while (bytes[i++] & 0x80 && i < limit) {}
+  return i;
+}
+function toHex(x) {
+  return ('0' + x.toString(16).toUpperCase()).slice(-2);
+}
+function addLeadingZero(num) {
+  return (num < 10 ? '0' : '') + num;
+}
 function patchEncyptionData(initSegment, decryptdata) {
   if (!initSegment || !decryptdata) {
     return initSegment;
@@ -2010,20 +2168,23 @@ function offsetStartDTS(initData, fmp4, timeOffset) {
       // get the base media decode time from the tfdt
       findBox(traf, ['tfdt']).forEach(tfdt => {
         const version = tfdt[0];
-        let baseMediaDecodeTime = readUint32(tfdt, 4);
-        if (version === 0) {
-          baseMediaDecodeTime -= timeOffset * timescale;
-          baseMediaDecodeTime = Math.max(baseMediaDecodeTime, 0);
-          writeUint32(tfdt, 4, baseMediaDecodeTime);
-        } else {
-          baseMediaDecodeTime *= Math.pow(2, 32);
-          baseMediaDecodeTime += readUint32(tfdt, 8);
-          baseMediaDecodeTime -= timeOffset * timescale;
-          baseMediaDecodeTime = Math.max(baseMediaDecodeTime, 0);
-          const upper = Math.floor(baseMediaDecodeTime / (UINT32_MAX$1 + 1));
-          const lower = Math.floor(baseMediaDecodeTime % (UINT32_MAX$1 + 1));
-          writeUint32(tfdt, 4, upper);
-          writeUint32(tfdt, 8, lower);
+        const offset = timeOffset * timescale;
+        if (offset) {
+          let baseMediaDecodeTime = readUint32(tfdt, 4);
+          if (version === 0) {
+            baseMediaDecodeTime -= offset;
+            baseMediaDecodeTime = Math.max(baseMediaDecodeTime, 0);
+            writeUint32(tfdt, 4, baseMediaDecodeTime);
+          } else {
+            baseMediaDecodeTime *= Math.pow(2, 32);
+            baseMediaDecodeTime += readUint32(tfdt, 8);
+            baseMediaDecodeTime -= offset;
+            baseMediaDecodeTime = Math.max(baseMediaDecodeTime, 0);
+            const upper = Math.floor(baseMediaDecodeTime / (UINT32_MAX$1 + 1));
+            const lower = Math.floor(baseMediaDecodeTime % (UINT32_MAX$1 + 1));
+            writeUint32(tfdt, 4, upper);
+            writeUint32(tfdt, 8, lower);
+          }
         }
       });
     });
@@ -2037,9 +2198,7 @@ function segmentValidRange(data) {
     remainder: null
   };
   const moofs = findBox(data, ['moof']);
-  if (!moofs) {
-    return segmentedRange;
-  } else if (moofs.length < 2) {
+  if (moofs.length < 2) {
     segmentedRange.remainder = data;
     return segmentedRange;
   }
@@ -2207,7 +2366,6 @@ function parseSEIMessageFromNALu(unescapedData, headerSize, pts, samples) {
   seiPtr += headerSize;
   let payloadType = 0;
   let payloadSize = 0;
-  let endOfCaptions = false;
   let b = 0;
   while (seiPtr < data.length) {
     payloadType = 0;
@@ -2229,21 +2387,32 @@ function parseSEIMessageFromNALu(unescapedData, headerSize, pts, samples) {
       payloadSize += b;
     } while (b === 0xff);
     const leftOver = data.length - seiPtr;
-    if (!endOfCaptions && payloadType === 4 && seiPtr < data.length) {
-      endOfCaptions = true;
-      const countryCode = data[seiPtr++];
+    // Create a variable to process the payload
+    let payPtr = seiPtr;
+
+    // Increment the seiPtr to the end of the payload
+    if (payloadSize < leftOver) {
+      seiPtr += payloadSize;
+    } else if (payloadSize > leftOver) {
+      // Some type of corruption has happened?
+      logger.error(`Malformed SEI payload. ${payloadSize} is too small, only ${leftOver} bytes left to parse.`);
+      // We might be able to parse some data, but let's be safe and ignore it.
+      break;
+    }
+    if (payloadType === 4) {
+      const countryCode = data[payPtr++];
       if (countryCode === 181) {
-        const providerCode = readUint16(data, seiPtr);
-        seiPtr += 2;
+        const providerCode = readUint16(data, payPtr);
+        payPtr += 2;
         if (providerCode === 49) {
-          const userStructure = readUint32(data, seiPtr);
-          seiPtr += 4;
+          const userStructure = readUint32(data, payPtr);
+          payPtr += 4;
           if (userStructure === 0x47413934) {
-            const userDataType = data[seiPtr++];
+            const userDataType = data[payPtr++];
 
             // Raw CEA-608 bytes wrapped in CEA-708 packet
             if (userDataType === 3) {
-              const firstByte = data[seiPtr++];
+              const firstByte = data[payPtr++];
               const totalCCs = 0x1f & firstByte;
               const enabled = 0x40 & firstByte;
               const totalBytes = enabled ? 2 + totalCCs * 3 : 0;
@@ -2251,7 +2420,7 @@ function parseSEIMessageFromNALu(unescapedData, headerSize, pts, samples) {
               if (enabled) {
                 byteArray[0] = firstByte;
                 for (let i = 1; i < totalBytes; i++) {
-                  byteArray[i] = data[seiPtr++];
+                  byteArray[i] = data[payPtr++];
                 }
               }
               samples.push({
@@ -2264,12 +2433,11 @@ function parseSEIMessageFromNALu(unescapedData, headerSize, pts, samples) {
           }
         }
       }
-    } else if (payloadType === 5 && payloadSize < leftOver) {
-      endOfCaptions = true;
+    } else if (payloadType === 5) {
       if (payloadSize > 16) {
         const uuidStrArray = [];
         for (let i = 0; i < 16; i++) {
-          const _b = data[seiPtr++].toString(16);
+          const _b = data[payPtr++].toString(16);
           uuidStrArray.push(_b.length == 1 ? '0' + _b : _b);
           if (i === 3 || i === 5 || i === 7 || i === 9) {
             uuidStrArray.push('-');
@@ -2278,7 +2446,7 @@ function parseSEIMessageFromNALu(unescapedData, headerSize, pts, samples) {
         const length = payloadSize - 16;
         const userDataBytes = new Uint8Array(length);
         for (let i = 0; i < length; i++) {
-          userDataBytes[i] = data[seiPtr++];
+          userDataBytes[i] = data[payPtr++];
         }
         samples.push({
           payloadType,
@@ -2288,10 +2456,6 @@ function parseSEIMessageFromNALu(unescapedData, headerSize, pts, samples) {
           userDataBytes
         });
       }
-    } else if (payloadSize < leftOver) {
-      seiPtr += payloadSize;
-    } else if (payloadSize > leftOver) {
-      break;
     }
   }
 }
@@ -2714,92 +2878,166 @@ function importVariableDefinition(parsed, attr, sourceVariableList) {
  * MediaSource helper
  */
 
-function getMediaSource() {
+function getMediaSource(preferManagedMediaSource = true) {
   if (typeof self === 'undefined') return undefined;
-  return self.MediaSource || self.WebKitMediaSource;
+  const mms = (preferManagedMediaSource || !self.MediaSource) && self.ManagedMediaSource;
+  return mms || self.MediaSource || self.WebKitMediaSource;
 }
 
 // from http://mp4ra.org/codecs.html
+// values indicate codec selection preference (lower is higher priority)
 const sampleEntryCodesISO = {
   audio: {
-    a3ds: true,
-    'ac-3': true,
-    'ac-4': true,
-    alac: true,
-    alaw: true,
-    dra1: true,
-    'dts+': true,
-    'dts-': true,
-    dtsc: true,
-    dtse: true,
-    dtsh: true,
-    'ec-3': true,
-    enca: true,
-    g719: true,
-    g726: true,
-    m4ae: true,
-    mha1: true,
-    mha2: true,
-    mhm1: true,
-    mhm2: true,
-    mlpa: true,
-    mp4a: true,
-    'raw ': true,
-    Opus: true,
-    opus: true,
+    a3ds: 1,
+    'ac-3': 0.95,
+    'ac-4': 1,
+    alac: 0.9,
+    alaw: 1,
+    dra1: 1,
+    'dts+': 1,
+    'dts-': 1,
+    dtsc: 1,
+    dtse: 1,
+    dtsh: 1,
+    'ec-3': 0.9,
+    enca: 1,
+    fLaC: 0.9,
+    // MP4-RA listed codec entry for FLAC
+    flac: 0.9,
+    // legacy browser codec name for FLAC
+    FLAC: 0.9,
+    // some manifests may list "FLAC" with Apple's tools
+    g719: 1,
+    g726: 1,
+    m4ae: 1,
+    mha1: 1,
+    mha2: 1,
+    mhm1: 1,
+    mhm2: 1,
+    mlpa: 1,
+    mp4a: 1,
+    'raw ': 1,
+    Opus: 1,
+    opus: 1,
     // browsers expect this to be lowercase despite MP4RA says 'Opus'
-    samr: true,
-    sawb: true,
-    sawp: true,
-    sevc: true,
-    sqcp: true,
-    ssmv: true,
-    twos: true,
-    ulaw: true
+    samr: 1,
+    sawb: 1,
+    sawp: 1,
+    sevc: 1,
+    sqcp: 1,
+    ssmv: 1,
+    twos: 1,
+    ulaw: 1
   },
   video: {
-    avc1: true,
-    avc2: true,
-    avc3: true,
-    avc4: true,
-    avcp: true,
-    av01: true,
-    drac: true,
-    dva1: true,
-    dvav: true,
-    dvh1: true,
-    dvhe: true,
-    encv: true,
-    hev1: true,
-    hvc1: true,
-    mjp2: true,
-    mp4v: true,
-    mvc1: true,
-    mvc2: true,
-    mvc3: true,
-    mvc4: true,
-    resv: true,
-    rv60: true,
-    s263: true,
-    svc1: true,
-    svc2: true,
-    'vc-1': true,
-    vp08: true,
-    vp09: true
+    avc1: 1,
+    avc2: 1,
+    avc3: 1,
+    avc4: 1,
+    avcp: 1,
+    av01: 0.8,
+    drac: 1,
+    dva1: 1,
+    dvav: 1,
+    dvh1: 0.7,
+    dvhe: 0.7,
+    encv: 1,
+    hev1: 0.75,
+    hvc1: 0.75,
+    mjp2: 1,
+    mp4v: 1,
+    mvc1: 1,
+    mvc2: 1,
+    mvc3: 1,
+    mvc4: 1,
+    resv: 1,
+    rv60: 1,
+    s263: 1,
+    svc1: 1,
+    svc2: 1,
+    'vc-1': 1,
+    vp08: 1,
+    vp09: 0.9
   },
   text: {
-    stpp: true,
-    wvtt: true
+    stpp: 1,
+    wvtt: 1
   }
 };
-const MediaSource$2 = getMediaSource();
 function isCodecType(codec, type) {
   const typeCodes = sampleEntryCodesISO[type];
-  return !!typeCodes && typeCodes[codec.slice(0, 4)] === true;
+  return !!typeCodes && !!typeCodes[codec.slice(0, 4)];
+}
+function areCodecsMediaSourceSupported(codecs, type, preferManagedMediaSource = true) {
+  return !codecs.split(',').some(codec => !isCodecMediaSourceSupported(codec, type, preferManagedMediaSource));
 }
-function isCodecSupportedInMp4(codec, type) {
+function isCodecMediaSourceSupported(codec, type, preferManagedMediaSource = true) {
   var _MediaSource$isTypeSu;
-  return (_MediaSource$isTypeSu = MediaSource$2 == null ? void 0 : MediaSource$2.isTypeSupported(`${type || 'video'}/mp4;codecs="${codec}"`)) != null ? _MediaSource$isTypeSu : false;
+  const MediaSource = getMediaSource(preferManagedMediaSource);
+  return (_MediaSource$isTypeSu = MediaSource == null ? void 0 : MediaSource.isTypeSupported(mimeTypeForCodec(codec, type))) != null ? _MediaSource$isTypeSu : false;
+}
+function mimeTypeForCodec(codec, type) {
+  return `${type}/mp4;codecs="${codec}"`;
+}
+function videoCodecPreferenceValue(videoCodec) {
+  if (videoCodec) {
+    const fourCC = videoCodec.substring(0, 4);
+    return sampleEntryCodesISO.video[fourCC];
+  }
+  return 2;
+}
+function codecsSetSelectionPreferenceValue(codecSet) {
+  return codecSet.split(',').reduce((num, fourCC) => {
+    const preferenceValue = sampleEntryCodesISO.video[fourCC];
+    if (preferenceValue) {
+      return (preferenceValue * 2 + num) / (num ? 3 : 2);
+    }
+    return (sampleEntryCodesISO.audio[fourCC] + num) / (num ? 2 : 1);
+  }, 0);
+}
+const CODEC_COMPATIBLE_NAMES = {};
+function getCodecCompatibleNameLower(lowerCaseCodec, preferManagedMediaSource = true) {
+  if (CODEC_COMPATIBLE_NAMES[lowerCaseCodec]) {
+    return CODEC_COMPATIBLE_NAMES[lowerCaseCodec];
+  }
+
+  // Idealy fLaC and Opus would be first (spec-compliant) but
+  // some browsers will report that fLaC is supported then fail.
+  // see: https://bugs.chromium.org/p/chromium/issues/detail?id=1422728
+  const codecsToCheck = {
+    flac: ['flac', 'fLaC', 'FLAC'],
+    opus: ['opus', 'Opus']
+  }[lowerCaseCodec];
+  for (let i = 0; i < codecsToCheck.length; i++) {
+    if (isCodecMediaSourceSupported(codecsToCheck[i], 'audio', preferManagedMediaSource)) {
+      CODEC_COMPATIBLE_NAMES[lowerCaseCodec] = codecsToCheck[i];
+      return codecsToCheck[i];
+    }
+  }
+  return lowerCaseCodec;
+}
+const AUDIO_CODEC_REGEXP = /flac|opus/i;
+function getCodecCompatibleName(codec, preferManagedMediaSource = true) {
+  return codec.replace(AUDIO_CODEC_REGEXP, m => getCodecCompatibleNameLower(m.toLowerCase(), preferManagedMediaSource));
+}
+function pickMostCompleteCodecName(parsedCodec, levelCodec) {
+  // Parsing of mp4a codecs strings in mp4-tools from media is incomplete as of d8c6c7a
+  // so use level codec is parsed codec is unavailable or incomplete
+  if (parsedCodec && parsedCodec !== 'mp4a') {
+    return parsedCodec;
+  }
+  return levelCodec;
+}
+function convertAVC1ToAVCOTI(codec) {
+  // Convert avc1 codec string from RFC-4281 to RFC-6381 for MediaSource.isTypeSupported
+  const avcdata = codec.split('.');
+  if (avcdata.length > 2) {
+    let result = avcdata.shift() + '.';
+    result += parseInt(avcdata.shift()).toString(16);
+    result += ('000' + parseInt(avcdata.shift()).toString(16)).slice(-4);
+    return result;
+  }
+  return codec;
 }
 
 const MASTER_PLAYLIST_REGEX = /#EXT-X-STREAM-INF:([^\r\n]*)(?:[\r\n](?:#[^\r\n]*)?)*([^\r\n]+)|#EXT-X-(SESSION-DATA|SESSION-KEY|DEFINE|CONTENT-STEERING|START):([^\r\n]*)[\r\n]+/g;
@@ -2816,7 +3054,7 @@ const LEVEL_PLAYLIST_REGEX_FAST = new RegExp([/#EXTINF:\s*(\d*(?:\.\d+)?)(?:,(.*
 // next segment's program date/time group 5 => the datetime spec
 /#.*/.source // All other non-segment oriented tags will match with all groups empty
 ].join('|'), 'g');
-const LEVEL_PLAYLIST_REGEX_SLOW = new RegExp([/#(EXTM3U)/.source, /#EXT-X-(DATERANGE|DEFINE|KEY|MAP|PART|PART-INF|PLAYLIST-TYPE|PRELOAD-HINT|RENDITION-REPORT|SERVER-CONTROL|SKIP|START):(.+)/.source, /#EXT-X-(BITRATE|DISCONTINUITY-SEQUENCE|MEDIA-SEQUENCE|TARGETDURATION|VERSION): *(\d+)/.source, /#EXT-X-(DISCONTINUITY|ENDLIST|GAP)/.source, /(#)([^:]*):(.*)/.source, /(#)(.*)(?:.*)\r?\n?/.source].join('|'));
+const LEVEL_PLAYLIST_REGEX_SLOW = new RegExp([/#(EXTM3U)/.source, /#EXT-X-(DATERANGE|DEFINE|KEY|MAP|PART|PART-INF|PLAYLIST-TYPE|PRELOAD-HINT|RENDITION-REPORT|SERVER-CONTROL|SKIP|START):(.+)/.source, /#EXT-X-(BITRATE|DISCONTINUITY-SEQUENCE|MEDIA-SEQUENCE|TARGETDURATION|VERSION): *(\d+)/.source, /#EXT-X-(DISCONTINUITY|ENDLIST|GAP|INDEPENDENT-SEGMENTS)/.source, /(#)([^:]*):(.*)/.source, /(#)(.*)(?:.*)\r?\n?/.source].join('|'));
 class M3U8Parser {
   static findGroup(groups, mediaGroupId) {
     for (let i = 0; i < groups.length; i++) {
@@ -2826,17 +3064,6 @@ class M3U8Parser {
       }
     }
   }
-  static convertAVC1ToAVCOTI(codec) {
-    // Convert avc1 codec string from RFC-4281 to RFC-6381 for MediaSource.isTypeSupported
-    const avcdata = codec.split('.');
-    if (avcdata.length > 2) {
-      let result = avcdata.shift() + '.';
-      result += parseInt(avcdata.shift()).toString(16);
-      result += ('000' + parseInt(avcdata.shift()).toString(16)).slice(-4);
-      return result;
-    }
-    return codec;
-  }
   static resolve(url, baseUrl) {
     return urlToolkitExports.buildAbsoluteURL(baseUrl, url, {
       alwaysNormalize: true
@@ -2871,7 +3098,7 @@ class M3U8Parser {
         const uri = substituteVariables(parsed, result[2]) ;
         const level = {
           attrs,
-          bitrate: attrs.decimalInteger('AVERAGE-BANDWIDTH') || attrs.decimalInteger('BANDWIDTH'),
+          bitrate: attrs.decimalInteger('BANDWIDTH') || attrs.decimalInteger('AVERAGE-BANDWIDTH'),
           name: attrs.NAME,
           url: M3U8Parser.resolve(uri, baseurl)
         };
@@ -2880,10 +3107,7 @@ class M3U8Parser {
           level.width = resolution.width;
           level.height = resolution.height;
         }
-        setCodecs((attrs.CODECS || '').split(/[ ,]+/).filter(c => c), level);
-        if (level.videoCodec && level.videoCodec.indexOf('avc1') !== -1) {
-          level.videoCodec = M3U8Parser.convertAVC1ToAVCOTI(level.videoCodec);
-        }
+        setCodecs(attrs.CODECS, level);
         if (!((_level$unknownCodecs = level.unknownCodecs) != null && _level$unknownCodecs.length)) {
           levelsWithKnownCodecs.push(level);
         }
@@ -2989,20 +3213,36 @@ class M3U8Parser {
         {
           substituteVariablesInAttributes(parsed, attrs, ['URI', 'GROUP-ID', 'LANGUAGE', 'ASSOC-LANGUAGE', 'STABLE-RENDITION-ID', 'NAME', 'INSTREAM-ID', 'CHARACTERISTICS', 'CHANNELS']);
         }
+        const lang = attrs.LANGUAGE;
+        const assocLang = attrs['ASSOC-LANGUAGE'];
+        const channels = attrs.CHANNELS;
+        const characteristics = attrs.CHARACTERISTICS;
+        const instreamId = attrs['INSTREAM-ID'];
         const media = {
           attrs,
           bitrate: 0,
           id: id++,
           groupId: attrs['GROUP-ID'] || '',
-          instreamId: attrs['INSTREAM-ID'],
-          name: attrs.NAME || attrs.LANGUAGE || '',
+          name: attrs.NAME || lang || '',
           type,
           default: attrs.bool('DEFAULT'),
           autoselect: attrs.bool('AUTOSELECT'),
           forced: attrs.bool('FORCED'),
-          lang: attrs.LANGUAGE,
+          lang,
           url: attrs.URI ? M3U8Parser.resolve(attrs.URI, baseurl) : ''
         };
+        if (assocLang) {
+          media.assocLang = assocLang;
+        }
+        if (channels) {
+          media.channels = channels;
+        }
+        if (characteristics) {
+          media.characteristics = characteristics;
+        }
+        if (instreamId) {
+          media.instreamId = instreamId;
+        }
         if (groups != null && groups.length) {
           // If there are audio or text groups signalled in the manifest, let's look for a matching codec string for this track
           // If we don't find the track signalled, lets use the first audio groups codec we have
@@ -3032,6 +3272,7 @@ class M3U8Parser {
     let levelkeys;
     let firstPdtIndex = -1;
     let createNextFrag = false;
+    let nextByteRange = null;
     LEVEL_PLAYLIST_REGEX_FAST.lastIndex = 0;
     level.m3u8 = string;
     level.hasVariableRefs = hasVariableReferences(string) ;
@@ -3048,6 +3289,10 @@ class M3U8Parser {
           frag.initSegment = currentInitSegment;
           frag.rawProgramDateTime = currentInitSegment.rawProgramDateTime;
           currentInitSegment.rawProgramDateTime = null;
+          if (nextByteRange) {
+            frag.setByteRange(nextByteRange);
+            nextByteRange = null;
+          }
         }
       }
       const duration = result[1];
@@ -3068,7 +3313,6 @@ class M3U8Parser {
           frag.sn = currentSN;
           frag.level = id;
           frag.cc = discontinuityCounter;
-          frag.urlId = levelUrlId;
           fragments.push(frag);
           // avoid sliced strings    https://github.com/video-dev/hls.js/issues/939
           const uri = (' ' + result[3]).slice(1);
@@ -3146,6 +3390,7 @@ class M3U8Parser {
           case 'VERSION':
             level.version = parseInt(value1);
             break;
+          case 'INDEPENDENT-SEGMENTS':
           case 'EXTM3U':
             break;
           case 'ENDLIST':
@@ -3242,6 +3487,14 @@ class M3U8Parser {
                 }
               } else {
                 // Initial segment tag is before segment duration tag
+                // Handle case where EXT-X-MAP is declared after EXT-X-BYTERANGE
+                const end = frag.byteRangeEndOffset;
+                if (end) {
+                  const start = frag.byteRangeStartOffset;
+                  nextByteRange = `${end - start}@${start}`;
+                } else {
+                  nextByteRange = null;
+                }
                 setInitSegment(frag, mapAttrs, id, levelkeys);
                 currentInitSegment = frag;
                 createNextFrag = true;
@@ -3389,16 +3642,14 @@ function parseStartTimeOffset(startAttributes) {
   }
   return null;
 }
-function setCodecs(codecs, level) {
+function setCodecs(codecsAttributeValue, level) {
+  let codecs = (codecsAttributeValue || '').split(/[ ,]+/).filter(c => c);
   ['video', 'audio', 'text'].forEach(type => {
     const filtered = codecs.filter(codec => isCodecType(codec, type));
     if (filtered.length) {
-      const preferred = filtered.filter(codec => {
-        return codec.lastIndexOf('avc1', 0) === 0 || codec.lastIndexOf('mp4a', 0) === 0;
-      });
-      level[`${type}Codec`] = preferred.length > 0 ? preferred[0] : filtered[0];
-
-      // remove from list
+      // Comma separated list of all codecs for type
+      level[`${type}Codec`] = filtered.join(',');
+      // Remove known codecs so that only unknownCodecs are left after iterating through each type
       codecs = codecs.filter(codec => filtered.indexOf(codec) === -1);
     }
   });
@@ -3577,12 +3828,14 @@ class PlaylistLoader {
     const {
       id,
       level,
+      pathwayId,
       url,
       deliveryDirectives
     } = data;
     this.load({
       id,
       level,
+      pathwayId,
       responseType: 'text',
       type: PlaylistContextType.LEVEL,
       url,
@@ -3633,7 +3886,7 @@ class PlaylistLoader {
     let loader = this.getInternalLoader(context);
     if (loader) {
       const loaderContext = loader.context;
-      if (loaderContext && loaderContext.url === context.url) {
+      if (loaderContext && loaderContext.url === context.url && loaderContext.level === context.level) {
         // same URL can't overlap
         logger.trace('[playlist-loader]: playlist request ongoing');
         return;
@@ -3657,7 +3910,7 @@ class PlaylistLoader {
 
     // Override level/track timeout for LL-HLS requests
     // (the default of 10000ms is counter productive to blocking playlist reload requests)
-    if ((_context$deliveryDire = context.deliveryDirectives) != null && _context$deliveryDire.part) {
+    if (isFiniteNumber((_context$deliveryDire = context.deliveryDirectives) == null ? void 0 : _context$deliveryDire.part)) {
       let levelDetails;
       if (context.type === PlaylistContextType.LEVEL && context.level !== null) {
         levelDetails = this.hls.levels[context.level].details;
@@ -3786,8 +4039,8 @@ class PlaylistLoader {
       type
     } = context;
     const url = getResponseUrl(response, context);
-    const levelUrlId = isFiniteNumber(id) ? id : 0;
-    const levelId = isFiniteNumber(level) ? level : levelUrlId;
+    const levelUrlId = 0;
+    const levelId = isFiniteNumber(level) ? level : isFiniteNumber(id) ? id : 0;
     const levelType = mapContextToLevelType(context);
     const levelDetails = M3U8Parser.parseLevelPlaylist(response.data, url, levelId, levelType, levelUrlId, this.variableList);
 
@@ -4107,6 +4360,17 @@ function getCuesInRange(cues, start, end) {
   }
   return cuesFound;
 }
+function filterSubtitleTracks(textTrackList) {
+  const tracks = [];
+  for (let i = 0; i < textTrackList.length; i++) {
+    const track = textTrackList[i];
+    // Edge adds a track without a label; we don't want to use it
+    if ((track.kind === 'subtitles' || track.kind === 'captions') && track.label) {
+      tracks.push(textTrackList[i]);
+    }
+  }
+  return tracks;
+}
 
 var MetadataSchema = {
   audioId3: "org.id3",
@@ -4365,28 +4629,35 @@ class ID3TrackController {
     for (let i = 0; i < ids.length; i++) {
       const id = ids[i];
       const dateRange = dateRanges[id];
+      const startTime = dateRangeDateToTimelineSeconds(dateRange.startDate, dateTimeOffset);
+
+      // Process DateRanges to determine end-time (known DURATION, END-DATE, or END-ON-NEXT)
       const appendedDateRangeCues = dateRangeCuesAppended[id];
       const cues = (appendedDateRangeCues == null ? void 0 : appendedDateRangeCues.cues) || {};
       let durationKnown = (appendedDateRangeCues == null ? void 0 : appendedDateRangeCues.durationKnown) || false;
-      const startTime = dateRangeDateToTimelineSeconds(dateRange.startDate, dateTimeOffset);
       let endTime = MAX_CUE_ENDTIME;
       const endDate = dateRange.endDate;
       if (endDate) {
         endTime = dateRangeDateToTimelineSeconds(endDate, dateTimeOffset);
         durationKnown = true;
       } else if (dateRange.endOnNext && !durationKnown) {
-        const nextDateRangeWithSameClass = ids.reduce((filterMapArray, id) => {
-          const candidate = dateRanges[id];
-          if (candidate.class === dateRange.class && candidate.id !== id && candidate.startDate > dateRange.startDate) {
-            filterMapArray.push(candidate);
+        const nextDateRangeWithSameClass = ids.reduce((candidateDateRange, id) => {
+          if (id !== dateRange.id) {
+            const otherDateRange = dateRanges[id];
+            if (otherDateRange.class === dateRange.class && otherDateRange.startDate > dateRange.startDate && (!candidateDateRange || dateRange.startDate < candidateDateRange.startDate)) {
+              return otherDateRange;
+            }
           }
-          return filterMapArray;
-        }, []).sort((a, b) => a.startDate.getTime() - b.startDate.getTime())[0];
+          return candidateDateRange;
+        }, null);
         if (nextDateRangeWithSameClass) {
           endTime = dateRangeDateToTimelineSeconds(nextDateRangeWithSameClass.startDate, dateTimeOffset);
           durationKnown = true;
         }
       }
+
+      // Create TextTrack Cues for each MetadataGroup Item (select DateRange attribute)
+      // This is to emulate Safari HLS playback handling of DateRange tags
       const attributes = Object.keys(dateRange.attr);
       for (let j = 0; j < attributes.length; j++) {
         const key = attributes[j];
@@ -4414,6 +4685,8 @@ class ID3TrackController {
           }
         }
       }
+
+      // Keep track of processed DateRanges by ID for updating cues with new DateRange tag attributes
       dateRangeCuesAppended[id] = {
         cues,
         dateRange,
@@ -4596,7 +4869,7 @@ class LatencyController {
       lowLatencyMode,
       maxLiveSyncPlaybackRate
     } = this.config;
-    if (!lowLatencyMode || maxLiveSyncPlaybackRate === 1) {
+    if (!lowLatencyMode || maxLiveSyncPlaybackRate === 1 || !levelDetails.live) {
       return;
     }
     const targetLatency = this.targetLatency;
@@ -4609,7 +4882,7 @@ class LatencyController {
     // Playback further than one target duration from target can be considered DVR playback.
     const liveMinLatencyDuration = Math.min(this.maxLatency, targetLatency + levelDetails.targetduration);
     const inLiveRange = distanceFromTarget < liveMinLatencyDuration;
-    if (levelDetails.live && inLiveRange && distanceFromTarget > 0.05 && this.forwardBufferLength > 1) {
+    if (inLiveRange && distanceFromTarget > 0.05 && this.forwardBufferLength > 1) {
       const max = Math.min(2, Math.max(1.0, maxLiveSyncPlaybackRate));
       const rate = Math.round(2 / (1 + Math.exp(-0.75 * distanceFromTarget - this.edgeStalled)) * 20) / 20;
       media.playbackRate = Math.min(max, Math.max(1, rate));
@@ -4636,6 +4909,13 @@ class LatencyController {
 }
 
 const HdcpLevels = ['NONE', 'TYPE-0', 'TYPE-1', null];
+function isHdcpLevel(value) {
+  return HdcpLevels.indexOf(value) > -1;
+}
+const VideoRangeValues = ['SDR', 'PQ', 'HLG'];
+function isVideoRange(value) {
+  return !!value && VideoRangeValues.indexOf(value) > -1;
+}
 var HlsSkip = {
   No: "",
   Yes: "YES",
@@ -4685,20 +4965,24 @@ class Level {
     this.audioCodec = void 0;
     this.bitrate = void 0;
     this.codecSet = void 0;
+    this.url = void 0;
+    this.frameRate = void 0;
     this.height = void 0;
     this.id = void 0;
     this.name = void 0;
     this.videoCodec = void 0;
     this.width = void 0;
-    this.unknownCodecs = void 0;
-    this.audioGroupIds = void 0;
     this.details = void 0;
     this.fragmentError = 0;
     this.loadError = 0;
     this.loaded = void 0;
     this.realBitrate = 0;
-    this.textGroupIds = void 0;
-    this.url = void 0;
+    this.supportedPromise = void 0;
+    this.supportedResult = void 0;
+    this._avgBitrate = 0;
+    this._audioGroups = void 0;
+    this._subtitleGroups = void 0;
+    // Deprecated (retained for backwards compatibility)
     this._urlId = 0;
     this.url = [data.url];
     this._attrs = [data.attrs];
@@ -4710,47 +4994,99 @@ class Level {
     this.name = data.name;
     this.width = data.width || 0;
     this.height = data.height || 0;
+    this.frameRate = data.attrs.optionalFloat('FRAME-RATE', 0);
+    this._avgBitrate = data.attrs.decimalInteger('AVERAGE-BANDWIDTH');
     this.audioCodec = data.audioCodec;
     this.videoCodec = data.videoCodec;
-    this.unknownCodecs = data.unknownCodecs;
-    this.codecSet = [data.videoCodec, data.audioCodec].filter(c => c).join(',').replace(/\.[^.,]+/g, '');
+    this.codecSet = [data.videoCodec, data.audioCodec].filter(c => !!c).map(s => s.substring(0, 4)).join(',');
+    this.addGroupId('audio', data.attrs.AUDIO);
+    this.addGroupId('text', data.attrs.SUBTITLES);
   }
   get maxBitrate() {
     return Math.max(this.realBitrate, this.bitrate);
   }
+  get averageBitrate() {
+    return this._avgBitrate || this.realBitrate || this.bitrate;
+  }
   get attrs() {
-    return this._attrs[this._urlId];
+    return this._attrs[0];
+  }
+  get codecs() {
+    return this.attrs.CODECS || '';
   }
   get pathwayId() {
     return this.attrs['PATHWAY-ID'] || '.';
   }
+  get videoRange() {
+    return this.attrs['VIDEO-RANGE'] || 'SDR';
+  }
+  get score() {
+    return this.attrs.optionalFloat('SCORE', 0);
+  }
   get uri() {
-    return this.url[this._urlId] || '';
+    return this.url[0] || '';
   }
-  get urlId() {
-    return this._urlId;
+  hasAudioGroup(groupId) {
+    return hasGroup(this._audioGroups, groupId);
   }
-  set urlId(value) {
-    const newValue = value % this.url.length;
-    if (this._urlId !== newValue) {
-      this.fragmentError = 0;
-      this.loadError = 0;
-      this.details = undefined;
-      this._urlId = newValue;
+  hasSubtitleGroup(groupId) {
+    return hasGroup(this._subtitleGroups, groupId);
+  }
+  get audioGroups() {
+    return this._audioGroups;
+  }
+  get subtitleGroups() {
+    return this._subtitleGroups;
+  }
+  addGroupId(type, groupId) {
+    if (!groupId) {
+      return;
     }
+    if (type === 'audio') {
+      let audioGroups = this._audioGroups;
+      if (!audioGroups) {
+        audioGroups = this._audioGroups = [];
+      }
+      if (audioGroups.indexOf(groupId) === -1) {
+        audioGroups.push(groupId);
+      }
+    } else if (type === 'text') {
+      let subtitleGroups = this._subtitleGroups;
+      if (!subtitleGroups) {
+        subtitleGroups = this._subtitleGroups = [];
+      }
+      if (subtitleGroups.indexOf(groupId) === -1) {
+        subtitleGroups.push(groupId);
+      }
+    }
+  }
+
+  // Deprecated methods (retained for backwards compatibility)
+  get urlId() {
+    return 0;
+  }
+  set urlId(value) {}
+  get audioGroupIds() {
+    return this.audioGroups ? [this.audioGroupId] : undefined;
+  }
+  get textGroupIds() {
+    return this.subtitleGroups ? [this.textGroupId] : undefined;
   }
   get audioGroupId() {
-    var _this$audioGroupIds;
-    return (_this$audioGroupIds = this.audioGroupIds) == null ? void 0 : _this$audioGroupIds[this.urlId];
+    var _this$audioGroups;
+    return (_this$audioGroups = this.audioGroups) == null ? void 0 : _this$audioGroups[0];
   }
   get textGroupId() {
-    var _this$textGroupIds;
-    return (_this$textGroupIds = this.textGroupIds) == null ? void 0 : _this$textGroupIds[this.urlId];
+    var _this$subtitleGroups;
+    return (_this$subtitleGroups = this.subtitleGroups) == null ? void 0 : _this$subtitleGroups[0];
   }
-  addFallback(data) {
-    this.url.push(data.url);
-    this._attrs.push(data.attrs);
+  addFallback() {}
+}
+function hasGroup(groups, groupId) {
+  if (!groupId || !groups) {
+    return false;
   }
+  return groups.indexOf(groupId) !== -1;
 }
 
 function updateFromToPTS(fragFrom, fragTo) {
@@ -4894,7 +5230,6 @@ function mergeDetails(oldDetails, newDetails) {
     newFrag.elementaryStreams = oldFrag.elementaryStreams;
     newFrag.loader = oldFrag.loader;
     newFrag.stats = oldFrag.stats;
-    newFrag.urlId = oldFrag.urlId;
     if (oldFrag.initSegment) {
       newFrag.initSegment = oldFrag.initSegment;
       currentInitSegment = oldFrag.initSegment;
@@ -4904,7 +5239,7 @@ function mergeDetails(oldDetails, newDetails) {
     const fragmentsToCheck = newDetails.fragmentHint ? newDetails.fragments.concat(newDetails.fragmentHint) : newDetails.fragments;
     fragmentsToCheck.forEach(frag => {
       var _currentInitSegment;
-      if (!frag.initSegment || frag.initSegment.relurl === ((_currentInitSegment = currentInitSegment) == null ? void 0 : _currentInitSegment.relurl)) {
+      if (frag && (!frag.initSegment || frag.initSegment.relurl === ((_currentInitSegment = currentInitSegment) == null ? void 0 : _currentInitSegment.relurl))) {
         frag.initSegment = currentInitSegment;
       }
     });
@@ -5094,6 +5429,18 @@ function findPart(partList, sn, partIndex) {
   }
   return null;
 }
+function reassignFragmentLevelIndexes(levels) {
+  levels.forEach((level, index) => {
+    const {
+      details
+    } = level;
+    if (details != null && details.fragments) {
+      details.fragments.forEach(fragment => {
+        fragment.level = index;
+      });
+    }
+  });
+}
 
 function isTimeoutError(error) {
   switch (error.details) {
@@ -5120,8 +5467,13 @@ function getLoaderConfigWithoutReties(loderConfig) {
     timeoutRetry: null
   });
 }
-function shouldRetry(retryConfig, retryCount, isTimeout, httpStatus) {
-  return !!retryConfig && retryCount < retryConfig.maxNumRetry && (retryForHttpStatus(httpStatus) || !!isTimeout);
+function shouldRetry(retryConfig, retryCount, isTimeout, loaderResponse) {
+  if (!retryConfig) {
+    return false;
+  }
+  const httpStatus = loaderResponse == null ? void 0 : loaderResponse.code;
+  const retry = retryCount < retryConfig.maxNumRetry && (retryForHttpStatus(httpStatus) || !!isTimeout);
+  return retryConfig.shouldRetry ? retryConfig.shouldRetry(retryConfig, retryCount, isTimeout, loaderResponse, retry) : retry;
 }
 function retryForHttpStatus(httpStatus) {
   // Do not retry on status 4xx, status 0 (CORS error), or undefined (decrypt/gap/parse error)
@@ -5209,11 +5561,16 @@ function findFragmentByPTS(fragPrevious, fragments, bufferEnd = 0, maxFragLookUp
   let fragNext = null;
   if (fragPrevious) {
     fragNext = fragments[fragPrevious.sn - fragments[0].sn + 1] || null;
+    // check for buffer-end rounding error
+    const bufferEdgeError = fragPrevious.endDTS - bufferEnd;
+    if (bufferEdgeError > 0 && bufferEdgeError < 0.0000015) {
+      bufferEnd += 0.0000015;
+    }
   } else if (bufferEnd === 0 && fragments[0].start === 0) {
     fragNext = fragments[0];
   }
   // Prefer the next fragment if it's within tolerance
-  if (fragNext && fragmentWithinToleranceTest(bufferEnd, maxFragLookUpTolerance, fragNext) === 0) {
+  if (fragNext && (!fragPrevious || fragPrevious.level === fragNext.level) && fragmentWithinToleranceTest(bufferEnd, maxFragLookUpTolerance, fragNext) === 0) {
     return fragNext;
   }
   // We might be seeking past the tolerance so find the best match
@@ -5288,7 +5645,6 @@ function findFragWithCC(fragments, cc) {
   });
 }
 
-const RENDITION_PENALTY_DURATION_MS = 300000;
 var NetworkErrorAction = {
   DoNothing: 0,
   SendEndCallback: 1,
@@ -5339,10 +5695,10 @@ class ErrorController {
     this.hls = null;
     this.penalizedRenditions = {};
   }
-  startLoad(startPosition) {
+  startLoad(startPosition) {}
+  stopLoad() {
     this.playlistError = 0;
   }
-  stopLoad() {}
   getVariantLevelIndex(frag) {
     return (frag == null ? void 0 : frag.type) === PlaylistLevelType.MAIN ? frag.level : this.hls.loadLevel;
   }
@@ -5412,7 +5768,7 @@ class ErrorController {
       case ErrorDetails.SUBTITLE_TRACK_LOAD_TIMEOUT:
         if (context) {
           const level = hls.levels[hls.loadLevel];
-          if (level && (context.type === PlaylistContextType.AUDIO_TRACK && context.groupId === level.audioGroupId || context.type === PlaylistContextType.SUBTITLE_TRACK && context.groupId === level.textGroupId)) {
+          if (level && (context.type === PlaylistContextType.AUDIO_TRACK && level.hasAudioGroup(context.groupId) || context.type === PlaylistContextType.SUBTITLE_TRACK && level.hasSubtitleGroup(context.groupId))) {
             // Perform Pathway switch or Redundant failover if possible for fastest recovery
             // otherwise allow playlist retry count to reach max error retries
             data.errorAction = this.getPlaylistRetryOrSwitchAction(data, hls.loadLevel);
@@ -5432,16 +5788,18 @@ class ErrorController {
               flags: ErrorActionFlags.MoveAllAlternatesMatchingHDCP,
               hdcpLevel: restrictedHdcpLevel
             };
+          } else {
+            this.keySystemError(data);
           }
         }
         return;
       case ErrorDetails.BUFFER_ADD_CODEC_ERROR:
       case ErrorDetails.REMUX_ALLOC_ERROR:
+      case ErrorDetails.BUFFER_APPEND_ERROR:
         data.errorAction = this.getLevelSwitchAction(data, (_data$level = data.level) != null ? _data$level : hls.loadLevel);
         return;
       case ErrorDetails.INTERNAL_EXCEPTION:
       case ErrorDetails.BUFFER_APPENDING_ERROR:
-      case ErrorDetails.BUFFER_APPEND_ERROR:
       case ErrorDetails.BUFFER_FULL_ERROR:
       case ErrorDetails.LEVEL_SWITCH_ERROR:
       case ErrorDetails.BUFFER_STALLED_ERROR:
@@ -5454,20 +5812,20 @@ class ErrorController {
         return;
     }
     if (data.type === ErrorTypes.KEY_SYSTEM_ERROR) {
-      const levelIndex = this.getVariantLevelIndex(data.frag);
-      // Do not retry level. Escalate to fatal if switching levels fails.
-      data.levelRetry = false;
-      data.errorAction = this.getLevelSwitchAction(data, levelIndex);
-      return;
+      this.keySystemError(data);
     }
   }
+  keySystemError(data) {
+    const levelIndex = this.getVariantLevelIndex(data.frag);
+    // Do not retry level. Escalate to fatal if switching levels fails.
+    data.levelRetry = false;
+    data.errorAction = this.getLevelSwitchAction(data, levelIndex);
+  }
   getPlaylistRetryOrSwitchAction(data, levelIndex) {
-    var _data$response;
     const hls = this.hls;
     const retryConfig = getRetryConfig(hls.config.playlistLoadPolicy, data);
     const retryCount = this.playlistError++;
-    const httpStatus = (_data$response = data.response) == null ? void 0 : _data$response.code;
-    const retry = shouldRetry(retryConfig, retryCount, isTimeoutError(data), httpStatus);
+    const retry = shouldRetry(retryConfig, retryCount, isTimeoutError(data), data.response);
     if (retry) {
       return {
         action: NetworkErrorAction.RetryRequest,
@@ -5497,12 +5855,10 @@ class ErrorController {
     const fragmentErrors = hls.levels.reduce((acc, level) => acc + level.fragmentError, 0);
     // Switch levels when out of retried or level index out of bounds
     if (level) {
-      var _data$response2;
       if (data.details !== ErrorDetails.FRAG_GAP) {
         level.fragmentError++;
       }
-      const httpStatus = (_data$response2 = data.response) == null ? void 0 : _data$response2.code;
-      const retry = shouldRetry(retryConfig, fragmentErrors, isTimeoutError(data), httpStatus);
+      const retry = shouldRetry(retryConfig, fragmentErrors, isTimeoutError(data), data.response);
       if (retry) {
         return {
           action: NetworkErrorAction.RetryRequest,
@@ -5529,55 +5885,72 @@ class ErrorController {
     }
     const level = this.hls.levels[levelIndex];
     if (level) {
+      var _data$frag2, _data$context2;
+      const errorDetails = data.details;
       level.loadError++;
-      if (hls.autoLevelEnabled) {
-        var _data$frag2, _data$context2;
-        // Search for next level to retry
-        let nextLevel = -1;
-        const {
-          levels,
-          loadLevel,
-          minAutoLevel,
-          maxAutoLevel
-        } = hls;
-        const fragErrorType = (_data$frag2 = data.frag) == null ? void 0 : _data$frag2.type;
-        const {
-          type: playlistErrorType,
-          groupId: playlistErrorGroupId
-        } = (_data$context2 = data.context) != null ? _data$context2 : {};
-        for (let i = levels.length; i--;) {
-          const candidate = (i + loadLevel) % levels.length;
-          if (candidate !== loadLevel && candidate >= minAutoLevel && candidate <= maxAutoLevel && levels[candidate].loadError === 0) {
-            const levelCandidate = levels[candidate];
-            // Skip level switch if GAP tag is found in next level at same position
-            if (data.details === ErrorDetails.FRAG_GAP && data.frag) {
-              const levelDetails = levels[candidate].details;
-              if (levelDetails) {
-                const fragCandidate = findFragmentByPTS(data.frag, levelDetails.fragments, data.frag.start);
-                if (fragCandidate != null && fragCandidate.gap) {
-                  continue;
-                }
+      if (errorDetails === ErrorDetails.BUFFER_APPEND_ERROR) {
+        level.fragmentError++;
+      }
+      // Search for next level to retry
+      let nextLevel = -1;
+      const {
+        levels,
+        loadLevel,
+        minAutoLevel,
+        maxAutoLevel
+      } = hls;
+      if (!hls.autoLevelEnabled) {
+        hls.loadLevel = -1;
+      }
+      const fragErrorType = (_data$frag2 = data.frag) == null ? void 0 : _data$frag2.type;
+      // Find alternate audio codec if available on audio codec error
+      const isAudioCodecError = fragErrorType === PlaylistLevelType.AUDIO && errorDetails === ErrorDetails.FRAG_PARSING_ERROR || data.sourceBufferName === 'audio' && (errorDetails === ErrorDetails.BUFFER_ADD_CODEC_ERROR || errorDetails === ErrorDetails.BUFFER_APPEND_ERROR);
+      const findAudioCodecAlternate = isAudioCodecError && levels.some(({
+        audioCodec
+      }) => level.audioCodec !== audioCodec);
+      // Find alternate video codec if available on video codec error
+      const isVideoCodecError = data.sourceBufferName === 'video' && (errorDetails === ErrorDetails.BUFFER_ADD_CODEC_ERROR || errorDetails === ErrorDetails.BUFFER_APPEND_ERROR);
+      const findVideoCodecAlternate = isVideoCodecError && levels.some(({
+        codecSet,
+        audioCodec
+      }) => level.codecSet !== codecSet && level.audioCodec === audioCodec);
+      const {
+        type: playlistErrorType,
+        groupId: playlistErrorGroupId
+      } = (_data$context2 = data.context) != null ? _data$context2 : {};
+      for (let i = levels.length; i--;) {
+        const candidate = (i + loadLevel) % levels.length;
+        if (candidate !== loadLevel && candidate >= minAutoLevel && candidate <= maxAutoLevel && levels[candidate].loadError === 0) {
+          var _level$audioGroups, _level$subtitleGroups;
+          const levelCandidate = levels[candidate];
+          // Skip level switch if GAP tag is found in next level at same position
+          if (errorDetails === ErrorDetails.FRAG_GAP && data.frag) {
+            const levelDetails = levels[candidate].details;
+            if (levelDetails) {
+              const fragCandidate = findFragmentByPTS(data.frag, levelDetails.fragments, data.frag.start);
+              if (fragCandidate != null && fragCandidate.gap) {
+                continue;
               }
-            } else if (playlistErrorType === PlaylistContextType.AUDIO_TRACK && playlistErrorGroupId === levelCandidate.audioGroupId || playlistErrorType === PlaylistContextType.SUBTITLE_TRACK && playlistErrorGroupId === levelCandidate.textGroupId) {
-              // For audio/subs playlist errors find another group ID or fallthrough to redundant fail-over
-              continue;
-            } else if (fragErrorType === PlaylistLevelType.AUDIO && level.audioGroupId === levelCandidate.audioGroupId || fragErrorType === PlaylistLevelType.SUBTITLE && level.textGroupId === levelCandidate.textGroupId) {
-              // For audio/subs frag errors find another group ID or fallthrough to redundant fail-over
-              continue;
             }
-            nextLevel = candidate;
-            break;
+          } else if (playlistErrorType === PlaylistContextType.AUDIO_TRACK && levelCandidate.hasAudioGroup(playlistErrorGroupId) || playlistErrorType === PlaylistContextType.SUBTITLE_TRACK && levelCandidate.hasSubtitleGroup(playlistErrorGroupId)) {
+            // For audio/subs playlist errors find another group ID or fallthrough to redundant fail-over
+            continue;
+          } else if (fragErrorType === PlaylistLevelType.AUDIO && (_level$audioGroups = level.audioGroups) != null && _level$audioGroups.some(groupId => levelCandidate.hasAudioGroup(groupId)) || fragErrorType === PlaylistLevelType.SUBTITLE && (_level$subtitleGroups = level.subtitleGroups) != null && _level$subtitleGroups.some(groupId => levelCandidate.hasSubtitleGroup(groupId)) || findAudioCodecAlternate && level.audioCodec === levelCandidate.audioCodec || !findAudioCodecAlternate && level.audioCodec !== levelCandidate.audioCodec || findVideoCodecAlternate && level.codecSet === levelCandidate.codecSet) {
+            // For video/audio/subs frag errors find another group ID or fallthrough to redundant fail-over
+            continue;
           }
+          nextLevel = candidate;
+          break;
         }
-        if (nextLevel > -1 && hls.loadLevel !== nextLevel) {
-          data.levelRetry = true;
-          this.playlistError = 0;
-          return {
-            action: NetworkErrorAction.SendAlternateToPenaltyBox,
-            flags: ErrorActionFlags.None,
-            nextAutoLevel: nextLevel
-          };
-        }
+      }
+      if (nextLevel > -1 && hls.loadLevel !== nextLevel) {
+        data.levelRetry = true;
+        this.playlistError = 0;
+        return {
+          action: NetworkErrorAction.SendAlternateToPenaltyBox,
+          flags: ErrorActionFlags.None,
+          nextAutoLevel: nextLevel
+        };
       }
     }
     // No levels to switch / Manual level selection / Level not found
@@ -5596,8 +5969,14 @@ class ErrorController {
         this.sendAlternateToPenaltyBox(data);
         if (!data.errorAction.resolved && data.details !== ErrorDetails.FRAG_GAP) {
           data.fatal = true;
+        } else if (/MediaSource readyState: ended/.test(data.error.message)) {
+          this.warn(`MediaSource ended after "${data.sourceBufferName}" sourceBuffer append error. Attempting to recover from media error.`);
+          this.hls.recoverMediaError();
         }
         break;
+      case NetworkErrorAction.RetryRequest:
+        // handled by stream and playlist/level controllers
+        break;
     }
     if (data.fatal) {
       this.hls.stopLoad();
@@ -5619,14 +5998,6 @@ class ErrorController {
       case ErrorActionFlags.None:
         this.switchLevel(data, nextAutoLevel);
         break;
-      case ErrorActionFlags.MoveAllAlternatesMatchingHost:
-        {
-          // Handle Redundant Levels here. Pathway switching is handled by content-steering-controller
-          if (!errorAction.resolved) {
-            errorAction.resolved = this.redundantFailover(data);
-          }
-        }
-        break;
       case ErrorActionFlags.MoveAllAlternatesMatchingHDCP:
         if (hdcpLevel) {
           hls.maxHdcpLevel = HdcpLevels[HdcpLevels.indexOf(hdcpLevel) - 1];
@@ -5649,73 +6020,6 @@ class ErrorController {
       this.hls.nextLoadLevel = this.hls.nextAutoLevel;
     }
   }
-  redundantFailover(data) {
-    const {
-      hls,
-      penalizedRenditions
-    } = this;
-    const levelIndex = data.parent === PlaylistLevelType.MAIN ? data.level : hls.loadLevel;
-    const level = hls.levels[levelIndex];
-    const redundantLevels = level.url.length;
-    const errorUrlId = data.frag ? data.frag.urlId : level.urlId;
-    if (level.urlId === errorUrlId && (!data.frag || level.details)) {
-      this.penalizeRendition(level, data);
-    }
-    for (let i = 1; i < redundantLevels; i++) {
-      const newUrlId = (errorUrlId + i) % redundantLevels;
-      const penalizedRendition = penalizedRenditions[newUrlId];
-      // Check if rendition is penalized and skip if it is a bad fit for failover
-      if (!penalizedRendition || checkExpired(penalizedRendition, data, penalizedRenditions[errorUrlId])) {
-        // delete penalizedRenditions[newUrlId];
-        // Update the url id of all levels so that we stay on the same set of variants when level switching
-        this.warn(`Switching to Redundant Stream ${newUrlId + 1}/${redundantLevels}: "${level.url[newUrlId]}" after ${data.details}`);
-        this.playlistError = 0;
-        hls.levels.forEach(lv => {
-          lv.urlId = newUrlId;
-        });
-        hls.nextLoadLevel = levelIndex;
-        return true;
-      }
-    }
-    return false;
-  }
-  penalizeRendition(level, data) {
-    const {
-      penalizedRenditions
-    } = this;
-    const penalizedRendition = penalizedRenditions[level.urlId] || {
-      lastErrorPerfMs: 0,
-      errors: [],
-      details: undefined
-    };
-    penalizedRendition.lastErrorPerfMs = performance.now();
-    penalizedRendition.errors.push(data);
-    penalizedRendition.details = level.details;
-    penalizedRenditions[level.urlId] = penalizedRendition;
-  }
-}
-function checkExpired(penalizedRendition, data, currentPenaltyState) {
-  // Expire penalty for switching back to rendition after RENDITION_PENALTY_DURATION_MS
-  if (performance.now() - penalizedRendition.lastErrorPerfMs > RENDITION_PENALTY_DURATION_MS) {
-    return true;
-  }
-  // Expire penalty on GAP tag error if rendition has no GAP at position (does not cover media tracks)
-  const lastErrorDetails = penalizedRendition.details;
-  if (data.details === ErrorDetails.FRAG_GAP && lastErrorDetails && data.frag) {
-    const position = data.frag.start;
-    const candidateFrag = findFragmentByPTS(null, lastErrorDetails.fragments, position);
-    if (candidateFrag && !candidateFrag.gap) {
-      return true;
-    }
-  }
-  // Expire penalty if there are more errors in currentLevel than in penalizedRendition
-  if (currentPenaltyState && penalizedRendition.errors.length < currentPenaltyState.errors.length) {
-    const lastCandidateError = penalizedRendition.errors[penalizedRendition.errors.length - 1];
-    if (lastErrorDetails && lastCandidateError.frag && data.frag && Math.abs(lastCandidateError.frag.start - data.frag.start) > lastErrorDetails.targetduration * 3) {
-      return true;
-    }
-  }
-  return false;
 }
 
 class BasePlaylistController {
@@ -5736,8 +6040,10 @@ class BasePlaylistController {
     this.hls = this.log = this.warn = null;
   }
   clearTimer() {
-    clearTimeout(this.timer);
-    this.timer = -1;
+    if (this.timer !== -1) {
+      self.clearTimeout(this.timer);
+      this.timer = -1;
+    }
   }
   startLoad() {
     this.canLoad = true;
@@ -5790,7 +6096,6 @@ class BasePlaylistController {
     }
     // Loading is handled by the subclasses
   }
-
   shouldLoadPlaylist(playlist) {
     return this.canLoad && !!playlist && !!playlist.url && (!playlist.details || playlist.details.live);
   }
@@ -5951,1587 +6256,1720 @@ class BasePlaylistController {
   }
 }
 
-let chromeOrFirefox;
-class LevelController extends BasePlaylistController {
-  constructor(hls, contentSteeringController) {
-    super(hls, '[level-controller]');
-    this._levels = [];
-    this._firstLevel = -1;
-    this._startLevel = void 0;
-    this.currentLevel = null;
-    this.currentLevelIndex = -1;
-    this.manualLevelIndex = -1;
-    this.steering = void 0;
-    this.onParsedComplete = void 0;
-    this.steering = contentSteeringController;
-    this._registerListeners();
-  }
-  _registerListeners() {
-    const {
-      hls
-    } = this;
-    hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
-    hls.on(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
-    hls.on(Events.LEVEL_LOADED, this.onLevelLoaded, this);
-    hls.on(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
-    hls.on(Events.AUDIO_TRACK_SWITCHED, this.onAudioTrackSwitched, this);
-    hls.on(Events.FRAG_LOADED, this.onFragLoaded, this);
-    hls.on(Events.ERROR, this.onError, this);
+/*
+ * compute an Exponential Weighted moving average
+ * - https://en.wikipedia.org/wiki/Moving_average#Exponential_moving_average
+ *  - heavily inspired from shaka-player
+ */
+
+class EWMA {
+  //  About half of the estimated value will be from the last |halfLife| samples by weight.
+  constructor(halfLife, estimate = 0, weight = 0) {
+    this.halfLife = void 0;
+    this.alpha_ = void 0;
+    this.estimate_ = void 0;
+    this.totalWeight_ = void 0;
+    this.halfLife = halfLife;
+    // Larger values of alpha expire historical data more slowly.
+    this.alpha_ = halfLife ? Math.exp(Math.log(0.5) / halfLife) : 0;
+    this.estimate_ = estimate;
+    this.totalWeight_ = weight;
   }
-  _unregisterListeners() {
+  sample(weight, value) {
+    const adjAlpha = Math.pow(this.alpha_, weight);
+    this.estimate_ = value * (1 - adjAlpha) + adjAlpha * this.estimate_;
+    this.totalWeight_ += weight;
+  }
+  getTotalWeight() {
+    return this.totalWeight_;
+  }
+  getEstimate() {
+    if (this.alpha_) {
+      const zeroFactor = 1 - Math.pow(this.alpha_, this.totalWeight_);
+      if (zeroFactor) {
+        return this.estimate_ / zeroFactor;
+      }
+    }
+    return this.estimate_;
+  }
+}
+
+/*
+ * EWMA Bandwidth Estimator
+ *  - heavily inspired from shaka-player
+ * Tracks bandwidth samples and estimates available bandwidth.
+ * Based on the minimum of two exponentially-weighted moving averages with
+ * different half-lives.
+ */
+
+class EwmaBandWidthEstimator {
+  constructor(slow, fast, defaultEstimate, defaultTTFB = 100) {
+    this.defaultEstimate_ = void 0;
+    this.minWeight_ = void 0;
+    this.minDelayMs_ = void 0;
+    this.slow_ = void 0;
+    this.fast_ = void 0;
+    this.defaultTTFB_ = void 0;
+    this.ttfb_ = void 0;
+    this.defaultEstimate_ = defaultEstimate;
+    this.minWeight_ = 0.001;
+    this.minDelayMs_ = 50;
+    this.slow_ = new EWMA(slow);
+    this.fast_ = new EWMA(fast);
+    this.defaultTTFB_ = defaultTTFB;
+    this.ttfb_ = new EWMA(slow);
+  }
+  update(slow, fast) {
     const {
-      hls
+      slow_,
+      fast_,
+      ttfb_
     } = this;
-    hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
-    hls.off(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
-    hls.off(Events.LEVEL_LOADED, this.onLevelLoaded, this);
-    hls.off(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
-    hls.off(Events.AUDIO_TRACK_SWITCHED, this.onAudioTrackSwitched, this);
-    hls.off(Events.FRAG_LOADED, this.onFragLoaded, this);
-    hls.off(Events.ERROR, this.onError, this);
+    if (slow_.halfLife !== slow) {
+      this.slow_ = new EWMA(slow, slow_.getEstimate(), slow_.getTotalWeight());
+    }
+    if (fast_.halfLife !== fast) {
+      this.fast_ = new EWMA(fast, fast_.getEstimate(), fast_.getTotalWeight());
+    }
+    if (ttfb_.halfLife !== slow) {
+      this.ttfb_ = new EWMA(slow, ttfb_.getEstimate(), ttfb_.getTotalWeight());
+    }
   }
-  destroy() {
-    this._unregisterListeners();
-    this.steering = null;
-    this.resetLevels();
-    super.destroy();
+  sample(durationMs, numBytes) {
+    durationMs = Math.max(durationMs, this.minDelayMs_);
+    const numBits = 8 * numBytes;
+    // weight is duration in seconds
+    const durationS = durationMs / 1000;
+    // value is bandwidth in bits/s
+    const bandwidthInBps = numBits / durationS;
+    this.fast_.sample(durationS, bandwidthInBps);
+    this.slow_.sample(durationS, bandwidthInBps);
   }
-  startLoad() {
-    const levels = this._levels;
-
-    // clean up live level details to force reload them, and reset load errors
-    levels.forEach(level => {
-      level.loadError = 0;
-      level.fragmentError = 0;
-    });
-    super.startLoad();
+  sampleTTFB(ttfb) {
+    // weight is frequency curve applied to TTFB in seconds
+    // (longer times have less weight with expected input under 1 second)
+    const seconds = ttfb / 1000;
+    const weight = Math.sqrt(2) * Math.exp(-Math.pow(seconds, 2) / 2);
+    this.ttfb_.sample(weight, Math.max(ttfb, 5));
   }
-  resetLevels() {
-    this._startLevel = undefined;
-    this.manualLevelIndex = -1;
-    this.currentLevelIndex = -1;
-    this.currentLevel = null;
-    this._levels = [];
+  canEstimate() {
+    return this.fast_.getTotalWeight() >= this.minWeight_;
   }
-  onManifestLoading(event, data) {
-    this.resetLevels();
+  getEstimate() {
+    if (this.canEstimate()) {
+      // console.log('slow estimate:'+ Math.round(this.slow_.getEstimate()));
+      // console.log('fast estimate:'+ Math.round(this.fast_.getEstimate()));
+      // Take the minimum of these two estimates.  This should have the effect of
+      // adapting down quickly, but up more slowly.
+      return Math.min(this.fast_.getEstimate(), this.slow_.getEstimate());
+    } else {
+      return this.defaultEstimate_;
+    }
   }
-  onManifestLoaded(event, data) {
-    const levels = [];
-    const levelSet = {};
-    let levelFromSet;
-
-    // regroup redundant levels together
-    data.levels.forEach(levelParsed => {
-      var _levelParsed$audioCod;
-      const attributes = levelParsed.attrs;
+  getEstimateTTFB() {
+    if (this.ttfb_.getTotalWeight() >= this.minWeight_) {
+      return this.ttfb_.getEstimate();
+    } else {
+      return this.defaultTTFB_;
+    }
+  }
+  destroy() {}
+}
 
-      // erase audio codec info if browser does not support mp4a.40.34.
-      // demuxer will autodetect codec and fallback to mpeg/audio
-      if (((_levelParsed$audioCod = levelParsed.audioCodec) == null ? void 0 : _levelParsed$audioCod.indexOf('mp4a.40.34')) !== -1) {
-        chromeOrFirefox || (chromeOrFirefox = /chrome|firefox/i.test(navigator.userAgent));
-        if (chromeOrFirefox) {
-          levelParsed.audioCodec = undefined;
-        }
-      }
-      const {
-        AUDIO,
-        CODECS,
-        'FRAME-RATE': FRAMERATE,
-        'PATHWAY-ID': PATHWAY,
-        RESOLUTION,
-        SUBTITLES
-      } = attributes;
-      const contentSteeringPrefix = `${PATHWAY || '.'}-` ;
-      const levelKey = `${contentSteeringPrefix}${levelParsed.bitrate}-${RESOLUTION}-${FRAMERATE}-${CODECS}`;
-      levelFromSet = levelSet[levelKey];
-      if (!levelFromSet) {
-        levelFromSet = new Level(levelParsed);
-        levelSet[levelKey] = levelFromSet;
-        levels.push(levelFromSet);
+const SUPPORTED_INFO_DEFAULT = {
+  supported: true,
+  configurations: [],
+  decodingInfoResults: [{
+    supported: true,
+    powerEfficient: true,
+    smooth: true
+  }]
+};
+const SUPPORTED_INFO_CACHE = {};
+function requiresMediaCapabilitiesDecodingInfo(level, audioTracksByGroup, currentVideoRange, currentFrameRate, currentBw, audioPreference) {
+  // Only test support when configuration is exceeds minimum options
+  const audioGroups = level.audioCodec ? level.audioGroups : null;
+  const audioCodecPreference = audioPreference == null ? void 0 : audioPreference.audioCodec;
+  const channelsPreference = audioPreference == null ? void 0 : audioPreference.channels;
+  const maxChannels = channelsPreference ? parseInt(channelsPreference) : audioCodecPreference ? Infinity : 2;
+  let audioChannels = null;
+  if (audioGroups != null && audioGroups.length) {
+    try {
+      if (audioGroups.length === 1 && audioGroups[0]) {
+        audioChannels = audioTracksByGroup.groups[audioGroups[0]].channels;
       } else {
-        levelFromSet.addFallback(levelParsed);
+        audioChannels = audioGroups.reduce((acc, groupId) => {
+          if (groupId) {
+            const audioTrackGroup = audioTracksByGroup.groups[groupId];
+            if (!audioTrackGroup) {
+              throw new Error(`Audio track group ${groupId} not found`);
+            }
+            // Sum all channel key values
+            Object.keys(audioTrackGroup.channels).forEach(key => {
+              acc[key] = (acc[key] || 0) + audioTrackGroup.channels[key];
+            });
+          }
+          return acc;
+        }, {
+          2: 0
+        });
+      }
+    } catch (error) {
+      return true;
+    }
+  }
+  return level.videoCodec !== undefined && (level.width > 1920 && level.height > 1088 || level.height > 1920 && level.width > 1088 || level.frameRate > Math.max(currentFrameRate, 30) || level.videoRange !== 'SDR' && level.videoRange !== currentVideoRange || level.bitrate > Math.max(currentBw, 8e6)) || !!audioChannels && isFiniteNumber(maxChannels) && Object.keys(audioChannels).some(channels => parseInt(channels) > maxChannels);
+}
+function getMediaDecodingInfoPromise(level, audioTracksByGroup, mediaCapabilities) {
+  const videoCodecs = level.videoCodec;
+  const audioCodecs = level.audioCodec;
+  if (!videoCodecs || !audioCodecs || !mediaCapabilities) {
+    return Promise.resolve(SUPPORTED_INFO_DEFAULT);
+  }
+  const baseVideoConfiguration = {
+    width: level.width,
+    height: level.height,
+    bitrate: Math.ceil(Math.max(level.bitrate * 0.9, level.averageBitrate)),
+    // Assume a framerate of 30fps since MediaCapabilities will not accept Level default of 0.
+    framerate: level.frameRate || 30
+  };
+  const videoRange = level.videoRange;
+  if (videoRange !== 'SDR') {
+    baseVideoConfiguration.transferFunction = videoRange.toLowerCase();
+  }
+  const configurations = videoCodecs.split(',').map(videoCodec => ({
+    type: 'media-source',
+    video: _objectSpread2(_objectSpread2({}, baseVideoConfiguration), {}, {
+      contentType: mimeTypeForCodec(videoCodec, 'video')
+    })
+  }));
+  if (audioCodecs && level.audioGroups) {
+    level.audioGroups.forEach(audioGroupId => {
+      var _audioTracksByGroup$g;
+      if (!audioGroupId) {
+        return;
       }
-      addGroupId(levelFromSet, 'audio', AUDIO);
-      addGroupId(levelFromSet, 'text', SUBTITLES);
+      (_audioTracksByGroup$g = audioTracksByGroup.groups[audioGroupId]) == null ? void 0 : _audioTracksByGroup$g.tracks.forEach(audioTrack => {
+        if (audioTrack.groupId === audioGroupId) {
+          const channels = audioTrack.channels || '';
+          const channelsNumber = parseFloat(channels);
+          if (isFiniteNumber(channelsNumber) && channelsNumber > 2) {
+            configurations.push.apply(configurations, audioCodecs.split(',').map(audioCodec => ({
+              type: 'media-source',
+              audio: {
+                contentType: mimeTypeForCodec(audioCodec, 'audio'),
+                channels: '' + channelsNumber
+                // spatialRendering:
+                //   audioCodec === 'ec-3' && channels.indexOf('JOC'),
+              }
+            })));
+          }
+        }
+      });
     });
-    this.filterAndSortMediaOptions(levels, data);
   }
-  filterAndSortMediaOptions(unfilteredLevels, data) {
-    let audioTracks = [];
-    let subtitleTracks = [];
-    let resolutionFound = false;
-    let videoCodecFound = false;
-    let audioCodecFound = false;
+  return Promise.all(configurations.map(configuration => {
+    // Cache MediaCapabilities promises
+    const decodingInfoKey = getMediaDecodingInfoKey(configuration);
+    return SUPPORTED_INFO_CACHE[decodingInfoKey] || (SUPPORTED_INFO_CACHE[decodingInfoKey] = mediaCapabilities.decodingInfo(configuration));
+  })).then(decodingInfoResults => ({
+    supported: !decodingInfoResults.some(info => !info.supported),
+    configurations,
+    decodingInfoResults
+  })).catch(error => ({
+    supported: false,
+    configurations,
+    decodingInfoResults: [],
+    error
+  }));
+}
+function getMediaDecodingInfoKey(config) {
+  const {
+    audio,
+    video
+  } = config;
+  const mediaConfig = video || audio;
+  if (mediaConfig) {
+    const codec = mediaConfig.contentType.split('"')[1];
+    if (video) {
+      return `r${video.height}x${video.width}f${Math.ceil(video.framerate)}${video.transferFunction || 'sd'}_${codec}_${Math.ceil(video.bitrate / 1e5)}`;
+    }
+    if (audio) {
+      return `c${audio.channels}${audio.spatialRendering ? 's' : 'n'}_${codec}`;
+    }
+  }
+  return '';
+}
 
-    // only keep levels with supported audio/video codecs
-    let levels = unfilteredLevels.filter(({
-      audioCodec,
-      videoCodec,
-      width,
-      height,
-      unknownCodecs
-    }) => {
-      resolutionFound || (resolutionFound = !!(width && height));
-      videoCodecFound || (videoCodecFound = !!videoCodec);
-      audioCodecFound || (audioCodecFound = !!audioCodec);
-      return !(unknownCodecs != null && unknownCodecs.length) && (!audioCodec || isCodecSupportedInMp4(audioCodec, 'audio')) && (!videoCodec || isCodecSupportedInMp4(videoCodec, 'video'));
-    });
+/**
+ * @returns Whether we can detect and validate HDR capability within the window context
+ */
+function isHdrSupported() {
+  if (typeof matchMedia === 'function') {
+    const mediaQueryList = matchMedia('(dynamic-range: high)');
+    const badQuery = matchMedia('bad query');
+    if (mediaQueryList.media !== badQuery.media) {
+      return mediaQueryList.matches === true;
+    }
+  }
+  return false;
+}
 
-    // remove audio-only level if we also have levels with video codecs or RESOLUTION signalled
-    if ((resolutionFound || videoCodecFound) && audioCodecFound) {
-      levels = levels.filter(({
-        videoCodec,
-        width,
-        height
-      }) => !!videoCodec || !!(width && height));
+/**
+ * Sanitizes inputs to return the active video selection options for HDR/SDR.
+ * When both inputs are null:
+ *
+ *    `{ preferHDR: false, allowedVideoRanges: [] }`
+ *
+ * When `currentVideoRange` non-null, maintain the active range:
+ *
+ *    `{ preferHDR: currentVideoRange !== 'SDR', allowedVideoRanges: [currentVideoRange] }`
+ *
+ * When VideoSelectionOption non-null:
+ *
+ *  - Allow all video ranges if `allowedVideoRanges` unspecified.
+ *  - If `preferHDR` is non-null use the value to filter `allowedVideoRanges`.
+ *  - Else check window for HDR support and set `preferHDR` to the result.
+ *
+ * @param currentVideoRange
+ * @param videoPreference
+ */
+function getVideoSelectionOptions(currentVideoRange, videoPreference) {
+  let preferHDR = false;
+  let allowedVideoRanges = [];
+  if (currentVideoRange) {
+    preferHDR = currentVideoRange !== 'SDR';
+    allowedVideoRanges = [currentVideoRange];
+  }
+  if (videoPreference) {
+    allowedVideoRanges = videoPreference.allowedVideoRanges || VideoRangeValues.slice(0);
+    preferHDR = videoPreference.preferHDR !== undefined ? videoPreference.preferHDR : isHdrSupported();
+    if (preferHDR) {
+      allowedVideoRanges = allowedVideoRanges.filter(range => range !== 'SDR');
+    } else {
+      allowedVideoRanges = ['SDR'];
     }
-    if (levels.length === 0) {
-      // Dispatch error after MANIFEST_LOADED is done propagating
-      Promise.resolve().then(() => {
-        if (this.hls) {
-          const error = new Error('no level with compatible codecs found in manifest');
-          this.hls.trigger(Events.ERROR, {
-            type: ErrorTypes.MEDIA_ERROR,
-            details: ErrorDetails.MANIFEST_INCOMPATIBLE_CODECS_ERROR,
-            fatal: true,
-            url: data.url,
-            error,
-            reason: error.message
-          });
+  }
+  return {
+    preferHDR,
+    allowedVideoRanges
+  };
+}
+
+function getStartCodecTier(codecTiers, currentVideoRange, currentBw, audioPreference, videoPreference) {
+  const codecSets = Object.keys(codecTiers);
+  const channelsPreference = audioPreference == null ? void 0 : audioPreference.channels;
+  const audioCodecPreference = audioPreference == null ? void 0 : audioPreference.audioCodec;
+  const preferStereo = channelsPreference && parseInt(channelsPreference) === 2;
+  // Use first level set to determine stereo, and minimum resolution and framerate
+  let hasStereo = true;
+  let hasCurrentVideoRange = false;
+  let minHeight = Infinity;
+  let minFramerate = Infinity;
+  let minBitrate = Infinity;
+  let selectedScore = 0;
+  let videoRanges = [];
+  const {
+    preferHDR,
+    allowedVideoRanges
+  } = getVideoSelectionOptions(currentVideoRange, videoPreference);
+  for (let i = codecSets.length; i--;) {
+    const tier = codecTiers[codecSets[i]];
+    hasStereo = tier.channels[2] > 0;
+    minHeight = Math.min(minHeight, tier.minHeight);
+    minFramerate = Math.min(minFramerate, tier.minFramerate);
+    minBitrate = Math.min(minBitrate, tier.minBitrate);
+    const matchingVideoRanges = allowedVideoRanges.filter(range => tier.videoRanges[range] > 0);
+    if (matchingVideoRanges.length > 0) {
+      hasCurrentVideoRange = true;
+      videoRanges = matchingVideoRanges;
+    }
+  }
+  minHeight = isFiniteNumber(minHeight) ? minHeight : 0;
+  minFramerate = isFiniteNumber(minFramerate) ? minFramerate : 0;
+  const maxHeight = Math.max(1080, minHeight);
+  const maxFramerate = Math.max(30, minFramerate);
+  minBitrate = isFiniteNumber(minBitrate) ? minBitrate : currentBw;
+  currentBw = Math.max(minBitrate, currentBw);
+  // If there are no variants with matching preference, set currentVideoRange to undefined
+  if (!hasCurrentVideoRange) {
+    currentVideoRange = undefined;
+    videoRanges = [];
+  }
+  const codecSet = codecSets.reduce((selected, candidate) => {
+    // Remove candiates which do not meet bitrate, default audio, stereo or channels preference, 1080p or lower, 30fps or lower, or SDR/HDR selection if present
+    const candidateTier = codecTiers[candidate];
+    if (candidate === selected) {
+      return selected;
+    }
+    if (candidateTier.minBitrate > currentBw) {
+      logStartCodecCandidateIgnored(candidate, `min bitrate of ${candidateTier.minBitrate} > current estimate of ${currentBw}`);
+      return selected;
+    }
+    if (!candidateTier.hasDefaultAudio) {
+      logStartCodecCandidateIgnored(candidate, `no renditions with default or auto-select sound found`);
+      return selected;
+    }
+    if (audioCodecPreference && candidate.indexOf(audioCodecPreference.substring(0, 4)) % 5 !== 0) {
+      logStartCodecCandidateIgnored(candidate, `audio codec preference "${audioCodecPreference}" not found`);
+      return selected;
+    }
+    if (channelsPreference && !preferStereo) {
+      if (!candidateTier.channels[channelsPreference]) {
+        logStartCodecCandidateIgnored(candidate, `no renditions with ${channelsPreference} channel sound found (channels options: ${Object.keys(candidateTier.channels)})`);
+        return selected;
+      }
+    } else if ((!audioCodecPreference || preferStereo) && hasStereo && candidateTier.channels['2'] === 0) {
+      logStartCodecCandidateIgnored(candidate, `no renditions with stereo sound found`);
+      return selected;
+    }
+    if (candidateTier.minHeight > maxHeight) {
+      logStartCodecCandidateIgnored(candidate, `min resolution of ${candidateTier.minHeight} > maximum of ${maxHeight}`);
+      return selected;
+    }
+    if (candidateTier.minFramerate > maxFramerate) {
+      logStartCodecCandidateIgnored(candidate, `min framerate of ${candidateTier.minFramerate} > maximum of ${maxFramerate}`);
+      return selected;
+    }
+    if (!videoRanges.some(range => candidateTier.videoRanges[range] > 0)) {
+      logStartCodecCandidateIgnored(candidate, `no variants with VIDEO-RANGE of ${JSON.stringify(videoRanges)} found`);
+      return selected;
+    }
+    if (candidateTier.maxScore < selectedScore) {
+      logStartCodecCandidateIgnored(candidate, `max score of ${candidateTier.maxScore} < selected max of ${selectedScore}`);
+      return selected;
+    }
+    // Remove candiates with less preferred codecs or more errors
+    if (selected && (codecsSetSelectionPreferenceValue(candidate) >= codecsSetSelectionPreferenceValue(selected) || candidateTier.fragmentError > codecTiers[selected].fragmentError)) {
+      return selected;
+    }
+    selectedScore = candidateTier.maxScore;
+    return candidate;
+  }, undefined);
+  return {
+    codecSet,
+    videoRanges,
+    preferHDR,
+    minFramerate,
+    minBitrate
+  };
+}
+function logStartCodecCandidateIgnored(codeSet, reason) {
+  logger.log(`[abr] start candidates with "${codeSet}" ignored because ${reason}`);
+}
+function getAudioTracksByGroup(allAudioTracks) {
+  return allAudioTracks.reduce((audioTracksByGroup, track) => {
+    let trackGroup = audioTracksByGroup.groups[track.groupId];
+    if (!trackGroup) {
+      trackGroup = audioTracksByGroup.groups[track.groupId] = {
+        tracks: [],
+        channels: {
+          2: 0
+        },
+        hasDefault: false,
+        hasAutoSelect: false
+      };
+    }
+    trackGroup.tracks.push(track);
+    const channelsKey = track.channels || '2';
+    trackGroup.channels[channelsKey] = (trackGroup.channels[channelsKey] || 0) + 1;
+    trackGroup.hasDefault = trackGroup.hasDefault || track.default;
+    trackGroup.hasAutoSelect = trackGroup.hasAutoSelect || track.autoselect;
+    if (trackGroup.hasDefault) {
+      audioTracksByGroup.hasDefaultAudio = true;
+    }
+    if (trackGroup.hasAutoSelect) {
+      audioTracksByGroup.hasAutoSelectAudio = true;
+    }
+    return audioTracksByGroup;
+  }, {
+    hasDefaultAudio: false,
+    hasAutoSelectAudio: false,
+    groups: {}
+  });
+}
+function getCodecTiers(levels, audioTracksByGroup, minAutoLevel, maxAutoLevel) {
+  return levels.slice(minAutoLevel, maxAutoLevel + 1).reduce((tiers, level) => {
+    if (!level.codecSet) {
+      return tiers;
+    }
+    const audioGroups = level.audioGroups;
+    let tier = tiers[level.codecSet];
+    if (!tier) {
+      tiers[level.codecSet] = tier = {
+        minBitrate: Infinity,
+        minHeight: Infinity,
+        minFramerate: Infinity,
+        maxScore: 0,
+        videoRanges: {
+          SDR: 0
+        },
+        channels: {
+          '2': 0
+        },
+        hasDefaultAudio: !audioGroups,
+        fragmentError: 0
+      };
+    }
+    tier.minBitrate = Math.min(tier.minBitrate, level.bitrate);
+    const lesserWidthOrHeight = Math.min(level.height, level.width);
+    tier.minHeight = Math.min(tier.minHeight, lesserWidthOrHeight);
+    tier.minFramerate = Math.min(tier.minFramerate, level.frameRate);
+    tier.maxScore = Math.max(tier.maxScore, level.score);
+    tier.fragmentError += level.fragmentError;
+    tier.videoRanges[level.videoRange] = (tier.videoRanges[level.videoRange] || 0) + 1;
+    if (audioGroups) {
+      audioGroups.forEach(audioGroupId => {
+        if (!audioGroupId) {
+          return;
         }
+        const audioGroup = audioTracksByGroup.groups[audioGroupId];
+        // Default audio is any group with DEFAULT=YES, or if missing then any group with AUTOSELECT=YES, or all variants
+        tier.hasDefaultAudio = tier.hasDefaultAudio || audioTracksByGroup.hasDefaultAudio ? audioGroup.hasDefault : audioGroup.hasAutoSelect || !audioTracksByGroup.hasDefaultAudio && !audioTracksByGroup.hasAutoSelectAudio;
+        Object.keys(audioGroup.channels).forEach(channels => {
+          tier.channels[channels] = (tier.channels[channels] || 0) + audioGroup.channels[channels];
+        });
       });
-      return;
     }
-    if (data.audioTracks) {
-      audioTracks = data.audioTracks.filter(track => !track.audioCodec || isCodecSupportedInMp4(track.audioCodec, 'audio'));
-      // Assign ids after filtering as array indices by group-id
-      assignTrackIdsByGroup(audioTracks);
+    return tiers;
+  }, {});
+}
+function findMatchingOption(option, tracks, matchPredicate) {
+  if ('attrs' in option) {
+    const index = tracks.indexOf(option);
+    if (index !== -1) {
+      return index;
     }
-    if (data.subtitles) {
-      subtitleTracks = data.subtitles;
-      assignTrackIdsByGroup(subtitleTracks);
+  }
+  for (let i = 0; i < tracks.length; i++) {
+    const track = tracks[i];
+    if (matchesOption(option, track, matchPredicate)) {
+      return i;
     }
-    // start bitrate is the first bitrate of the manifest
-    const unsortedLevels = levels.slice(0);
-    // sort levels from lowest to highest
-    levels.sort((a, b) => {
-      if (a.attrs['HDCP-LEVEL'] !== b.attrs['HDCP-LEVEL']) {
-        return (a.attrs['HDCP-LEVEL'] || '') > (b.attrs['HDCP-LEVEL'] || '') ? 1 : -1;
+  }
+  return -1;
+}
+function matchesOption(option, track, matchPredicate) {
+  const {
+    groupId,
+    name,
+    lang,
+    assocLang,
+    characteristics,
+    default: isDefault
+  } = option;
+  const forced = option.forced;
+  return (groupId === undefined || track.groupId === groupId) && (name === undefined || track.name === name) && (lang === undefined || track.lang === lang) && (lang === undefined || track.assocLang === assocLang) && (isDefault === undefined || track.default === isDefault) && (forced === undefined || track.forced === forced) && (characteristics === undefined || characteristicsMatch(characteristics, track.characteristics)) && (matchPredicate === undefined || matchPredicate(option, track));
+}
+function characteristicsMatch(characteristicsA, characteristicsB = '') {
+  const arrA = characteristicsA.split(',');
+  const arrB = characteristicsB.split(',');
+  // Expects each item to be unique:
+  return arrA.length === arrB.length && !arrA.some(el => arrB.indexOf(el) === -1);
+}
+function audioMatchPredicate(option, track) {
+  const {
+    audioCodec,
+    channels
+  } = option;
+  return (audioCodec === undefined || (track.audioCodec || '').substring(0, 4) === audioCodec.substring(0, 4)) && (channels === undefined || channels === (track.channels || '2'));
+}
+function findClosestLevelWithAudioGroup(option, levels, allAudioTracks, searchIndex, matchPredicate) {
+  const currentLevel = levels[searchIndex];
+  // Are there variants with same URI as current level?
+  // If so, find a match that does not require any level URI change
+  const variants = levels.reduce((variantMap, level, index) => {
+    const uri = level.uri;
+    const renditions = variantMap[uri] || (variantMap[uri] = []);
+    renditions.push(index);
+    return variantMap;
+  }, {});
+  const renditions = variants[currentLevel.uri];
+  if (renditions.length > 1) {
+    searchIndex = Math.max.apply(Math, renditions);
+  }
+  // Find best match
+  const currentVideoRange = currentLevel.videoRange;
+  const currentFrameRate = currentLevel.frameRate;
+  const currentVideoCodec = currentLevel.codecSet.substring(0, 4);
+  const matchingVideo = searchDownAndUpList(levels, searchIndex, level => {
+    if (level.videoRange !== currentVideoRange || level.frameRate !== currentFrameRate || level.codecSet.substring(0, 4) !== currentVideoCodec) {
+      return false;
+    }
+    const audioGroups = level.audioGroups;
+    const tracks = allAudioTracks.filter(track => !audioGroups || audioGroups.indexOf(track.groupId) !== -1);
+    return findMatchingOption(option, tracks, matchPredicate) > -1;
+  });
+  if (matchingVideo > -1) {
+    return matchingVideo;
+  }
+  return searchDownAndUpList(levels, searchIndex, level => {
+    const audioGroups = level.audioGroups;
+    const tracks = allAudioTracks.filter(track => !audioGroups || audioGroups.indexOf(track.groupId) !== -1);
+    return findMatchingOption(option, tracks, matchPredicate) > -1;
+  });
+}
+function searchDownAndUpList(arr, searchIndex, predicate) {
+  for (let i = searchIndex; i; i--) {
+    if (predicate(arr[i])) {
+      return i;
+    }
+  }
+  for (let i = searchIndex + 1; i < arr.length; i++) {
+    if (predicate(arr[i])) {
+      return i;
+    }
+  }
+  return -1;
+}
+
+class AbrController {
+  constructor(_hls) {
+    this.hls = void 0;
+    this.lastLevelLoadSec = 0;
+    this.lastLoadedFragLevel = -1;
+    this.firstSelection = -1;
+    this._nextAutoLevel = -1;
+    this.nextAutoLevelKey = '';
+    this.audioTracksByGroup = null;
+    this.codecTiers = null;
+    this.timer = -1;
+    this.fragCurrent = null;
+    this.partCurrent = null;
+    this.bitrateTestDelay = 0;
+    this.bwEstimator = void 0;
+    /*
+        This method monitors the download rate of the current fragment, and will downswitch if that fragment will not load
+        quickly enough to prevent underbuffering
+      */
+    this._abandonRulesCheck = () => {
+      const {
+        fragCurrent: frag,
+        partCurrent: part,
+        hls
+      } = this;
+      const {
+        autoLevelEnabled,
+        media
+      } = hls;
+      if (!frag || !media) {
+        return;
       }
-      if (a.bitrate !== b.bitrate) {
-        return a.bitrate - b.bitrate;
+      const now = performance.now();
+      const stats = part ? part.stats : frag.stats;
+      const duration = part ? part.duration : frag.duration;
+      const timeLoading = now - stats.loading.start;
+      const minAutoLevel = hls.minAutoLevel;
+      // If frag loading is aborted, complete, or from lowest level, stop timer and return
+      if (stats.aborted || stats.loaded && stats.loaded === stats.total || frag.level <= minAutoLevel) {
+        this.clearTimer();
+        // reset forced auto level value so that next level will be selected
+        this._nextAutoLevel = -1;
+        return;
       }
-      if (a.attrs['FRAME-RATE'] !== b.attrs['FRAME-RATE']) {
-        return a.attrs.decimalFloatingPoint('FRAME-RATE') - b.attrs.decimalFloatingPoint('FRAME-RATE');
+
+      // This check only runs if we're in ABR mode and actually playing
+      if (!autoLevelEnabled || media.paused || !media.playbackRate || !media.readyState) {
+        return;
       }
-      if (a.attrs.SCORE !== b.attrs.SCORE) {
-        return a.attrs.decimalFloatingPoint('SCORE') - b.attrs.decimalFloatingPoint('SCORE');
+      const bufferInfo = hls.mainForwardBufferInfo;
+      if (bufferInfo === null) {
+        return;
       }
-      if (resolutionFound && a.height !== b.height) {
-        return a.height - b.height;
+      const ttfbEstimate = this.bwEstimator.getEstimateTTFB();
+      const playbackRate = Math.abs(media.playbackRate);
+      // To maintain stable adaptive playback, only begin monitoring frag loading after half or more of its playback duration has passed
+      if (timeLoading <= Math.max(ttfbEstimate, 1000 * (duration / (playbackRate * 2)))) {
+        return;
       }
-      return 0;
-    });
-    let firstLevelInPlaylist = unsortedLevels[0];
-    if (this.steering) {
-      levels = this.steering.filterParsedLevels(levels);
-      if (levels.length !== unsortedLevels.length) {
-        for (let i = 0; i < unsortedLevels.length; i++) {
-          if (unsortedLevels[i].pathwayId === levels[0].pathwayId) {
-            firstLevelInPlaylist = unsortedLevels[i];
-            break;
-          }
+
+      // bufferStarvationDelay is an estimate of the amount time (in seconds) it will take to exhaust the buffer
+      const bufferStarvationDelay = bufferInfo.len / playbackRate;
+      const ttfb = stats.loading.first ? stats.loading.first - stats.loading.start : -1;
+      const loadedFirstByte = stats.loaded && ttfb > -1;
+      const bwEstimate = this.getBwEstimate();
+      const levels = hls.levels;
+      const level = levels[frag.level];
+      const expectedLen = stats.total || Math.max(stats.loaded, Math.round(duration * level.maxBitrate / 8));
+      let timeStreaming = loadedFirstByte ? timeLoading - ttfb : timeLoading;
+      if (timeStreaming < 1 && loadedFirstByte) {
+        timeStreaming = Math.min(timeLoading, stats.loaded * 8 / bwEstimate);
+      }
+      const loadRate = loadedFirstByte ? stats.loaded * 1000 / timeStreaming : 0;
+      // fragLoadDelay is an estimate of the time (in seconds) it will take to buffer the remainder of the fragment
+      const fragLoadedDelay = loadRate ? (expectedLen - stats.loaded) / loadRate : expectedLen * 8 / bwEstimate + ttfbEstimate / 1000;
+      // Only downswitch if the time to finish loading the current fragment is greater than the amount of buffer left
+      if (fragLoadedDelay <= bufferStarvationDelay) {
+        return;
+      }
+      const bwe = loadRate ? loadRate * 8 : bwEstimate;
+      let fragLevelNextLoadedDelay = Number.POSITIVE_INFINITY;
+      let nextLoadLevel;
+      // Iterate through lower level and try to find the largest one that avoids rebuffering
+      for (nextLoadLevel = frag.level - 1; nextLoadLevel > minAutoLevel; nextLoadLevel--) {
+        // compute time to load next fragment at lower level
+        // 8 = bits per byte (bps/Bps)
+        const levelNextBitrate = levels[nextLoadLevel].maxBitrate;
+        fragLevelNextLoadedDelay = this.getTimeToLoadFrag(ttfbEstimate / 1000, bwe, duration * levelNextBitrate, !levels[nextLoadLevel].details);
+        if (fragLevelNextLoadedDelay < bufferStarvationDelay) {
+          break;
         }
       }
-    }
-    this._levels = levels;
-
-    // find index of first level in sorted levels
-    for (let i = 0; i < levels.length; i++) {
-      if (levels[i] === firstLevelInPlaylist) {
-        this._firstLevel = i;
-        this.log(`manifest loaded, ${levels.length} level(s) found, first bitrate: ${firstLevelInPlaylist.bitrate}`);
-        break;
+      // Only emergency switch down if it takes less time to load a new fragment at lowest level instead of continuing
+      // to load the current one
+      if (fragLevelNextLoadedDelay >= fragLoadedDelay) {
+        return;
       }
-    }
 
-    // Audio is only alternate if manifest include a URI along with the audio group tag,
-    // and this is not an audio-only stream where levels contain audio-only
-    const audioOnly = audioCodecFound && !videoCodecFound;
-    const edata = {
-      levels,
-      audioTracks,
-      subtitleTracks,
-      sessionData: data.sessionData,
-      sessionKeys: data.sessionKeys,
-      firstLevel: this._firstLevel,
-      stats: data.stats,
-      audio: audioCodecFound,
-      video: videoCodecFound,
-      altAudio: !audioOnly && audioTracks.some(t => !!t.url)
+      // if estimated load time of new segment is completely unreasonable, ignore and do not emergency switch down
+      if (fragLevelNextLoadedDelay > duration * 10) {
+        return;
+      }
+      hls.nextLoadLevel = hls.nextAutoLevel = nextLoadLevel;
+      if (loadedFirstByte) {
+        // If there has been loading progress, sample bandwidth using loading time offset by minimum TTFB time
+        this.bwEstimator.sample(timeLoading - Math.min(ttfbEstimate, ttfb), stats.loaded);
+      } else {
+        // If there has been no loading progress, sample TTFB
+        this.bwEstimator.sampleTTFB(timeLoading);
+      }
+      const nextLoadLevelBitrate = levels[nextLoadLevel].bitrate;
+      if (this.getBwEstimate() * this.hls.config.abrBandWidthUpFactor > nextLoadLevelBitrate) {
+        this.resetEstimator(nextLoadLevelBitrate);
+      }
+      this.clearTimer();
+      logger.warn(`[abr] Fragment ${frag.sn}${part ? ' part ' + part.index : ''} of level ${frag.level} is loading too slowly;
+      Time to underbuffer: ${bufferStarvationDelay.toFixed(3)} s
+      Estimated load time for current fragment: ${fragLoadedDelay.toFixed(3)} s
+      Estimated load time for down switch fragment: ${fragLevelNextLoadedDelay.toFixed(3)} s
+      TTFB estimate: ${ttfb | 0} ms
+      Current BW estimate: ${isFiniteNumber(bwEstimate) ? bwEstimate | 0 : 'Unknown'} bps
+      New BW estimate: ${this.getBwEstimate() | 0} bps
+      Switching to level ${nextLoadLevel} @ ${nextLoadLevelBitrate | 0} bps`);
+      hls.trigger(Events.FRAG_LOAD_EMERGENCY_ABORTED, {
+        frag,
+        part,
+        stats
+      });
     };
-    this.hls.trigger(Events.MANIFEST_PARSED, edata);
-
-    // Initiate loading after all controllers have received MANIFEST_PARSED
-    if (this.hls.config.autoStartLoad || this.hls.forceStartLoad) {
-      this.hls.startLoad(this.hls.config.startPosition);
-    }
+    this.hls = _hls;
+    this.bwEstimator = this.initEstimator();
+    this.registerListeners();
   }
-  get levels() {
-    if (this._levels.length === 0) {
-      return null;
+  resetEstimator(abrEwmaDefaultEstimate) {
+    if (abrEwmaDefaultEstimate) {
+      logger.log(`setting initial bwe to ${abrEwmaDefaultEstimate}`);
+      this.hls.config.abrEwmaDefaultEstimate = abrEwmaDefaultEstimate;
     }
-    return this._levels;
+    this.firstSelection = -1;
+    this.bwEstimator = this.initEstimator();
   }
-  get level() {
-    return this.currentLevelIndex;
+  initEstimator() {
+    const config = this.hls.config;
+    return new EwmaBandWidthEstimator(config.abrEwmaSlowVoD, config.abrEwmaFastVoD, config.abrEwmaDefaultEstimate);
   }
-  set level(newLevel) {
-    const levels = this._levels;
-    if (levels.length === 0) {
-      return;
-    }
-    // check if level idx is valid
-    if (newLevel < 0 || newLevel >= levels.length) {
-      // invalid level id given, trigger error
-      const error = new Error('invalid level idx');
-      const fatal = newLevel < 0;
-      this.hls.trigger(Events.ERROR, {
-        type: ErrorTypes.OTHER_ERROR,
-        details: ErrorDetails.LEVEL_SWITCH_ERROR,
-        level: newLevel,
-        fatal,
-        error,
-        reason: error.message
-      });
-      if (fatal) {
-        return;
-      }
-      newLevel = Math.min(newLevel, levels.length - 1);
-    }
-    const lastLevelIndex = this.currentLevelIndex;
-    const lastLevel = this.currentLevel;
-    const lastPathwayId = lastLevel ? lastLevel.attrs['PATHWAY-ID'] : undefined;
-    const level = levels[newLevel];
-    const pathwayId = level.attrs['PATHWAY-ID'];
-    this.currentLevelIndex = newLevel;
-    this.currentLevel = level;
-    if (lastLevelIndex === newLevel && level.details && lastLevel && lastPathwayId === pathwayId) {
+  registerListeners() {
+    const {
+      hls
+    } = this;
+    hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
+    hls.on(Events.FRAG_LOADING, this.onFragLoading, this);
+    hls.on(Events.FRAG_LOADED, this.onFragLoaded, this);
+    hls.on(Events.FRAG_BUFFERED, this.onFragBuffered, this);
+    hls.on(Events.LEVEL_SWITCHING, this.onLevelSwitching, this);
+    hls.on(Events.LEVEL_LOADED, this.onLevelLoaded, this);
+    hls.on(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
+    hls.on(Events.MAX_AUTO_LEVEL_UPDATED, this.onMaxAutoLevelUpdated, this);
+    hls.on(Events.ERROR, this.onError, this);
+  }
+  unregisterListeners() {
+    const {
+      hls
+    } = this;
+    if (!hls) {
       return;
     }
-    this.log(`Switching to level ${newLevel}${pathwayId ? ' with Pathway ' + pathwayId : ''} from level ${lastLevelIndex}${lastPathwayId ? ' with Pathway ' + lastPathwayId : ''}`);
-    const levelSwitchingData = _extends({}, level, {
-      level: newLevel,
-      maxBitrate: level.maxBitrate,
-      attrs: level.attrs,
-      uri: level.uri,
-      urlId: level.urlId
-    });
-    // @ts-ignore
-    delete levelSwitchingData._attrs;
+    hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
+    hls.off(Events.FRAG_LOADING, this.onFragLoading, this);
+    hls.off(Events.FRAG_LOADED, this.onFragLoaded, this);
+    hls.off(Events.FRAG_BUFFERED, this.onFragBuffered, this);
+    hls.off(Events.LEVEL_SWITCHING, this.onLevelSwitching, this);
+    hls.off(Events.LEVEL_LOADED, this.onLevelLoaded, this);
+    hls.off(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
+    hls.off(Events.MAX_AUTO_LEVEL_UPDATED, this.onMaxAutoLevelUpdated, this);
+    hls.off(Events.ERROR, this.onError, this);
+  }
+  destroy() {
+    this.unregisterListeners();
+    this.clearTimer();
     // @ts-ignore
-    delete levelSwitchingData._urlId;
-    this.hls.trigger(Events.LEVEL_SWITCHING, levelSwitchingData);
-    // check if we need to load playlist for this level
-    const levelDetails = level.details;
-    if (!levelDetails || levelDetails.live) {
-      // level not retrieved yet, or live playlist we need to (re)load it
-      const hlsUrlParameters = this.switchParams(level.uri, lastLevel == null ? void 0 : lastLevel.details);
-      this.loadPlaylist(hlsUrlParameters);
-    }
+    this.hls = this._abandonRulesCheck = null;
+    this.fragCurrent = this.partCurrent = null;
   }
-  get manualLevel() {
-    return this.manualLevelIndex;
+  onManifestLoading(event, data) {
+    this.lastLoadedFragLevel = -1;
+    this.firstSelection = -1;
+    this.lastLevelLoadSec = 0;
+    this.fragCurrent = this.partCurrent = null;
+    this.onLevelsUpdated();
+    this.clearTimer();
   }
-  set manualLevel(newLevel) {
-    this.manualLevelIndex = newLevel;
-    if (this._startLevel === undefined) {
-      this._startLevel = newLevel;
-    }
-    if (newLevel !== -1) {
-      this.level = newLevel;
+  onLevelsUpdated() {
+    if (this.lastLoadedFragLevel > -1 && this.fragCurrent) {
+      this.lastLoadedFragLevel = this.fragCurrent.level;
     }
+    this._nextAutoLevel = -1;
+    this.onMaxAutoLevelUpdated();
+    this.codecTiers = null;
+    this.audioTracksByGroup = null;
   }
-  get firstLevel() {
-    return this._firstLevel;
-  }
-  set firstLevel(newLevel) {
-    this._firstLevel = newLevel;
+  onMaxAutoLevelUpdated() {
+    this.firstSelection = -1;
+    this.nextAutoLevelKey = '';
   }
-  get startLevel() {
-    // hls.startLevel takes precedence over config.startLevel
-    // if none of these values are defined, fallback on this._firstLevel (first quality level appearing in variant manifest)
-    if (this._startLevel === undefined) {
-      const configStartLevel = this.hls.config.startLevel;
-      if (configStartLevel !== undefined) {
-        return configStartLevel;
-      } else {
-        return this._firstLevel;
-      }
-    } else {
-      return this._startLevel;
+  onFragLoading(event, data) {
+    const frag = data.frag;
+    if (this.ignoreFragment(frag)) {
+      return;
+    }
+    if (!frag.bitrateTest) {
+      var _data$part;
+      this.fragCurrent = frag;
+      this.partCurrent = (_data$part = data.part) != null ? _data$part : null;
     }
+    this.clearTimer();
+    this.timer = self.setInterval(this._abandonRulesCheck, 100);
   }
-  set startLevel(newLevel) {
-    this._startLevel = newLevel;
+  onLevelSwitching(event, data) {
+    this.clearTimer();
   }
   onError(event, data) {
-    if (data.fatal || !data.context) {
+    if (data.fatal) {
       return;
     }
-    if (data.context.type === PlaylistContextType.LEVEL && data.context.level === this.level) {
-      this.checkRetry(data);
+    switch (data.details) {
+      case ErrorDetails.BUFFER_ADD_CODEC_ERROR:
+      case ErrorDetails.BUFFER_APPEND_ERROR:
+        // Reset last loaded level so that a new selection can be made after calling recoverMediaError
+        this.lastLoadedFragLevel = -1;
+        this.firstSelection = -1;
+        break;
+      case ErrorDetails.FRAG_LOAD_TIMEOUT:
+        {
+          const frag = data.frag;
+          const {
+            fragCurrent,
+            partCurrent: part
+          } = this;
+          if (frag && fragCurrent && frag.sn === fragCurrent.sn && frag.level === fragCurrent.level) {
+            const now = performance.now();
+            const stats = part ? part.stats : frag.stats;
+            const timeLoading = now - stats.loading.start;
+            const ttfb = stats.loading.first ? stats.loading.first - stats.loading.start : -1;
+            const loadedFirstByte = stats.loaded && ttfb > -1;
+            if (loadedFirstByte) {
+              const ttfbEstimate = this.bwEstimator.getEstimateTTFB();
+              this.bwEstimator.sample(timeLoading - Math.min(ttfbEstimate, ttfb), stats.loaded);
+            } else {
+              this.bwEstimator.sampleTTFB(timeLoading);
+            }
+          }
+          break;
+        }
     }
   }
-
-  // reset errors on the successful load of a fragment
-  onFragLoaded(event, {
-    frag
-  }) {
-    if (frag !== undefined && frag.type === PlaylistLevelType.MAIN) {
-      const level = this._levels[frag.level];
-      if (level !== undefined) {
-        level.loadError = 0;
-      }
-    }
+  getTimeToLoadFrag(timeToFirstByteSec, bandwidth, fragSizeBits, isSwitch) {
+    const fragLoadSec = timeToFirstByteSec + fragSizeBits / bandwidth;
+    const playlistLoadSec = isSwitch ? this.lastLevelLoadSec : 0;
+    return fragLoadSec + playlistLoadSec;
   }
   onLevelLoaded(event, data) {
-    var _data$deliveryDirecti2;
+    const config = this.hls.config;
     const {
-      level,
-      details
-    } = data;
-    const curLevel = this._levels[level];
-    if (!curLevel) {
-      var _data$deliveryDirecti;
-      this.warn(`Invalid level index ${level}`);
-      if ((_data$deliveryDirecti = data.deliveryDirectives) != null && _data$deliveryDirecti.skip) {
-        details.deltaUpdateFailed = true;
-      }
-      return;
+      loading
+    } = data.stats;
+    const timeLoadingMs = loading.end - loading.start;
+    if (isFiniteNumber(timeLoadingMs)) {
+      this.lastLevelLoadSec = timeLoadingMs / 1000;
     }
-
-    // only process level loaded events matching with expected level
-    if (level === this.currentLevelIndex) {
-      // reset level load error counter on successful level loaded only if there is no issues with fragments
-      if (curLevel.fragmentError === 0) {
-        curLevel.loadError = 0;
-      }
-      this.playlistLoaded(level, data, curLevel.details);
-    } else if ((_data$deliveryDirecti2 = data.deliveryDirectives) != null && _data$deliveryDirecti2.skip) {
-      // received a delta playlist update that cannot be merged
-      details.deltaUpdateFailed = true;
+    if (data.details.live) {
+      this.bwEstimator.update(config.abrEwmaSlowLive, config.abrEwmaFastLive);
+    } else {
+      this.bwEstimator.update(config.abrEwmaSlowVoD, config.abrEwmaFastVoD);
     }
   }
-  onAudioTrackSwitched(event, data) {
-    const currentLevel = this.currentLevel;
-    if (!currentLevel) {
+  onFragLoaded(event, {
+    frag,
+    part
+  }) {
+    const stats = part ? part.stats : frag.stats;
+    if (frag.type === PlaylistLevelType.MAIN) {
+      this.bwEstimator.sampleTTFB(stats.loading.first - stats.loading.start);
+    }
+    if (this.ignoreFragment(frag)) {
       return;
     }
-    const audioGroupId = this.hls.audioTracks[data.id].groupId;
-    if (currentLevel.audioGroupIds && currentLevel.audioGroupId !== audioGroupId) {
-      let urlId = -1;
-      for (let i = 0; i < currentLevel.audioGroupIds.length; i++) {
-        if (currentLevel.audioGroupIds[i] === audioGroupId) {
-          urlId = i;
-          break;
-        }
-      }
-      if (urlId !== -1 && urlId !== currentLevel.urlId) {
-        currentLevel.urlId = urlId;
-        if (this.canLoad) {
-          this.startLoad();
-        }
-      }
+    // stop monitoring bw once frag loaded
+    this.clearTimer();
+    // reset forced auto level value so that next level will be selected
+    if (frag.level === this._nextAutoLevel) {
+      this._nextAutoLevel = -1;
     }
-  }
-  loadPlaylist(hlsUrlParameters) {
-    super.loadPlaylist();
-    const currentLevelIndex = this.currentLevelIndex;
-    const currentLevel = this.currentLevel;
-    if (currentLevel && this.shouldLoadPlaylist(currentLevel)) {
-      const id = currentLevel.urlId;
-      let url = currentLevel.uri;
-      if (hlsUrlParameters) {
-        try {
-          url = hlsUrlParameters.addDirectives(url);
-        } catch (error) {
-          this.warn(`Could not construct new URL with HLS Delivery Directives: ${error}`);
-        }
-      }
-      const pathwayId = currentLevel.attrs['PATHWAY-ID'];
-      this.log(`Loading level index ${currentLevelIndex}${(hlsUrlParameters == null ? void 0 : hlsUrlParameters.msn) !== undefined ? ' at sn ' + hlsUrlParameters.msn + ' part ' + hlsUrlParameters.part : ''} with${pathwayId ? ' Pathway ' + pathwayId : ''} URI ${id + 1}/${currentLevel.url.length} ${url}`);
+    this.firstSelection = -1;
 
-      // console.log('Current audio track group ID:', this.hls.audioTracks[this.hls.audioTrack].groupId);
-      // console.log('New video quality level audio group id:', levelObject.attrs.AUDIO, level);
-      this.clearTimer();
-      this.hls.trigger(Events.LEVEL_LOADING, {
-        url,
-        level: currentLevelIndex,
-        id,
-        deliveryDirectives: hlsUrlParameters || null
-      });
+    // compute level average bitrate
+    if (this.hls.config.abrMaxWithRealBitrate) {
+      const duration = part ? part.duration : frag.duration;
+      const level = this.hls.levels[frag.level];
+      const loadedBytes = (level.loaded ? level.loaded.bytes : 0) + stats.loaded;
+      const loadedDuration = (level.loaded ? level.loaded.duration : 0) + duration;
+      level.loaded = {
+        bytes: loadedBytes,
+        duration: loadedDuration
+      };
+      level.realBitrate = Math.round(8 * loadedBytes / loadedDuration);
     }
-  }
-  get nextLoadLevel() {
-    if (this.manualLevelIndex !== -1) {
-      return this.manualLevelIndex;
+    if (frag.bitrateTest) {
+      const fragBufferedData = {
+        stats,
+        frag,
+        part,
+        id: frag.type
+      };
+      this.onFragBuffered(Events.FRAG_BUFFERED, fragBufferedData);
+      frag.bitrateTest = false;
     } else {
-      return this.hls.nextAutoLevel;
+      // store level id after successful fragment load for playback
+      this.lastLoadedFragLevel = frag.level;
     }
   }
-  set nextLoadLevel(nextLevel) {
-    this.level = nextLevel;
-    if (this.manualLevelIndex === -1) {
-      this.hls.nextAutoLevel = nextLevel;
+  onFragBuffered(event, data) {
+    const {
+      frag,
+      part
+    } = data;
+    const stats = part != null && part.stats.loaded ? part.stats : frag.stats;
+    if (stats.aborted) {
+      return;
+    }
+    if (this.ignoreFragment(frag)) {
+      return;
+    }
+    // Use the difference between parsing and request instead of buffering and request to compute fragLoadingProcessing;
+    // rationale is that buffer appending only happens once media is attached. This can happen when config.startFragPrefetch
+    // is used. If we used buffering in that case, our BW estimate sample will be very large.
+    const processingMs = stats.parsing.end - stats.loading.start - Math.min(stats.loading.first - stats.loading.start, this.bwEstimator.getEstimateTTFB());
+    this.bwEstimator.sample(processingMs, stats.loaded);
+    stats.bwEstimate = this.getBwEstimate();
+    if (frag.bitrateTest) {
+      this.bitrateTestDelay = processingMs / 1000;
+    } else {
+      this.bitrateTestDelay = 0;
     }
   }
-  removeLevel(levelIndex, urlId) {
-    const filterLevelAndGroupByIdIndex = (url, id) => id !== urlId;
-    const levels = this._levels.filter((level, index) => {
-      if (index !== levelIndex) {
-        return true;
-      }
-      if (level.url.length > 1 && urlId !== undefined) {
-        level.url = level.url.filter(filterLevelAndGroupByIdIndex);
-        if (level.audioGroupIds) {
-          level.audioGroupIds = level.audioGroupIds.filter(filterLevelAndGroupByIdIndex);
-        }
-        if (level.textGroupIds) {
-          level.textGroupIds = level.textGroupIds.filter(filterLevelAndGroupByIdIndex);
-        }
-        level.urlId = 0;
-        return true;
-      }
-      if (this.steering) {
-        this.steering.removeLevel(level);
-      }
-      return false;
-    });
-    this.hls.trigger(Events.LEVELS_UPDATED, {
-      levels
-    });
+  ignoreFragment(frag) {
+    // Only count non-alt-audio frags which were actually buffered in our BW calculations
+    return frag.type !== PlaylistLevelType.MAIN || frag.sn === 'initSegment';
   }
-  onLevelsUpdated(event, {
-    levels
-  }) {
-    levels.forEach((level, index) => {
-      const {
-        details
-      } = level;
-      if (details != null && details.fragments) {
-        details.fragments.forEach(fragment => {
-          fragment.level = index;
-        });
-      }
-    });
-    this._levels = levels;
+  clearTimer() {
+    if (this.timer > -1) {
+      self.clearInterval(this.timer);
+      this.timer = -1;
+    }
   }
-}
-function addGroupId(level, type, id) {
-  if (!id) {
-    return;
+  get firstAutoLevel() {
+    const {
+      maxAutoLevel,
+      minAutoLevel
+    } = this.hls;
+    const bwEstimate = this.getBwEstimate();
+    const maxStartDelay = this.hls.config.maxStarvationDelay;
+    const abrAutoLevel = this.findBestLevel(bwEstimate, minAutoLevel, maxAutoLevel, 0, maxStartDelay, 1, 1);
+    if (abrAutoLevel > -1) {
+      return abrAutoLevel;
+    }
+    const firstLevel = this.hls.firstLevel;
+    const clamped = Math.min(Math.max(firstLevel, minAutoLevel), maxAutoLevel);
+    logger.warn(`[abr] Could not find best starting auto level. Defaulting to first in playlist ${firstLevel} clamped to ${clamped}`);
+    return clamped;
+  }
+  get forcedAutoLevel() {
+    if (this.nextAutoLevelKey) {
+      return -1;
+    }
+    return this._nextAutoLevel;
   }
-  if (type === 'audio') {
-    if (!level.audioGroupIds) {
-      level.audioGroupIds = [];
+
+  // return next auto level
+  get nextAutoLevel() {
+    const forcedAutoLevel = this.forcedAutoLevel;
+    const bwEstimator = this.bwEstimator;
+    const useEstimate = bwEstimator.canEstimate();
+    const loadedFirstFrag = this.lastLoadedFragLevel > -1;
+    // in case next auto level has been forced, and bw not available or not reliable, return forced value
+    if (forcedAutoLevel !== -1 && (!useEstimate || !loadedFirstFrag || this.nextAutoLevelKey === this.getAutoLevelKey())) {
+      return forcedAutoLevel;
     }
-    level.audioGroupIds[level.url.length - 1] = id;
-  } else if (type === 'text') {
-    if (!level.textGroupIds) {
-      level.textGroupIds = [];
+
+    // compute next level using ABR logic
+    const nextABRAutoLevel = useEstimate && loadedFirstFrag ? this.getNextABRAutoLevel() : this.firstAutoLevel;
+
+    // use forced auto level while it hasn't errored more than ABR selection
+    if (forcedAutoLevel !== -1) {
+      const levels = this.hls.levels;
+      if (levels.length > Math.max(forcedAutoLevel, nextABRAutoLevel) && levels[forcedAutoLevel].loadError <= levels[nextABRAutoLevel].loadError) {
+        return forcedAutoLevel;
+      }
     }
-    level.textGroupIds[level.url.length - 1] = id;
-  }
-}
-function assignTrackIdsByGroup(tracks) {
-  const groups = {};
-  tracks.forEach(track => {
-    const groupId = track.groupId || '';
-    track.id = groups[groupId] = groups[groupId] || 0;
-    groups[groupId]++;
-  });
-}
 
-var FragmentState = {
-  NOT_LOADED: "NOT_LOADED",
-  APPENDING: "APPENDING",
-  PARTIAL: "PARTIAL",
-  OK: "OK"
-};
-class FragmentTracker {
-  constructor(hls) {
-    this.activePartLists = Object.create(null);
-    this.endListFragments = Object.create(null);
-    this.fragments = Object.create(null);
-    this.timeRanges = Object.create(null);
-    this.bufferPadding = 0.2;
-    this.hls = void 0;
-    this.hasGaps = false;
-    this.hls = hls;
-    this._registerListeners();
+    // save result until state has changed
+    this._nextAutoLevel = nextABRAutoLevel;
+    this.nextAutoLevelKey = this.getAutoLevelKey();
+    return nextABRAutoLevel;
   }
-  _registerListeners() {
-    const {
-      hls
-    } = this;
-    hls.on(Events.BUFFER_APPENDED, this.onBufferAppended, this);
-    hls.on(Events.FRAG_BUFFERED, this.onFragBuffered, this);
-    hls.on(Events.FRAG_LOADED, this.onFragLoaded, this);
+  getAutoLevelKey() {
+    var _this$hls$mainForward;
+    return `${this.getBwEstimate()}_${(_this$hls$mainForward = this.hls.mainForwardBufferInfo) == null ? void 0 : _this$hls$mainForward.len}`;
   }
-  _unregisterListeners() {
+  getNextABRAutoLevel() {
     const {
+      fragCurrent,
+      partCurrent,
       hls
     } = this;
-    hls.off(Events.BUFFER_APPENDED, this.onBufferAppended, this);
-    hls.off(Events.FRAG_BUFFERED, this.onFragBuffered, this);
-    hls.off(Events.FRAG_LOADED, this.onFragLoaded, this);
-  }
-  destroy() {
-    this._unregisterListeners();
-    // @ts-ignore
-    this.fragments =
-    // @ts-ignore
-    this.activePartLists =
-    // @ts-ignore
-    this.endListFragments = this.timeRanges = null;
-  }
+    const {
+      maxAutoLevel,
+      config,
+      minAutoLevel,
+      media
+    } = hls;
+    const currentFragDuration = partCurrent ? partCurrent.duration : fragCurrent ? fragCurrent.duration : 0;
 
-  /**
-   * Return a Fragment or Part with an appended range that matches the position and levelType
-   * Otherwise, return null
-   */
-  getAppendedFrag(position, levelType) {
-    const activeParts = this.activePartLists[levelType];
-    if (activeParts) {
-      for (let i = activeParts.length; i--;) {
-        const activePart = activeParts[i];
-        if (!activePart) {
-          break;
-        }
-        const appendedPTS = activePart.end;
-        if (activePart.start <= position && appendedPTS !== null && position <= appendedPTS) {
-          return activePart;
-        }
+    // playbackRate is the absolute value of the playback rate; if media.playbackRate is 0, we use 1 to load as
+    // if we're playing back at the normal rate.
+    const playbackRate = media && media.playbackRate !== 0 ? Math.abs(media.playbackRate) : 1.0;
+    const avgbw = this.getBwEstimate();
+    // bufferStarvationDelay is the wall-clock time left until the playback buffer is exhausted.
+    const bufferInfo = hls.mainForwardBufferInfo;
+    const bufferStarvationDelay = (bufferInfo ? bufferInfo.len : 0) / playbackRate;
+    let bwFactor = config.abrBandWidthFactor;
+    let bwUpFactor = config.abrBandWidthUpFactor;
+
+    // First, look to see if we can find a level matching with our avg bandwidth AND that could also guarantee no rebuffering at all
+    if (bufferStarvationDelay) {
+      const _bestLevel = this.findBestLevel(avgbw, minAutoLevel, maxAutoLevel, bufferStarvationDelay, 0, bwFactor, bwUpFactor);
+      if (_bestLevel >= 0) {
+        return _bestLevel;
       }
     }
-    return this.getBufferedFrag(position, levelType);
-  }
-
-  /**
-   * Return a buffered Fragment that matches the position and levelType.
-   * A buffered Fragment is one whose loading, parsing and appending is done (completed or "partial" meaning aborted).
-   * If not found any Fragment, return null
-   */
-  getBufferedFrag(position, levelType) {
-    const {
-      fragments
-    } = this;
-    const keys = Object.keys(fragments);
-    for (let i = keys.length; i--;) {
-      const fragmentEntity = fragments[keys[i]];
-      if ((fragmentEntity == null ? void 0 : fragmentEntity.body.type) === levelType && fragmentEntity.buffered) {
-        const frag = fragmentEntity.body;
-        if (frag.start <= position && position <= frag.end) {
-          return frag;
-        }
+    // not possible to get rid of rebuffering... try to find level that will guarantee less than maxStarvationDelay of rebuffering
+    let maxStarvationDelay = currentFragDuration ? Math.min(currentFragDuration, config.maxStarvationDelay) : config.maxStarvationDelay;
+    if (!bufferStarvationDelay) {
+      // in case buffer is empty, let's check if previous fragment was loaded to perform a bitrate test
+      const bitrateTestDelay = this.bitrateTestDelay;
+      if (bitrateTestDelay) {
+        // if it is the case, then we need to adjust our max starvation delay using maxLoadingDelay config value
+        // max video loading delay used in  automatic start level selection :
+        // in that mode ABR controller will ensure that video loading time (ie the time to fetch the first fragment at lowest quality level +
+        // the time to fetch the fragment at the appropriate quality level is less than ```maxLoadingDelay``` )
+        // cap maxLoadingDelay and ensure it is not bigger 'than bitrate test' frag duration
+        const maxLoadingDelay = currentFragDuration ? Math.min(currentFragDuration, config.maxLoadingDelay) : config.maxLoadingDelay;
+        maxStarvationDelay = maxLoadingDelay - bitrateTestDelay;
+        logger.info(`[abr] bitrate test took ${Math.round(1000 * bitrateTestDelay)}ms, set first fragment max fetchDuration to ${Math.round(1000 * maxStarvationDelay)} ms`);
+        // don't use conservative factor on bitrate test
+        bwFactor = bwUpFactor = 1;
       }
     }
-    return null;
+    const bestLevel = this.findBestLevel(avgbw, minAutoLevel, maxAutoLevel, bufferStarvationDelay, maxStarvationDelay, bwFactor, bwUpFactor);
+    logger.info(`[abr] ${bufferStarvationDelay ? 'rebuffering expected' : 'buffer is empty'}, optimal quality level ${bestLevel}`);
+    if (bestLevel > -1) {
+      return bestLevel;
+    }
+    // If no matching level found, see if min auto level would be a better option
+    const minLevel = hls.levels[minAutoLevel];
+    const autoLevel = hls.levels[hls.loadLevel];
+    if ((minLevel == null ? void 0 : minLevel.bitrate) < (autoLevel == null ? void 0 : autoLevel.bitrate)) {
+      return minAutoLevel;
+    }
+    // or if bitrate is not lower, continue to use loadLevel
+    return hls.loadLevel;
   }
-
-  /**
-   * Partial fragments effected by coded frame eviction will be removed
-   * The browser will unload parts of the buffer to free up memory for new buffer data
-   * Fragments will need to be reloaded when the buffer is freed up, removing partial fragments will allow them to reload(since there might be parts that are still playable)
-   */
-  detectEvictedFragments(elementaryStream, timeRange, playlistType, appendedPart) {
-    if (this.timeRanges) {
-      this.timeRanges[elementaryStream] = timeRange;
+  getBwEstimate() {
+    return this.bwEstimator.canEstimate() ? this.bwEstimator.getEstimate() : this.hls.config.abrEwmaDefaultEstimate;
+  }
+  findBestLevel(currentBw, minAutoLevel, maxAutoLevel, bufferStarvationDelay, maxStarvationDelay, bwFactor, bwUpFactor) {
+    var _level$details;
+    const maxFetchDuration = bufferStarvationDelay + maxStarvationDelay;
+    const lastLoadedFragLevel = this.lastLoadedFragLevel;
+    const selectionBaseLevel = lastLoadedFragLevel === -1 ? this.hls.firstLevel : lastLoadedFragLevel;
+    const {
+      fragCurrent,
+      partCurrent
+    } = this;
+    const {
+      levels,
+      allAudioTracks,
+      loadLevel,
+      config
+    } = this.hls;
+    if (levels.length === 1) {
+      return 0;
     }
-    // Check if any flagged fragments have been unloaded
-    // excluding anything newer than appendedPartSn
-    const appendedPartSn = (appendedPart == null ? void 0 : appendedPart.fragment.sn) || -1;
-    Object.keys(this.fragments).forEach(key => {
-      const fragmentEntity = this.fragments[key];
-      if (!fragmentEntity) {
-        return;
+    const level = levels[selectionBaseLevel];
+    const live = !!(level != null && (_level$details = level.details) != null && _level$details.live);
+    const firstSelection = loadLevel === -1 || lastLoadedFragLevel === -1;
+    let currentCodecSet;
+    let currentVideoRange = 'SDR';
+    let currentFrameRate = (level == null ? void 0 : level.frameRate) || 0;
+    const {
+      audioPreference,
+      videoPreference
+    } = config;
+    const audioTracksByGroup = this.audioTracksByGroup || (this.audioTracksByGroup = getAudioTracksByGroup(allAudioTracks));
+    if (firstSelection) {
+      if (this.firstSelection !== -1) {
+        return this.firstSelection;
       }
-      if (appendedPartSn >= fragmentEntity.body.sn) {
-        return;
+      const codecTiers = this.codecTiers || (this.codecTiers = getCodecTiers(levels, audioTracksByGroup, minAutoLevel, maxAutoLevel));
+      const startTier = getStartCodecTier(codecTiers, currentVideoRange, currentBw, audioPreference, videoPreference);
+      const {
+        codecSet,
+        videoRanges,
+        minFramerate,
+        minBitrate,
+        preferHDR
+      } = startTier;
+      currentCodecSet = codecSet;
+      currentVideoRange = preferHDR ? videoRanges[videoRanges.length - 1] : videoRanges[0];
+      currentFrameRate = minFramerate;
+      currentBw = Math.max(currentBw, minBitrate);
+      logger.log(`[abr] picked start tier ${JSON.stringify(startTier)}`);
+    } else {
+      currentCodecSet = level == null ? void 0 : level.codecSet;
+      currentVideoRange = level == null ? void 0 : level.videoRange;
+    }
+    const currentFragDuration = partCurrent ? partCurrent.duration : fragCurrent ? fragCurrent.duration : 0;
+    const ttfbEstimateSec = this.bwEstimator.getEstimateTTFB() / 1000;
+    const levelsSkipped = [];
+    for (let i = maxAutoLevel; i >= minAutoLevel; i--) {
+      var _levelInfo$supportedR, _levelInfo$supportedR2;
+      const levelInfo = levels[i];
+      const upSwitch = i > selectionBaseLevel;
+      if (!levelInfo) {
+        continue;
       }
-      if (!fragmentEntity.buffered && !fragmentEntity.loaded) {
-        if (fragmentEntity.body.type === playlistType) {
-          this.removeFragment(fragmentEntity.body);
+      if (config.useMediaCapabilities && !levelInfo.supportedResult && !levelInfo.supportedPromise) {
+        const mediaCapabilities = navigator.mediaCapabilities;
+        if (typeof (mediaCapabilities == null ? void 0 : mediaCapabilities.decodingInfo) === 'function' && requiresMediaCapabilitiesDecodingInfo(levelInfo, audioTracksByGroup, currentVideoRange, currentFrameRate, currentBw, audioPreference)) {
+          levelInfo.supportedPromise = getMediaDecodingInfoPromise(levelInfo, audioTracksByGroup, mediaCapabilities);
+          levelInfo.supportedPromise.then(decodingInfo => {
+            levelInfo.supportedResult = decodingInfo;
+            const levels = this.hls.levels;
+            const index = levels.indexOf(levelInfo);
+            if (decodingInfo.error) {
+              logger.warn(`[abr] MediaCapabilities decodingInfo error: "${decodingInfo.error}" for level ${index} ${JSON.stringify(decodingInfo)}`);
+            } else if (!decodingInfo.supported) {
+              logger.warn(`[abr] Unsupported MediaCapabilities decodingInfo result for level ${index} ${JSON.stringify(decodingInfo)}`);
+              if (index > -1 && levels.length > 1) {
+                logger.log(`[abr] Removing unsupported level ${index}`);
+                this.hls.removeLevel(index);
+              }
+            }
+          });
+        } else {
+          levelInfo.supportedResult = SUPPORTED_INFO_DEFAULT;
         }
-        return;
-      }
-      const esData = fragmentEntity.range[elementaryStream];
-      if (!esData) {
-        return;
       }
-      esData.time.some(time => {
-        const isNotBuffered = !this.isTimeBuffered(time.startPTS, time.endPTS, timeRange);
-        if (isNotBuffered) {
-          // Unregister partial fragment as it needs to load again to be reused
-          this.removeFragment(fragmentEntity.body);
-        }
-        return isNotBuffered;
-      });
-    });
-  }
 
-  /**
-   * Checks if the fragment passed in is loaded in the buffer properly
-   * Partially loaded fragments will be registered as a partial fragment
-   */
-  detectPartialFragments(data) {
-    const timeRanges = this.timeRanges;
-    const {
-      frag,
-      part
-    } = data;
-    if (!timeRanges || frag.sn === 'initSegment') {
-      return;
-    }
-    const fragKey = getFragmentKey(frag);
-    const fragmentEntity = this.fragments[fragKey];
-    if (!fragmentEntity || fragmentEntity.buffered && frag.gap) {
-      return;
-    }
-    const isFragHint = !frag.relurl;
-    Object.keys(timeRanges).forEach(elementaryStream => {
-      const streamInfo = frag.elementaryStreams[elementaryStream];
-      if (!streamInfo) {
-        return;
-      }
-      const timeRange = timeRanges[elementaryStream];
-      const partial = isFragHint || streamInfo.partial === true;
-      fragmentEntity.range[elementaryStream] = this.getBufferedTimes(frag, part, partial, timeRange);
-    });
-    fragmentEntity.loaded = null;
-    if (Object.keys(fragmentEntity.range).length) {
-      fragmentEntity.buffered = true;
-      const endList = fragmentEntity.body.endList = frag.endList || fragmentEntity.body.endList;
-      if (endList) {
-        this.endListFragments[fragmentEntity.body.type] = fragmentEntity;
+      // skip candidates which change codec-family or video-range,
+      // and which decrease or increase frame-rate for up and down-switch respectfully
+      if (currentCodecSet && levelInfo.codecSet !== currentCodecSet || currentVideoRange && levelInfo.videoRange !== currentVideoRange || upSwitch && currentFrameRate > levelInfo.frameRate || !upSwitch && currentFrameRate > 0 && currentFrameRate < levelInfo.frameRate || !((_levelInfo$supportedR = levelInfo.supportedResult) != null && (_levelInfo$supportedR2 = _levelInfo$supportedR.decodingInfoResults) != null && _levelInfo$supportedR2[0].smooth)) {
+        levelsSkipped.push(i);
+        continue;
       }
-      if (!isPartial(fragmentEntity)) {
-        // Remove older fragment parts from lookup after frag is tracked as buffered
-        this.removeParts(frag.sn - 1, frag.type);
+      const levelDetails = levelInfo.details;
+      const avgDuration = (partCurrent ? levelDetails == null ? void 0 : levelDetails.partTarget : levelDetails == null ? void 0 : levelDetails.averagetargetduration) || currentFragDuration;
+      let adjustedbw;
+      // follow algorithm captured from stagefright :
+      // https://android.googlesource.com/platform/frameworks/av/+/master/media/libstagefright/httplive/LiveSession.cpp
+      // Pick the highest bandwidth stream below or equal to estimated bandwidth.
+      // consider only 80% of the available bandwidth, but if we are switching up,
+      // be even more conservative (70%) to avoid overestimating and immediately
+      // switching back.
+      if (!upSwitch) {
+        adjustedbw = bwFactor * currentBw;
+      } else {
+        adjustedbw = bwUpFactor * currentBw;
       }
-    } else {
-      // remove fragment if nothing was appended
-      this.removeFragment(fragmentEntity.body);
-    }
-  }
-  removeParts(snToKeep, levelType) {
-    const activeParts = this.activePartLists[levelType];
-    if (!activeParts) {
-      return;
-    }
-    this.activePartLists[levelType] = activeParts.filter(part => part.fragment.sn >= snToKeep);
-  }
-  fragBuffered(frag, force) {
-    const fragKey = getFragmentKey(frag);
-    let fragmentEntity = this.fragments[fragKey];
-    if (!fragmentEntity && force) {
-      fragmentEntity = this.fragments[fragKey] = {
-        body: frag,
-        appendedPTS: null,
-        loaded: null,
-        buffered: false,
-        range: Object.create(null)
-      };
-      if (frag.gap) {
-        this.hasGaps = true;
+
+      // Use average bitrate when starvation delay (buffer length) is gt or eq two segment durations and rebuffering is not expected (maxStarvationDelay > 0)
+      const bitrate = currentFragDuration && bufferStarvationDelay >= currentFragDuration * 2 && maxStarvationDelay === 0 ? levels[i].averageBitrate : levels[i].maxBitrate;
+      const fetchDuration = this.getTimeToLoadFrag(ttfbEstimateSec, adjustedbw, bitrate * avgDuration, levelDetails === undefined);
+      const canSwitchWithinTolerance =
+      // if adjusted bw is greater than level bitrate AND
+      adjustedbw >= bitrate && (
+      // no level change, or new level has no error history
+      i === lastLoadedFragLevel || levelInfo.loadError === 0 && levelInfo.fragmentError === 0) && (
+      // fragment fetchDuration unknown OR live stream OR fragment fetchDuration less than max allowed fetch duration, then this level matches
+      // we don't account for max Fetch Duration for live streams, this is to avoid switching down when near the edge of live sliding window ...
+      // special case to support startLevel = -1 (bitrateTest) on live streams : in that case we should not exit loop so that findBestLevel will return -1
+      fetchDuration <= ttfbEstimateSec || !isFiniteNumber(fetchDuration) || live && !this.bitrateTestDelay || fetchDuration < maxFetchDuration);
+      if (canSwitchWithinTolerance) {
+        const forcedAutoLevel = this.forcedAutoLevel;
+        if (i !== loadLevel && (forcedAutoLevel === -1 || forcedAutoLevel !== loadLevel)) {
+          if (levelsSkipped.length) {
+            logger.trace(`[abr] Skipped level(s) ${levelsSkipped.join(',')} of ${maxAutoLevel} max with CODECS and VIDEO-RANGE:"${levels[levelsSkipped[0]].codecs}" ${levels[levelsSkipped[0]].videoRange}; not compatible with "${level.codecs}" ${currentVideoRange}`);
+          }
+          logger.info(`[abr] switch candidate:${selectionBaseLevel}->${i} adjustedbw(${Math.round(adjustedbw)})-bitrate=${Math.round(adjustedbw - bitrate)} ttfb:${ttfbEstimateSec.toFixed(1)} avgDuration:${avgDuration.toFixed(1)} maxFetchDuration:${maxFetchDuration.toFixed(1)} fetchDuration:${fetchDuration.toFixed(1)} firstSelection:${firstSelection} codecSet:${currentCodecSet} videoRange:${currentVideoRange} hls.loadLevel:${loadLevel}`);
+        }
+        if (firstSelection) {
+          this.firstSelection = i;
+        }
+        // as we are looping from highest to lowest, this will return the best achievable quality level
+        return i;
       }
     }
-    if (fragmentEntity) {
-      fragmentEntity.loaded = null;
-      fragmentEntity.buffered = true;
-    }
+    // not enough time budget even with quality level 0 ... rebuffering might happen
+    return -1;
   }
-  getBufferedTimes(fragment, part, partial, timeRange) {
-    const buffered = {
-      time: [],
-      partial
-    };
-    const startPTS = fragment.start;
-    const endPTS = fragment.end;
-    const minEndPTS = fragment.minEndPTS || endPTS;
-    const maxStartPTS = fragment.maxStartPTS || startPTS;
-    for (let i = 0; i < timeRange.length; i++) {
-      const startTime = timeRange.start(i) - this.bufferPadding;
-      const endTime = timeRange.end(i) + this.bufferPadding;
-      if (maxStartPTS >= startTime && minEndPTS <= endTime) {
-        // Fragment is entirely contained in buffer
-        // No need to check the other timeRange times since it's completely playable
-        buffered.time.push({
-          startPTS: Math.max(startPTS, timeRange.start(i)),
-          endPTS: Math.min(endPTS, timeRange.end(i))
-        });
-        break;
-      } else if (startPTS < endTime && endPTS > startTime) {
-        buffered.partial = true;
-        // Check for intersection with buffer
-        // Get playable sections of the fragment
-        buffered.time.push({
-          startPTS: Math.max(startPTS, timeRange.start(i)),
-          endPTS: Math.min(endPTS, timeRange.end(i))
-        });
-      } else if (endPTS <= startTime) {
-        // No need to check the rest of the timeRange as it is in order
-        break;
-      }
+  set nextAutoLevel(nextLevel) {
+    const value = Math.max(this.hls.minAutoLevel, nextLevel);
+    if (this._nextAutoLevel != value) {
+      this.nextAutoLevelKey = '';
+      this._nextAutoLevel = value;
     }
-    return buffered;
   }
+}
 
-  /**
-   * Gets the partial fragment for a certain time
-   */
-  getPartialFragment(time) {
-    let bestFragment = null;
-    let timePadding;
-    let startTime;
-    let endTime;
-    let bestOverlap = 0;
-    const {
-      bufferPadding,
-      fragments
-    } = this;
-    Object.keys(fragments).forEach(key => {
-      const fragmentEntity = fragments[key];
-      if (!fragmentEntity) {
-        return;
-      }
-      if (isPartial(fragmentEntity)) {
-        startTime = fragmentEntity.body.start - bufferPadding;
-        endTime = fragmentEntity.body.end + bufferPadding;
-        if (time >= startTime && time <= endTime) {
-          // Use the fragment that has the most padding from start and end time
-          timePadding = Math.min(time - startTime, endTime - time);
-          if (bestOverlap <= timePadding) {
-            bestFragment = fragmentEntity.body;
-            bestOverlap = timePadding;
-          }
-        }
-      }
-    });
-    return bestFragment;
+/**
+ * @ignore
+ * Sub-class specialization of EventHandler base class.
+ *
+ * TaskLoop allows to schedule a task function being called (optionnaly repeatedly) on the main loop,
+ * scheduled asynchroneously, avoiding recursive calls in the same tick.
+ *
+ * The task itself is implemented in `doTick`. It can be requested and called for single execution
+ * using the `tick` method.
+ *
+ * It will be assured that the task execution method (`tick`) only gets called once per main loop "tick",
+ * no matter how often it gets requested for execution. Execution in further ticks will be scheduled accordingly.
+ *
+ * If further execution requests have already been scheduled on the next tick, it can be checked with `hasNextTick`,
+ * and cancelled with `clearNextTick`.
+ *
+ * The task can be scheduled as an interval repeatedly with a period as parameter (see `setInterval`, `clearInterval`).
+ *
+ * Sub-classes need to implement the `doTick` method which will effectively have the task execution routine.
+ *
+ * Further explanations:
+ *
+ * The baseclass has a `tick` method that will schedule the doTick call. It may be called synchroneously
+ * only for a stack-depth of one. On re-entrant calls, sub-sequent calls are scheduled for next main loop ticks.
+ *
+ * When the task execution (`tick` method) is called in re-entrant way this is detected and
+ * we are limiting the task execution per call stack to exactly one, but scheduling/post-poning further
+ * task processing on the next main loop iteration (also known as "next tick" in the Node/JS runtime lingo).
+ */
+class TaskLoop {
+  constructor() {
+    this._boundTick = void 0;
+    this._tickTimer = null;
+    this._tickInterval = null;
+    this._tickCallCount = 0;
+    this._boundTick = this.tick.bind(this);
   }
-  isEndListAppended(type) {
-    const lastFragmentEntity = this.endListFragments[type];
-    return lastFragmentEntity !== undefined && (lastFragmentEntity.buffered || isPartial(lastFragmentEntity));
+  destroy() {
+    this.onHandlerDestroying();
+    this.onHandlerDestroyed();
   }
-  getState(fragment) {
-    const fragKey = getFragmentKey(fragment);
-    const fragmentEntity = this.fragments[fragKey];
-    if (fragmentEntity) {
-      if (!fragmentEntity.buffered) {
-        return FragmentState.APPENDING;
-      } else if (isPartial(fragmentEntity)) {
-        return FragmentState.PARTIAL;
-      } else {
-        return FragmentState.OK;
-      }
-    }
-    return FragmentState.NOT_LOADED;
+  onHandlerDestroying() {
+    // clear all timers before unregistering from event bus
+    this.clearNextTick();
+    this.clearInterval();
   }
-  isTimeBuffered(startPTS, endPTS, timeRange) {
-    let startTime;
-    let endTime;
-    for (let i = 0; i < timeRange.length; i++) {
-      startTime = timeRange.start(i) - this.bufferPadding;
-      endTime = timeRange.end(i) + this.bufferPadding;
-      if (startPTS >= startTime && endPTS <= endTime) {
-        return true;
-      }
-      if (endPTS <= startTime) {
-        // No need to check the rest of the timeRange as it is in order
-        return false;
-      }
+  onHandlerDestroyed() {}
+  hasInterval() {
+    return !!this._tickInterval;
+  }
+  hasNextTick() {
+    return !!this._tickTimer;
+  }
+
+  /**
+   * @param millis - Interval time (ms)
+   * @eturns True when interval has been scheduled, false when already scheduled (no effect)
+   */
+  setInterval(millis) {
+    if (!this._tickInterval) {
+      this._tickCallCount = 0;
+      this._tickInterval = self.setInterval(this._boundTick, millis);
+      return true;
     }
     return false;
   }
-  onFragLoaded(event, data) {
-    const {
-      frag,
-      part
-    } = data;
-    // don't track initsegment (for which sn is not a number)
-    // don't track frags used for bitrateTest, they're irrelevant.
-    if (frag.sn === 'initSegment' || frag.bitrateTest) {
-      return;
-    }
 
-    // Fragment entity `loaded` FragLoadedData is null when loading parts
-    const loaded = part ? null : data;
-    const fragKey = getFragmentKey(frag);
-    this.fragments[fragKey] = {
-      body: frag,
-      appendedPTS: null,
-      loaded,
-      buffered: false,
-      range: Object.create(null)
-    };
-  }
-  onBufferAppended(event, data) {
-    const {
-      frag,
-      part,
-      timeRanges
-    } = data;
-    if (frag.sn === 'initSegment') {
-      return;
-    }
-    const playlistType = frag.type;
-    if (part) {
-      let activeParts = this.activePartLists[playlistType];
-      if (!activeParts) {
-        this.activePartLists[playlistType] = activeParts = [];
-      }
-      activeParts.push(part);
+  /**
+   * @returns True when interval was cleared, false when none was set (no effect)
+   */
+  clearInterval() {
+    if (this._tickInterval) {
+      self.clearInterval(this._tickInterval);
+      this._tickInterval = null;
+      return true;
     }
-    // Store the latest timeRanges loaded in the buffer
-    this.timeRanges = timeRanges;
-    Object.keys(timeRanges).forEach(elementaryStream => {
-      const timeRange = timeRanges[elementaryStream];
-      this.detectEvictedFragments(elementaryStream, timeRange, playlistType, part);
-    });
-  }
-  onFragBuffered(event, data) {
-    this.detectPartialFragments(data);
-  }
-  hasFragment(fragment) {
-    const fragKey = getFragmentKey(fragment);
-    return !!this.fragments[fragKey];
-  }
-  hasParts(type) {
-    var _this$activePartLists;
-    return !!((_this$activePartLists = this.activePartLists[type]) != null && _this$activePartLists.length);
+    return false;
   }
-  removeFragmentsInRange(start, end, playlistType, withGapOnly, unbufferedOnly) {
-    if (withGapOnly && !this.hasGaps) {
-      return;
+
+  /**
+   * @returns True when timeout was cleared, false when none was set (no effect)
+   */
+  clearNextTick() {
+    if (this._tickTimer) {
+      self.clearTimeout(this._tickTimer);
+      this._tickTimer = null;
+      return true;
     }
-    Object.keys(this.fragments).forEach(key => {
-      const fragmentEntity = this.fragments[key];
-      if (!fragmentEntity) {
-        return;
-      }
-      const frag = fragmentEntity.body;
-      if (frag.type !== playlistType || withGapOnly && !frag.gap) {
-        return;
-      }
-      if (frag.start < end && frag.end > start && (fragmentEntity.buffered || unbufferedOnly)) {
-        this.removeFragment(frag);
-      }
-    });
+    return false;
   }
-  removeFragment(fragment) {
-    const fragKey = getFragmentKey(fragment);
-    fragment.stats.loaded = 0;
-    fragment.clearElementaryStreamInfo();
-    const activeParts = this.activePartLists[fragment.type];
-    if (activeParts) {
-      const snToRemove = fragment.sn;
-      this.activePartLists[fragment.type] = activeParts.filter(part => part.fragment.sn !== snToRemove);
-    }
-    delete this.fragments[fragKey];
-    if (fragment.endList) {
-      delete this.endListFragments[fragment.type];
+
+  /**
+   * Will call the subclass doTick implementation in this main loop tick
+   * or in the next one (via setTimeout(,0)) in case it has already been called
+   * in this tick (in case this is a re-entrant call).
+   */
+  tick() {
+    this._tickCallCount++;
+    if (this._tickCallCount === 1) {
+      this.doTick();
+      // re-entrant call to tick from previous doTick call stack
+      // -> schedule a call on the next main loop iteration to process this task processing request
+      if (this._tickCallCount > 1) {
+        // make sure only one timer exists at any time at max
+        this.tickImmediate();
+      }
+      this._tickCallCount = 0;
     }
   }
-  removeAllFragments() {
-    this.fragments = Object.create(null);
-    this.endListFragments = Object.create(null);
-    this.activePartLists = Object.create(null);
-    this.hasGaps = false;
+  tickImmediate() {
+    this.clearNextTick();
+    this._tickTimer = self.setTimeout(this._boundTick, 0);
   }
-}
-function isPartial(fragmentEntity) {
-  var _fragmentEntity$range, _fragmentEntity$range2, _fragmentEntity$range3;
-  return fragmentEntity.buffered && (fragmentEntity.body.gap || ((_fragmentEntity$range = fragmentEntity.range.video) == null ? void 0 : _fragmentEntity$range.partial) || ((_fragmentEntity$range2 = fragmentEntity.range.audio) == null ? void 0 : _fragmentEntity$range2.partial) || ((_fragmentEntity$range3 = fragmentEntity.range.audiovideo) == null ? void 0 : _fragmentEntity$range3.partial));
-}
-function getFragmentKey(fragment) {
-  return `${fragment.type}_${fragment.level}_${fragment.urlId}_${fragment.sn}`;
-}
 
-const MIN_CHUNK_SIZE = Math.pow(2, 17); // 128kb
+  /**
+   * For subclass to implement task logic
+   * @abstract
+   */
+  doTick() {}
+}
 
-class FragmentLoader {
-  constructor(config) {
-    this.config = void 0;
-    this.loader = null;
-    this.partLoadTimeout = -1;
-    this.config = config;
-  }
-  destroy() {
-    if (this.loader) {
-      this.loader.destroy();
-      this.loader = null;
+var FragmentState = {
+  NOT_LOADED: "NOT_LOADED",
+  APPENDING: "APPENDING",
+  PARTIAL: "PARTIAL",
+  OK: "OK"
+};
+class FragmentTracker {
+  constructor(hls) {
+    this.activePartLists = Object.create(null);
+    this.endListFragments = Object.create(null);
+    this.fragments = Object.create(null);
+    this.timeRanges = Object.create(null);
+    this.bufferPadding = 0.2;
+    this.hls = void 0;
+    this.hasGaps = false;
+    this.hls = hls;
+    this._registerListeners();
+  }
+  _registerListeners() {
+    const {
+      hls
+    } = this;
+    hls.on(Events.BUFFER_APPENDED, this.onBufferAppended, this);
+    hls.on(Events.FRAG_BUFFERED, this.onFragBuffered, this);
+    hls.on(Events.FRAG_LOADED, this.onFragLoaded, this);
+  }
+  _unregisterListeners() {
+    const {
+      hls
+    } = this;
+    hls.off(Events.BUFFER_APPENDED, this.onBufferAppended, this);
+    hls.off(Events.FRAG_BUFFERED, this.onFragBuffered, this);
+    hls.off(Events.FRAG_LOADED, this.onFragLoaded, this);
+  }
+  destroy() {
+    this._unregisterListeners();
+    // @ts-ignore
+    this.fragments =
+    // @ts-ignore
+    this.activePartLists =
+    // @ts-ignore
+    this.endListFragments = this.timeRanges = null;
+  }
+
+  /**
+   * Return a Fragment or Part with an appended range that matches the position and levelType
+   * Otherwise, return null
+   */
+  getAppendedFrag(position, levelType) {
+    const activeParts = this.activePartLists[levelType];
+    if (activeParts) {
+      for (let i = activeParts.length; i--;) {
+        const activePart = activeParts[i];
+        if (!activePart) {
+          break;
+        }
+        const appendedPTS = activePart.end;
+        if (activePart.start <= position && appendedPTS !== null && position <= appendedPTS) {
+          return activePart;
+        }
+      }
     }
+    return this.getBufferedFrag(position, levelType);
   }
-  abort() {
-    if (this.loader) {
-      // Abort the loader for current fragment. Only one may load at any given time
-      this.loader.abort();
+
+  /**
+   * Return a buffered Fragment that matches the position and levelType.
+   * A buffered Fragment is one whose loading, parsing and appending is done (completed or "partial" meaning aborted).
+   * If not found any Fragment, return null
+   */
+  getBufferedFrag(position, levelType) {
+    const {
+      fragments
+    } = this;
+    const keys = Object.keys(fragments);
+    for (let i = keys.length; i--;) {
+      const fragmentEntity = fragments[keys[i]];
+      if ((fragmentEntity == null ? void 0 : fragmentEntity.body.type) === levelType && fragmentEntity.buffered) {
+        const frag = fragmentEntity.body;
+        if (frag.start <= position && position <= frag.end) {
+          return frag;
+        }
+      }
     }
+    return null;
   }
-  load(frag, onProgress) {
-    const url = frag.url;
-    if (!url) {
-      return Promise.reject(new LoadError({
-        type: ErrorTypes.NETWORK_ERROR,
-        details: ErrorDetails.FRAG_LOAD_ERROR,
-        fatal: false,
-        frag,
-        error: new Error(`Fragment does not have a ${url ? 'part list' : 'url'}`),
-        networkDetails: null
-      }));
+
+  /**
+   * Partial fragments effected by coded frame eviction will be removed
+   * The browser will unload parts of the buffer to free up memory for new buffer data
+   * Fragments will need to be reloaded when the buffer is freed up, removing partial fragments will allow them to reload(since there might be parts that are still playable)
+   */
+  detectEvictedFragments(elementaryStream, timeRange, playlistType, appendedPart) {
+    if (this.timeRanges) {
+      this.timeRanges[elementaryStream] = timeRange;
     }
-    this.abort();
-    const config = this.config;
-    const FragmentILoader = config.fLoader;
-    const DefaultILoader = config.loader;
-    return new Promise((resolve, reject) => {
-      if (this.loader) {
-        this.loader.destroy();
+    // Check if any flagged fragments have been unloaded
+    // excluding anything newer than appendedPartSn
+    const appendedPartSn = (appendedPart == null ? void 0 : appendedPart.fragment.sn) || -1;
+    Object.keys(this.fragments).forEach(key => {
+      const fragmentEntity = this.fragments[key];
+      if (!fragmentEntity) {
+        return;
       }
-      if (frag.gap) {
-        if (frag.tagList.some(tags => tags[0] === 'GAP')) {
-          reject(createGapLoadError(frag));
-          return;
-        } else {
-          // Reset temporary treatment as GAP tag
-          frag.gap = false;
+      if (appendedPartSn >= fragmentEntity.body.sn) {
+        return;
+      }
+      if (!fragmentEntity.buffered && !fragmentEntity.loaded) {
+        if (fragmentEntity.body.type === playlistType) {
+          this.removeFragment(fragmentEntity.body);
         }
+        return;
       }
-      const loader = this.loader = frag.loader = FragmentILoader ? new FragmentILoader(config) : new DefaultILoader(config);
-      const loaderContext = createLoaderContext(frag);
-      const loadPolicy = getLoaderConfigWithoutReties(config.fragLoadPolicy.default);
-      const loaderConfig = {
-        loadPolicy,
-        timeout: loadPolicy.maxLoadTimeMs,
-        maxRetry: 0,
-        retryDelay: 0,
-        maxRetryDelay: 0,
-        highWaterMark: frag.sn === 'initSegment' ? Infinity : MIN_CHUNK_SIZE
-      };
-      // Assign frag stats to the loader's stats reference
-      frag.stats = loader.stats;
-      loader.load(loaderContext, loaderConfig, {
-        onSuccess: (response, stats, context, networkDetails) => {
-          this.resetLoader(frag, loader);
-          let payload = response.data;
-          if (context.resetIV && frag.decryptdata) {
-            frag.decryptdata.iv = new Uint8Array(payload.slice(0, 16));
-            payload = payload.slice(16);
-          }
-          resolve({
-            frag,
-            part: null,
-            payload,
-            networkDetails
-          });
-        },
-        onError: (response, context, networkDetails, stats) => {
-          this.resetLoader(frag, loader);
-          reject(new LoadError({
-            type: ErrorTypes.NETWORK_ERROR,
-            details: ErrorDetails.FRAG_LOAD_ERROR,
-            fatal: false,
-            frag,
-            response: _objectSpread2({
-              url,
-              data: undefined
-            }, response),
-            error: new Error(`HTTP Error ${response.code} ${response.text}`),
-            networkDetails,
-            stats
-          }));
-        },
-        onAbort: (stats, context, networkDetails) => {
-          this.resetLoader(frag, loader);
-          reject(new LoadError({
-            type: ErrorTypes.NETWORK_ERROR,
-            details: ErrorDetails.INTERNAL_ABORTED,
-            fatal: false,
-            frag,
-            error: new Error('Aborted'),
-            networkDetails,
-            stats
-          }));
-        },
-        onTimeout: (stats, context, networkDetails) => {
-          this.resetLoader(frag, loader);
-          reject(new LoadError({
-            type: ErrorTypes.NETWORK_ERROR,
-            details: ErrorDetails.FRAG_LOAD_TIMEOUT,
-            fatal: false,
-            frag,
-            error: new Error(`Timeout after ${loaderConfig.timeout}ms`),
-            networkDetails,
-            stats
-          }));
-        },
-        onProgress: (stats, context, data, networkDetails) => {
-          if (onProgress) {
-            onProgress({
-              frag,
-              part: null,
-              payload: data,
-              networkDetails
-            });
-          }
+      const esData = fragmentEntity.range[elementaryStream];
+      if (!esData) {
+        return;
+      }
+      esData.time.some(time => {
+        const isNotBuffered = !this.isTimeBuffered(time.startPTS, time.endPTS, timeRange);
+        if (isNotBuffered) {
+          // Unregister partial fragment as it needs to load again to be reused
+          this.removeFragment(fragmentEntity.body);
         }
+        return isNotBuffered;
       });
     });
   }
-  loadPart(frag, part, onProgress) {
-    this.abort();
-    const config = this.config;
-    const FragmentILoader = config.fLoader;
-    const DefaultILoader = config.loader;
-    return new Promise((resolve, reject) => {
-      if (this.loader) {
-        this.loader.destroy();
-      }
-      if (frag.gap || part.gap) {
-        reject(createGapLoadError(frag, part));
+
+  /**
+   * Checks if the fragment passed in is loaded in the buffer properly
+   * Partially loaded fragments will be registered as a partial fragment
+   */
+  detectPartialFragments(data) {
+    const timeRanges = this.timeRanges;
+    const {
+      frag,
+      part
+    } = data;
+    if (!timeRanges || frag.sn === 'initSegment') {
+      return;
+    }
+    const fragKey = getFragmentKey(frag);
+    const fragmentEntity = this.fragments[fragKey];
+    if (!fragmentEntity || fragmentEntity.buffered && frag.gap) {
+      return;
+    }
+    const isFragHint = !frag.relurl;
+    Object.keys(timeRanges).forEach(elementaryStream => {
+      const streamInfo = frag.elementaryStreams[elementaryStream];
+      if (!streamInfo) {
         return;
       }
-      const loader = this.loader = frag.loader = FragmentILoader ? new FragmentILoader(config) : new DefaultILoader(config);
-      const loaderContext = createLoaderContext(frag, part);
-      // Should we define another load policy for parts?
-      const loadPolicy = getLoaderConfigWithoutReties(config.fragLoadPolicy.default);
-      const loaderConfig = {
-        loadPolicy,
-        timeout: loadPolicy.maxLoadTimeMs,
-        maxRetry: 0,
-        retryDelay: 0,
-        maxRetryDelay: 0,
-        highWaterMark: MIN_CHUNK_SIZE
-      };
-      // Assign part stats to the loader's stats reference
-      part.stats = loader.stats;
-      loader.load(loaderContext, loaderConfig, {
-        onSuccess: (response, stats, context, networkDetails) => {
-          this.resetLoader(frag, loader);
-          this.updateStatsFromPart(frag, part);
-          const partLoadedData = {
-            frag,
-            part,
-            payload: response.data,
-            networkDetails
-          };
-          onProgress(partLoadedData);
-          resolve(partLoadedData);
-        },
-        onError: (response, context, networkDetails, stats) => {
-          this.resetLoader(frag, loader);
-          reject(new LoadError({
-            type: ErrorTypes.NETWORK_ERROR,
-            details: ErrorDetails.FRAG_LOAD_ERROR,
-            fatal: false,
-            frag,
-            part,
-            response: _objectSpread2({
-              url: loaderContext.url,
-              data: undefined
-            }, response),
-            error: new Error(`HTTP Error ${response.code} ${response.text}`),
-            networkDetails,
-            stats
-          }));
-        },
-        onAbort: (stats, context, networkDetails) => {
-          frag.stats.aborted = part.stats.aborted;
-          this.resetLoader(frag, loader);
-          reject(new LoadError({
-            type: ErrorTypes.NETWORK_ERROR,
-            details: ErrorDetails.INTERNAL_ABORTED,
-            fatal: false,
-            frag,
-            part,
-            error: new Error('Aborted'),
-            networkDetails,
-            stats
-          }));
-        },
-        onTimeout: (stats, context, networkDetails) => {
-          this.resetLoader(frag, loader);
-          reject(new LoadError({
-            type: ErrorTypes.NETWORK_ERROR,
-            details: ErrorDetails.FRAG_LOAD_TIMEOUT,
-            fatal: false,
-            frag,
-            part,
-            error: new Error(`Timeout after ${loaderConfig.timeout}ms`),
-            networkDetails,
-            stats
-          }));
-        }
-      });
+      const timeRange = timeRanges[elementaryStream];
+      const partial = isFragHint || streamInfo.partial === true;
+      fragmentEntity.range[elementaryStream] = this.getBufferedTimes(frag, part, partial, timeRange);
     });
-  }
-  updateStatsFromPart(frag, part) {
-    const fragStats = frag.stats;
-    const partStats = part.stats;
-    const partTotal = partStats.total;
-    fragStats.loaded += partStats.loaded;
-    if (partTotal) {
-      const estTotalParts = Math.round(frag.duration / part.duration);
-      const estLoadedParts = Math.min(Math.round(fragStats.loaded / partTotal), estTotalParts);
-      const estRemainingParts = estTotalParts - estLoadedParts;
-      const estRemainingBytes = estRemainingParts * Math.round(fragStats.loaded / estLoadedParts);
-      fragStats.total = fragStats.loaded + estRemainingBytes;
-    } else {
-      fragStats.total = Math.max(fragStats.loaded, fragStats.total);
-    }
-    const fragLoading = fragStats.loading;
-    const partLoading = partStats.loading;
-    if (fragLoading.start) {
-      // add to fragment loader latency
-      fragLoading.first += partLoading.first - partLoading.start;
-    } else {
-      fragLoading.start = partLoading.start;
-      fragLoading.first = partLoading.first;
-    }
-    fragLoading.end = partLoading.end;
-  }
-  resetLoader(frag, loader) {
-    frag.loader = null;
-    if (this.loader === loader) {
-      self.clearTimeout(this.partLoadTimeout);
-      this.loader = null;
-    }
-    loader.destroy();
-  }
-}
-function createLoaderContext(frag, part = null) {
-  const segment = part || frag;
-  const loaderContext = {
-    frag,
-    part,
-    responseType: 'arraybuffer',
-    url: segment.url,
-    headers: {},
-    rangeStart: 0,
-    rangeEnd: 0
-  };
-  const start = segment.byteRangeStartOffset;
-  const end = segment.byteRangeEndOffset;
-  if (isFiniteNumber(start) && isFiniteNumber(end)) {
-    var _frag$decryptdata;
-    let byteRangeStart = start;
-    let byteRangeEnd = end;
-    if (frag.sn === 'initSegment' && ((_frag$decryptdata = frag.decryptdata) == null ? void 0 : _frag$decryptdata.method) === 'AES-128') {
-      // MAP segment encrypted with method 'AES-128', when served with HTTP Range,
-      // has the unencrypted size specified in the range.
-      // Ref: https://tools.ietf.org/html/draft-pantos-hls-rfc8216bis-08#section-6.3.6
-      const fragmentLen = end - start;
-      if (fragmentLen % 16) {
-        byteRangeEnd = end + (16 - fragmentLen % 16);
+    fragmentEntity.loaded = null;
+    if (Object.keys(fragmentEntity.range).length) {
+      fragmentEntity.buffered = true;
+      const endList = fragmentEntity.body.endList = frag.endList || fragmentEntity.body.endList;
+      if (endList) {
+        this.endListFragments[fragmentEntity.body.type] = fragmentEntity;
       }
-      if (start !== 0) {
-        loaderContext.resetIV = true;
-        byteRangeStart = start - 16;
+      if (!isPartial(fragmentEntity)) {
+        // Remove older fragment parts from lookup after frag is tracked as buffered
+        this.removeParts(frag.sn - 1, frag.type);
       }
+    } else {
+      // remove fragment if nothing was appended
+      this.removeFragment(fragmentEntity.body);
     }
-    loaderContext.rangeStart = byteRangeStart;
-    loaderContext.rangeEnd = byteRangeEnd;
-  }
-  return loaderContext;
-}
-function createGapLoadError(frag, part) {
-  const error = new Error(`GAP ${frag.gap ? 'tag' : 'attribute'} found`);
-  const errorData = {
-    type: ErrorTypes.MEDIA_ERROR,
-    details: ErrorDetails.FRAG_GAP,
-    fatal: false,
-    frag,
-    error,
-    networkDetails: null
-  };
-  if (part) {
-    errorData.part = part;
-  }
-  (part ? part : frag).stats.aborted = true;
-  return new LoadError(errorData);
-}
-class LoadError extends Error {
-  constructor(data) {
-    super(data.error.message);
-    this.data = void 0;
-    this.data = data;
-  }
-}
-
-class KeyLoader {
-  constructor(config) {
-    this.config = void 0;
-    this.keyUriToKeyInfo = {};
-    this.emeController = null;
-    this.config = config;
   }
-  abort(type) {
-    for (const uri in this.keyUriToKeyInfo) {
-      const loader = this.keyUriToKeyInfo[uri].loader;
-      if (loader) {
-        if (type && type !== loader.context.frag.type) {
-          return;
-        }
-        loader.abort();
-      }
+  removeParts(snToKeep, levelType) {
+    const activeParts = this.activePartLists[levelType];
+    if (!activeParts) {
+      return;
     }
+    this.activePartLists[levelType] = activeParts.filter(part => part.fragment.sn >= snToKeep);
   }
-  detach() {
-    for (const uri in this.keyUriToKeyInfo) {
-      const keyInfo = this.keyUriToKeyInfo[uri];
-      // Remove cached EME keys on detach
-      if (keyInfo.mediaKeySessionContext || keyInfo.decryptdata.isCommonEncryption) {
-        delete this.keyUriToKeyInfo[uri];
+  fragBuffered(frag, force) {
+    const fragKey = getFragmentKey(frag);
+    let fragmentEntity = this.fragments[fragKey];
+    if (!fragmentEntity && force) {
+      fragmentEntity = this.fragments[fragKey] = {
+        body: frag,
+        appendedPTS: null,
+        loaded: null,
+        buffered: false,
+        range: Object.create(null)
+      };
+      if (frag.gap) {
+        this.hasGaps = true;
       }
     }
+    if (fragmentEntity) {
+      fragmentEntity.loaded = null;
+      fragmentEntity.buffered = true;
+    }
   }
-  destroy() {
-    this.detach();
-    for (const uri in this.keyUriToKeyInfo) {
-      const loader = this.keyUriToKeyInfo[uri].loader;
-      if (loader) {
-        loader.destroy();
+  getBufferedTimes(fragment, part, partial, timeRange) {
+    const buffered = {
+      time: [],
+      partial
+    };
+    const startPTS = fragment.start;
+    const endPTS = fragment.end;
+    const minEndPTS = fragment.minEndPTS || endPTS;
+    const maxStartPTS = fragment.maxStartPTS || startPTS;
+    for (let i = 0; i < timeRange.length; i++) {
+      const startTime = timeRange.start(i) - this.bufferPadding;
+      const endTime = timeRange.end(i) + this.bufferPadding;
+      if (maxStartPTS >= startTime && minEndPTS <= endTime) {
+        // Fragment is entirely contained in buffer
+        // No need to check the other timeRange times since it's completely playable
+        buffered.time.push({
+          startPTS: Math.max(startPTS, timeRange.start(i)),
+          endPTS: Math.min(endPTS, timeRange.end(i))
+        });
+        break;
+      } else if (startPTS < endTime && endPTS > startTime) {
+        const start = Math.max(startPTS, timeRange.start(i));
+        const end = Math.min(endPTS, timeRange.end(i));
+        if (end > start) {
+          buffered.partial = true;
+          // Check for intersection with buffer
+          // Get playable sections of the fragment
+          buffered.time.push({
+            startPTS: start,
+            endPTS: end
+          });
+        }
+      } else if (endPTS <= startTime) {
+        // No need to check the rest of the timeRange as it is in order
+        break;
       }
     }
-    this.keyUriToKeyInfo = {};
+    return buffered;
   }
-  createKeyLoadError(frag, details = ErrorDetails.KEY_LOAD_ERROR, error, networkDetails, response) {
-    return new LoadError({
-      type: ErrorTypes.NETWORK_ERROR,
-      details,
-      fatal: false,
-      frag,
-      response,
-      error,
-      networkDetails
+
+  /**
+   * Gets the partial fragment for a certain time
+   */
+  getPartialFragment(time) {
+    let bestFragment = null;
+    let timePadding;
+    let startTime;
+    let endTime;
+    let bestOverlap = 0;
+    const {
+      bufferPadding,
+      fragments
+    } = this;
+    Object.keys(fragments).forEach(key => {
+      const fragmentEntity = fragments[key];
+      if (!fragmentEntity) {
+        return;
+      }
+      if (isPartial(fragmentEntity)) {
+        startTime = fragmentEntity.body.start - bufferPadding;
+        endTime = fragmentEntity.body.end + bufferPadding;
+        if (time >= startTime && time <= endTime) {
+          // Use the fragment that has the most padding from start and end time
+          timePadding = Math.min(time - startTime, endTime - time);
+          if (bestOverlap <= timePadding) {
+            bestFragment = fragmentEntity.body;
+            bestOverlap = timePadding;
+          }
+        }
+      }
     });
+    return bestFragment;
   }
-  loadClear(loadingFrag, encryptedFragments) {
-    if (this.emeController && this.config.emeEnabled) {
-      // access key-system with nearest key on start (loaidng frag is unencrypted)
-      const {
-        sn,
-        cc
-      } = loadingFrag;
-      for (let i = 0; i < encryptedFragments.length; i++) {
-        const frag = encryptedFragments[i];
-        if (cc <= frag.cc && (sn === 'initSegment' || frag.sn === 'initSegment' || sn < frag.sn)) {
-          this.emeController.selectKeySystemFormat(frag).then(keySystemFormat => {
-            frag.setKeyFormat(keySystemFormat);
-          });
-          break;
-        }
+  isEndListAppended(type) {
+    const lastFragmentEntity = this.endListFragments[type];
+    return lastFragmentEntity !== undefined && (lastFragmentEntity.buffered || isPartial(lastFragmentEntity));
+  }
+  getState(fragment) {
+    const fragKey = getFragmentKey(fragment);
+    const fragmentEntity = this.fragments[fragKey];
+    if (fragmentEntity) {
+      if (!fragmentEntity.buffered) {
+        return FragmentState.APPENDING;
+      } else if (isPartial(fragmentEntity)) {
+        return FragmentState.PARTIAL;
+      } else {
+        return FragmentState.OK;
       }
     }
+    return FragmentState.NOT_LOADED;
   }
-  load(frag) {
-    if (!frag.decryptdata && frag.encrypted && this.emeController) {
-      // Multiple keys, but none selected, resolve in eme-controller
-      return this.emeController.selectKeySystemFormat(frag).then(keySystemFormat => {
-        return this.loadInternal(frag, keySystemFormat);
-      });
+  isTimeBuffered(startPTS, endPTS, timeRange) {
+    let startTime;
+    let endTime;
+    for (let i = 0; i < timeRange.length; i++) {
+      startTime = timeRange.start(i) - this.bufferPadding;
+      endTime = timeRange.end(i) + this.bufferPadding;
+      if (startPTS >= startTime && endPTS <= endTime) {
+        return true;
+      }
+      if (endPTS <= startTime) {
+        // No need to check the rest of the timeRange as it is in order
+        return false;
+      }
     }
-    return this.loadInternal(frag);
+    return false;
   }
-  loadInternal(frag, keySystemFormat) {
-    var _keyInfo, _keyInfo2;
-    if (keySystemFormat) {
-      frag.setKeyFormat(keySystemFormat);
+  onFragLoaded(event, data) {
+    const {
+      frag,
+      part
+    } = data;
+    // don't track initsegment (for which sn is not a number)
+    // don't track frags used for bitrateTest, they're irrelevant.
+    if (frag.sn === 'initSegment' || frag.bitrateTest) {
+      return;
     }
-    const decryptdata = frag.decryptdata;
-    if (!decryptdata) {
-      const error = new Error(keySystemFormat ? `Expected frag.decryptdata to be defined after setting format ${keySystemFormat}` : 'Missing decryption data on fragment in onKeyLoading');
-      return Promise.reject(this.createKeyLoadError(frag, ErrorDetails.KEY_LOAD_ERROR, error));
+
+    // Fragment entity `loaded` FragLoadedData is null when loading parts
+    const loaded = part ? null : data;
+    const fragKey = getFragmentKey(frag);
+    this.fragments[fragKey] = {
+      body: frag,
+      appendedPTS: null,
+      loaded,
+      buffered: false,
+      range: Object.create(null)
+    };
+  }
+  onBufferAppended(event, data) {
+    const {
+      frag,
+      part,
+      timeRanges
+    } = data;
+    if (frag.sn === 'initSegment') {
+      return;
     }
-    const uri = decryptdata.uri;
-    if (!uri) {
-      return Promise.reject(this.createKeyLoadError(frag, ErrorDetails.KEY_LOAD_ERROR, new Error(`Invalid key URI: "${uri}"`)));
+    const playlistType = frag.type;
+    if (part) {
+      let activeParts = this.activePartLists[playlistType];
+      if (!activeParts) {
+        this.activePartLists[playlistType] = activeParts = [];
+      }
+      activeParts.push(part);
     }
-    let keyInfo = this.keyUriToKeyInfo[uri];
-    if ((_keyInfo = keyInfo) != null && _keyInfo.decryptdata.key) {
-      decryptdata.key = keyInfo.decryptdata.key;
-      return Promise.resolve({
-        frag,
-        keyInfo
-      });
+    // Store the latest timeRanges loaded in the buffer
+    this.timeRanges = timeRanges;
+    Object.keys(timeRanges).forEach(elementaryStream => {
+      const timeRange = timeRanges[elementaryStream];
+      this.detectEvictedFragments(elementaryStream, timeRange, playlistType, part);
+    });
+  }
+  onFragBuffered(event, data) {
+    this.detectPartialFragments(data);
+  }
+  hasFragment(fragment) {
+    const fragKey = getFragmentKey(fragment);
+    return !!this.fragments[fragKey];
+  }
+  hasParts(type) {
+    var _this$activePartLists;
+    return !!((_this$activePartLists = this.activePartLists[type]) != null && _this$activePartLists.length);
+  }
+  removeFragmentsInRange(start, end, playlistType, withGapOnly, unbufferedOnly) {
+    if (withGapOnly && !this.hasGaps) {
+      return;
     }
-    // Return key load promise as long as it does not have a mediakey session with an unusable key status
-    if ((_keyInfo2 = keyInfo) != null && _keyInfo2.keyLoadPromise) {
-      var _keyInfo$mediaKeySess;
-      switch ((_keyInfo$mediaKeySess = keyInfo.mediaKeySessionContext) == null ? void 0 : _keyInfo$mediaKeySess.keyStatus) {
-        case undefined:
-        case 'status-pending':
-        case 'usable':
-        case 'usable-in-future':
-          return keyInfo.keyLoadPromise.then(keyLoadedData => {
-            // Return the correct fragment with updated decryptdata key and loaded keyInfo
-            decryptdata.key = keyLoadedData.keyInfo.decryptdata.key;
-            return {
-              frag,
-              keyInfo
-            };
-          });
+    Object.keys(this.fragments).forEach(key => {
+      const fragmentEntity = this.fragments[key];
+      if (!fragmentEntity) {
+        return;
       }
-      // If we have a key session and status and it is not pending or usable, continue
-      // This will go back to the eme-controller for expired keys to get a new keyLoadPromise
+      const frag = fragmentEntity.body;
+      if (frag.type !== playlistType || withGapOnly && !frag.gap) {
+        return;
+      }
+      if (frag.start < end && frag.end > start && (fragmentEntity.buffered || unbufferedOnly)) {
+        this.removeFragment(frag);
+      }
+    });
+  }
+  removeFragment(fragment) {
+    const fragKey = getFragmentKey(fragment);
+    fragment.stats.loaded = 0;
+    fragment.clearElementaryStreamInfo();
+    const activeParts = this.activePartLists[fragment.type];
+    if (activeParts) {
+      const snToRemove = fragment.sn;
+      this.activePartLists[fragment.type] = activeParts.filter(part => part.fragment.sn !== snToRemove);
     }
-
-    // Load the key or return the loading promise
-    keyInfo = this.keyUriToKeyInfo[uri] = {
-      decryptdata,
-      keyLoadPromise: null,
-      loader: null,
-      mediaKeySessionContext: null
-    };
-    switch (decryptdata.method) {
-      case 'ISO-23001-7':
-      case 'SAMPLE-AES':
-      case 'SAMPLE-AES-CENC':
-      case 'SAMPLE-AES-CTR':
-        if (decryptdata.keyFormat === 'identity') {
-          // loadKeyHTTP handles http(s) and data URLs
-          return this.loadKeyHTTP(keyInfo, frag);
-        }
-        return this.loadKeyEME(keyInfo, frag);
-      case 'AES-128':
-        return this.loadKeyHTTP(keyInfo, frag);
-      default:
-        return Promise.reject(this.createKeyLoadError(frag, ErrorDetails.KEY_LOAD_ERROR, new Error(`Key supplied with unsupported METHOD: "${decryptdata.method}"`)));
+    delete this.fragments[fragKey];
+    if (fragment.endList) {
+      delete this.endListFragments[fragment.type];
     }
   }
-  loadKeyEME(keyInfo, frag) {
-    const keyLoadedData = {
-      frag,
-      keyInfo
-    };
-    if (this.emeController && this.config.emeEnabled) {
-      const keySessionContextPromise = this.emeController.loadKey(keyLoadedData);
-      if (keySessionContextPromise) {
-        return (keyInfo.keyLoadPromise = keySessionContextPromise.then(keySessionContext => {
-          keyInfo.mediaKeySessionContext = keySessionContext;
-          return keyLoadedData;
-        })).catch(error => {
-          // Remove promise for license renewal or retry
-          keyInfo.keyLoadPromise = null;
-          throw error;
-        });
-      }
-    }
-    return Promise.resolve(keyLoadedData);
-  }
-  loadKeyHTTP(keyInfo, frag) {
-    const config = this.config;
-    const Loader = config.loader;
-    const keyLoader = new Loader(config);
-    frag.keyLoader = keyInfo.loader = keyLoader;
-    return keyInfo.keyLoadPromise = new Promise((resolve, reject) => {
-      const loaderContext = {
-        keyInfo,
-        frag,
-        responseType: 'arraybuffer',
-        url: keyInfo.decryptdata.uri
-      };
-
-      // maxRetry is 0 so that instead of retrying the same key on the same variant multiple times,
-      // key-loader will trigger an error and rely on stream-controller to handle retry logic.
-      // this will also align retry logic with fragment-loader
-      const loadPolicy = config.keyLoadPolicy.default;
-      const loaderConfig = {
-        loadPolicy,
-        timeout: loadPolicy.maxLoadTimeMs,
-        maxRetry: 0,
-        retryDelay: 0,
-        maxRetryDelay: 0
-      };
-      const loaderCallbacks = {
-        onSuccess: (response, stats, context, networkDetails) => {
-          const {
-            frag,
-            keyInfo,
-            url: uri
-          } = context;
-          if (!frag.decryptdata || keyInfo !== this.keyUriToKeyInfo[uri]) {
-            return reject(this.createKeyLoadError(frag, ErrorDetails.KEY_LOAD_ERROR, new Error('after key load, decryptdata unset or changed'), networkDetails));
-          }
-          keyInfo.decryptdata.key = frag.decryptdata.key = new Uint8Array(response.data);
-
-          // detach fragment key loader on load success
-          frag.keyLoader = null;
-          keyInfo.loader = null;
-          resolve({
-            frag,
-            keyInfo
-          });
-        },
-        onError: (response, context, networkDetails, stats) => {
-          this.resetLoader(context);
-          reject(this.createKeyLoadError(frag, ErrorDetails.KEY_LOAD_ERROR, new Error(`HTTP Error ${response.code} loading key ${response.text}`), networkDetails, _objectSpread2({
-            url: loaderContext.url,
-            data: undefined
-          }, response)));
-        },
-        onTimeout: (stats, context, networkDetails) => {
-          this.resetLoader(context);
-          reject(this.createKeyLoadError(frag, ErrorDetails.KEY_LOAD_TIMEOUT, new Error('key loading timed out'), networkDetails));
-        },
-        onAbort: (stats, context, networkDetails) => {
-          this.resetLoader(context);
-          reject(this.createKeyLoadError(frag, ErrorDetails.INTERNAL_ABORTED, new Error('key loading aborted'), networkDetails));
-        }
-      };
-      keyLoader.load(loaderContext, loaderConfig, loaderCallbacks);
-    });
-  }
-  resetLoader(context) {
-    const {
-      frag,
-      keyInfo,
-      url: uri
-    } = context;
-    const loader = keyInfo.loader;
-    if (frag.keyLoader === loader) {
-      frag.keyLoader = null;
-      keyInfo.loader = null;
-    }
-    delete this.keyUriToKeyInfo[uri];
-    if (loader) {
-      loader.destroy();
-    }
+  removeAllFragments() {
+    this.fragments = Object.create(null);
+    this.endListFragments = Object.create(null);
+    this.activePartLists = Object.create(null);
+    this.hasGaps = false;
   }
 }
-
-/**
- * @ignore
- * Sub-class specialization of EventHandler base class.
- *
- * TaskLoop allows to schedule a task function being called (optionnaly repeatedly) on the main loop,
- * scheduled asynchroneously, avoiding recursive calls in the same tick.
- *
- * The task itself is implemented in `doTick`. It can be requested and called for single execution
- * using the `tick` method.
- *
- * It will be assured that the task execution method (`tick`) only gets called once per main loop "tick",
- * no matter how often it gets requested for execution. Execution in further ticks will be scheduled accordingly.
- *
- * If further execution requests have already been scheduled on the next tick, it can be checked with `hasNextTick`,
- * and cancelled with `clearNextTick`.
- *
- * The task can be scheduled as an interval repeatedly with a period as parameter (see `setInterval`, `clearInterval`).
- *
- * Sub-classes need to implement the `doTick` method which will effectively have the task execution routine.
- *
- * Further explanations:
- *
- * The baseclass has a `tick` method that will schedule the doTick call. It may be called synchroneously
- * only for a stack-depth of one. On re-entrant calls, sub-sequent calls are scheduled for next main loop ticks.
- *
- * When the task execution (`tick` method) is called in re-entrant way this is detected and
- * we are limiting the task execution per call stack to exactly one, but scheduling/post-poning further
- * task processing on the next main loop iteration (also known as "next tick" in the Node/JS runtime lingo).
- */
-class TaskLoop {
-  constructor() {
-    this._boundTick = void 0;
-    this._tickTimer = null;
-    this._tickInterval = null;
-    this._tickCallCount = 0;
-    this._boundTick = this.tick.bind(this);
-  }
-  destroy() {
-    this.onHandlerDestroying();
-    this.onHandlerDestroyed();
-  }
-  onHandlerDestroying() {
-    // clear all timers before unregistering from event bus
-    this.clearNextTick();
-    this.clearInterval();
-  }
-  onHandlerDestroyed() {}
-  hasInterval() {
-    return !!this._tickInterval;
-  }
-  hasNextTick() {
-    return !!this._tickTimer;
-  }
-
-  /**
-   * @param millis - Interval time (ms)
-   * @eturns True when interval has been scheduled, false when already scheduled (no effect)
-   */
-  setInterval(millis) {
-    if (!this._tickInterval) {
-      this._tickCallCount = 0;
-      this._tickInterval = self.setInterval(this._boundTick, millis);
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * @returns True when interval was cleared, false when none was set (no effect)
-   */
-  clearInterval() {
-    if (this._tickInterval) {
-      self.clearInterval(this._tickInterval);
-      this._tickInterval = null;
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * @returns True when timeout was cleared, false when none was set (no effect)
-   */
-  clearNextTick() {
-    if (this._tickTimer) {
-      self.clearTimeout(this._tickTimer);
-      this._tickTimer = null;
-      return true;
-    }
-    return false;
-  }
-
-  /**
-   * Will call the subclass doTick implementation in this main loop tick
-   * or in the next one (via setTimeout(,0)) in case it has already been called
-   * in this tick (in case this is a re-entrant call).
-   */
-  tick() {
-    this._tickCallCount++;
-    if (this._tickCallCount === 1) {
-      this.doTick();
-      // re-entrant call to tick from previous doTick call stack
-      // -> schedule a call on the next main loop iteration to process this task processing request
-      if (this._tickCallCount > 1) {
-        // make sure only one timer exists at any time at max
-        this.tickImmediate();
-      }
-      this._tickCallCount = 0;
-    }
-  }
-  tickImmediate() {
-    this.clearNextTick();
-    this._tickTimer = self.setTimeout(this._boundTick, 0);
-  }
-
-  /**
-   * For subclass to implement task logic
-   * @abstract
-   */
-  doTick() {}
+function isPartial(fragmentEntity) {
+  var _fragmentEntity$range, _fragmentEntity$range2, _fragmentEntity$range3;
+  return fragmentEntity.buffered && (fragmentEntity.body.gap || ((_fragmentEntity$range = fragmentEntity.range.video) == null ? void 0 : _fragmentEntity$range.partial) || ((_fragmentEntity$range2 = fragmentEntity.range.audio) == null ? void 0 : _fragmentEntity$range2.partial) || ((_fragmentEntity$range3 = fragmentEntity.range.audiovideo) == null ? void 0 : _fragmentEntity$range3.partial));
+}
+function getFragmentKey(fragment) {
+  return `${fragment.type}_${fragment.level}_${fragment.sn}`;
 }
 
 /**
@@ -7711,18 +8149,16 @@ function getNewPerformanceTiming() {
 }
 
 function findFirstFragWithCC(fragments, cc) {
-  let firstFrag = null;
   for (let i = 0, len = fragments.length; i < len; i++) {
-    const currentFrag = fragments[i];
-    if (currentFrag && currentFrag.cc === cc) {
-      firstFrag = currentFrag;
-      break;
+    var _fragments$i;
+    if (((_fragments$i = fragments[i]) == null ? void 0 : _fragments$i.cc) === cc) {
+      return fragments[i];
     }
   }
-  return firstFrag;
+  return null;
 }
-function shouldAlignOnDiscontinuities(lastFrag, lastLevel, details) {
-  if (lastLevel.details) {
+function shouldAlignOnDiscontinuities(lastFrag, switchDetails, details) {
+  if (switchDetails) {
     if (details.endCC > details.startCC || lastFrag && lastFrag.cc < details.startCC) {
       return true;
     }
@@ -7731,7 +8167,7 @@ function shouldAlignOnDiscontinuities(lastFrag, lastLevel, details) {
 }
 
 // Find the first frag in the previous level which matches the CC of the first frag of the new level
-function findDiscontinuousReferenceFrag(prevDetails, curDetails, referenceIndex = 0) {
+function findDiscontinuousReferenceFrag(prevDetails, curDetails) {
   const prevFrags = prevDetails.fragments;
   const curFrags = curDetails.fragments;
   if (!curFrags.length || !prevFrags.length) {
@@ -7775,22 +8211,22 @@ function adjustSlidingStart(sliding, details) {
  * @param lastLevel
  * @param details
  */
-function alignStream(lastFrag, lastLevel, details) {
-  if (!lastLevel) {
+function alignStream(lastFrag, switchDetails, details) {
+  if (!switchDetails) {
     return;
   }
-  alignDiscontinuities(lastFrag, details, lastLevel);
-  if (!details.alignedSliding && lastLevel.details) {
+  alignDiscontinuities(lastFrag, details, switchDetails);
+  if (!details.alignedSliding && switchDetails) {
     // If the PTS wasn't figured out via discontinuity sequence that means there was no CC increase within the level.
     // Aligning via Program Date Time should therefore be reliable, since PDT should be the same within the same
     // discontinuity sequence.
-    alignPDT(details, lastLevel.details);
+    alignMediaPlaylistByPDT(details, switchDetails);
   }
-  if (!details.alignedSliding && lastLevel.details && !details.skippedSegments) {
+  if (!details.alignedSliding && switchDetails && !details.skippedSegments) {
     // Try to align on sn so that we pick a better start fragment.
     // Do not perform this on playlists with delta updates as this is only to align levels on switch
     // and adjustSliding only adjusts fragments after skippedSegments.
-    adjustSliding(lastLevel.details, details);
+    adjustSliding(switchDetails, details);
   }
 }
 
@@ -7801,9 +8237,9 @@ function alignStream(lastFrag, lastLevel, details) {
  * @param lastLevel - The details of the last loaded level
  * @param details - The details of the new level
  */
-function alignDiscontinuities(lastFrag, details, lastLevel) {
-  if (shouldAlignOnDiscontinuities(lastFrag, lastLevel, details)) {
-    const referenceFrag = findDiscontinuousReferenceFrag(lastLevel.details, details);
+function alignDiscontinuities(lastFrag, details, switchDetails) {
+  if (shouldAlignOnDiscontinuities(lastFrag, switchDetails, details)) {
+    const referenceFrag = findDiscontinuousReferenceFrag(switchDetails, details);
     if (referenceFrag && isFiniteNumber(referenceFrag.start)) {
       logger.log(`Adjusting PTS using last level due to CC increase within current level ${details.url}`);
       adjustSlidingStart(referenceFrag.start, details);
@@ -7812,32 +8248,9 @@ function alignDiscontinuities(lastFrag, details, lastLevel) {
 }
 
 /**
- * Computes the PTS of a new level's fragments using the difference in Program Date Time from the last level.
- * @param details - The details of the new level
- * @param lastDetails - The details of the last loaded level
- */
-function alignPDT(details, lastDetails) {
-  // This check protects the unsafe "!" usage below for null program date time access.
-  if (!lastDetails.fragments.length || !details.hasProgramDateTime || !lastDetails.hasProgramDateTime) {
-    return;
-  }
-  // if last level sliding is 1000 and its first frag PROGRAM-DATE-TIME is 2017-08-20 1:10:00 AM
-  // and if new details first frag PROGRAM DATE-TIME is 2017-08-20 1:10:08 AM
-  // then we can deduce that playlist B sliding is 1000+8 = 1008s
-  const lastPDT = lastDetails.fragments[0].programDateTime; // hasProgramDateTime check above makes this safe.
-  const newPDT = details.fragments[0].programDateTime;
-  // date diff is in ms. frag.start is in seconds
-  const sliding = (newPDT - lastPDT) / 1000 + lastDetails.fragments[0].start;
-  if (sliding && isFiniteNumber(sliding)) {
-    logger.log(`Adjusting PTS using programDateTime delta ${newPDT - lastPDT}ms, sliding:${sliding.toFixed(3)} ${details.url} `);
-    adjustSlidingStart(sliding, details);
-  }
-}
-
-/**
- * Ensures appropriate time-alignment between renditions based on PDT. Unlike `alignPDT`, which adjusts
- * the timeline based on the delta between PDTs of the 0th fragment of two playlists/`LevelDetails`,
- * this function assumes the timelines represented in `refDetails` are accurate, including the PDTs,
+ * Ensures appropriate time-alignment between renditions based on PDT.
+ * This function assumes the timelines represented in `refDetails` are accurate, including the PDTs
+ * for the last discontinuity sequence number shared by both playlists when present,
  * and uses the "wallclock"/PDT timeline as a cross-reference to `details`, adjusting the presentation
  * times/timelines of `details` accordingly.
  * Given the asynchronous nature of fetches and initial loads of live `main` and audio/subtitle tracks,
@@ -7860,228 +8273,547 @@ function alignMediaPlaylistByPDT(details, refDetails) {
   // Calculate a delta to apply to all fragments according to the delta in PDT times and start times
   // of a fragment in the reference details, and a fragment in the target details of the same discontinuity.
   // If a fragment of the same discontinuity was not found use the middle fragment of both.
-  const middleFrag = Math.round(refFragments.length / 2) - 1;
-  const refFrag = refFragments[middleFrag];
-  const frag = findFirstFragWithCC(fragments, refFrag.cc) || fragments[Math.round(fragments.length / 2) - 1];
+  let refFrag;
+  let frag;
+  const targetCC = Math.min(refDetails.endCC, details.endCC);
+  if (refDetails.startCC < targetCC && details.startCC < targetCC) {
+    refFrag = findFirstFragWithCC(refFragments, targetCC);
+    frag = findFirstFragWithCC(fragments, targetCC);
+  }
+  if (!refFrag || !frag) {
+    refFrag = refFragments[Math.floor(refFragments.length / 2)];
+    frag = findFirstFragWithCC(fragments, refFrag.cc) || fragments[Math.floor(fragments.length / 2)];
+  }
   const refPDT = refFrag.programDateTime;
   const targetPDT = frag.programDateTime;
-  if (refPDT === null || targetPDT === null) {
+  if (!refPDT || !targetPDT) {
     return;
   }
   const delta = (targetPDT - refPDT) / 1000 - (frag.start - refFrag.start);
   adjustSlidingStart(delta, details);
 }
 
-class AESCrypto {
-  constructor(subtle, iv) {
-    this.subtle = void 0;
-    this.aesIV = void 0;
-    this.subtle = subtle;
-    this.aesIV = iv;
-  }
-  decrypt(data, key) {
-    return this.subtle.decrypt({
-      name: 'AES-CBC',
-      iv: this.aesIV
-    }, key, data);
-  }
-}
+const MIN_CHUNK_SIZE = Math.pow(2, 17); // 128kb
 
-class FastAESKey {
-  constructor(subtle, key) {
-    this.subtle = void 0;
-    this.key = void 0;
-    this.subtle = subtle;
-    this.key = key;
+class FragmentLoader {
+  constructor(config) {
+    this.config = void 0;
+    this.loader = null;
+    this.partLoadTimeout = -1;
+    this.config = config;
   }
-  expandKey() {
-    return this.subtle.importKey('raw', this.key, {
-      name: 'AES-CBC'
-    }, false, ['encrypt', 'decrypt']);
+  destroy() {
+    if (this.loader) {
+      this.loader.destroy();
+      this.loader = null;
+    }
   }
-}
-
-// PKCS7
-function removePadding(array) {
-  const outputBytes = array.byteLength;
-  const paddingBytes = outputBytes && new DataView(array.buffer).getUint8(outputBytes - 1);
-  if (paddingBytes) {
-    return sliceUint8(array, 0, outputBytes - paddingBytes);
-  }
-  return array;
-}
-class AESDecryptor {
-  constructor() {
-    this.rcon = [0x0, 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
-    this.subMix = [new Uint32Array(256), new Uint32Array(256), new Uint32Array(256), new Uint32Array(256)];
-    this.invSubMix = [new Uint32Array(256), new Uint32Array(256), new Uint32Array(256), new Uint32Array(256)];
-    this.sBox = new Uint32Array(256);
-    this.invSBox = new Uint32Array(256);
-    this.key = new Uint32Array(0);
-    this.ksRows = 0;
-    this.keySize = 0;
-    this.keySchedule = void 0;
-    this.invKeySchedule = void 0;
-    this.initTable();
-  }
-
-  // Using view.getUint32() also swaps the byte order.
-  uint8ArrayToUint32Array_(arrayBuffer) {
-    const view = new DataView(arrayBuffer);
-    const newArray = new Uint32Array(4);
-    for (let i = 0; i < 4; i++) {
-      newArray[i] = view.getUint32(i * 4);
+  abort() {
+    if (this.loader) {
+      // Abort the loader for current fragment. Only one may load at any given time
+      this.loader.abort();
     }
-    return newArray;
   }
-  initTable() {
-    const sBox = this.sBox;
-    const invSBox = this.invSBox;
-    const subMix = this.subMix;
-    const subMix0 = subMix[0];
-    const subMix1 = subMix[1];
-    const subMix2 = subMix[2];
-    const subMix3 = subMix[3];
-    const invSubMix = this.invSubMix;
-    const invSubMix0 = invSubMix[0];
-    const invSubMix1 = invSubMix[1];
-    const invSubMix2 = invSubMix[2];
-    const invSubMix3 = invSubMix[3];
-    const d = new Uint32Array(256);
-    let x = 0;
-    let xi = 0;
-    let i = 0;
-    for (i = 0; i < 256; i++) {
-      if (i < 128) {
-        d[i] = i << 1;
-      } else {
-        d[i] = i << 1 ^ 0x11b;
-      }
+  load(frag, onProgress) {
+    const url = frag.url;
+    if (!url) {
+      return Promise.reject(new LoadError({
+        type: ErrorTypes.NETWORK_ERROR,
+        details: ErrorDetails.FRAG_LOAD_ERROR,
+        fatal: false,
+        frag,
+        error: new Error(`Fragment does not have a ${url ? 'part list' : 'url'}`),
+        networkDetails: null
+      }));
     }
-    for (i = 0; i < 256; i++) {
-      let sx = xi ^ xi << 1 ^ xi << 2 ^ xi << 3 ^ xi << 4;
-      sx = sx >>> 8 ^ sx & 0xff ^ 0x63;
-      sBox[x] = sx;
-      invSBox[sx] = x;
-
-      // Compute multiplication
-      const x2 = d[x];
-      const x4 = d[x2];
-      const x8 = d[x4];
-
-      // Compute sub/invSub bytes, mix columns tables
-      let t = d[sx] * 0x101 ^ sx * 0x1010100;
-      subMix0[x] = t << 24 | t >>> 8;
-      subMix1[x] = t << 16 | t >>> 16;
-      subMix2[x] = t << 8 | t >>> 24;
-      subMix3[x] = t;
-
-      // Compute inv sub bytes, inv mix columns tables
-      t = x8 * 0x1010101 ^ x4 * 0x10001 ^ x2 * 0x101 ^ x * 0x1010100;
-      invSubMix0[sx] = t << 24 | t >>> 8;
-      invSubMix1[sx] = t << 16 | t >>> 16;
-      invSubMix2[sx] = t << 8 | t >>> 24;
-      invSubMix3[sx] = t;
-
-      // Compute next counter
-      if (!x) {
-        x = xi = 1;
-      } else {
-        x = x2 ^ d[d[d[x8 ^ x2]]];
-        xi ^= d[d[xi]];
+    this.abort();
+    const config = this.config;
+    const FragmentILoader = config.fLoader;
+    const DefaultILoader = config.loader;
+    return new Promise((resolve, reject) => {
+      if (this.loader) {
+        this.loader.destroy();
       }
-    }
+      if (frag.gap) {
+        if (frag.tagList.some(tags => tags[0] === 'GAP')) {
+          reject(createGapLoadError(frag));
+          return;
+        } else {
+          // Reset temporary treatment as GAP tag
+          frag.gap = false;
+        }
+      }
+      const loader = this.loader = frag.loader = FragmentILoader ? new FragmentILoader(config) : new DefaultILoader(config);
+      const loaderContext = createLoaderContext(frag);
+      const loadPolicy = getLoaderConfigWithoutReties(config.fragLoadPolicy.default);
+      const loaderConfig = {
+        loadPolicy,
+        timeout: loadPolicy.maxLoadTimeMs,
+        maxRetry: 0,
+        retryDelay: 0,
+        maxRetryDelay: 0,
+        highWaterMark: frag.sn === 'initSegment' ? Infinity : MIN_CHUNK_SIZE
+      };
+      // Assign frag stats to the loader's stats reference
+      frag.stats = loader.stats;
+      loader.load(loaderContext, loaderConfig, {
+        onSuccess: (response, stats, context, networkDetails) => {
+          this.resetLoader(frag, loader);
+          let payload = response.data;
+          if (context.resetIV && frag.decryptdata) {
+            frag.decryptdata.iv = new Uint8Array(payload.slice(0, 16));
+            payload = payload.slice(16);
+          }
+          resolve({
+            frag,
+            part: null,
+            payload,
+            networkDetails
+          });
+        },
+        onError: (response, context, networkDetails, stats) => {
+          this.resetLoader(frag, loader);
+          reject(new LoadError({
+            type: ErrorTypes.NETWORK_ERROR,
+            details: ErrorDetails.FRAG_LOAD_ERROR,
+            fatal: false,
+            frag,
+            response: _objectSpread2({
+              url,
+              data: undefined
+            }, response),
+            error: new Error(`HTTP Error ${response.code} ${response.text}`),
+            networkDetails,
+            stats
+          }));
+        },
+        onAbort: (stats, context, networkDetails) => {
+          this.resetLoader(frag, loader);
+          reject(new LoadError({
+            type: ErrorTypes.NETWORK_ERROR,
+            details: ErrorDetails.INTERNAL_ABORTED,
+            fatal: false,
+            frag,
+            error: new Error('Aborted'),
+            networkDetails,
+            stats
+          }));
+        },
+        onTimeout: (stats, context, networkDetails) => {
+          this.resetLoader(frag, loader);
+          reject(new LoadError({
+            type: ErrorTypes.NETWORK_ERROR,
+            details: ErrorDetails.FRAG_LOAD_TIMEOUT,
+            fatal: false,
+            frag,
+            error: new Error(`Timeout after ${loaderConfig.timeout}ms`),
+            networkDetails,
+            stats
+          }));
+        },
+        onProgress: (stats, context, data, networkDetails) => {
+          if (onProgress) {
+            onProgress({
+              frag,
+              part: null,
+              payload: data,
+              networkDetails
+            });
+          }
+        }
+      });
+    });
   }
-  expandKey(keyBuffer) {
-    // convert keyBuffer to Uint32Array
-    const key = this.uint8ArrayToUint32Array_(keyBuffer);
-    let sameKey = true;
-    let offset = 0;
-    while (offset < key.length && sameKey) {
-      sameKey = key[offset] === this.key[offset];
-      offset++;
-    }
-    if (sameKey) {
-      return;
-    }
-    this.key = key;
-    const keySize = this.keySize = key.length;
-    if (keySize !== 4 && keySize !== 6 && keySize !== 8) {
-      throw new Error('Invalid aes key size=' + keySize);
-    }
-    const ksRows = this.ksRows = (keySize + 6 + 1) * 4;
-    let ksRow;
-    let invKsRow;
-    const keySchedule = this.keySchedule = new Uint32Array(ksRows);
-    const invKeySchedule = this.invKeySchedule = new Uint32Array(ksRows);
-    const sbox = this.sBox;
-    const rcon = this.rcon;
-    const invSubMix = this.invSubMix;
-    const invSubMix0 = invSubMix[0];
-    const invSubMix1 = invSubMix[1];
-    const invSubMix2 = invSubMix[2];
-    const invSubMix3 = invSubMix[3];
-    let prev;
-    let t;
-    for (ksRow = 0; ksRow < ksRows; ksRow++) {
-      if (ksRow < keySize) {
-        prev = keySchedule[ksRow] = key[ksRow];
-        continue;
+  loadPart(frag, part, onProgress) {
+    this.abort();
+    const config = this.config;
+    const FragmentILoader = config.fLoader;
+    const DefaultILoader = config.loader;
+    return new Promise((resolve, reject) => {
+      if (this.loader) {
+        this.loader.destroy();
       }
-      t = prev;
-      if (ksRow % keySize === 0) {
-        // Rot word
-        t = t << 8 | t >>> 24;
-
-        // Sub word
-        t = sbox[t >>> 24] << 24 | sbox[t >>> 16 & 0xff] << 16 | sbox[t >>> 8 & 0xff] << 8 | sbox[t & 0xff];
-
-        // Mix Rcon
-        t ^= rcon[ksRow / keySize | 0] << 24;
-      } else if (keySize > 6 && ksRow % keySize === 4) {
-        // Sub word
-        t = sbox[t >>> 24] << 24 | sbox[t >>> 16 & 0xff] << 16 | sbox[t >>> 8 & 0xff] << 8 | sbox[t & 0xff];
+      if (frag.gap || part.gap) {
+        reject(createGapLoadError(frag, part));
+        return;
       }
-      keySchedule[ksRow] = prev = (keySchedule[ksRow - keySize] ^ t) >>> 0;
-    }
-    for (invKsRow = 0; invKsRow < ksRows; invKsRow++) {
-      ksRow = ksRows - invKsRow;
-      if (invKsRow & 3) {
-        t = keySchedule[ksRow];
-      } else {
-        t = keySchedule[ksRow - 4];
+      const loader = this.loader = frag.loader = FragmentILoader ? new FragmentILoader(config) : new DefaultILoader(config);
+      const loaderContext = createLoaderContext(frag, part);
+      // Should we define another load policy for parts?
+      const loadPolicy = getLoaderConfigWithoutReties(config.fragLoadPolicy.default);
+      const loaderConfig = {
+        loadPolicy,
+        timeout: loadPolicy.maxLoadTimeMs,
+        maxRetry: 0,
+        retryDelay: 0,
+        maxRetryDelay: 0,
+        highWaterMark: MIN_CHUNK_SIZE
+      };
+      // Assign part stats to the loader's stats reference
+      part.stats = loader.stats;
+      loader.load(loaderContext, loaderConfig, {
+        onSuccess: (response, stats, context, networkDetails) => {
+          this.resetLoader(frag, loader);
+          this.updateStatsFromPart(frag, part);
+          const partLoadedData = {
+            frag,
+            part,
+            payload: response.data,
+            networkDetails
+          };
+          onProgress(partLoadedData);
+          resolve(partLoadedData);
+        },
+        onError: (response, context, networkDetails, stats) => {
+          this.resetLoader(frag, loader);
+          reject(new LoadError({
+            type: ErrorTypes.NETWORK_ERROR,
+            details: ErrorDetails.FRAG_LOAD_ERROR,
+            fatal: false,
+            frag,
+            part,
+            response: _objectSpread2({
+              url: loaderContext.url,
+              data: undefined
+            }, response),
+            error: new Error(`HTTP Error ${response.code} ${response.text}`),
+            networkDetails,
+            stats
+          }));
+        },
+        onAbort: (stats, context, networkDetails) => {
+          frag.stats.aborted = part.stats.aborted;
+          this.resetLoader(frag, loader);
+          reject(new LoadError({
+            type: ErrorTypes.NETWORK_ERROR,
+            details: ErrorDetails.INTERNAL_ABORTED,
+            fatal: false,
+            frag,
+            part,
+            error: new Error('Aborted'),
+            networkDetails,
+            stats
+          }));
+        },
+        onTimeout: (stats, context, networkDetails) => {
+          this.resetLoader(frag, loader);
+          reject(new LoadError({
+            type: ErrorTypes.NETWORK_ERROR,
+            details: ErrorDetails.FRAG_LOAD_TIMEOUT,
+            fatal: false,
+            frag,
+            part,
+            error: new Error(`Timeout after ${loaderConfig.timeout}ms`),
+            networkDetails,
+            stats
+          }));
+        }
+      });
+    });
+  }
+  updateStatsFromPart(frag, part) {
+    const fragStats = frag.stats;
+    const partStats = part.stats;
+    const partTotal = partStats.total;
+    fragStats.loaded += partStats.loaded;
+    if (partTotal) {
+      const estTotalParts = Math.round(frag.duration / part.duration);
+      const estLoadedParts = Math.min(Math.round(fragStats.loaded / partTotal), estTotalParts);
+      const estRemainingParts = estTotalParts - estLoadedParts;
+      const estRemainingBytes = estRemainingParts * Math.round(fragStats.loaded / estLoadedParts);
+      fragStats.total = fragStats.loaded + estRemainingBytes;
+    } else {
+      fragStats.total = Math.max(fragStats.loaded, fragStats.total);
+    }
+    const fragLoading = fragStats.loading;
+    const partLoading = partStats.loading;
+    if (fragLoading.start) {
+      // add to fragment loader latency
+      fragLoading.first += partLoading.first - partLoading.start;
+    } else {
+      fragLoading.start = partLoading.start;
+      fragLoading.first = partLoading.first;
+    }
+    fragLoading.end = partLoading.end;
+  }
+  resetLoader(frag, loader) {
+    frag.loader = null;
+    if (this.loader === loader) {
+      self.clearTimeout(this.partLoadTimeout);
+      this.loader = null;
+    }
+    loader.destroy();
+  }
+}
+function createLoaderContext(frag, part = null) {
+  const segment = part || frag;
+  const loaderContext = {
+    frag,
+    part,
+    responseType: 'arraybuffer',
+    url: segment.url,
+    headers: {},
+    rangeStart: 0,
+    rangeEnd: 0
+  };
+  const start = segment.byteRangeStartOffset;
+  const end = segment.byteRangeEndOffset;
+  if (isFiniteNumber(start) && isFiniteNumber(end)) {
+    var _frag$decryptdata;
+    let byteRangeStart = start;
+    let byteRangeEnd = end;
+    if (frag.sn === 'initSegment' && ((_frag$decryptdata = frag.decryptdata) == null ? void 0 : _frag$decryptdata.method) === 'AES-128') {
+      // MAP segment encrypted with method 'AES-128', when served with HTTP Range,
+      // has the unencrypted size specified in the range.
+      // Ref: https://tools.ietf.org/html/draft-pantos-hls-rfc8216bis-08#section-6.3.6
+      const fragmentLen = end - start;
+      if (fragmentLen % 16) {
+        byteRangeEnd = end + (16 - fragmentLen % 16);
       }
-      if (invKsRow < 4 || ksRow <= 4) {
-        invKeySchedule[invKsRow] = t;
-      } else {
-        invKeySchedule[invKsRow] = invSubMix0[sbox[t >>> 24]] ^ invSubMix1[sbox[t >>> 16 & 0xff]] ^ invSubMix2[sbox[t >>> 8 & 0xff]] ^ invSubMix3[sbox[t & 0xff]];
+      if (start !== 0) {
+        loaderContext.resetIV = true;
+        byteRangeStart = start - 16;
       }
-      invKeySchedule[invKsRow] = invKeySchedule[invKsRow] >>> 0;
     }
+    loaderContext.rangeStart = byteRangeStart;
+    loaderContext.rangeEnd = byteRangeEnd;
+  }
+  return loaderContext;
+}
+function createGapLoadError(frag, part) {
+  const error = new Error(`GAP ${frag.gap ? 'tag' : 'attribute'} found`);
+  const errorData = {
+    type: ErrorTypes.MEDIA_ERROR,
+    details: ErrorDetails.FRAG_GAP,
+    fatal: false,
+    frag,
+    error,
+    networkDetails: null
+  };
+  if (part) {
+    errorData.part = part;
+  }
+  (part ? part : frag).stats.aborted = true;
+  return new LoadError(errorData);
+}
+class LoadError extends Error {
+  constructor(data) {
+    super(data.error.message);
+    this.data = void 0;
+    this.data = data;
   }
+}
 
-  // Adding this as a method greatly improves performance.
-  networkToHostOrderSwap(word) {
-    return word << 24 | (word & 0xff00) << 8 | (word & 0xff0000) >> 8 | word >>> 24;
+class AESCrypto {
+  constructor(subtle, iv) {
+    this.subtle = void 0;
+    this.aesIV = void 0;
+    this.subtle = subtle;
+    this.aesIV = iv;
   }
-  decrypt(inputArrayBuffer, offset, aesIV) {
-    const nRounds = this.keySize + 6;
-    const invKeySchedule = this.invKeySchedule;
-    const invSBOX = this.invSBox;
+  decrypt(data, key) {
+    return this.subtle.decrypt({
+      name: 'AES-CBC',
+      iv: this.aesIV
+    }, key, data);
+  }
+}
+
+class FastAESKey {
+  constructor(subtle, key) {
+    this.subtle = void 0;
+    this.key = void 0;
+    this.subtle = subtle;
+    this.key = key;
+  }
+  expandKey() {
+    return this.subtle.importKey('raw', this.key, {
+      name: 'AES-CBC'
+    }, false, ['encrypt', 'decrypt']);
+  }
+}
+
+// PKCS7
+function removePadding(array) {
+  const outputBytes = array.byteLength;
+  const paddingBytes = outputBytes && new DataView(array.buffer).getUint8(outputBytes - 1);
+  if (paddingBytes) {
+    return sliceUint8(array, 0, outputBytes - paddingBytes);
+  }
+  return array;
+}
+class AESDecryptor {
+  constructor() {
+    this.rcon = [0x0, 0x1, 0x2, 0x4, 0x8, 0x10, 0x20, 0x40, 0x80, 0x1b, 0x36];
+    this.subMix = [new Uint32Array(256), new Uint32Array(256), new Uint32Array(256), new Uint32Array(256)];
+    this.invSubMix = [new Uint32Array(256), new Uint32Array(256), new Uint32Array(256), new Uint32Array(256)];
+    this.sBox = new Uint32Array(256);
+    this.invSBox = new Uint32Array(256);
+    this.key = new Uint32Array(0);
+    this.ksRows = 0;
+    this.keySize = 0;
+    this.keySchedule = void 0;
+    this.invKeySchedule = void 0;
+    this.initTable();
+  }
+
+  // Using view.getUint32() also swaps the byte order.
+  uint8ArrayToUint32Array_(arrayBuffer) {
+    const view = new DataView(arrayBuffer);
+    const newArray = new Uint32Array(4);
+    for (let i = 0; i < 4; i++) {
+      newArray[i] = view.getUint32(i * 4);
+    }
+    return newArray;
+  }
+  initTable() {
+    const sBox = this.sBox;
+    const invSBox = this.invSBox;
+    const subMix = this.subMix;
+    const subMix0 = subMix[0];
+    const subMix1 = subMix[1];
+    const subMix2 = subMix[2];
+    const subMix3 = subMix[3];
     const invSubMix = this.invSubMix;
     const invSubMix0 = invSubMix[0];
     const invSubMix1 = invSubMix[1];
     const invSubMix2 = invSubMix[2];
     const invSubMix3 = invSubMix[3];
-    const initVector = this.uint8ArrayToUint32Array_(aesIV);
-    let initVector0 = initVector[0];
-    let initVector1 = initVector[1];
-    let initVector2 = initVector[2];
-    let initVector3 = initVector[3];
-    const inputInt32 = new Int32Array(inputArrayBuffer);
-    const outputInt32 = new Int32Array(inputInt32.length);
-    let t0, t1, t2, t3;
-    let s0, s1, s2, s3;
+    const d = new Uint32Array(256);
+    let x = 0;
+    let xi = 0;
+    let i = 0;
+    for (i = 0; i < 256; i++) {
+      if (i < 128) {
+        d[i] = i << 1;
+      } else {
+        d[i] = i << 1 ^ 0x11b;
+      }
+    }
+    for (i = 0; i < 256; i++) {
+      let sx = xi ^ xi << 1 ^ xi << 2 ^ xi << 3 ^ xi << 4;
+      sx = sx >>> 8 ^ sx & 0xff ^ 0x63;
+      sBox[x] = sx;
+      invSBox[sx] = x;
+
+      // Compute multiplication
+      const x2 = d[x];
+      const x4 = d[x2];
+      const x8 = d[x4];
+
+      // Compute sub/invSub bytes, mix columns tables
+      let t = d[sx] * 0x101 ^ sx * 0x1010100;
+      subMix0[x] = t << 24 | t >>> 8;
+      subMix1[x] = t << 16 | t >>> 16;
+      subMix2[x] = t << 8 | t >>> 24;
+      subMix3[x] = t;
+
+      // Compute inv sub bytes, inv mix columns tables
+      t = x8 * 0x1010101 ^ x4 * 0x10001 ^ x2 * 0x101 ^ x * 0x1010100;
+      invSubMix0[sx] = t << 24 | t >>> 8;
+      invSubMix1[sx] = t << 16 | t >>> 16;
+      invSubMix2[sx] = t << 8 | t >>> 24;
+      invSubMix3[sx] = t;
+
+      // Compute next counter
+      if (!x) {
+        x = xi = 1;
+      } else {
+        x = x2 ^ d[d[d[x8 ^ x2]]];
+        xi ^= d[d[xi]];
+      }
+    }
+  }
+  expandKey(keyBuffer) {
+    // convert keyBuffer to Uint32Array
+    const key = this.uint8ArrayToUint32Array_(keyBuffer);
+    let sameKey = true;
+    let offset = 0;
+    while (offset < key.length && sameKey) {
+      sameKey = key[offset] === this.key[offset];
+      offset++;
+    }
+    if (sameKey) {
+      return;
+    }
+    this.key = key;
+    const keySize = this.keySize = key.length;
+    if (keySize !== 4 && keySize !== 6 && keySize !== 8) {
+      throw new Error('Invalid aes key size=' + keySize);
+    }
+    const ksRows = this.ksRows = (keySize + 6 + 1) * 4;
+    let ksRow;
+    let invKsRow;
+    const keySchedule = this.keySchedule = new Uint32Array(ksRows);
+    const invKeySchedule = this.invKeySchedule = new Uint32Array(ksRows);
+    const sbox = this.sBox;
+    const rcon = this.rcon;
+    const invSubMix = this.invSubMix;
+    const invSubMix0 = invSubMix[0];
+    const invSubMix1 = invSubMix[1];
+    const invSubMix2 = invSubMix[2];
+    const invSubMix3 = invSubMix[3];
+    let prev;
+    let t;
+    for (ksRow = 0; ksRow < ksRows; ksRow++) {
+      if (ksRow < keySize) {
+        prev = keySchedule[ksRow] = key[ksRow];
+        continue;
+      }
+      t = prev;
+      if (ksRow % keySize === 0) {
+        // Rot word
+        t = t << 8 | t >>> 24;
+
+        // Sub word
+        t = sbox[t >>> 24] << 24 | sbox[t >>> 16 & 0xff] << 16 | sbox[t >>> 8 & 0xff] << 8 | sbox[t & 0xff];
+
+        // Mix Rcon
+        t ^= rcon[ksRow / keySize | 0] << 24;
+      } else if (keySize > 6 && ksRow % keySize === 4) {
+        // Sub word
+        t = sbox[t >>> 24] << 24 | sbox[t >>> 16 & 0xff] << 16 | sbox[t >>> 8 & 0xff] << 8 | sbox[t & 0xff];
+      }
+      keySchedule[ksRow] = prev = (keySchedule[ksRow - keySize] ^ t) >>> 0;
+    }
+    for (invKsRow = 0; invKsRow < ksRows; invKsRow++) {
+      ksRow = ksRows - invKsRow;
+      if (invKsRow & 3) {
+        t = keySchedule[ksRow];
+      } else {
+        t = keySchedule[ksRow - 4];
+      }
+      if (invKsRow < 4 || ksRow <= 4) {
+        invKeySchedule[invKsRow] = t;
+      } else {
+        invKeySchedule[invKsRow] = invSubMix0[sbox[t >>> 24]] ^ invSubMix1[sbox[t >>> 16 & 0xff]] ^ invSubMix2[sbox[t >>> 8 & 0xff]] ^ invSubMix3[sbox[t & 0xff]];
+      }
+      invKeySchedule[invKsRow] = invKeySchedule[invKsRow] >>> 0;
+    }
+  }
+
+  // Adding this as a method greatly improves performance.
+  networkToHostOrderSwap(word) {
+    return word << 24 | (word & 0xff00) << 8 | (word & 0xff0000) >> 8 | word >>> 24;
+  }
+  decrypt(inputArrayBuffer, offset, aesIV) {
+    const nRounds = this.keySize + 6;
+    const invKeySchedule = this.invKeySchedule;
+    const invSBOX = this.invSBox;
+    const invSubMix = this.invSubMix;
+    const invSubMix0 = invSubMix[0];
+    const invSubMix1 = invSubMix[1];
+    const invSubMix2 = invSubMix[2];
+    const invSubMix3 = invSubMix[3];
+    const initVector = this.uint8ArrayToUint32Array_(aesIV);
+    let initVector0 = initVector[0];
+    let initVector1 = initVector[1];
+    let initVector2 = initVector[2];
+    let initVector3 = initVector[3];
+    const inputInt32 = new Int32Array(inputArrayBuffer);
+    const outputInt32 = new Int32Array(inputInt32.length);
+    let t0, t1, t2, t3;
+    let s0, s1, s2, s3;
     let inputWords0, inputWords1, inputWords2, inputWords3;
     let ksRow, i;
     const swapWord = this.networkToHostOrderSwap;
@@ -8423,8 +9155,8 @@ class BaseStreamController extends TaskLoop {
   }
   getLevelDetails() {
     if (this.levels && this.levelLastLoaded !== null) {
-      var _this$levels$this$lev;
-      return (_this$levels$this$lev = this.levels[this.levelLastLoaded]) == null ? void 0 : _this$levels$this$lev.details;
+      var _this$levelLastLoaded;
+      return (_this$levelLastLoaded = this.levelLastLoaded) == null ? void 0 : _this$levelLastLoaded.details;
     }
   }
   onMediaAttached(event, data) {
@@ -8514,8 +9246,11 @@ class BaseStreamController extends TaskLoop {
     this.initPTS = [];
   }
   onHandlerDestroying() {
+    this.hls.off(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
     this.stopLoad();
     super.onHandlerDestroying();
+    // @ts-ignore
+    this.hls = null;
   }
   onHandlerDestroyed() {
     this.state = State.STOPPED;
@@ -8646,7 +9381,7 @@ class BaseStreamController extends TaskLoop {
       const decryptData = frag.decryptdata;
 
       // check to see if the payload needs to be decrypted
-      if (payload && payload.byteLength > 0 && decryptData && decryptData.key && decryptData.iv && decryptData.method === 'AES-128') {
+      if (payload && payload.byteLength > 0 && decryptData != null && decryptData.key && decryptData.iv && decryptData.method === 'AES-128') {
         const startTime = self.performance.now();
         // decrypt init segment data
         return this.decrypter.decrypt(new Uint8Array(payload), decryptData.key.buffer, decryptData.iv.buffer).catch(err => {
@@ -8670,36 +9405,10 @@ class BaseStreamController extends TaskLoop {
             }
           });
           data.payload = decryptedData;
-          return data;
-        });
-      }
-      return data;
-    }).then(data => {
-      const {
-        fragCurrent,
-        hls,
-        levels
-      } = this;
-      if (!levels) {
-        throw new Error('init load aborted, missing levels');
-      }
-      const stats = frag.stats;
-      this.state = State.IDLE;
-      level.fragmentError = 0;
-      frag.data = new Uint8Array(data.payload);
-      stats.parsing.start = stats.buffering.start = self.performance.now();
-      stats.parsing.end = stats.buffering.end = self.performance.now();
-
-      // Silence FRAG_BUFFERED event if fragCurrent is null
-      if (data.frag === fragCurrent) {
-        hls.trigger(Events.FRAG_BUFFERED, {
-          stats,
-          frag: fragCurrent,
-          part: null,
-          id: frag.type
+          return this.completeInitSegmentLoad(data);
         });
       }
-      this.tick();
+      return this.completeInitSegmentLoad(data);
     }).catch(reason => {
       if (this.state === State.STOPPED || this.state === State.ERROR) {
         return;
@@ -8708,16 +9417,46 @@ class BaseStreamController extends TaskLoop {
       this.resetFragmentLoading(frag);
     });
   }
+  completeInitSegmentLoad(data) {
+    const {
+      levels
+    } = this;
+    if (!levels) {
+      throw new Error('init load aborted, missing levels');
+    }
+    const stats = data.frag.stats;
+    this.state = State.IDLE;
+    data.frag.data = new Uint8Array(data.payload);
+    stats.parsing.start = stats.buffering.start = self.performance.now();
+    stats.parsing.end = stats.buffering.end = self.performance.now();
+    this.tick();
+  }
   fragContextChanged(frag) {
     const {
       fragCurrent
     } = this;
-    return !frag || !fragCurrent || frag.level !== fragCurrent.level || frag.sn !== fragCurrent.sn || frag.urlId !== fragCurrent.urlId;
+    return !frag || !fragCurrent || frag.sn !== fragCurrent.sn || frag.level !== fragCurrent.level;
   }
   fragBufferedComplete(frag, part) {
     var _frag$startPTS, _frag$endPTS, _this$fragCurrent, _this$fragPrevious;
     const media = this.mediaBuffer ? this.mediaBuffer : this.media;
     this.log(`Buffered ${frag.type} sn: ${frag.sn}${part ? ' part: ' + part.index : ''} of ${this.playlistType === PlaylistLevelType.MAIN ? 'level' : 'track'} ${frag.level} (frag:[${((_frag$startPTS = frag.startPTS) != null ? _frag$startPTS : NaN).toFixed(3)}-${((_frag$endPTS = frag.endPTS) != null ? _frag$endPTS : NaN).toFixed(3)}] > buffer:${media ? TimeRanges.toString(BufferHelper.getBuffered(media)) : '(detached)'})`);
+    if (frag.sn !== 'initSegment') {
+      var _this$levels;
+      if (frag.type !== PlaylistLevelType.SUBTITLE) {
+        const el = frag.elementaryStreams;
+        if (!Object.keys(el).some(type => !!el[type])) {
+          // empty segment
+          this.state = State.IDLE;
+          return;
+        }
+      }
+      const level = (_this$levels = this.levels) == null ? void 0 : _this$levels[frag.level];
+      if (level != null && level.fragmentError) {
+        this.log(`Resetting level fragment error count of ${level.fragmentError} on frag buffered`);
+        level.fragmentError = 0;
+      }
+    }
     this.state = State.IDLE;
     if (!media) {
       return;
@@ -9076,9 +9815,9 @@ class BaseStreamController extends TaskLoop {
       // In order to discover the range, we load the best matching fragment for that level and demux it.
       // Do not load using live logic if the starting frag is requested - we want to use getFragmentAtPosition() so that
       // we get the fragment matching that start time
-      if (!levelDetails.PTSKnown && !this.startFragRequested && this.startPosition === -1) {
+      if (!levelDetails.PTSKnown && !this.startFragRequested && this.startPosition === -1 || pos < start) {
         frag = this.getInitialLiveFragment(levelDetails, fragments);
-        this.startPosition = frag ? this.hls.liveSyncPosition || frag.start : pos;
+        this.startPosition = this.nextLoadPosition = frag ? this.hls.liveSyncPosition || frag.start : pos;
       }
     } else if (pos <= start) {
       // VoD playlist: if loadPosition before start of playlist, load first fragment
@@ -9278,14 +10017,7 @@ class BaseStreamController extends TaskLoop {
       }
     }
   }
-  alignPlaylists(details, previousDetails) {
-    const {
-      levels,
-      levelLastLoaded,
-      fragPrevious
-    } = this;
-    const lastLevel = levelLastLoaded !== null ? levels[levelLastLoaded] : null;
-
+  alignPlaylists(details, previousDetails, switchDetails) {
     // FIXME: If not for `shouldAlignOnDiscontinuities` requiring fragPrevious.cc,
     //  this could all go in level-helper mergeDetails()
     const length = details.fragments.length;
@@ -9297,7 +10029,10 @@ class BaseStreamController extends TaskLoop {
     const firstLevelLoad = !previousDetails;
     const aligned = details.alignedSliding && isFiniteNumber(slidingStart);
     if (firstLevelLoad || !aligned && !slidingStart) {
-      alignStream(fragPrevious, lastLevel, details);
+      const {
+        fragPrevious
+      } = this;
+      alignStream(fragPrevious, switchDetails, details);
       const alignedSlidingStart = details.fragments[0].start;
       this.log(`Live playlist sliding: ${alignedSlidingStart.toFixed(2)} start-sn: ${previousDetails ? previousDetails.startSN : 'na'}->${details.startSN} prev-sn: ${fragPrevious ? fragPrevious.sn : 'na'} fragments: ${length}`);
       return alignedSlidingStart;
@@ -9392,8 +10127,7 @@ class BaseStreamController extends TaskLoop {
       retryConfig
     } = errorAction || {};
     if (errorAction && action === NetworkErrorAction.RetryRequest && retryConfig) {
-      var _this$levelLastLoaded;
-      this.resetStartWhenNotLoaded((_this$levelLastLoaded = this.levelLastLoaded) != null ? _this$levelLastLoaded : frag.level);
+      this.resetStartWhenNotLoaded(this.levelLastLoaded);
       const delay = getRetryDelay(retryConfig, retryCount);
       this.warn(`Fragment ${frag.sn} of ${filterType} ${frag.level} errored with ${data.details}, retrying loading ${retryCount + 1}/${retryConfig.maxNumRetry} in ${delay}ms`);
       errorAction.resolved = true;
@@ -9403,11 +10137,12 @@ class BaseStreamController extends TaskLoop {
       this.resetFragmentErrors(filterType);
       if (retryCount < retryConfig.maxNumRetry) {
         // Network retry is skipped when level switch is preferred
-        if (!gapTagEncountered) {
+        if (!gapTagEncountered && action !== NetworkErrorAction.RemoveAlternatePermanently) {
           errorAction.resolved = true;
         }
       } else {
         logger.warn(`${data.details} reached or exceeded max retry (${retryCount})`);
+        return;
       }
     } else if ((errorAction == null ? void 0 : errorAction.action) === NetworkErrorAction.SendAlternateToPenaltyBox) {
       this.state = State.WAITING_LEVEL;
@@ -9481,7 +10216,7 @@ class BaseStreamController extends TaskLoop {
     // in that case, reset startFragRequested flag
     if (!this.loadedmetadata) {
       this.startFragRequested = false;
-      const details = this.levels ? this.levels[level].details : null;
+      const details = level ? level.details : null;
       if (details != null && details.live) {
         // Update the start position and return to IDLE to recover live start
         this.startPosition = -1;
@@ -9493,10 +10228,9 @@ class BaseStreamController extends TaskLoop {
     }
   }
   resetWhenMissingContext(chunkMeta) {
-    var _this$levelLastLoaded2;
     this.warn(`The loading context changed while buffering fragment ${chunkMeta.sn} of level ${chunkMeta.level}. This chunk will not be buffered.`);
     this.removeUnbufferedFrags();
-    this.resetStartWhenNotLoaded((_this$levelLastLoaded2 = this.levelLastLoaded) != null ? _this$levelLastLoaded2 : chunkMeta.level);
+    this.resetStartWhenNotLoaded(this.levelLastLoaded);
     this.resetLoadingState();
   }
   removeUnbufferedFrags(start = 0) {
@@ -9534,9 +10268,7 @@ class BaseStreamController extends TaskLoop {
       }
       return result;
     }, false);
-    if (parsed) {
-      level.fragmentError = 0;
-    } else if (((_this$transmuxer = this.transmuxer) == null ? void 0 : _this$transmuxer.error) === null) {
+    if (!parsed && ((_this$transmuxer = this.transmuxer) == null ? void 0 : _this$transmuxer.error) === null) {
       const error = new Error(`Found no media in fragment ${frag.sn} of level ${frag.level} resetting transmuxer to fallback to playlist timing`);
       if (level.fragmentError === 0) {
         // Mark and track the odd empty segment as a gap to avoid reloading
@@ -9560,7 +10292,6 @@ class BaseStreamController extends TaskLoop {
       this.resetTransmuxer();
       // For this error fallthrough. Marking parsed will allow advancing to next fragment.
     }
-
     this.state = State.PARSED;
     this.hls.trigger(Events.FRAG_PARSED, {
       frag,
@@ -9575,10 +10306,9 @@ class BaseStreamController extends TaskLoop {
   }
   recoverWorkerError(data) {
     if (data.event === 'demuxerWorker') {
-      var _ref, _this$levelLastLoaded3, _this$fragCurrent3;
       this.fragmentTracker.removeAllFragments();
       this.resetTransmuxer();
-      this.resetStartWhenNotLoaded((_ref = (_this$levelLastLoaded3 = this.levelLastLoaded) != null ? _this$levelLastLoaded3 : (_this$fragCurrent3 = this.fragCurrent) == null ? void 0 : _this$fragCurrent3.level) != null ? _ref : 0);
+      this.resetStartWhenNotLoaded(this.levelLastLoaded);
       this.resetLoadingState();
     }
   }
@@ -9594,34 +10324,45 @@ class BaseStreamController extends TaskLoop {
   }
 }
 
-function getSourceBuffer() {
-  return self.SourceBuffer || self.WebKitSourceBuffer;
-}
-
-/**
- * @ignore
- */
-function isSupported() {
-  const mediaSource = getMediaSource();
-  if (!mediaSource) {
-    return false;
+class ChunkCache {
+  constructor() {
+    this.chunks = [];
+    this.dataLength = 0;
+  }
+  push(chunk) {
+    this.chunks.push(chunk);
+    this.dataLength += chunk.length;
+  }
+  flush() {
+    const {
+      chunks,
+      dataLength
+    } = this;
+    let result;
+    if (!chunks.length) {
+      return new Uint8Array(0);
+    } else if (chunks.length === 1) {
+      result = chunks[0];
+    } else {
+      result = concatUint8Arrays(chunks, dataLength);
+    }
+    this.reset();
+    return result;
+  }
+  reset() {
+    this.chunks.length = 0;
+    this.dataLength = 0;
   }
-  const sourceBuffer = getSourceBuffer();
-  const isTypeSupported = mediaSource && typeof mediaSource.isTypeSupported === 'function' && mediaSource.isTypeSupported('video/mp4; codecs="avc1.42E01E,mp4a.40.2"');
-
-  // if SourceBuffer is exposed ensure its API is valid
-  // Older browsers do not expose SourceBuffer globally so checking SourceBuffer.prototype is impossible
-  const sourceBufferValidAPI = !sourceBuffer || sourceBuffer.prototype && typeof sourceBuffer.prototype.appendBuffer === 'function' && typeof sourceBuffer.prototype.remove === 'function';
-  return !!isTypeSupported && !!sourceBufferValidAPI;
 }
-
-/**
- * @ignore
- */
-function changeTypeSupported() {
-  var _sourceBuffer$prototy;
-  const sourceBuffer = getSourceBuffer();
-  return typeof (sourceBuffer == null ? void 0 : (_sourceBuffer$prototy = sourceBuffer.prototype) == null ? void 0 : _sourceBuffer$prototy.changeType) === 'function';
+function concatUint8Arrays(chunks, dataLength) {
+  const result = new Uint8Array(dataLength);
+  let offset = 0;
+  for (let i = 0; i < chunks.length; i++) {
+    const chunk = chunks[i];
+    result.set(chunk, offset);
+    offset += chunk.length;
+  }
+  return result;
 }
 
 // ensure the worker ends up in the bundle
@@ -9819,11 +10560,13 @@ function getAudioConfig(observer, data, offset, audioCodec) {
   adtsObjectType = ((data[offset + 2] & 0xc0) >>> 6) + 1;
   const adtsSamplingIndex = (data[offset + 2] & 0x3c) >>> 2;
   if (adtsSamplingIndex > adtsSamplingRates.length - 1) {
-    observer.trigger(Events.ERROR, {
+    const error = new Error(`invalid ADTS sampling index:${adtsSamplingIndex}`);
+    observer.emit(Events.ERROR, Events.ERROR, {
       type: ErrorTypes.MEDIA_ERROR,
       details: ErrorDetails.FRAG_PARSING_ERROR,
       fatal: true,
-      reason: `invalid ADTS sampling index:${adtsSamplingIndex}`
+      error,
+      reason: error.message
     });
     return;
   }
@@ -10001,7 +10744,7 @@ function parseFrameHeader(data, offset) {
     }
   }
 }
-function appendFrame$1(track, data, offset, pts, frameIndex) {
+function appendFrame$2(track, data, offset, pts, frameIndex) {
   const frameDuration = getFrameDuration(track.samplerate);
   const stamp = pts + frameIndex * frameDuration;
   const header = parseFrameHeader(data, offset);
@@ -10049,19 +10792,162 @@ function appendFrame$1(track, data, offset, pts, frameIndex) {
 }
 
 /**
- * AAC demuxer
+ *  MPEG parser helper
  */
-class AACDemuxer extends BaseAudioDemuxer {
-  constructor(observer, config) {
-    super();
-    this.observer = void 0;
-    this.config = void 0;
-    this.observer = observer;
-    this.config = config;
-  }
-  resetInitSegment(initSegment, audioCodec, videoCodec, trackDuration) {
-    super.resetInitSegment(initSegment, audioCodec, videoCodec, trackDuration);
-    this._audioTrack = {
+
+let chromeVersion$1 = null;
+const BitratesMap = [32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160];
+const SamplingRateMap = [44100, 48000, 32000, 22050, 24000, 16000, 11025, 12000, 8000];
+const SamplesCoefficients = [
+// MPEG 2.5
+[0,
+// Reserved
+72,
+// Layer3
+144,
+// Layer2
+12 // Layer1
+],
+// Reserved
+[0,
+// Reserved
+0,
+// Layer3
+0,
+// Layer2
+0 // Layer1
+],
+// MPEG 2
+[0,
+// Reserved
+72,
+// Layer3
+144,
+// Layer2
+12 // Layer1
+],
+// MPEG 1
+[0,
+// Reserved
+144,
+// Layer3
+144,
+// Layer2
+12 // Layer1
+]];
+const BytesInSlot = [0,
+// Reserved
+1,
+// Layer3
+1,
+// Layer2
+4 // Layer1
+];
+function appendFrame$1(track, data, offset, pts, frameIndex) {
+  // Using http://www.datavoyage.com/mpgscript/mpeghdr.htm as a reference
+  if (offset + 24 > data.length) {
+    return;
+  }
+  const header = parseHeader(data, offset);
+  if (header && offset + header.frameLength <= data.length) {
+    const frameDuration = header.samplesPerFrame * 90000 / header.sampleRate;
+    const stamp = pts + frameIndex * frameDuration;
+    const sample = {
+      unit: data.subarray(offset, offset + header.frameLength),
+      pts: stamp,
+      dts: stamp
+    };
+    track.config = [];
+    track.channelCount = header.channelCount;
+    track.samplerate = header.sampleRate;
+    track.samples.push(sample);
+    return {
+      sample,
+      length: header.frameLength,
+      missing: 0
+    };
+  }
+}
+function parseHeader(data, offset) {
+  const mpegVersion = data[offset + 1] >> 3 & 3;
+  const mpegLayer = data[offset + 1] >> 1 & 3;
+  const bitRateIndex = data[offset + 2] >> 4 & 15;
+  const sampleRateIndex = data[offset + 2] >> 2 & 3;
+  if (mpegVersion !== 1 && bitRateIndex !== 0 && bitRateIndex !== 15 && sampleRateIndex !== 3) {
+    const paddingBit = data[offset + 2] >> 1 & 1;
+    const channelMode = data[offset + 3] >> 6;
+    const columnInBitrates = mpegVersion === 3 ? 3 - mpegLayer : mpegLayer === 3 ? 3 : 4;
+    const bitRate = BitratesMap[columnInBitrates * 14 + bitRateIndex - 1] * 1000;
+    const columnInSampleRates = mpegVersion === 3 ? 0 : mpegVersion === 2 ? 1 : 2;
+    const sampleRate = SamplingRateMap[columnInSampleRates * 3 + sampleRateIndex];
+    const channelCount = channelMode === 3 ? 1 : 2; // If bits of channel mode are `11` then it is a single channel (Mono)
+    const sampleCoefficient = SamplesCoefficients[mpegVersion][mpegLayer];
+    const bytesInSlot = BytesInSlot[mpegLayer];
+    const samplesPerFrame = sampleCoefficient * 8 * bytesInSlot;
+    const frameLength = Math.floor(sampleCoefficient * bitRate / sampleRate + paddingBit) * bytesInSlot;
+    if (chromeVersion$1 === null) {
+      const userAgent = navigator.userAgent || '';
+      const result = userAgent.match(/Chrome\/(\d+)/i);
+      chromeVersion$1 = result ? parseInt(result[1]) : 0;
+    }
+    const needChromeFix = !!chromeVersion$1 && chromeVersion$1 <= 87;
+    if (needChromeFix && mpegLayer === 2 && bitRate >= 224000 && channelMode === 0) {
+      // Work around bug in Chromium by setting channelMode to dual-channel (01) instead of stereo (00)
+      data[offset + 3] = data[offset + 3] | 0x80;
+    }
+    return {
+      sampleRate,
+      channelCount,
+      frameLength,
+      samplesPerFrame
+    };
+  }
+}
+function isHeaderPattern(data, offset) {
+  return data[offset] === 0xff && (data[offset + 1] & 0xe0) === 0xe0 && (data[offset + 1] & 0x06) !== 0x00;
+}
+function isHeader(data, offset) {
+  // Look for MPEG header | 1111 1111 | 111X XYZX | where X can be either 0 or 1 and Y or Z should be 1
+  // Layer bits (position 14 and 15) in header should be always different from 0 (Layer I or Layer II or Layer III)
+  // More info http://www.mp3-tech.org/programmer/frame_header.html
+  return offset + 1 < data.length && isHeaderPattern(data, offset);
+}
+function canParse(data, offset) {
+  const headerSize = 4;
+  return isHeaderPattern(data, offset) && headerSize <= data.length - offset;
+}
+function probe(data, offset) {
+  // same as isHeader but we also check that MPEG frame follows last MPEG frame
+  // or end of data is reached
+  if (offset + 1 < data.length && isHeaderPattern(data, offset)) {
+    // MPEG header Length
+    const headerLength = 4;
+    // MPEG frame Length
+    const header = parseHeader(data, offset);
+    let frameLength = headerLength;
+    if (header != null && header.frameLength) {
+      frameLength = header.frameLength;
+    }
+    const newOffset = offset + frameLength;
+    return newOffset === data.length || isHeader(data, newOffset);
+  }
+  return false;
+}
+
+/**
+ * AAC demuxer
+ */
+class AACDemuxer extends BaseAudioDemuxer {
+  constructor(observer, config) {
+    super();
+    this.observer = void 0;
+    this.config = void 0;
+    this.observer = observer;
+    this.config = config;
+  }
+  resetInitSegment(initSegment, audioCodec, videoCodec, trackDuration) {
+    super.resetInitSegment(initSegment, audioCodec, videoCodec, trackDuration);
+    this._audioTrack = {
       container: 'audio/adts',
       type: 'audio',
       id: 2,
@@ -10086,8 +10972,11 @@ class AACDemuxer extends BaseAudioDemuxer {
     // Look for ADTS header | 1111 1111 | 1111 X00X | where X can be either 0 or 1
     // Layer bits (position 14 and 15) in header should be always 0 for ADTS
     // More info https://wiki.multimedia.cx/index.php?title=ADTS
-    const id3Data = getID3Data(data, 0) || [];
-    let offset = id3Data.length;
+    const id3Data = getID3Data(data, 0);
+    let offset = (id3Data == null ? void 0 : id3Data.length) || 0;
+    if (probe(data, offset)) {
+      return false;
+    }
     for (let length = data.length; offset < length; offset++) {
       if (probe$1(data, offset)) {
         logger.log('ADTS sync word found !');
@@ -10101,7 +10990,7 @@ class AACDemuxer extends BaseAudioDemuxer {
   }
   appendFrame(track, data, offset) {
     initTrackConfig(track, this.observer, data, offset, track.manifestCodec);
-    const frame = appendFrame$1(track, data, offset, this.basePTS, this.frameIndex);
+    const frame = appendFrame$2(track, data, offset, this.basePTS, this.frameIndex);
     if (frame && frame.missing === 0) {
       return frame;
     }
@@ -10159,9 +11048,7 @@ class MP4Demuxer {
     this.remainderData = null;
   }
   static probe(data) {
-    // ensure we find a moof box in the first 16 kB
-    data = data.length > 16384 ? data.subarray(0, 16384) : data;
-    return findBox(data, ['moof']).length > 0;
+    return hasMoofData(data);
   }
   demux(data, timeOffset) {
     this.timeOffset = timeOffset;
@@ -10241,149 +11128,192 @@ class MP4Demuxer {
   destroy() {}
 }
 
-/**
- *  MPEG parser helper
- */
-
-let chromeVersion$1 = null;
-const BitratesMap = [32, 64, 96, 128, 160, 192, 224, 256, 288, 320, 352, 384, 416, 448, 32, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 384, 32, 40, 48, 56, 64, 80, 96, 112, 128, 160, 192, 224, 256, 320, 32, 48, 56, 64, 80, 96, 112, 128, 144, 160, 176, 192, 224, 256, 8, 16, 24, 32, 40, 48, 56, 64, 80, 96, 112, 128, 144, 160];
-const SamplingRateMap = [44100, 48000, 32000, 22050, 24000, 16000, 11025, 12000, 8000];
-const SamplesCoefficients = [
-// MPEG 2.5
-[0,
-// Reserved
-72,
-// Layer3
-144,
-// Layer2
-12 // Layer1
-],
-// Reserved
-[0,
-// Reserved
-0,
-// Layer3
-0,
-// Layer2
-0 // Layer1
-],
-// MPEG 2
-[0,
-// Reserved
-72,
-// Layer3
-144,
-// Layer2
-12 // Layer1
-],
-// MPEG 1
-[0,
-// Reserved
-144,
-// Layer3
-144,
-// Layer2
-12 // Layer1
-]];
-
-const BytesInSlot = [0,
-// Reserved
-1,
-// Layer3
-1,
-// Layer2
-4 // Layer1
-];
+const getAudioBSID = (data, offset) => {
+  // check the bsid to confirm ac-3 | ec-3
+  let bsid = 0;
+  let numBits = 5;
+  offset += numBits;
+  const temp = new Uint32Array(1); // unsigned 32 bit for temporary storage
+  const mask = new Uint32Array(1); // unsigned 32 bit mask value
+  const byte = new Uint8Array(1); // unsigned 8 bit for temporary storage
+  while (numBits > 0) {
+    byte[0] = data[offset];
+    // read remaining bits, upto 8 bits at a time
+    const bits = Math.min(numBits, 8);
+    const shift = 8 - bits;
+    mask[0] = 0xff000000 >>> 24 + shift << shift;
+    temp[0] = (byte[0] & mask[0]) >> shift;
+    bsid = !bsid ? temp[0] : bsid << bits | temp[0];
+    offset += 1;
+    numBits -= bits;
+  }
+  return bsid;
+};
 
-function appendFrame(track, data, offset, pts, frameIndex) {
-  // Using http://www.datavoyage.com/mpgscript/mpeghdr.htm as a reference
-  if (offset + 24 > data.length) {
-    return;
+class AC3Demuxer extends BaseAudioDemuxer {
+  constructor(observer) {
+    super();
+    this.observer = void 0;
+    this.observer = observer;
   }
-  const header = parseHeader(data, offset);
-  if (header && offset + header.frameLength <= data.length) {
-    const frameDuration = header.samplesPerFrame * 90000 / header.sampleRate;
-    const stamp = pts + frameIndex * frameDuration;
-    const sample = {
-      unit: data.subarray(offset, offset + header.frameLength),
-      pts: stamp,
-      dts: stamp
-    };
-    track.config = [];
-    track.channelCount = header.channelCount;
-    track.samplerate = header.sampleRate;
-    track.samples.push(sample);
-    return {
-      sample,
-      length: header.frameLength,
-      missing: 0
+  resetInitSegment(initSegment, audioCodec, videoCodec, trackDuration) {
+    super.resetInitSegment(initSegment, audioCodec, videoCodec, trackDuration);
+    this._audioTrack = {
+      container: 'audio/ac-3',
+      type: 'audio',
+      id: 2,
+      pid: -1,
+      sequenceNumber: 0,
+      segmentCodec: 'ac3',
+      samples: [],
+      manifestCodec: audioCodec,
+      duration: trackDuration,
+      inputTimeScale: 90000,
+      dropped: 0
     };
   }
-}
-function parseHeader(data, offset) {
-  const mpegVersion = data[offset + 1] >> 3 & 3;
-  const mpegLayer = data[offset + 1] >> 1 & 3;
-  const bitRateIndex = data[offset + 2] >> 4 & 15;
-  const sampleRateIndex = data[offset + 2] >> 2 & 3;
-  if (mpegVersion !== 1 && bitRateIndex !== 0 && bitRateIndex !== 15 && sampleRateIndex !== 3) {
-    const paddingBit = data[offset + 2] >> 1 & 1;
-    const channelMode = data[offset + 3] >> 6;
-    const columnInBitrates = mpegVersion === 3 ? 3 - mpegLayer : mpegLayer === 3 ? 3 : 4;
-    const bitRate = BitratesMap[columnInBitrates * 14 + bitRateIndex - 1] * 1000;
-    const columnInSampleRates = mpegVersion === 3 ? 0 : mpegVersion === 2 ? 1 : 2;
-    const sampleRate = SamplingRateMap[columnInSampleRates * 3 + sampleRateIndex];
-    const channelCount = channelMode === 3 ? 1 : 2; // If bits of channel mode are `11` then it is a single channel (Mono)
-    const sampleCoefficient = SamplesCoefficients[mpegVersion][mpegLayer];
-    const bytesInSlot = BytesInSlot[mpegLayer];
-    const samplesPerFrame = sampleCoefficient * 8 * bytesInSlot;
-    const frameLength = Math.floor(sampleCoefficient * bitRate / sampleRate + paddingBit) * bytesInSlot;
-    if (chromeVersion$1 === null) {
-      const userAgent = navigator.userAgent || '';
-      const result = userAgent.match(/Chrome\/(\d+)/i);
-      chromeVersion$1 = result ? parseInt(result[1]) : 0;
+  canParse(data, offset) {
+    return offset + 64 < data.length;
+  }
+  appendFrame(track, data, offset) {
+    const frameLength = appendFrame(track, data, offset, this.basePTS, this.frameIndex);
+    if (frameLength !== -1) {
+      const sample = track.samples[track.samples.length - 1];
+      return {
+        sample,
+        length: frameLength,
+        missing: 0
+      };
     }
-    const needChromeFix = !!chromeVersion$1 && chromeVersion$1 <= 87;
-    if (needChromeFix && mpegLayer === 2 && bitRate >= 224000 && channelMode === 0) {
-      // Work around bug in Chromium by setting channelMode to dual-channel (01) instead of stereo (00)
-      data[offset + 3] = data[offset + 3] | 0x80;
+  }
+  static probe(data) {
+    if (!data) {
+      return false;
     }
-    return {
-      sampleRate,
-      channelCount,
-      frameLength,
-      samplesPerFrame
-    };
+    const id3Data = getID3Data(data, 0);
+    if (!id3Data) {
+      return false;
+    }
+
+    // look for the ac-3 sync bytes
+    const offset = id3Data.length;
+    if (data[offset] === 0x0b && data[offset + 1] === 0x77 && getTimeStamp(id3Data) !== undefined &&
+    // check the bsid to confirm ac-3
+    getAudioBSID(data, offset) < 16) {
+      return true;
+    }
+    return false;
   }
 }
-function isHeaderPattern(data, offset) {
-  return data[offset] === 0xff && (data[offset + 1] & 0xe0) === 0xe0 && (data[offset + 1] & 0x06) !== 0x00;
-}
-function isHeader(data, offset) {
-  // Look for MPEG header | 1111 1111 | 111X XYZX | where X can be either 0 or 1 and Y or Z should be 1
-  // Layer bits (position 14 and 15) in header should be always different from 0 (Layer I or Layer II or Layer III)
-  // More info http://www.mp3-tech.org/programmer/frame_header.html
-  return offset + 1 < data.length && isHeaderPattern(data, offset);
-}
-function canParse(data, offset) {
-  const headerSize = 4;
-  return isHeaderPattern(data, offset) && headerSize <= data.length - offset;
+function appendFrame(track, data, start, pts, frameIndex) {
+  if (start + 8 > data.length) {
+    return -1; // not enough bytes left
+  }
+  if (data[start] !== 0x0b || data[start + 1] !== 0x77) {
+    return -1; // invalid magic
+  }
+
+  // get sample rate
+  const samplingRateCode = data[start + 4] >> 6;
+  if (samplingRateCode >= 3) {
+    return -1; // invalid sampling rate
+  }
+  const samplingRateMap = [48000, 44100, 32000];
+  const sampleRate = samplingRateMap[samplingRateCode];
+
+  // get frame size
+  const frameSizeCode = data[start + 4] & 0x3f;
+  const frameSizeMap = [64, 69, 96, 64, 70, 96, 80, 87, 120, 80, 88, 120, 96, 104, 144, 96, 105, 144, 112, 121, 168, 112, 122, 168, 128, 139, 192, 128, 140, 192, 160, 174, 240, 160, 175, 240, 192, 208, 288, 192, 209, 288, 224, 243, 336, 224, 244, 336, 256, 278, 384, 256, 279, 384, 320, 348, 480, 320, 349, 480, 384, 417, 576, 384, 418, 576, 448, 487, 672, 448, 488, 672, 512, 557, 768, 512, 558, 768, 640, 696, 960, 640, 697, 960, 768, 835, 1152, 768, 836, 1152, 896, 975, 1344, 896, 976, 1344, 1024, 1114, 1536, 1024, 1115, 1536, 1152, 1253, 1728, 1152, 1254, 1728, 1280, 1393, 1920, 1280, 1394, 1920];
+  const frameLength = frameSizeMap[frameSizeCode * 3 + samplingRateCode] * 2;
+  if (start + frameLength > data.length) {
+    return -1;
+  }
+
+  // get channel count
+  const channelMode = data[start + 6] >> 5;
+  let skipCount = 0;
+  if (channelMode === 2) {
+    skipCount += 2;
+  } else {
+    if (channelMode & 1 && channelMode !== 1) {
+      skipCount += 2;
+    }
+    if (channelMode & 4) {
+      skipCount += 2;
+    }
+  }
+  const lfeon = (data[start + 6] << 8 | data[start + 7]) >> 12 - skipCount & 1;
+  const channelsMap = [2, 1, 2, 3, 3, 4, 4, 5];
+  const channelCount = channelsMap[channelMode] + lfeon;
+
+  // build dac3 box
+  const bsid = data[start + 5] >> 3;
+  const bsmod = data[start + 5] & 7;
+  const config = new Uint8Array([samplingRateCode << 6 | bsid << 1 | bsmod >> 2, (bsmod & 3) << 6 | channelMode << 3 | lfeon << 2 | frameSizeCode >> 4, frameSizeCode << 4 & 0xe0]);
+  const frameDuration = 1536 / sampleRate * 90000;
+  const stamp = pts + frameIndex * frameDuration;
+  const unit = data.subarray(start, start + frameLength);
+  track.config = config;
+  track.channelCount = channelCount;
+  track.samplerate = sampleRate;
+  track.samples.push({
+    unit,
+    pts: stamp
+  });
+  return frameLength;
 }
-function probe(data, offset) {
-  // same as isHeader but we also check that MPEG frame follows last MPEG frame
-  // or end of data is reached
-  if (offset + 1 < data.length && isHeaderPattern(data, offset)) {
-    // MPEG header Length
-    const headerLength = 4;
-    // MPEG frame Length
-    const header = parseHeader(data, offset);
-    let frameLength = headerLength;
-    if (header != null && header.frameLength) {
-      frameLength = header.frameLength;
+
+class BaseVideoParser {
+  constructor() {
+    this.VideoSample = null;
+  }
+  createVideoSample(key, pts, dts, debug) {
+    return {
+      key,
+      frame: false,
+      pts,
+      dts,
+      units: [],
+      debug,
+      length: 0
+    };
+  }
+  getLastNalUnit(samples) {
+    var _VideoSample;
+    let VideoSample = this.VideoSample;
+    let lastUnit;
+    // try to fallback to previous sample if current one is empty
+    if (!VideoSample || VideoSample.units.length === 0) {
+      VideoSample = samples[samples.length - 1];
+    }
+    if ((_VideoSample = VideoSample) != null && _VideoSample.units) {
+      const units = VideoSample.units;
+      lastUnit = units[units.length - 1];
+    }
+    return lastUnit;
+  }
+  pushAccessUnit(VideoSample, videoTrack) {
+    if (VideoSample.units.length && VideoSample.frame) {
+      // if sample does not have PTS/DTS, patch with last sample PTS/DTS
+      if (VideoSample.pts === undefined) {
+        const samples = videoTrack.samples;
+        const nbSamples = samples.length;
+        if (nbSamples) {
+          const lastSample = samples[nbSamples - 1];
+          VideoSample.pts = lastSample.pts;
+          VideoSample.dts = lastSample.dts;
+        } else {
+          // dropping samples, no timestamp found
+          videoTrack.dropped++;
+          return;
+        }
+      }
+      videoTrack.samples.push(VideoSample);
+    }
+    if (VideoSample.debug.length) {
+      logger.log(VideoSample.pts + '/' + VideoSample.dts + ':' + VideoSample.debug);
     }
-    const newOffset = offset + frameLength;
-    return newOffset === data.length || isHeader(data, newOffset);
   }
-  return false;
 }
 
 /**
@@ -10615,7 +11545,6 @@ class ExpGolomb {
         skipEG();
       } // offset_for_ref_frame[ i ]
     }
-
     skipUEG(); // max_num_ref_frames
     skipBits(1); // gaps_in_frame_num_value_allowed_flag
     const picWidthInMbsMinus1 = readUEG();
@@ -10712,68 +11641,312 @@ class ExpGolomb {
   }
 }
 
-/**
- * SAMPLE-AES decrypter
- */
-
-class SampleAesDecrypter {
-  constructor(observer, config, keyData) {
-    this.keyData = void 0;
-    this.decrypter = void 0;
-    this.keyData = keyData;
-    this.decrypter = new Decrypter(config, {
-      removePKCS7Padding: false
-    });
-  }
-  decryptBuffer(encryptedData) {
-    return this.decrypter.decrypt(encryptedData, this.keyData.key.buffer, this.keyData.iv.buffer);
-  }
+class AvcVideoParser extends BaseVideoParser {
+  parseAVCPES(track, textTrack, pes, last, duration) {
+    const units = this.parseAVCNALu(track, pes.data);
+    let VideoSample = this.VideoSample;
+    let push;
+    let spsfound = false;
+    // free pes.data to save up some memory
+    pes.data = null;
 
-  // AAC - encrypt all full 16 bytes blocks starting from offset 16
-  decryptAacSample(samples, sampleIndex, callback) {
-    const curUnit = samples[sampleIndex].unit;
-    if (curUnit.length <= 16) {
-      // No encrypted portion in this sample (first 16 bytes is not
-      // encrypted, see https://developer.apple.com/library/archive/documentation/AudioVideo/Conceptual/HLS_Sample_Encryption/Encryption/Encryption.html),
-      return;
+    // if new NAL units found and last sample still there, let's push ...
+    // this helps parsing streams with missing AUD (only do this if AUD never found)
+    if (VideoSample && units.length && !track.audFound) {
+      this.pushAccessUnit(VideoSample, track);
+      VideoSample = this.VideoSample = this.createVideoSample(false, pes.pts, pes.dts, '');
     }
-    const encryptedData = curUnit.subarray(16, curUnit.length - curUnit.length % 16);
-    const encryptedBuffer = encryptedData.buffer.slice(encryptedData.byteOffset, encryptedData.byteOffset + encryptedData.length);
-    this.decryptBuffer(encryptedBuffer).then(decryptedBuffer => {
-      const decryptedData = new Uint8Array(decryptedBuffer);
-      curUnit.set(decryptedData, 16);
-      if (!this.decrypter.isSync()) {
-        this.decryptAacSamples(samples, sampleIndex + 1, callback);
-      }
-    });
-  }
-  decryptAacSamples(samples, sampleIndex, callback) {
-    for (;; sampleIndex++) {
-      if (sampleIndex >= samples.length) {
-        callback();
-        return;
-      }
-      if (samples[sampleIndex].unit.length < 32) {
-        continue;
+    units.forEach(unit => {
+      var _VideoSample2;
+      switch (unit.type) {
+        // NDR
+        case 1:
+          {
+            let iskey = false;
+            push = true;
+            const data = unit.data;
+            // only check slice type to detect KF in case SPS found in same packet (any keyframe is preceded by SPS ...)
+            if (spsfound && data.length > 4) {
+              // retrieve slice type by parsing beginning of NAL unit (follow H264 spec, slice_header definition) to detect keyframe embedded in NDR
+              const sliceType = new ExpGolomb(data).readSliceType();
+              // 2 : I slice, 4 : SI slice, 7 : I slice, 9: SI slice
+              // SI slice : A slice that is coded using intra prediction only and using quantisation of the prediction samples.
+              // An SI slice can be coded such that its decoded samples can be constructed identically to an SP slice.
+              // I slice: A slice that is not an SI slice that is decoded using intra prediction only.
+              // if (sliceType === 2 || sliceType === 7) {
+              if (sliceType === 2 || sliceType === 4 || sliceType === 7 || sliceType === 9) {
+                iskey = true;
+              }
+            }
+            if (iskey) {
+              var _VideoSample;
+              // if we have non-keyframe data already, that cannot belong to the same frame as a keyframe, so force a push
+              if ((_VideoSample = VideoSample) != null && _VideoSample.frame && !VideoSample.key) {
+                this.pushAccessUnit(VideoSample, track);
+                VideoSample = this.VideoSample = null;
+              }
+            }
+            if (!VideoSample) {
+              VideoSample = this.VideoSample = this.createVideoSample(true, pes.pts, pes.dts, '');
+            }
+            VideoSample.frame = true;
+            VideoSample.key = iskey;
+            break;
+            // IDR
+          }
+        case 5:
+          push = true;
+          // handle PES not starting with AUD
+          // if we have frame data already, that cannot belong to the same frame, so force a push
+          if ((_VideoSample2 = VideoSample) != null && _VideoSample2.frame && !VideoSample.key) {
+            this.pushAccessUnit(VideoSample, track);
+            VideoSample = this.VideoSample = null;
+          }
+          if (!VideoSample) {
+            VideoSample = this.VideoSample = this.createVideoSample(true, pes.pts, pes.dts, '');
+          }
+          VideoSample.key = true;
+          VideoSample.frame = true;
+          break;
+        // SEI
+        case 6:
+          {
+            push = true;
+            parseSEIMessageFromNALu(unit.data, 1, pes.pts, textTrack.samples);
+            break;
+            // SPS
+          }
+        case 7:
+          {
+            var _track$pixelRatio, _track$pixelRatio2;
+            push = true;
+            spsfound = true;
+            const sps = unit.data;
+            const expGolombDecoder = new ExpGolomb(sps);
+            const config = expGolombDecoder.readSPS();
+            if (!track.sps || track.width !== config.width || track.height !== config.height || ((_track$pixelRatio = track.pixelRatio) == null ? void 0 : _track$pixelRatio[0]) !== config.pixelRatio[0] || ((_track$pixelRatio2 = track.pixelRatio) == null ? void 0 : _track$pixelRatio2[1]) !== config.pixelRatio[1]) {
+              track.width = config.width;
+              track.height = config.height;
+              track.pixelRatio = config.pixelRatio;
+              track.sps = [sps];
+              track.duration = duration;
+              const codecarray = sps.subarray(1, 4);
+              let codecstring = 'avc1.';
+              for (let i = 0; i < 3; i++) {
+                let h = codecarray[i].toString(16);
+                if (h.length < 2) {
+                  h = '0' + h;
+                }
+                codecstring += h;
+              }
+              track.codec = codecstring;
+            }
+            break;
+          }
+        // PPS
+        case 8:
+          push = true;
+          track.pps = [unit.data];
+          break;
+        // AUD
+        case 9:
+          push = true;
+          track.audFound = true;
+          if (VideoSample) {
+            this.pushAccessUnit(VideoSample, track);
+          }
+          VideoSample = this.VideoSample = this.createVideoSample(false, pes.pts, pes.dts, '');
+          break;
+        // Filler Data
+        case 12:
+          push = true;
+          break;
+        default:
+          push = false;
+          if (VideoSample) {
+            VideoSample.debug += 'unknown NAL ' + unit.type + ' ';
+          }
+          break;
       }
-      this.decryptAacSample(samples, sampleIndex, callback);
-      if (!this.decrypter.isSync()) {
-        return;
+      if (VideoSample && push) {
+        const units = VideoSample.units;
+        units.push(unit);
       }
+    });
+    // if last PES packet, push samples
+    if (last && VideoSample) {
+      this.pushAccessUnit(VideoSample, track);
+      this.VideoSample = null;
     }
   }
+  parseAVCNALu(track, array) {
+    const len = array.byteLength;
+    let state = track.naluState || 0;
+    const lastState = state;
+    const units = [];
+    let i = 0;
+    let value;
+    let overflow;
+    let unitType;
+    let lastUnitStart = -1;
+    let lastUnitType = 0;
+    // logger.log('PES:' + Hex.hexDump(array));
 
-  // AVC - encrypt one 16 bytes block out of ten, starting from offset 32
-  getAvcEncryptedData(decodedData) {
-    const encryptedDataLen = Math.floor((decodedData.length - 48) / 160) * 16 + 16;
-    const encryptedData = new Int8Array(encryptedDataLen);
-    let outputPos = 0;
-    for (let inputPos = 32; inputPos < decodedData.length - 16; inputPos += 160, outputPos += 16) {
-      encryptedData.set(decodedData.subarray(inputPos, inputPos + 16), outputPos);
+    if (state === -1) {
+      // special use case where we found 3 or 4-byte start codes exactly at the end of previous PES packet
+      lastUnitStart = 0;
+      // NALu type is value read from offset 0
+      lastUnitType = array[0] & 0x1f;
+      state = 0;
+      i = 1;
     }
-    return encryptedData;
-  }
-  getAvcDecryptedUnit(decodedData, decryptedData) {
+    while (i < len) {
+      value = array[i++];
+      // optimization. state 0 and 1 are the predominant case. let's handle them outside of the switch/case
+      if (!state) {
+        state = value ? 0 : 1;
+        continue;
+      }
+      if (state === 1) {
+        state = value ? 0 : 2;
+        continue;
+      }
+      // here we have state either equal to 2 or 3
+      if (!value) {
+        state = 3;
+      } else if (value === 1) {
+        overflow = i - state - 1;
+        if (lastUnitStart >= 0) {
+          const unit = {
+            data: array.subarray(lastUnitStart, overflow),
+            type: lastUnitType
+          };
+          // logger.log('pushing NALU, type/size:' + unit.type + '/' + unit.data.byteLength);
+          units.push(unit);
+        } else {
+          // lastUnitStart is undefined => this is the first start code found in this PES packet
+          // first check if start code delimiter is overlapping between 2 PES packets,
+          // ie it started in last packet (lastState not zero)
+          // and ended at the beginning of this PES packet (i <= 4 - lastState)
+          const lastUnit = this.getLastNalUnit(track.samples);
+          if (lastUnit) {
+            if (lastState && i <= 4 - lastState) {
+              // start delimiter overlapping between PES packets
+              // strip start delimiter bytes from the end of last NAL unit
+              // check if lastUnit had a state different from zero
+              if (lastUnit.state) {
+                // strip last bytes
+                lastUnit.data = lastUnit.data.subarray(0, lastUnit.data.byteLength - lastState);
+              }
+            }
+            // If NAL units are not starting right at the beginning of the PES packet, push preceding data into previous NAL unit.
+
+            if (overflow > 0) {
+              // logger.log('first NALU found with overflow:' + overflow);
+              lastUnit.data = appendUint8Array(lastUnit.data, array.subarray(0, overflow));
+              lastUnit.state = 0;
+            }
+          }
+        }
+        // check if we can read unit type
+        if (i < len) {
+          unitType = array[i] & 0x1f;
+          // logger.log('find NALU @ offset:' + i + ',type:' + unitType);
+          lastUnitStart = i;
+          lastUnitType = unitType;
+          state = 0;
+        } else {
+          // not enough byte to read unit type. let's read it on next PES parsing
+          state = -1;
+        }
+      } else {
+        state = 0;
+      }
+    }
+    if (lastUnitStart >= 0 && state >= 0) {
+      const unit = {
+        data: array.subarray(lastUnitStart, len),
+        type: lastUnitType,
+        state: state
+      };
+      units.push(unit);
+      // logger.log('pushing NALU, type/size/state:' + unit.type + '/' + unit.data.byteLength + '/' + state);
+    }
+    // no NALu found
+    if (units.length === 0) {
+      // append pes.data to previous NAL unit
+      const lastUnit = this.getLastNalUnit(track.samples);
+      if (lastUnit) {
+        lastUnit.data = appendUint8Array(lastUnit.data, array);
+      }
+    }
+    track.naluState = state;
+    return units;
+  }
+}
+
+/**
+ * SAMPLE-AES decrypter
+ */
+
+class SampleAesDecrypter {
+  constructor(observer, config, keyData) {
+    this.keyData = void 0;
+    this.decrypter = void 0;
+    this.keyData = keyData;
+    this.decrypter = new Decrypter(config, {
+      removePKCS7Padding: false
+    });
+  }
+  decryptBuffer(encryptedData) {
+    return this.decrypter.decrypt(encryptedData, this.keyData.key.buffer, this.keyData.iv.buffer);
+  }
+
+  // AAC - encrypt all full 16 bytes blocks starting from offset 16
+  decryptAacSample(samples, sampleIndex, callback) {
+    const curUnit = samples[sampleIndex].unit;
+    if (curUnit.length <= 16) {
+      // No encrypted portion in this sample (first 16 bytes is not
+      // encrypted, see https://developer.apple.com/library/archive/documentation/AudioVideo/Conceptual/HLS_Sample_Encryption/Encryption/Encryption.html),
+      return;
+    }
+    const encryptedData = curUnit.subarray(16, curUnit.length - curUnit.length % 16);
+    const encryptedBuffer = encryptedData.buffer.slice(encryptedData.byteOffset, encryptedData.byteOffset + encryptedData.length);
+    this.decryptBuffer(encryptedBuffer).then(decryptedBuffer => {
+      const decryptedData = new Uint8Array(decryptedBuffer);
+      curUnit.set(decryptedData, 16);
+      if (!this.decrypter.isSync()) {
+        this.decryptAacSamples(samples, sampleIndex + 1, callback);
+      }
+    });
+  }
+  decryptAacSamples(samples, sampleIndex, callback) {
+    for (;; sampleIndex++) {
+      if (sampleIndex >= samples.length) {
+        callback();
+        return;
+      }
+      if (samples[sampleIndex].unit.length < 32) {
+        continue;
+      }
+      this.decryptAacSample(samples, sampleIndex, callback);
+      if (!this.decrypter.isSync()) {
+        return;
+      }
+    }
+  }
+
+  // AVC - encrypt one 16 bytes block out of ten, starting from offset 32
+  getAvcEncryptedData(decodedData) {
+    const encryptedDataLen = Math.floor((decodedData.length - 48) / 160) * 16 + 16;
+    const encryptedData = new Int8Array(encryptedDataLen);
+    let outputPos = 0;
+    for (let inputPos = 32; inputPos < decodedData.length - 16; inputPos += 160, outputPos += 16) {
+      encryptedData.set(decodedData.subarray(inputPos, inputPos + 16), outputPos);
+    }
+    return encryptedData;
+  }
+  getAvcDecryptedUnit(decodedData, decryptedData) {
     const uint8DecryptedData = new Uint8Array(decryptedData);
     let inputPos = 0;
     for (let outputPos = 32; outputPos < decodedData.length - 16; outputPos += 160, inputPos += 16) {
@@ -10830,16 +12003,17 @@ class TSDemuxer {
     this.videoCodec = void 0;
     this._duration = 0;
     this._pmtId = -1;
-    this._avcTrack = void 0;
+    this._videoTrack = void 0;
     this._audioTrack = void 0;
     this._id3Track = void 0;
     this._txtTrack = void 0;
     this.aacOverFlow = null;
-    this.avcSample = null;
     this.remainderData = null;
+    this.videoParser = void 0;
     this.observer = observer;
     this.config = config;
     this.typeSupported = typeSupported;
+    this.videoParser = new AvcVideoParser();
   }
   static probe(data) {
     const syncOffset = TSDemuxer.syncOffset(data);
@@ -10850,7 +12024,7 @@ class TSDemuxer {
   }
   static syncOffset(data) {
     const length = data.length;
-    let scanwindow = Math.min(PACKET_LENGTH * 5, data.length - PACKET_LENGTH) + 1;
+    let scanwindow = Math.min(PACKET_LENGTH * 5, length - PACKET_LENGTH) + 1;
     let i = 0;
     while (i < scanwindow) {
       // a TS init segment should contain at least 2 TS packets: PAT and PMT, each starting with 0x47
@@ -10858,7 +12032,7 @@ class TSDemuxer {
       let packetStart = -1;
       let tsPackets = 0;
       for (let j = i; j < length; j += PACKET_LENGTH) {
-        if (data[j] === 0x47) {
+        if (data[j] === 0x47 && (length - j === PACKET_LENGTH || data[j + PACKET_LENGTH] === 0x47)) {
           tsPackets++;
           if (packetStart === -1) {
             packetStart = j;
@@ -10875,7 +12049,7 @@ class TSDemuxer {
             return packetStart;
           }
         } else if (tsPackets) {
-          // Exit if sync word found, but does not contain contiguous packets (#5501)
+          // Exit if sync word found, but does not contain contiguous packets
           return -1;
         } else {
           break;
@@ -10910,7 +12084,7 @@ class TSDemuxer {
   resetInitSegment(initSegment, audioCodec, videoCodec, trackDuration) {
     this.pmtParsed = false;
     this._pmtId = -1;
-    this._avcTrack = TSDemuxer.createTrack('video');
+    this._videoTrack = TSDemuxer.createTrack('video');
     this._audioTrack = TSDemuxer.createTrack('audio', trackDuration);
     this._id3Track = TSDemuxer.createTrack('id3');
     this._txtTrack = TSDemuxer.createTrack('text');
@@ -10918,7 +12092,6 @@ class TSDemuxer {
 
     // flush any partial content
     this.aacOverFlow = null;
-    this.avcSample = null;
     this.remainderData = null;
     this.audioCodec = audioCodec;
     this.videoCodec = videoCodec;
@@ -10928,20 +12101,19 @@ class TSDemuxer {
   resetContiguity() {
     const {
       _audioTrack,
-      _avcTrack,
+      _videoTrack,
       _id3Track
     } = this;
     if (_audioTrack) {
       _audioTrack.pesData = null;
     }
-    if (_avcTrack) {
-      _avcTrack.pesData = null;
+    if (_videoTrack) {
+      _videoTrack.pesData = null;
     }
     if (_id3Track) {
       _id3Track.pesData = null;
     }
     this.aacOverFlow = null;
-    this.avcSample = null;
     this.remainderData = null;
   }
   demux(data, timeOffset, isSampleAes = false, flush = false) {
@@ -10949,14 +12121,14 @@ class TSDemuxer {
       this.sampleAes = null;
     }
     let pes;
-    const videoTrack = this._avcTrack;
+    const videoTrack = this._videoTrack;
     const audioTrack = this._audioTrack;
     const id3Track = this._id3Track;
     const textTrack = this._txtTrack;
-    let avcId = videoTrack.pid;
-    let avcData = videoTrack.pesData;
-    let audioId = audioTrack.pid;
-    let id3Id = id3Track.pid;
+    let videoPid = videoTrack.pid;
+    let videoData = videoTrack.pesData;
+    let audioPid = audioTrack.pid;
+    let id3Pid = id3Track.pid;
     let audioData = audioTrack.pesData;
     let id3Data = id3Track.pesData;
     let unknownPID = null;
@@ -11003,22 +12175,22 @@ class TSDemuxer {
           offset = start + 4;
         }
         switch (pid) {
-          case avcId:
+          case videoPid:
             if (stt) {
-              if (avcData && (pes = parsePES(avcData))) {
-                this.parseAVCPES(videoTrack, textTrack, pes, false);
+              if (videoData && (pes = parsePES(videoData))) {
+                this.videoParser.parseAVCPES(videoTrack, textTrack, pes, false, this._duration);
               }
-              avcData = {
+              videoData = {
                 data: [],
                 size: 0
               };
             }
-            if (avcData) {
-              avcData.data.push(data.subarray(offset, start + PACKET_LENGTH));
-              avcData.size += start + PACKET_LENGTH - offset;
+            if (videoData) {
+              videoData.data.push(data.subarray(offset, start + PACKET_LENGTH));
+              videoData.size += start + PACKET_LENGTH - offset;
             }
             break;
-          case audioId:
+          case audioPid:
             if (stt) {
               if (audioData && (pes = parsePES(audioData))) {
                 switch (audioTrack.segmentCodec) {
@@ -11028,6 +12200,11 @@ class TSDemuxer {
                   case 'mp3':
                     this.parseMPEGPES(audioTrack, pes);
                     break;
+                  case 'ac3':
+                    {
+                      this.parseAC3PES(audioTrack, pes);
+                    }
+                    break;
                 }
               }
               audioData = {
@@ -11040,7 +12217,7 @@ class TSDemuxer {
               audioData.size += start + PACKET_LENGTH - offset;
             }
             break;
-          case id3Id:
+          case id3Pid:
             if (stt) {
               if (id3Data && (pes = parsePES(id3Data))) {
                 this.parseID3PES(id3Track, pes);
@@ -11075,18 +12252,19 @@ class TSDemuxer {
               // this could happen in case of transient missing audio samples for example
               // NOTE this is only the PID of the track as found in TS,
               // but we are not using this for MP4 track IDs.
-              avcId = parsedPIDs.avc;
-              if (avcId > 0) {
-                videoTrack.pid = avcId;
+              videoPid = parsedPIDs.videoPid;
+              if (videoPid > 0) {
+                videoTrack.pid = videoPid;
+                videoTrack.segmentCodec = parsedPIDs.segmentVideoCodec;
               }
-              audioId = parsedPIDs.audio;
-              if (audioId > 0) {
-                audioTrack.pid = audioId;
-                audioTrack.segmentCodec = parsedPIDs.segmentCodec;
+              audioPid = parsedPIDs.audioPid;
+              if (audioPid > 0) {
+                audioTrack.pid = audioPid;
+                audioTrack.segmentCodec = parsedPIDs.segmentAudioCodec;
               }
-              id3Id = parsedPIDs.id3;
-              if (id3Id > 0) {
-                id3Track.pid = id3Id;
+              id3Pid = parsedPIDs.id3Pid;
+              if (id3Pid > 0) {
+                id3Track.pid = id3Pid;
               }
               if (unknownPID !== null && !pmtParsed) {
                 logger.warn(`MPEG-TS PMT found at ${start} after unknown PID '${unknownPID}'. Backtracking to sync byte @${syncOffset} to parse all TS packets.`);
@@ -11118,7 +12296,7 @@ class TSDemuxer {
         reason: error.message
       });
     }
-    videoTrack.pesData = avcData;
+    videoTrack.pesData = videoData;
     audioTrack.pesData = audioData;
     id3Track.pesData = id3Data;
     const demuxResult = {
@@ -11142,7 +12320,7 @@ class TSDemuxer {
       result = this.demux(remainderData, -1, false, true);
     } else {
       result = {
-        videoTrack: this._avcTrack,
+        videoTrack: this._videoTrack,
         audioTrack: this._audioTrack,
         id3Track: this._id3Track,
         textTrack: this._txtTrack
@@ -11161,17 +12339,17 @@ class TSDemuxer {
       id3Track,
       textTrack
     } = demuxResult;
-    const avcData = videoTrack.pesData;
+    const videoData = videoTrack.pesData;
     const audioData = audioTrack.pesData;
     const id3Data = id3Track.pesData;
     // try to parse last PES packets
     let pes;
-    if (avcData && (pes = parsePES(avcData))) {
-      this.parseAVCPES(videoTrack, textTrack, pes, true);
+    if (videoData && (pes = parsePES(videoData))) {
+      this.videoParser.parseAVCPES(videoTrack, textTrack, pes, true, this._duration);
       videoTrack.pesData = null;
     } else {
       // either avcData null or PES truncated, keep it for next frag parsing
-      videoTrack.pesData = avcData;
+      videoTrack.pesData = videoData;
     }
     if (audioData && (pes = parsePES(audioData))) {
       switch (audioTrack.segmentCodec) {
@@ -11181,6 +12359,11 @@ class TSDemuxer {
         case 'mp3':
           this.parseMPEGPES(audioTrack, pes);
           break;
+        case 'ac3':
+          {
+            this.parseAC3PES(audioTrack, pes);
+          }
+          break;
       }
       audioTrack.pesData = null;
     } else {
@@ -11230,294 +12413,30 @@ class TSDemuxer {
   destroy() {
     this._duration = 0;
   }
-  parseAVCPES(track, textTrack, pes, last) {
-    const units = this.parseAVCNALu(track, pes.data);
-    let avcSample = this.avcSample;
-    let push;
-    let spsfound = false;
-    // free pes.data to save up some memory
-    pes.data = null;
-
-    // if new NAL units found and last sample still there, let's push ...
-    // this helps parsing streams with missing AUD (only do this if AUD never found)
-    if (avcSample && units.length && !track.audFound) {
-      pushAccessUnit(avcSample, track);
-      avcSample = this.avcSample = createAVCSample(false, pes.pts, pes.dts, '');
-    }
-    units.forEach(unit => {
-      var _avcSample2;
-      switch (unit.type) {
-        // NDR
-        case 1:
-          {
-            let iskey = false;
-            push = true;
-            const data = unit.data;
-            // only check slice type to detect KF in case SPS found in same packet (any keyframe is preceded by SPS ...)
-            if (spsfound && data.length > 4) {
-              // retrieve slice type by parsing beginning of NAL unit (follow H264 spec, slice_header definition) to detect keyframe embedded in NDR
-              const sliceType = new ExpGolomb(data).readSliceType();
-              // 2 : I slice, 4 : SI slice, 7 : I slice, 9: SI slice
-              // SI slice : A slice that is coded using intra prediction only and using quantisation of the prediction samples.
-              // An SI slice can be coded such that its decoded samples can be constructed identically to an SP slice.
-              // I slice: A slice that is not an SI slice that is decoded using intra prediction only.
-              // if (sliceType === 2 || sliceType === 7) {
-              if (sliceType === 2 || sliceType === 4 || sliceType === 7 || sliceType === 9) {
-                iskey = true;
-              }
-            }
-            if (iskey) {
-              var _avcSample;
-              // if we have non-keyframe data already, that cannot belong to the same frame as a keyframe, so force a push
-              if ((_avcSample = avcSample) != null && _avcSample.frame && !avcSample.key) {
-                pushAccessUnit(avcSample, track);
-                avcSample = this.avcSample = null;
-              }
-            }
-            if (!avcSample) {
-              avcSample = this.avcSample = createAVCSample(true, pes.pts, pes.dts, '');
-            }
-            avcSample.frame = true;
-            avcSample.key = iskey;
-            break;
-            // IDR
-          }
-
-        case 5:
-          push = true;
-          // handle PES not starting with AUD
-          // if we have non-keyframe data already, that cannot belong to the same frame as a keyframe, so force a push
-          if ((_avcSample2 = avcSample) != null && _avcSample2.frame && !avcSample.key) {
-            pushAccessUnit(avcSample, track);
-            avcSample = this.avcSample = null;
-          }
-          if (!avcSample) {
-            avcSample = this.avcSample = createAVCSample(true, pes.pts, pes.dts, '');
-          }
-          avcSample.key = true;
-          avcSample.frame = true;
-          break;
-        // SEI
-        case 6:
-          {
-            push = true;
-            parseSEIMessageFromNALu(unit.data, 1, pes.pts, textTrack.samples);
-            break;
-            // SPS
-          }
-
-        case 7:
-          push = true;
-          spsfound = true;
-          if (!track.sps) {
-            const sps = unit.data;
-            const expGolombDecoder = new ExpGolomb(sps);
-            const config = expGolombDecoder.readSPS();
-            track.width = config.width;
-            track.height = config.height;
-            track.pixelRatio = config.pixelRatio;
-            track.sps = [sps];
-            track.duration = this._duration;
-            const codecarray = sps.subarray(1, 4);
-            let codecstring = 'avc1.';
-            for (let i = 0; i < 3; i++) {
-              let h = codecarray[i].toString(16);
-              if (h.length < 2) {
-                h = '0' + h;
-              }
-              codecstring += h;
-            }
-            track.codec = codecstring;
-          }
-          break;
-        // PPS
-        case 8:
-          push = true;
-          if (!track.pps) {
-            track.pps = [unit.data];
-          }
-          break;
-        // AUD
-        case 9:
-          push = false;
-          track.audFound = true;
-          if (avcSample) {
-            pushAccessUnit(avcSample, track);
-          }
-          avcSample = this.avcSample = createAVCSample(false, pes.pts, pes.dts, '');
-          break;
-        // Filler Data
-        case 12:
-          push = true;
-          break;
-        default:
-          push = false;
-          if (avcSample) {
-            avcSample.debug += 'unknown NAL ' + unit.type + ' ';
-          }
-          break;
+  parseAACPES(track, pes) {
+    let startOffset = 0;
+    const aacOverFlow = this.aacOverFlow;
+    let data = pes.data;
+    if (aacOverFlow) {
+      this.aacOverFlow = null;
+      const frameMissingBytes = aacOverFlow.missing;
+      const sampleLength = aacOverFlow.sample.unit.byteLength;
+      // logger.log(`AAC: append overflowing ${sampleLength} bytes to beginning of new PES`);
+      if (frameMissingBytes === -1) {
+        data = appendUint8Array(aacOverFlow.sample.unit, data);
+      } else {
+        const frameOverflowBytes = sampleLength - frameMissingBytes;
+        aacOverFlow.sample.unit.set(data.subarray(0, frameMissingBytes), frameOverflowBytes);
+        track.samples.push(aacOverFlow.sample);
+        startOffset = aacOverFlow.missing;
       }
-      if (avcSample && push) {
-        const units = avcSample.units;
-        units.push(unit);
-      }
-    });
-    // if last PES packet, push samples
-    if (last && avcSample) {
-      pushAccessUnit(avcSample, track);
-      this.avcSample = null;
-    }
-  }
-  getLastNalUnit(samples) {
-    var _avcSample3;
-    let avcSample = this.avcSample;
-    let lastUnit;
-    // try to fallback to previous sample if current one is empty
-    if (!avcSample || avcSample.units.length === 0) {
-      avcSample = samples[samples.length - 1];
-    }
-    if ((_avcSample3 = avcSample) != null && _avcSample3.units) {
-      const units = avcSample.units;
-      lastUnit = units[units.length - 1];
-    }
-    return lastUnit;
-  }
-  parseAVCNALu(track, array) {
-    const len = array.byteLength;
-    let state = track.naluState || 0;
-    const lastState = state;
-    const units = [];
-    let i = 0;
-    let value;
-    let overflow;
-    let unitType;
-    let lastUnitStart = -1;
-    let lastUnitType = 0;
-    // logger.log('PES:' + Hex.hexDump(array));
-
-    if (state === -1) {
-      // special use case where we found 3 or 4-byte start codes exactly at the end of previous PES packet
-      lastUnitStart = 0;
-      // NALu type is value read from offset 0
-      lastUnitType = array[0] & 0x1f;
-      state = 0;
-      i = 1;
-    }
-    while (i < len) {
-      value = array[i++];
-      // optimization. state 0 and 1 are the predominant case. let's handle them outside of the switch/case
-      if (!state) {
-        state = value ? 0 : 1;
-        continue;
-      }
-      if (state === 1) {
-        state = value ? 0 : 2;
-        continue;
-      }
-      // here we have state either equal to 2 or 3
-      if (!value) {
-        state = 3;
-      } else if (value === 1) {
-        if (lastUnitStart >= 0) {
-          const unit = {
-            data: array.subarray(lastUnitStart, i - state - 1),
-            type: lastUnitType
-          };
-          // logger.log('pushing NALU, type/size:' + unit.type + '/' + unit.data.byteLength);
-          units.push(unit);
-        } else {
-          // lastUnitStart is undefined => this is the first start code found in this PES packet
-          // first check if start code delimiter is overlapping between 2 PES packets,
-          // ie it started in last packet (lastState not zero)
-          // and ended at the beginning of this PES packet (i <= 4 - lastState)
-          const lastUnit = this.getLastNalUnit(track.samples);
-          if (lastUnit) {
-            if (lastState && i <= 4 - lastState) {
-              // start delimiter overlapping between PES packets
-              // strip start delimiter bytes from the end of last NAL unit
-              // check if lastUnit had a state different from zero
-              if (lastUnit.state) {
-                // strip last bytes
-                lastUnit.data = lastUnit.data.subarray(0, lastUnit.data.byteLength - lastState);
-              }
-            }
-            // If NAL units are not starting right at the beginning of the PES packet, push preceding data into previous NAL unit.
-            overflow = i - state - 1;
-            if (overflow > 0) {
-              // logger.log('first NALU found with overflow:' + overflow);
-              const tmp = new Uint8Array(lastUnit.data.byteLength + overflow);
-              tmp.set(lastUnit.data, 0);
-              tmp.set(array.subarray(0, overflow), lastUnit.data.byteLength);
-              lastUnit.data = tmp;
-              lastUnit.state = 0;
-            }
-          }
-        }
-        // check if we can read unit type
-        if (i < len) {
-          unitType = array[i] & 0x1f;
-          // logger.log('find NALU @ offset:' + i + ',type:' + unitType);
-          lastUnitStart = i;
-          lastUnitType = unitType;
-          state = 0;
-        } else {
-          // not enough byte to read unit type. let's read it on next PES parsing
-          state = -1;
-        }
-      } else {
-        state = 0;
-      }
-    }
-    if (lastUnitStart >= 0 && state >= 0) {
-      const unit = {
-        data: array.subarray(lastUnitStart, len),
-        type: lastUnitType,
-        state: state
-      };
-      units.push(unit);
-      // logger.log('pushing NALU, type/size/state:' + unit.type + '/' + unit.data.byteLength + '/' + state);
-    }
-    // no NALu found
-    if (units.length === 0) {
-      // append pes.data to previous NAL unit
-      const lastUnit = this.getLastNalUnit(track.samples);
-      if (lastUnit) {
-        const tmp = new Uint8Array(lastUnit.data.byteLength + array.byteLength);
-        tmp.set(lastUnit.data, 0);
-        tmp.set(array, lastUnit.data.byteLength);
-        lastUnit.data = tmp;
-      }
-    }
-    track.naluState = state;
-    return units;
-  }
-  parseAACPES(track, pes) {
-    let startOffset = 0;
-    const aacOverFlow = this.aacOverFlow;
-    let data = pes.data;
-    if (aacOverFlow) {
-      this.aacOverFlow = null;
-      const frameMissingBytes = aacOverFlow.missing;
-      const sampleLength = aacOverFlow.sample.unit.byteLength;
-      // logger.log(`AAC: append overflowing ${sampleLength} bytes to beginning of new PES`);
-      if (frameMissingBytes === -1) {
-        const tmp = new Uint8Array(sampleLength + data.byteLength);
-        tmp.set(aacOverFlow.sample.unit, 0);
-        tmp.set(data, sampleLength);
-        data = tmp;
-      } else {
-        const frameOverflowBytes = sampleLength - frameMissingBytes;
-        aacOverFlow.sample.unit.set(data.subarray(0, frameMissingBytes), frameOverflowBytes);
-        track.samples.push(aacOverFlow.sample);
-        startOffset = aacOverFlow.missing;
-      }
-    }
-    // look for ADTS header (0xFFFx)
-    let offset;
-    let len;
-    for (offset = startOffset, len = data.length; offset < len - 1; offset++) {
-      if (isHeader$1(data, offset)) {
-        break;
+    }
+    // look for ADTS header (0xFFFx)
+    let offset;
+    let len;
+    for (offset = startOffset, len = data.length; offset < len - 1; offset++) {
+      if (isHeader$1(data, offset)) {
+        break;
       }
     }
     // if ADTS header does not start straight from the beginning of the PES payload, raise an error
@@ -11561,7 +12480,7 @@ class TSDemuxer {
     let frameIndex = 0;
     let frame;
     while (offset < len) {
-      frame = appendFrame$1(track, data, offset, pts, frameIndex);
+      frame = appendFrame$2(track, data, offset, pts, frameIndex);
       offset += frame.length;
       if (!frame.missing) {
         frameIndex++;
@@ -11588,7 +12507,7 @@ class TSDemuxer {
     }
     while (offset < length) {
       if (isHeader(data, offset)) {
-        const frame = appendFrame(track, data, offset, pts, frameIndex);
+        const frame = appendFrame$1(track, data, offset, pts, frameIndex);
         if (frame) {
           offset += frame.length;
           frameIndex++;
@@ -11602,29 +12521,35 @@ class TSDemuxer {
       }
     }
   }
+  parseAC3PES(track, pes) {
+    {
+      const data = pes.data;
+      const pts = pes.pts;
+      if (pts === undefined) {
+        logger.warn('[tsdemuxer]: AC3 PES unknown PTS');
+        return;
+      }
+      const length = data.length;
+      let frameIndex = 0;
+      let offset = 0;
+      let parsed;
+      while (offset < length && (parsed = appendFrame(track, data, offset, pts, frameIndex++)) > 0) {
+        offset += parsed;
+      }
+    }
+  }
   parseID3PES(id3Track, pes) {
     if (pes.pts === undefined) {
       logger.warn('[tsdemuxer]: ID3 PES unknown PTS');
       return;
     }
     const id3Sample = _extends({}, pes, {
-      type: this._avcTrack ? MetadataSchema.emsg : MetadataSchema.audioId3,
+      type: this._videoTrack ? MetadataSchema.emsg : MetadataSchema.audioId3,
       duration: Number.POSITIVE_INFINITY
     });
     id3Track.samples.push(id3Sample);
   }
 }
-function createAVCSample(key, pts, dts, debug) {
-  return {
-    key,
-    frame: false,
-    pts,
-    dts,
-    units: [],
-    debug,
-    length: 0
-  };
-}
 function parsePID(data, offset) {
   // pid is a 13-bit field starting at the last bit of TS[1]
   return ((data[offset + 1] & 0x1f) << 8) + data[offset + 2];
@@ -11635,10 +12560,11 @@ function parsePAT(data, offset) {
 }
 function parsePMT(data, offset, typeSupported, isSampleAes) {
   const result = {
-    audio: -1,
-    avc: -1,
-    id3: -1,
-    segmentCodec: 'aac'
+    audioPid: -1,
+    videoPid: -1,
+    id3Pid: -1,
+    segmentVideoCodec: 'avc',
+    segmentAudioCodec: 'aac'
   };
   const sectionLength = (data[offset + 1] & 0x0f) << 8 | data[offset + 2];
   const tableEnd = offset + 3 + sectionLength - 4;
@@ -11649,41 +12575,43 @@ function parsePMT(data, offset, typeSupported, isSampleAes) {
   offset += 12 + programInfoLength;
   while (offset < tableEnd) {
     const pid = parsePID(data, offset);
+    const esInfoLength = (data[offset + 3] & 0x0f) << 8 | data[offset + 4];
     switch (data[offset]) {
       case 0xcf:
         // SAMPLE-AES AAC
         if (!isSampleAes) {
-          logger.log('ADTS AAC with AES-128-CBC frame encryption found in unencrypted stream');
+          logEncryptedSamplesFoundInUnencryptedStream('ADTS AAC');
           break;
         }
       /* falls through */
       case 0x0f:
         // ISO/IEC 13818-7 ADTS AAC (MPEG-2 lower bit-rate audio)
         // logger.log('AAC PID:'  + pid);
-        if (result.audio === -1) {
-          result.audio = pid;
+        if (result.audioPid === -1) {
+          result.audioPid = pid;
         }
         break;
 
       // Packetized metadata (ID3)
       case 0x15:
         // logger.log('ID3 PID:'  + pid);
-        if (result.id3 === -1) {
-          result.id3 = pid;
+        if (result.id3Pid === -1) {
+          result.id3Pid = pid;
         }
         break;
       case 0xdb:
         // SAMPLE-AES AVC
         if (!isSampleAes) {
-          logger.log('H.264 with AES-128-CBC slice encryption found in unencrypted stream');
+          logEncryptedSamplesFoundInUnencryptedStream('H.264');
           break;
         }
       /* falls through */
       case 0x1b:
         // ITU-T Rec. H.264 and ISO/IEC 14496-10 (lower bit-rate video)
         // logger.log('AVC PID:'  + pid);
-        if (result.avc === -1) {
-          result.avc = pid;
+        if (result.videoPid === -1) {
+          result.videoPid = pid;
+          result.segmentVideoCodec = 'avc';
         }
         break;
 
@@ -11692,23 +12620,77 @@ function parsePMT(data, offset, typeSupported, isSampleAes) {
       case 0x03:
       case 0x04:
         // logger.log('MPEG PID:'  + pid);
-        if (typeSupported.mpeg !== true && typeSupported.mp3 !== true) {
+        if (!typeSupported.mpeg && !typeSupported.mp3) {
           logger.log('MPEG audio found, not supported in this browser');
-        } else if (result.audio === -1) {
-          result.audio = pid;
-          result.segmentCodec = 'mp3';
+        } else if (result.audioPid === -1) {
+          result.audioPid = pid;
+          result.segmentAudioCodec = 'mp3';
+        }
+        break;
+      case 0xc1:
+        // SAMPLE-AES AC3
+        if (!isSampleAes) {
+          logEncryptedSamplesFoundInUnencryptedStream('AC-3');
+          break;
+        }
+      /* falls through */
+      case 0x81:
+        {
+          if (!typeSupported.ac3) {
+            logger.log('AC-3 audio found, not supported in this browser');
+          } else if (result.audioPid === -1) {
+            result.audioPid = pid;
+            result.segmentAudioCodec = 'ac3';
+          }
+        }
+        break;
+      case 0x06:
+        // stream_type 6 can mean a lot of different things in case of DVB.
+        // We need to look at the descriptors. Right now, we're only interested
+        // in AC-3 audio, so we do the descriptor parsing only when we don't have
+        // an audio PID yet.
+        if (result.audioPid === -1 && esInfoLength > 0) {
+          let parsePos = offset + 5;
+          let remaining = esInfoLength;
+          while (remaining > 2) {
+            const descriptorId = data[parsePos];
+            switch (descriptorId) {
+              case 0x6a:
+                // DVB Descriptor for AC-3
+                {
+                  if (typeSupported.ac3 !== true) {
+                    logger.log('AC-3 audio found, not supported in this browser for now');
+                  } else {
+                    result.audioPid = pid;
+                    result.segmentAudioCodec = 'ac3';
+                  }
+                }
+                break;
+            }
+            const descriptorLen = data[parsePos + 1] + 2;
+            parsePos += descriptorLen;
+            remaining -= descriptorLen;
+          }
         }
         break;
+      case 0xc2: // SAMPLE-AES EC3
+      /* falls through */
+      case 0x87:
+        logger.warn('Unsupported EC-3 in M2TS found');
+        break;
       case 0x24:
-        logger.warn('Unsupported HEVC stream type found');
+        logger.warn('Unsupported HEVC in M2TS found');
         break;
     }
     // move to the next table entry
     // skip past the elementary stream descriptors, if present
-    offset += ((data[offset + 3] & 0x0f) << 8 | data[offset + 4]) + 5;
+    offset += esInfoLength + 5;
   }
   return result;
 }
+function logEncryptedSamplesFoundInUnencryptedStream(type) {
+  logger.log(`${type} with AES-128-CBC encryption found in unencrypted stream`);
+}
 function parsePES(stream) {
   let i = 0;
   let frag;
@@ -11726,10 +12708,7 @@ function parsePES(stream) {
   // if first chunk of data is less than 19 bytes, let's merge it with following ones until we get 19 bytes
   // usually only one merge is needed (and this is rare ...)
   while (data[0].length < 19 && data.length > 1) {
-    const newData = new Uint8Array(data[0].length + data[1].length);
-    newData.set(data[0]);
-    newData.set(data[1], data[0].length);
-    data[0] = newData;
+    data[0] = appendUint8Array(data[0], data[1]);
     data.splice(1, 1);
   }
   // retrieve PTS/DTS from first fragment
@@ -11814,28 +12793,6 @@ function parsePES(stream) {
   }
   return null;
 }
-function pushAccessUnit(avcSample, avcTrack) {
-  if (avcSample.units.length && avcSample.frame) {
-    // if sample does not have PTS/DTS, patch with last sample PTS/DTS
-    if (avcSample.pts === undefined) {
-      const samples = avcTrack.samples;
-      const nbSamples = samples.length;
-      if (nbSamples) {
-        const lastSample = samples[nbSamples - 1];
-        avcSample.pts = lastSample.pts;
-        avcSample.dts = lastSample.dts;
-      } else {
-        // dropping samples, no timestamp found
-        avcTrack.dropped++;
-        return;
-      }
-    }
-    avcTrack.samples.push(avcSample);
-  }
-  if (avcSample.debug.length) {
-    logger.log(avcSample.pts + '/' + avcSample.dts + ':' + avcSample.debug);
-  }
-}
 
 /**
  * MP3 demuxer
@@ -11866,8 +12823,15 @@ class MP3Demuxer extends BaseAudioDemuxer {
     // Look for MPEG header | 1111 1111 | 111X XYZX | where X can be either 0 or 1 and Y or Z should be 1
     // Layer bits (position 14 and 15) in header should be always different from 0 (Layer I or Layer II or Layer III)
     // More info http://www.mp3-tech.org/programmer/frame_header.html
-    const id3Data = getID3Data(data, 0) || [];
-    let offset = id3Data.length;
+    const id3Data = getID3Data(data, 0);
+    let offset = (id3Data == null ? void 0 : id3Data.length) || 0;
+
+    // Check for ac-3|ec-3 sync bytes and return false if present
+    if (id3Data && data[offset] === 0x0b && data[offset + 1] === 0x77 && getTimeStamp(id3Data) !== undefined &&
+    // check the bsid to confirm ac-3 or ec-3 (not mp3)
+    getAudioBSID(data, offset) <= 16) {
+      return false;
+    }
     for (let length = data.length; offset < length; offset++) {
       if (probe(data, offset)) {
         logger.log('MPEG Audio sync word found !');
@@ -11883,7 +12847,7 @@ class MP3Demuxer extends BaseAudioDemuxer {
     if (this.basePTS === null) {
       return;
     }
-    return appendFrame(track, data, offset, this.basePTS, this.frameIndex);
+    return appendFrame$1(track, data, offset, this.basePTS, this.frameIndex);
   }
 }
 
@@ -11953,6 +12917,8 @@ class MP4 {
       moov: [],
       mp4a: [],
       '.mp3': [],
+      dac3: [],
+      'ac-3': [],
       mvex: [],
       mvhd: [],
       pasp: [],
@@ -11995,7 +12961,6 @@ class MP4 {
     // reserved
     0x56, 0x69, 0x64, 0x65, 0x6f, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x00 // name: 'VideoHandler'
     ]);
-
     const audioHdlr = new Uint8Array([0x00,
     // version 0
     0x00, 0x00, 0x00,
@@ -12012,7 +12977,6 @@ class MP4 {
     // reserved
     0x53, 0x6f, 0x75, 0x6e, 0x64, 0x48, 0x61, 0x6e, 0x64, 0x6c, 0x65, 0x72, 0x00 // name: 'SoundHandler'
     ]);
-
     MP4.HDLR_TYPES = {
       video: videoHdlr,
       audio: audioHdlr
@@ -12031,14 +12995,12 @@ class MP4 {
     // version 0
     0x00, 0x00, 0x01 // entry_flags
     ]);
-
     const stco = new Uint8Array([0x00,
     // version
     0x00, 0x00, 0x00,
     // flags
     0x00, 0x00, 0x00, 0x00 // entry_count
     ]);
-
     MP4.STTS = MP4.STSC = MP4.STCO = stco;
     MP4.STSZ = new Uint8Array([0x00,
     // version
@@ -12048,7 +13010,6 @@ class MP4 {
     // sample_size
     0x00, 0x00, 0x00, 0x00 // sample_count
     ]);
-
     MP4.VMHD = new Uint8Array([0x00,
     // version
     0x00, 0x00, 0x01,
@@ -12057,7 +13018,6 @@ class MP4 {
     // graphicsmode
     0x00, 0x00, 0x00, 0x00, 0x00, 0x00 // opcolor
     ]);
-
     MP4.SMHD = new Uint8Array([0x00,
     // version
     0x00, 0x00, 0x00,
@@ -12066,7 +13026,6 @@ class MP4 {
     // balance
     0x00, 0x00 // reserved
     ]);
-
     MP4.STSD = new Uint8Array([0x00,
     // version 0
     0x00, 0x00, 0x00,
@@ -12134,7 +13093,6 @@ class MP4 {
     sequenceNumber >> 24, sequenceNumber >> 16 & 0xff, sequenceNumber >> 8 & 0xff, sequenceNumber & 0xff // sequence_number
     ]));
   }
-
   static minf(track) {
     if (track.type === 'audio') {
       return MP4.box(MP4.types.minf, MP4.box(MP4.types.smhd, MP4.SMHD), MP4.DINF, MP4.stbl(track));
@@ -12191,7 +13149,6 @@ class MP4 {
     // pre_defined
     0xff, 0xff, 0xff, 0xff // next_track_ID
     ]);
-
     return MP4.box(MP4.types.mvhd, bytes);
   }
   static sdtp(track) {
@@ -12331,10 +13288,9 @@ class MP4 {
     0x05 // descriptor_type
     ].concat([configlen]).concat(track.config).concat([0x06, 0x01, 0x02])); // GASpecificConfig)); // length + audio config descriptor
   }
-
-  static mp4a(track) {
+  static audioStsd(track) {
     const samplerate = track.samplerate;
-    return MP4.box(MP4.types.mp4a, new Uint8Array([0x00, 0x00, 0x00,
+    return new Uint8Array([0x00, 0x00, 0x00,
     // reserved
     0x00, 0x00, 0x00,
     // reserved
@@ -12350,33 +13306,25 @@ class MP4 {
     // reserved2
     samplerate >> 8 & 0xff, samplerate & 0xff,
     //
-    0x00, 0x00]), MP4.box(MP4.types.esds, MP4.esds(track)));
+    0x00, 0x00]);
+  }
+  static mp4a(track) {
+    return MP4.box(MP4.types.mp4a, MP4.audioStsd(track), MP4.box(MP4.types.esds, MP4.esds(track)));
   }
   static mp3(track) {
-    const samplerate = track.samplerate;
-    return MP4.box(MP4.types['.mp3'], new Uint8Array([0x00, 0x00, 0x00,
-    // reserved
-    0x00, 0x00, 0x00,
-    // reserved
-    0x00, 0x01,
-    // data_reference_index
-    0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
-    // reserved
-    0x00, track.channelCount,
-    // channelcount
-    0x00, 0x10,
-    // sampleSize:16bits
-    0x00, 0x00, 0x00, 0x00,
-    // reserved2
-    samplerate >> 8 & 0xff, samplerate & 0xff,
-    //
-    0x00, 0x00]));
+    return MP4.box(MP4.types['.mp3'], MP4.audioStsd(track));
+  }
+  static ac3(track) {
+    return MP4.box(MP4.types['ac-3'], MP4.audioStsd(track), MP4.box(MP4.types.dac3, track.config));
   }
   static stsd(track) {
     if (track.type === 'audio') {
       if (track.segmentCodec === 'mp3' && track.codec === 'mp3') {
         return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp3(track));
       }
+      if (track.segmentCodec === 'ac3') {
+        return MP4.box(MP4.types.stsd, MP4.STSD, MP4.ac3(track));
+      }
       return MP4.box(MP4.types.stsd, MP4.STSD, MP4.mp4a(track));
     } else {
       return MP4.box(MP4.types.stsd, MP4.STSD, MP4.avc1(track));
@@ -12418,7 +13366,6 @@ class MP4 {
     height >> 8 & 0xff, height & 0xff, 0x00, 0x00 // height
     ]));
   }
-
   static traf(track, baseMediaDecodeTime) {
     const sampleDependencyTable = MP4.sdtp(track);
     const id = track.id;
@@ -12473,7 +13420,6 @@ class MP4 {
     0x00, 0x01, 0x00, 0x01 // default_sample_flags
     ]));
   }
-
   static trun(track, offset) {
     const samples = track.samples || [];
     const len = samples.length;
@@ -12516,9 +13462,7 @@ class MP4 {
       MP4.init();
     }
     const movie = MP4.moov(tracks);
-    const result = new Uint8Array(MP4.FTYP.byteLength + movie.byteLength);
-    result.set(MP4.FTYP);
-    result.set(movie, MP4.FTYP.byteLength);
+    const result = appendUint8Array(MP4.FTYP, movie);
     return result;
   }
 }
@@ -12552,6 +13496,7 @@ function toMpegTsClockFromTimescale(baseTime, srcScale = 1) {
 const MAX_SILENT_FRAME_DURATION = 10 * 1000; // 10 seconds
 const AAC_SAMPLES_PER_FRAME = 1024;
 const MPEG_AUDIO_SAMPLE_PER_FRAME = 1152;
+const AC3_SAMPLES_PER_FRAME = 1536;
 let chromeVersion = null;
 let safariWebkitVersion = null;
 class MP4Remuxer {
@@ -12567,6 +13512,7 @@ class MP4Remuxer {
     this.videoSampleDuration = null;
     this.isAudioContiguous = false;
     this.isVideoContiguous = false;
+    this.videoTrackConfig = void 0;
     this.observer = observer;
     this.config = config;
     this.typeSupported = typeSupported;
@@ -12581,7 +13527,10 @@ class MP4Remuxer {
       safariWebkitVersion = result ? parseInt(result[1]) : 0;
     }
   }
-  destroy() {}
+  destroy() {
+    // @ts-ignore
+    this.config = this.videoTrackConfig = this._initPTS = this._initDTS = null;
+  }
   resetTimeStamp(defaultTimeStamp) {
     logger.log('[mp4-remuxer]: initPTS & initDTS reset');
     this._initPTS = this._initDTS = defaultTimeStamp;
@@ -12594,6 +13543,7 @@ class MP4Remuxer {
   resetInitSegment() {
     logger.log('[mp4-remuxer]: ISGenerated flag reset');
     this.ISGenerated = false;
+    this.videoTrackConfig = undefined;
   }
   getVideoStartPts(videoSamples) {
     let rolloverDetected = false;
@@ -12636,7 +13586,13 @@ class MP4Remuxer {
     const enoughVideoSamples = flush && length > 0 || length > 1;
     const canRemuxAvc = (!hasAudio || enoughAudioSamples) && (!hasVideo || enoughVideoSamples) || this.ISGenerated || flush;
     if (canRemuxAvc) {
-      if (!this.ISGenerated) {
+      if (this.ISGenerated) {
+        var _videoTrack$pixelRati, _config$pixelRatio, _videoTrack$pixelRati2, _config$pixelRatio2;
+        const config = this.videoTrackConfig;
+        if (config && (videoTrack.width !== config.width || videoTrack.height !== config.height || ((_videoTrack$pixelRati = videoTrack.pixelRatio) == null ? void 0 : _videoTrack$pixelRati[0]) !== ((_config$pixelRatio = config.pixelRatio) == null ? void 0 : _config$pixelRatio[0]) || ((_videoTrack$pixelRati2 = videoTrack.pixelRatio) == null ? void 0 : _videoTrack$pixelRati2[1]) !== ((_config$pixelRatio2 = config.pixelRatio) == null ? void 0 : _config$pixelRatio2[1]))) {
+          this.resetInitSegment();
+        }
+      } else {
         initSegment = this.generateIS(audioTrack, videoTrack, timeOffset, accurateTimeOffset);
       }
       const isVideoContiguous = this.isVideoContiguous;
@@ -12749,6 +13705,9 @@ class MP4Remuxer {
             audioTrack.codec = 'mp3';
           }
           break;
+        case 'ac3':
+          audioTrack.codec = 'ac-3';
+          break;
       }
       tracks.audio = {
         id: 'audio',
@@ -12794,6 +13753,11 @@ class MP4Remuxer {
           computePTSDTS = false;
         }
       }
+      this.videoTrackConfig = {
+        width: videoTrack.width,
+        height: videoTrack.height,
+        pixelRatio: videoTrack.pixelRatio
+      };
     }
     if (Object.keys(tracks).length) {
       this.ISGenerated = true;
@@ -12835,8 +13799,13 @@ class MP4Remuxer {
     if (!contiguous || nextAvcDts === null) {
       const pts = timeOffset * timeScale;
       const cts = inputSamples[0].pts - normalizePts(inputSamples[0].dts, inputSamples[0].pts);
-      // if not contiguous, let's use target timeOffset
-      nextAvcDts = pts - cts;
+      if (chromeVersion && nextAvcDts !== null && Math.abs(pts - cts - nextAvcDts) < 15000) {
+        // treat as contigous to adjust samples that would otherwise produce video buffer gaps in Chrome
+        contiguous = true;
+      } else {
+        // if not contiguous, let's use target timeOffset
+        nextAvcDts = pts - cts;
+      }
     }
 
     // PTS is coded on 33bits, and can loop from -2^32 to 2^32
@@ -12877,22 +13846,33 @@ class MP4Remuxer {
       const foundOverlap = delta < -1;
       if (foundHole || foundOverlap) {
         if (foundHole) {
-          logger.warn(`AVC: ${toMsFromMpegTsClock(delta, true)} ms (${delta}dts) hole between fragments detected, filling it`);
+          logger.warn(`AVC: ${toMsFromMpegTsClock(delta, true)} ms (${delta}dts) hole between fragments detected at ${timeOffset.toFixed(3)}`);
         } else {
-          logger.warn(`AVC: ${toMsFromMpegTsClock(-delta, true)} ms (${delta}dts) overlapping between fragments detected`);
+          logger.warn(`AVC: ${toMsFromMpegTsClock(-delta, true)} ms (${delta}dts) overlapping between fragments detected at ${timeOffset.toFixed(3)}`);
         }
-        if (!foundOverlap || nextAvcDts >= inputSamples[0].pts) {
+        if (!foundOverlap || nextAvcDts >= inputSamples[0].pts || chromeVersion) {
           firstDTS = nextAvcDts;
           const firstPTS = inputSamples[0].pts - delta;
-          inputSamples[0].dts = firstDTS;
-          inputSamples[0].pts = firstPTS;
-          logger.log(`Video: First PTS/DTS adjusted: ${toMsFromMpegTsClock(firstPTS, true)}/${toMsFromMpegTsClock(firstDTS, true)}, delta: ${toMsFromMpegTsClock(delta, true)} ms`);
+          if (foundHole) {
+            inputSamples[0].dts = firstDTS;
+            inputSamples[0].pts = firstPTS;
+          } else {
+            for (let i = 0; i < inputSamples.length; i++) {
+              if (inputSamples[i].dts > firstPTS) {
+                break;
+              }
+              inputSamples[i].dts -= delta;
+              inputSamples[i].pts -= delta;
+            }
+          }
+          logger.log(`Video: Initial PTS/DTS adjusted: ${toMsFromMpegTsClock(firstPTS, true)}/${toMsFromMpegTsClock(firstDTS, true)}, delta: ${toMsFromMpegTsClock(delta, true)} ms`);
         }
       }
     }
     firstDTS = Math.max(0, firstDTS);
     let nbNalu = 0;
     let naluLen = 0;
+    let dtsStep = firstDTS;
     for (let i = 0; i < nbSamples; i++) {
       // compute total/avc sample length and nb of NAL units
       const sample = inputSamples[i];
@@ -12907,7 +13887,12 @@ class MP4Remuxer {
       sample.length = sampleLen;
 
       // ensure sample monotonic DTS
-      sample.dts = Math.max(sample.dts, firstDTS);
+      if (sample.dts < dtsStep) {
+        sample.dts = dtsStep;
+        dtsStep += averageSampleDuration / 4 | 0 || 1;
+      } else {
+        dtsStep = sample.dts;
+      }
       minPTS = Math.min(sample.pts, minPTS);
       maxPTS = Math.max(sample.pts, maxPTS);
     }
@@ -12939,12 +13924,12 @@ class MP4Remuxer {
     let maxDtsDelta = Number.NEGATIVE_INFINITY;
     let maxPtsDelta = Number.NEGATIVE_INFINITY;
     for (let i = 0; i < nbSamples; i++) {
-      const avcSample = inputSamples[i];
-      const avcSampleUnits = avcSample.units;
+      const VideoSample = inputSamples[i];
+      const VideoSampleUnits = VideoSample.units;
       let mp4SampleLength = 0;
       // convert NALU bitstream to MP4 format (prepend NALU with size field)
-      for (let j = 0, nbUnits = avcSampleUnits.length; j < nbUnits; j++) {
-        const unit = avcSampleUnits[j];
+      for (let j = 0, nbUnits = VideoSampleUnits.length; j < nbUnits; j++) {
+        const unit = VideoSampleUnits[j];
         const unitData = unit.data;
         const unitDataLen = unit.data.byteLength;
         view.setUint32(offset, unitDataLen);
@@ -12957,12 +13942,12 @@ class MP4Remuxer {
       // expected sample duration is the Decoding Timestamp diff of consecutive samples
       let ptsDelta;
       if (i < nbSamples - 1) {
-        mp4SampleDuration = inputSamples[i + 1].dts - avcSample.dts;
-        ptsDelta = inputSamples[i + 1].pts - avcSample.pts;
+        mp4SampleDuration = inputSamples[i + 1].dts - VideoSample.dts;
+        ptsDelta = inputSamples[i + 1].pts - VideoSample.pts;
       } else {
         const config = this.config;
-        const lastFrameDuration = i > 0 ? avcSample.dts - inputSamples[i - 1].dts : averageSampleDuration;
-        ptsDelta = i > 0 ? avcSample.pts - inputSamples[i - 1].pts : averageSampleDuration;
+        const lastFrameDuration = i > 0 ? VideoSample.dts - inputSamples[i - 1].dts : averageSampleDuration;
+        ptsDelta = i > 0 ? VideoSample.pts - inputSamples[i - 1].pts : averageSampleDuration;
         if (config.stretchShortVideoTrack && this.nextAudioPts !== null) {
           // In some cases, a segment's audio track duration may exceed the video track duration.
           // Since we've already remuxed audio, and we know how long the audio track is, we look to
@@ -12970,7 +13955,7 @@ class MP4Remuxer {
           // If so, playback would potentially get stuck, so we artificially inflate
           // the duration of the last frame to minimize any potential gap between segments.
           const gapTolerance = Math.floor(config.maxBufferHole * timeScale);
-          const deltaToFrameEnd = (audioTrackLength ? minPTS + audioTrackLength * timeScale : this.nextAudioPts) - avcSample.pts;
+          const deltaToFrameEnd = (audioTrackLength ? minPTS + audioTrackLength * timeScale : this.nextAudioPts) - VideoSample.pts;
           if (deltaToFrameEnd > gapTolerance) {
             // We subtract lastFrameDuration from deltaToFrameEnd to try to prevent any video
             // frame overlap. maxBufferHole should be >> lastFrameDuration anyway.
@@ -12988,12 +13973,12 @@ class MP4Remuxer {
           mp4SampleDuration = lastFrameDuration;
         }
       }
-      const compositionTimeOffset = Math.round(avcSample.pts - avcSample.dts);
+      const compositionTimeOffset = Math.round(VideoSample.pts - VideoSample.dts);
       minDtsDelta = Math.min(minDtsDelta, mp4SampleDuration);
       maxDtsDelta = Math.max(maxDtsDelta, mp4SampleDuration);
       minPtsDelta = Math.min(minPtsDelta, ptsDelta);
       maxPtsDelta = Math.max(maxPtsDelta, ptsDelta);
-      outputSamples.push(new Mp4Sample(avcSample.key, mp4SampleDuration, mp4SampleLength, compositionTimeOffset));
+      outputSamples.push(new Mp4Sample(VideoSample.key, mp4SampleDuration, mp4SampleLength, compositionTimeOffset));
     }
     if (outputSamples.length) {
       if (chromeVersion) {
@@ -13051,11 +14036,21 @@ class MP4Remuxer {
     track.dropped = 0;
     return data;
   }
+  getSamplesPerFrame(track) {
+    switch (track.segmentCodec) {
+      case 'mp3':
+        return MPEG_AUDIO_SAMPLE_PER_FRAME;
+      case 'ac3':
+        return AC3_SAMPLES_PER_FRAME;
+      default:
+        return AAC_SAMPLES_PER_FRAME;
+    }
+  }
   remuxAudio(track, timeOffset, contiguous, accurateTimeOffset, videoTimeOffset) {
     const inputTimeScale = track.inputTimeScale;
     const mp4timeScale = track.samplerate ? track.samplerate : inputTimeScale;
     const scaleFactor = inputTimeScale / mp4timeScale;
-    const mp4SampleDuration = track.segmentCodec === 'aac' ? AAC_SAMPLES_PER_FRAME : MPEG_AUDIO_SAMPLE_PER_FRAME;
+    const mp4SampleDuration = this.getSamplesPerFrame(track);
     const inputSampleDuration = mp4SampleDuration * scaleFactor;
     const initPTS = this._initPTS;
     const rawMPEG = track.segmentCodec === 'mp3' && this.typeSupported.mpeg;
@@ -13371,19 +14366,14 @@ class Mp4Sample {
     this.duration = duration;
     this.size = size;
     this.cts = cts;
-    this.flags = new Mp4SampleFlags(isKeyframe);
-  }
-}
-class Mp4SampleFlags {
-  constructor(isKeyframe) {
-    this.isLeading = 0;
-    this.isDependedOn = 0;
-    this.hasRedundancy = 0;
-    this.degradPrio = 0;
-    this.dependsOn = 1;
-    this.isNonSync = 1;
-    this.dependsOn = isKeyframe ? 2 : 1;
-    this.isNonSync = isKeyframe ? 0 : 1;
+    this.flags = {
+      isLeading: 0,
+      isDependedOn: 0,
+      hasRedundancy: 0,
+      degradPrio: 0,
+      dependsOn: isKeyframe ? 2 : 1,
+      isNonSync: isKeyframe ? 0 : 1
+    };
   }
 }
 
@@ -13424,10 +14414,10 @@ class PassThroughRemuxer {
     const initData = this.initData = parseInitSegment(initSegment);
 
     // Get codec from initSegment or fallback to default
-    if (!audioCodec) {
+    if (initData.audio) {
       audioCodec = getParsedTrackCodec(initData.audio, ElementaryStreamTypes.AUDIO);
     }
-    if (!videoCodec) {
+    if (initData.video) {
       videoCodec = getParsedTrackCodec(initData.video, ElementaryStreamTypes.VIDEO);
     }
     const tracks = {};
@@ -13569,19 +14559,29 @@ function getParsedTrackCodec(track, type) {
   if (parsedCodec && parsedCodec.length > 4) {
     return parsedCodec;
   }
-  // Since mp4-tools cannot parse full codec string (see 'TODO: Parse codec details'... in mp4-tools)
+  if (type === ElementaryStreamTypes.AUDIO) {
+    if (parsedCodec === 'ec-3' || parsedCodec === 'ac-3' || parsedCodec === 'alac') {
+      return parsedCodec;
+    }
+    if (parsedCodec === 'fLaC' || parsedCodec === 'Opus') {
+      // Opting not to get `preferManagedMediaSource` from player config for isSupported() check for simplicity
+      const preferManagedMediaSource = false;
+      return getCodecCompatibleName(parsedCodec, preferManagedMediaSource);
+    }
+    const result = 'mp4a.40.5';
+    logger.info(`Parsed audio codec "${parsedCodec}" or audio object type not handled. Using "${result}"`);
+    return result;
+  }
   // Provide defaults based on codec type
   // This allows for some playback of some fmp4 playlists without CODECS defined in manifest
+  logger.warn(`Unhandled video codec "${parsedCodec}"`);
   if (parsedCodec === 'hvc1' || parsedCodec === 'hev1') {
     return 'hvc1.1.6.L120.90';
   }
   if (parsedCodec === 'av01') {
     return 'av01.0.04M.08';
   }
-  if (parsedCodec === 'avc1' || type === ElementaryStreamTypes.VIDEO) {
-    return 'avc1.42e01e';
-  }
-  return 'mp4a.40.5';
+  return 'avc1.42e01e';
 }
 
 let now;
@@ -13590,7 +14590,7 @@ try {
   now = self.performance.now.bind(self.performance);
 } catch (err) {
   logger.debug('Unable to use Performance API on this environment');
-  now = typeof self !== 'undefined' && self.Date.now;
+  now = optionalSelf == null ? void 0 : optionalSelf.Date.now;
 }
 const muxConfig = [{
   demux: MP4Demuxer,
@@ -13605,6 +14605,12 @@ const muxConfig = [{
   demux: MP3Demuxer,
   remux: MP4Remuxer
 }];
+{
+  muxConfig.splice(2, 0, {
+    demux: AC3Demuxer,
+    remux: MP4Remuxer
+  });
+}
 class Transmuxer {
   constructor(observer, typeSupported, config, vendor, id) {
     this.async = false;
@@ -13874,7 +14880,8 @@ class Transmuxer {
     // probe for content type
     let mux;
     for (let i = 0, len = muxConfig.length; i < len; i++) {
-      if (muxConfig[i].demux.probe(data)) {
+      var _muxConfig$i$demux;
+      if ((_muxConfig$i$demux = muxConfig[i].demux) != null && _muxConfig$i$demux.probe(data)) {
         mux = muxConfig[i];
         break;
       }
@@ -13910,7 +14917,7 @@ class Transmuxer {
 }
 function getEncryptionType(data, decryptData) {
   let encryptionType = null;
-  if (data.byteLength > 0 && decryptData != null && decryptData.key != null && decryptData.iv !== null && decryptData.method != null) {
+  if (data.byteLength > 0 && (decryptData == null ? void 0 : decryptData.key) != null && decryptData.iv !== null && decryptData.method != null) {
     encryptionType = decryptData;
   }
   return encryptionType;
@@ -14296,9 +15303,6 @@ var eventemitter3 = {exports: {}};
 var eventemitter3Exports = eventemitter3.exports;
 var EventEmitter = /*@__PURE__*/getDefaultExportFromCjs(eventemitter3Exports);
 
-const MediaSource$1 = getMediaSource() || {
-  isTypeSupported: () => false
-};
 class TransmuxerInterface {
   constructor(hls, id, onTransmuxComplete, onFlush) {
     this.error = null;
@@ -14333,11 +15337,15 @@ class TransmuxerInterface {
     this.observer = new EventEmitter();
     this.observer.on(Events.FRAG_DECRYPTED, forwardMessage);
     this.observer.on(Events.ERROR, forwardMessage);
-    const typeSupported = {
-      mp4: MediaSource$1.isTypeSupported('video/mp4'),
-      mpeg: MediaSource$1.isTypeSupported('audio/mpeg'),
-      mp3: MediaSource$1.isTypeSupported('audio/mp4; codecs="mp3"')
+    const MediaSource = getMediaSource(config.preferManagedMediaSource) || {
+      isTypeSupported: () => false
+    };
+    const m2tsTypeSupported = {
+      mpeg: MediaSource.isTypeSupported('audio/mpeg'),
+      mp3: MediaSource.isTypeSupported('audio/mp4; codecs="mp3"'),
+      ac3: MediaSource.isTypeSupported('audio/mp4; codecs="ac-3"') 
     };
+
     // navigator.vendor is not always available in Web Worker
     // refer to https://developer.mozilla.org/en-US/docs/Web/API/WorkerGlobalScope/navigator
     const vendor = navigator.vendor;
@@ -14371,7 +15379,7 @@ class TransmuxerInterface {
           };
           worker.postMessage({
             cmd: 'init',
-            typeSupported: typeSupported,
+            typeSupported: m2tsTypeSupported,
             vendor: vendor,
             id: id,
             config: JSON.stringify(config)
@@ -14380,12 +15388,12 @@ class TransmuxerInterface {
           logger.warn(`Error setting up "${id}" Web Worker, fallback to inline`, err);
           this.resetWorker();
           this.error = null;
-          this.transmuxer = new Transmuxer(this.observer, typeSupported, config, vendor, id);
+          this.transmuxer = new Transmuxer(this.observer, m2tsTypeSupported, config, vendor, id);
         }
         return;
       }
     }
-    this.transmuxer = new Transmuxer(this.observer, typeSupported, config, vendor, id);
+    this.transmuxer = new Transmuxer(this.observer, m2tsTypeSupported, config, vendor, id);
   }
   resetWorker() {
     if (this.workerContext) {
@@ -14596,10488 +15604,12085 @@ class TransmuxerInterface {
   }
 }
 
-const STALL_MINIMUM_DURATION_MS = 250;
-const MAX_START_GAP_JUMP = 2.0;
-const SKIP_BUFFER_HOLE_STEP_SECONDS = 0.1;
-const SKIP_BUFFER_RANGE_START = 0.05;
-class GapController {
-  constructor(config, media, fragmentTracker, hls) {
-    this.config = void 0;
-    this.media = null;
-    this.fragmentTracker = void 0;
-    this.hls = void 0;
-    this.nudgeRetry = 0;
-    this.stallReported = false;
-    this.stalled = null;
-    this.moved = false;
-    this.seeking = false;
-    this.config = config;
-    this.media = media;
-    this.fragmentTracker = fragmentTracker;
-    this.hls = hls;
+function subtitleOptionsIdentical(trackList1, trackList2) {
+  if (trackList1.length !== trackList2.length) {
+    return false;
   }
-  destroy() {
-    this.media = null;
-    // @ts-ignore
-    this.hls = this.fragmentTracker = null;
+  for (let i = 0; i < trackList1.length; i++) {
+    if (!mediaAttributesIdentical(trackList1[i].attrs, trackList2[i].attrs)) {
+      return false;
+    }
+  }
+  return true;
+}
+function mediaAttributesIdentical(attrs1, attrs2, customAttributes) {
+  // Media options with the same rendition ID must be bit identical
+  const stableRenditionId = attrs1['STABLE-RENDITION-ID'];
+  if (stableRenditionId && !customAttributes) {
+    return stableRenditionId === attrs2['STABLE-RENDITION-ID'];
   }
+  // When rendition ID is not present, compare attributes
+  return !(customAttributes || ['LANGUAGE', 'NAME', 'CHARACTERISTICS', 'AUTOSELECT', 'DEFAULT', 'FORCED', 'ASSOC-LANGUAGE']).some(subtitleAttribute => attrs1[subtitleAttribute] !== attrs2[subtitleAttribute]);
+}
+function subtitleTrackMatchesTextTrack(subtitleTrack, textTrack) {
+  return textTrack.label.toLowerCase() === subtitleTrack.name.toLowerCase() && (!textTrack.language || textTrack.language.toLowerCase() === (subtitleTrack.lang || '').toLowerCase());
+}
 
-  /**
-   * Checks if the playhead is stuck within a gap, and if so, attempts to free it.
-   * A gap is an unbuffered range between two buffered ranges (or the start and the first buffered range).
-   *
-   * @param lastCurrentTime - Previously read playhead position
-   */
-  poll(lastCurrentTime, activeFrag) {
+const TICK_INTERVAL$2 = 100; // how often to tick in ms
+
+class AudioStreamController extends BaseStreamController {
+  constructor(hls, fragmentTracker, keyLoader) {
+    super(hls, fragmentTracker, keyLoader, '[audio-stream-controller]', PlaylistLevelType.AUDIO);
+    this.videoBuffer = null;
+    this.videoTrackCC = -1;
+    this.waitingVideoCC = -1;
+    this.bufferedTrack = null;
+    this.switchingTrack = null;
+    this.trackId = -1;
+    this.waitingData = null;
+    this.mainDetails = null;
+    this.flushing = false;
+    this.bufferFlushed = false;
+    this.cachedTrackLoadedData = null;
+    this._registerListeners();
+  }
+  onHandlerDestroying() {
+    this._unregisterListeners();
+    super.onHandlerDestroying();
+    this.mainDetails = null;
+    this.bufferedTrack = null;
+    this.switchingTrack = null;
+  }
+  _registerListeners() {
     const {
-      config,
-      media,
-      stalled
+      hls
     } = this;
-    if (media === null) {
-      return;
-    }
+    hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
+    hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
+    hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
+    hls.on(Events.LEVEL_LOADED, this.onLevelLoaded, this);
+    hls.on(Events.AUDIO_TRACKS_UPDATED, this.onAudioTracksUpdated, this);
+    hls.on(Events.AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
+    hls.on(Events.AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
+    hls.on(Events.ERROR, this.onError, this);
+    hls.on(Events.BUFFER_RESET, this.onBufferReset, this);
+    hls.on(Events.BUFFER_CREATED, this.onBufferCreated, this);
+    hls.on(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
+    hls.on(Events.BUFFER_FLUSHED, this.onBufferFlushed, this);
+    hls.on(Events.INIT_PTS_FOUND, this.onInitPtsFound, this);
+    hls.on(Events.FRAG_BUFFERED, this.onFragBuffered, this);
+  }
+  _unregisterListeners() {
     const {
-      currentTime,
-      seeking
-    } = media;
-    const seeked = this.seeking && !seeking;
-    const beginSeek = !this.seeking && seeking;
-    this.seeking = seeking;
-
-    // The playhead is moving, no-op
-    if (currentTime !== lastCurrentTime) {
-      this.moved = true;
-      if (stalled !== null) {
-        // The playhead is now moving, but was previously stalled
-        if (this.stallReported) {
-          const _stalledDuration = self.performance.now() - stalled;
-          logger.warn(`playback not stuck anymore @${currentTime}, after ${Math.round(_stalledDuration)}ms`);
-          this.stallReported = false;
-        }
-        this.stalled = null;
-        this.nudgeRetry = 0;
-      }
-      return;
-    }
-
-    // Clear stalled state when beginning or finishing seeking so that we don't report stalls coming out of a seek
-    if (beginSeek || seeked) {
-      this.stalled = null;
-      return;
-    }
-
-    // The playhead should not be moving
-    if (media.paused && !seeking || media.ended || media.playbackRate === 0 || !BufferHelper.getBuffered(media).length) {
-      return;
-    }
-    const bufferInfo = BufferHelper.bufferInfo(media, currentTime, 0);
-    const isBuffered = bufferInfo.len > 0;
-    const nextStart = bufferInfo.nextStart || 0;
-
-    // There is no playable buffer (seeked, waiting for buffer)
-    if (!isBuffered && !nextStart) {
-      return;
-    }
-    if (seeking) {
-      // Waiting for seeking in a buffered range to complete
-      const hasEnoughBuffer = bufferInfo.len > MAX_START_GAP_JUMP;
-      // Next buffered range is too far ahead to jump to while still seeking
-      const noBufferGap = !nextStart || activeFrag && activeFrag.start <= currentTime || nextStart - currentTime > MAX_START_GAP_JUMP && !this.fragmentTracker.getPartialFragment(currentTime);
-      if (hasEnoughBuffer || noBufferGap) {
-        return;
-      }
-      // Reset moved state when seeking to a point in or before a gap
-      this.moved = false;
-    }
-
-    // Skip start gaps if we haven't played, but the last poll detected the start of a stall
-    // The addition poll gives the browser a chance to jump the gap for us
-    if (!this.moved && this.stalled !== null) {
-      var _level$details;
-      // Jump start gaps within jump threshold
-      const startJump = Math.max(nextStart, bufferInfo.start || 0) - currentTime;
-
-      // When joining a live stream with audio tracks, account for live playlist window sliding by allowing
-      // a larger jump over start gaps caused by the audio-stream-controller buffering a start fragment
-      // that begins over 1 target duration after the video start position.
-      const level = this.hls.levels ? this.hls.levels[this.hls.currentLevel] : null;
-      const isLive = level == null ? void 0 : (_level$details = level.details) == null ? void 0 : _level$details.live;
-      const maxStartGapJump = isLive ? level.details.targetduration * 2 : MAX_START_GAP_JUMP;
-      const partialOrGap = this.fragmentTracker.getPartialFragment(currentTime);
-      if (startJump > 0 && (startJump <= maxStartGapJump || partialOrGap)) {
-        this._trySkipBufferHole(partialOrGap);
-        return;
-      }
-    }
+      hls
+    } = this;
+    hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
+    hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
+    hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
+    hls.off(Events.LEVEL_LOADED, this.onLevelLoaded, this);
+    hls.off(Events.AUDIO_TRACKS_UPDATED, this.onAudioTracksUpdated, this);
+    hls.off(Events.AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
+    hls.off(Events.AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
+    hls.off(Events.ERROR, this.onError, this);
+    hls.off(Events.BUFFER_RESET, this.onBufferReset, this);
+    hls.off(Events.BUFFER_CREATED, this.onBufferCreated, this);
+    hls.off(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
+    hls.off(Events.BUFFER_FLUSHED, this.onBufferFlushed, this);
+    hls.off(Events.INIT_PTS_FOUND, this.onInitPtsFound, this);
+    hls.off(Events.FRAG_BUFFERED, this.onFragBuffered, this);
+  }
 
-    // Start tracking stall time
-    const tnow = self.performance.now();
-    if (stalled === null) {
-      this.stalled = tnow;
-      return;
-    }
-    const stalledDuration = tnow - stalled;
-    if (!seeking && stalledDuration >= STALL_MINIMUM_DURATION_MS) {
-      // Report stalling after trying to fix
-      this._reportStall(bufferInfo);
-      if (!this.media) {
-        return;
+  // INIT_PTS_FOUND is triggered when the video track parsed in the stream-controller has a new PTS value
+  onInitPtsFound(event, {
+    frag,
+    id,
+    initPTS,
+    timescale
+  }) {
+    // Always update the new INIT PTS
+    // Can change due level switch
+    if (id === 'main') {
+      const cc = frag.cc;
+      this.initPTS[frag.cc] = {
+        baseTime: initPTS,
+        timescale
+      };
+      this.log(`InitPTS for cc: ${cc} found from main: ${initPTS}`);
+      this.videoTrackCC = cc;
+      // If we are waiting, tick immediately to unblock audio fragment transmuxing
+      if (this.state === State.WAITING_INIT_PTS) {
+        this.tick();
       }
     }
-    const bufferedWithHoles = BufferHelper.bufferInfo(media, currentTime, config.maxBufferHole);
-    this._tryFixBufferStall(bufferedWithHoles, stalledDuration);
   }
-
-  /**
-   * Detects and attempts to fix known buffer stalling issues.
-   * @param bufferInfo - The properties of the current buffer.
-   * @param stalledDurationMs - The amount of time Hls.js has been stalling for.
-   * @private
-   */
-  _tryFixBufferStall(bufferInfo, stalledDurationMs) {
-    const {
-      config,
-      fragmentTracker,
-      media
-    } = this;
-    if (media === null) {
+  startLoad(startPosition) {
+    if (!this.levels) {
+      this.startPosition = startPosition;
+      this.state = State.STOPPED;
       return;
     }
-    const currentTime = media.currentTime;
-    const partial = fragmentTracker.getPartialFragment(currentTime);
-    if (partial) {
-      // Try to skip over the buffer hole caused by a partial fragment
-      // This method isn't limited by the size of the gap between buffered ranges
-      const targetTime = this._trySkipBufferHole(partial);
-      // we return here in this case, meaning
-      // the branch below only executes when we haven't seeked to a new position
-      if (targetTime || !this.media) {
-        return;
-      }
-    }
-
-    // if we haven't had to skip over a buffer hole of a partial fragment
-    // we may just have to "nudge" the playlist as the browser decoding/rendering engine
-    // needs to cross some sort of threshold covering all source-buffers content
-    // to start playing properly.
-    if ((bufferInfo.len > config.maxBufferHole || bufferInfo.nextStart && bufferInfo.nextStart - currentTime < config.maxBufferHole) && stalledDurationMs > config.highBufferWatchdogPeriod * 1000) {
-      logger.warn('Trying to nudge playhead over buffer-hole');
-      // Try to nudge currentTime over a buffer hole if we've been stalling for the configured amount of seconds
-      // We only try to jump the hole if it's under the configured size
-      // Reset stalled so to rearm watchdog timer
-      this.stalled = null;
-      this._tryNudgeBuffer();
+    const lastCurrentTime = this.lastCurrentTime;
+    this.stopLoad();
+    this.setInterval(TICK_INTERVAL$2);
+    if (lastCurrentTime > 0 && startPosition === -1) {
+      this.log(`Override startPosition with lastCurrentTime @${lastCurrentTime.toFixed(3)}`);
+      startPosition = lastCurrentTime;
+      this.state = State.IDLE;
+    } else {
+      this.loadedmetadata = false;
+      this.state = State.WAITING_TRACK;
     }
+    this.nextLoadPosition = this.startPosition = this.lastCurrentTime = startPosition;
+    this.tick();
   }
-
-  /**
-   * Triggers a BUFFER_STALLED_ERROR event, but only once per stall period.
-   * @param bufferLen - The playhead distance from the end of the current buffer segment.
-   * @private
-   */
-  _reportStall(bufferInfo) {
-    const {
-      hls,
-      media,
-      stallReported
-    } = this;
-    if (!stallReported && media) {
-      // Report stalled error once
-      this.stallReported = true;
-      const error = new Error(`Playback stalling at @${media.currentTime} due to low buffer (${JSON.stringify(bufferInfo)})`);
-      logger.warn(error.message);
-      hls.trigger(Events.ERROR, {
-        type: ErrorTypes.MEDIA_ERROR,
-        details: ErrorDetails.BUFFER_STALLED_ERROR,
-        fatal: false,
-        error,
-        buffer: bufferInfo.len
-      });
-    }
-  }
-
-  /**
-   * Attempts to fix buffer stalls by jumping over known gaps caused by partial fragments
-   * @param partial - The partial fragment found at the current time (where playback is stalling).
-   * @private
-   */
-  _trySkipBufferHole(partial) {
-    const {
-      config,
-      hls,
-      media
-    } = this;
-    if (media === null) {
-      return 0;
-    }
-
-    // Check if currentTime is between unbuffered regions of partial fragments
-    const currentTime = media.currentTime;
-    const bufferInfo = BufferHelper.bufferInfo(media, currentTime, 0);
-    const startTime = currentTime < bufferInfo.start ? bufferInfo.start : bufferInfo.nextStart;
-    if (startTime) {
-      const bufferStarved = bufferInfo.len <= config.maxBufferHole;
-      const waiting = bufferInfo.len > 0 && bufferInfo.len < 1 && media.readyState < 3;
-      const gapLength = startTime - currentTime;
-      if (gapLength > 0 && (bufferStarved || waiting)) {
-        // Only allow large gaps to be skipped if it is a start gap, or all fragments in skip range are partial
-        if (gapLength > config.maxBufferHole) {
+  doTick() {
+    switch (this.state) {
+      case State.IDLE:
+        this.doTickIdle();
+        break;
+      case State.WAITING_TRACK:
+        {
+          var _levels$trackId;
           const {
-            fragmentTracker
+            levels,
+            trackId
           } = this;
-          let startGap = false;
-          if (currentTime === 0) {
-            const startFrag = fragmentTracker.getAppendedFrag(0, PlaylistLevelType.MAIN);
-            if (startFrag && startTime < startFrag.end) {
-              startGap = true;
+          const details = levels == null ? void 0 : (_levels$trackId = levels[trackId]) == null ? void 0 : _levels$trackId.details;
+          if (details) {
+            if (this.waitForCdnTuneIn(details)) {
+              break;
             }
+            this.state = State.WAITING_INIT_PTS;
           }
-          if (!startGap) {
-            const startProvisioned = partial || fragmentTracker.getAppendedFrag(currentTime, PlaylistLevelType.MAIN);
-            if (startProvisioned) {
-              let moreToLoad = false;
-              let pos = startProvisioned.end;
-              while (pos < startTime) {
-                const provisioned = fragmentTracker.getPartialFragment(pos);
-                if (provisioned) {
-                  pos += provisioned.duration;
-                } else {
-                  moreToLoad = true;
-                  break;
-                }
+          break;
+        }
+      case State.FRAG_LOADING_WAITING_RETRY:
+        {
+          var _this$media;
+          const now = performance.now();
+          const retryDate = this.retryDate;
+          // if current time is gt than retryDate, or if media seeking let's switch to IDLE state to retry loading
+          if (!retryDate || now >= retryDate || (_this$media = this.media) != null && _this$media.seeking) {
+            const {
+              levels,
+              trackId
+            } = this;
+            this.log('RetryDate reached, switch back to IDLE state');
+            this.resetStartWhenNotLoaded((levels == null ? void 0 : levels[trackId]) || null);
+            this.state = State.IDLE;
+          }
+          break;
+        }
+      case State.WAITING_INIT_PTS:
+        {
+          // Ensure we don't get stuck in the WAITING_INIT_PTS state if the waiting frag CC doesn't match any initPTS
+          const waitingData = this.waitingData;
+          if (waitingData) {
+            const {
+              frag,
+              part,
+              cache,
+              complete
+            } = waitingData;
+            if (this.initPTS[frag.cc] !== undefined) {
+              this.waitingData = null;
+              this.waitingVideoCC = -1;
+              this.state = State.FRAG_LOADING;
+              const payload = cache.flush();
+              const data = {
+                frag,
+                part,
+                payload,
+                networkDetails: null
+              };
+              this._handleFragmentLoadProgress(data);
+              if (complete) {
+                super._handleFragmentLoadComplete(data);
               }
-              if (moreToLoad) {
-                return 0;
+            } else if (this.videoTrackCC !== this.waitingVideoCC) {
+              // Drop waiting fragment if videoTrackCC has changed since waitingFragment was set and initPTS was not found
+              this.log(`Waiting fragment cc (${frag.cc}) cancelled because video is at cc ${this.videoTrackCC}`);
+              this.clearWaitingFragment();
+            } else {
+              // Drop waiting fragment if an earlier fragment is needed
+              const pos = this.getLoadPosition();
+              const bufferInfo = BufferHelper.bufferInfo(this.mediaBuffer, pos, this.config.maxBufferHole);
+              const waitingFragmentAtPosition = fragmentWithinToleranceTest(bufferInfo.end, this.config.maxFragLookUpTolerance, frag);
+              if (waitingFragmentAtPosition < 0) {
+                this.log(`Waiting fragment cc (${frag.cc}) @ ${frag.start} cancelled because another fragment at ${bufferInfo.end} is needed`);
+                this.clearWaitingFragment();
               }
             }
+          } else {
+            this.state = State.IDLE;
           }
         }
-        const targetTime = Math.max(startTime + SKIP_BUFFER_RANGE_START, currentTime + SKIP_BUFFER_HOLE_STEP_SECONDS);
-        logger.warn(`skipping hole, adjusting currentTime from ${currentTime} to ${targetTime}`);
-        this.moved = true;
-        this.stalled = null;
-        media.currentTime = targetTime;
-        if (partial && !partial.gap) {
-          const error = new Error(`fragment loaded with buffer holes, seeking from ${currentTime} to ${targetTime}`);
-          hls.trigger(Events.ERROR, {
-            type: ErrorTypes.MEDIA_ERROR,
-            details: ErrorDetails.BUFFER_SEEK_OVER_HOLE,
-            fatal: false,
-            error,
-            reason: error.message,
-            frag: partial
-          });
-        }
-        return targetTime;
-      }
     }
-    return 0;
+    this.onTickEnd();
   }
-
-  /**
-   * Attempts to fix buffer stalls by advancing the mediaElement's current time by a small amount.
-   * @private
-   */
-  _tryNudgeBuffer() {
+  clearWaitingFragment() {
+    const waitingData = this.waitingData;
+    if (waitingData) {
+      this.fragmentTracker.removeFragment(waitingData.frag);
+      this.waitingData = null;
+      this.waitingVideoCC = -1;
+      this.state = State.IDLE;
+    }
+  }
+  resetLoadingState() {
+    this.clearWaitingFragment();
+    super.resetLoadingState();
+  }
+  onTickEnd() {
+    const {
+      media
+    } = this;
+    if (!(media != null && media.readyState)) {
+      // Exit early if we don't have media or if the media hasn't buffered anything yet (readyState 0)
+      return;
+    }
+    this.lastCurrentTime = media.currentTime;
+  }
+  doTickIdle() {
     const {
-      config,
       hls,
+      levels,
       media,
-      nudgeRetry
+      trackId
     } = this;
-    if (media === null) {
+    const config = hls.config;
+
+    // 1. if video not attached AND
+    //    start fragment already requested OR start frag prefetch not enabled
+    // 2. if tracks or track not loaded and selected
+    // then exit loop
+    // => if media not attached but start frag prefetch is enabled and start frag not requested yet, we will not exit loop
+    if (!media && (this.startFragRequested || !config.startFragPrefetch) || !(levels != null && levels[trackId])) {
       return;
     }
-    const currentTime = media.currentTime;
-    this.nudgeRetry++;
-    if (nudgeRetry < config.nudgeMaxRetry) {
-      const targetTime = currentTime + (nudgeRetry + 1) * config.nudgeOffset;
-      // playback stalled in buffered area ... let's nudge currentTime to try to overcome this
-      const error = new Error(`Nudging 'currentTime' from ${currentTime} to ${targetTime}`);
-      logger.warn(error.message);
-      media.currentTime = targetTime;
-      hls.trigger(Events.ERROR, {
-        type: ErrorTypes.MEDIA_ERROR,
-        details: ErrorDetails.BUFFER_NUDGE_ON_STALL,
-        error,
-        fatal: false
-      });
-    } else {
-      const error = new Error(`Playhead still not moving while enough data buffered @${currentTime} after ${config.nudgeMaxRetry} nudges`);
-      logger.error(error.message);
-      hls.trigger(Events.ERROR, {
-        type: ErrorTypes.MEDIA_ERROR,
-        details: ErrorDetails.BUFFER_STALLED_ERROR,
-        error,
-        fatal: true
-      });
+    const levelInfo = levels[trackId];
+    const trackDetails = levelInfo.details;
+    if (!trackDetails || trackDetails.live && this.levelLastLoaded !== levelInfo || this.waitForCdnTuneIn(trackDetails)) {
+      this.state = State.WAITING_TRACK;
+      return;
+    }
+    const bufferable = this.mediaBuffer ? this.mediaBuffer : this.media;
+    if (this.bufferFlushed && bufferable) {
+      this.bufferFlushed = false;
+      this.afterBufferFlushed(bufferable, ElementaryStreamTypes.AUDIO, PlaylistLevelType.AUDIO);
+    }
+    const bufferInfo = this.getFwdBufferInfo(bufferable, PlaylistLevelType.AUDIO);
+    if (bufferInfo === null) {
+      return;
     }
-  }
-}
-
-const TICK_INTERVAL$2 = 100; // how often to tick in ms
-
-class StreamController extends BaseStreamController {
-  constructor(hls, fragmentTracker, keyLoader) {
-    super(hls, fragmentTracker, keyLoader, '[stream-controller]', PlaylistLevelType.MAIN);
-    this.audioCodecSwap = false;
-    this.gapController = null;
-    this.level = -1;
-    this._forceStartLoad = false;
-    this.altAudio = false;
-    this.audioOnly = false;
-    this.fragPlaying = null;
-    this.onvplaying = null;
-    this.onvseeked = null;
-    this.fragLastKbps = 0;
-    this.couldBacktrack = false;
-    this.backtrackFragment = null;
-    this.audioCodecSwitch = false;
-    this.videoBuffer = null;
-    this._registerListeners();
-  }
-  _registerListeners() {
     const {
-      hls
+      bufferedTrack,
+      switchingTrack
     } = this;
-    hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-    hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-    hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
-    hls.on(Events.MANIFEST_PARSED, this.onManifestParsed, this);
-    hls.on(Events.LEVEL_LOADING, this.onLevelLoading, this);
-    hls.on(Events.LEVEL_LOADED, this.onLevelLoaded, this);
-    hls.on(Events.FRAG_LOAD_EMERGENCY_ABORTED, this.onFragLoadEmergencyAborted, this);
-    hls.on(Events.ERROR, this.onError, this);
-    hls.on(Events.AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
-    hls.on(Events.AUDIO_TRACK_SWITCHED, this.onAudioTrackSwitched, this);
-    hls.on(Events.BUFFER_CREATED, this.onBufferCreated, this);
-    hls.on(Events.BUFFER_FLUSHED, this.onBufferFlushed, this);
-    hls.on(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
-    hls.on(Events.FRAG_BUFFERED, this.onFragBuffered, this);
+    if (!switchingTrack && this._streamEnded(bufferInfo, trackDetails)) {
+      hls.trigger(Events.BUFFER_EOS, {
+        type: 'audio'
+      });
+      this.state = State.ENDED;
+      return;
+    }
+    const mainBufferInfo = this.getFwdBufferInfo(this.videoBuffer ? this.videoBuffer : this.media, PlaylistLevelType.MAIN);
+    const bufferLen = bufferInfo.len;
+    const maxBufLen = this.getMaxBufferLength(mainBufferInfo == null ? void 0 : mainBufferInfo.len);
+    const fragments = trackDetails.fragments;
+    const start = fragments[0].start;
+    let targetBufferTime = this.flushing ? this.getLoadPosition() : bufferInfo.end;
+    if (switchingTrack && media) {
+      const pos = this.getLoadPosition();
+      // STABLE
+      if (bufferedTrack && !mediaAttributesIdentical(switchingTrack.attrs, bufferedTrack.attrs)) {
+        targetBufferTime = pos;
+      }
+      // if currentTime (pos) is less than alt audio playlist start time, it means that alt audio is ahead of currentTime
+      if (trackDetails.PTSKnown && pos < start) {
+        // if everything is buffered from pos to start or if audio buffer upfront, let's seek to start
+        if (bufferInfo.end > start || bufferInfo.nextStart) {
+          this.log('Alt audio track ahead of main track, seek to start of alt audio track');
+          media.currentTime = start + 0.05;
+        }
+      }
+    }
+
+    // if buffer length is less than maxBufLen, or near the end, find a fragment to load
+    if (bufferLen >= maxBufLen && !switchingTrack && targetBufferTime < fragments[fragments.length - 1].start) {
+      return;
+    }
+    let frag = this.getNextFragment(targetBufferTime, trackDetails);
+    let atGap = false;
+    // Avoid loop loading by using nextLoadPosition set for backtracking and skipping consecutive GAP tags
+    if (frag && this.isLoopLoading(frag, targetBufferTime)) {
+      atGap = !!frag.gap;
+      frag = this.getNextFragmentLoopLoading(frag, trackDetails, bufferInfo, PlaylistLevelType.MAIN, maxBufLen);
+    }
+    if (!frag) {
+      this.bufferFlushed = true;
+      return;
+    }
+
+    // Buffer audio up to one target duration ahead of main buffer
+    const atBufferSyncLimit = mainBufferInfo && frag.start > mainBufferInfo.end + trackDetails.targetduration;
+    if (atBufferSyncLimit ||
+    // Or wait for main buffer after buffing some audio
+    !(mainBufferInfo != null && mainBufferInfo.len) && bufferInfo.len) {
+      // Check fragment-tracker for main fragments since GAP segments do not show up in bufferInfo
+      const mainFrag = this.getAppendedFrag(frag.start, PlaylistLevelType.MAIN);
+      if (mainFrag === null) {
+        return;
+      }
+      // Bridge gaps in main buffer
+      atGap || (atGap = !!mainFrag.gap || !!atBufferSyncLimit && mainBufferInfo.len === 0);
+      if (atBufferSyncLimit && !atGap || atGap && bufferInfo.nextStart && bufferInfo.nextStart < mainFrag.end) {
+        return;
+      }
+    }
+    this.loadFragment(frag, levelInfo, targetBufferTime);
   }
-  _unregisterListeners() {
-    const {
-      hls
-    } = this;
-    hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-    hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-    hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
-    hls.off(Events.MANIFEST_PARSED, this.onManifestParsed, this);
-    hls.off(Events.LEVEL_LOADED, this.onLevelLoaded, this);
-    hls.off(Events.FRAG_LOAD_EMERGENCY_ABORTED, this.onFragLoadEmergencyAborted, this);
-    hls.off(Events.ERROR, this.onError, this);
-    hls.off(Events.AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
-    hls.off(Events.AUDIO_TRACK_SWITCHED, this.onAudioTrackSwitched, this);
-    hls.off(Events.BUFFER_CREATED, this.onBufferCreated, this);
-    hls.off(Events.BUFFER_FLUSHED, this.onBufferFlushed, this);
-    hls.off(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
-    hls.off(Events.FRAG_BUFFERED, this.onFragBuffered, this);
+  getMaxBufferLength(mainBufferLength) {
+    const maxConfigBuffer = super.getMaxBufferLength();
+    if (!mainBufferLength) {
+      return maxConfigBuffer;
+    }
+    return Math.min(Math.max(maxConfigBuffer, mainBufferLength), this.config.maxMaxBufferLength);
   }
-  onHandlerDestroying() {
-    this._unregisterListeners();
-    this.onMediaDetaching();
+  onMediaDetaching() {
+    this.videoBuffer = null;
+    this.bufferFlushed = this.flushing = false;
+    super.onMediaDetaching();
   }
-  startLoad(startPosition) {
-    if (this.levels) {
-      const {
-        lastCurrentTime,
-        hls
-      } = this;
-      this.stopLoad();
+  onAudioTracksUpdated(event, {
+    audioTracks
+  }) {
+    // Reset tranxmuxer is essential for large context switches (Content Steering)
+    this.resetTransmuxer();
+    this.levels = audioTracks.map(mediaPlaylist => new Level(mediaPlaylist));
+  }
+  onAudioTrackSwitching(event, data) {
+    // if any URL found on new audio track, it is an alternate audio track
+    const altAudio = !!data.url;
+    this.trackId = data.id;
+    const {
+      fragCurrent
+    } = this;
+    if (fragCurrent) {
+      fragCurrent.abortRequests();
+      this.removeUnbufferedFrags(fragCurrent.start);
+    }
+    this.resetLoadingState();
+    // destroy useless transmuxer when switching audio to main
+    if (!altAudio) {
+      this.resetTransmuxer();
+    } else {
+      // switching to audio track, start timer if not already started
       this.setInterval(TICK_INTERVAL$2);
-      this.level = -1;
-      if (!this.startFragRequested) {
-        // determine load level
-        let startLevel = hls.startLevel;
-        if (startLevel === -1) {
-          if (hls.config.testBandwidth && this.levels.length > 1) {
-            // -1 : guess start Level by doing a bitrate test by loading first fragment of lowest quality level
-            startLevel = 0;
-            this.bitrateTest = true;
-          } else {
-            startLevel = hls.nextAutoLevel;
-          }
-        }
-        // set new level to playlist loader : this will trigger start level load
-        // hls.nextLoadLevel remains until it is set to a new value or until a new frag is successfully loaded
-        this.level = hls.nextLoadLevel = startLevel;
-        this.loadedmetadata = false;
-      }
-      // if startPosition undefined but lastCurrentTime set, set startPosition to last currentTime
-      if (lastCurrentTime > 0 && startPosition === -1) {
-        this.log(`Override startPosition with lastCurrentTime @${lastCurrentTime.toFixed(3)}`);
-        startPosition = lastCurrentTime;
-      }
+    }
+
+    // should we switch tracks ?
+    if (altAudio) {
+      this.switchingTrack = data;
+      // main audio track are handled by stream-controller, just do something if switching to alt audio track
       this.state = State.IDLE;
-      this.nextLoadPosition = this.startPosition = this.lastCurrentTime = startPosition;
-      this.tick();
+      this.flushAudioIfNeeded(data);
     } else {
-      this._forceStartLoad = true;
+      this.switchingTrack = null;
+      this.bufferedTrack = data;
       this.state = State.STOPPED;
     }
+    this.tick();
   }
-  stopLoad() {
-    this._forceStartLoad = false;
-    super.stopLoad();
+  onManifestLoading() {
+    this.fragmentTracker.removeAllFragments();
+    this.startPosition = this.lastCurrentTime = 0;
+    this.bufferFlushed = this.flushing = false;
+    this.levels = this.mainDetails = this.waitingData = this.bufferedTrack = this.cachedTrackLoadedData = this.switchingTrack = null;
+    this.startFragRequested = false;
+    this.trackId = this.videoTrackCC = this.waitingVideoCC = -1;
   }
-  doTick() {
-    switch (this.state) {
-      case State.WAITING_LEVEL:
-        {
-          var _levels$level;
-          const {
-            levels,
-            level
-          } = this;
-          const details = levels == null ? void 0 : (_levels$level = levels[level]) == null ? void 0 : _levels$level.details;
-          if (details && (!details.live || this.levelLastLoaded === this.level)) {
-            if (this.waitForCdnTuneIn(details)) {
-              break;
-            }
-            this.state = State.IDLE;
-            break;
-          } else if (this.hls.nextLoadLevel !== this.level) {
-            this.state = State.IDLE;
-            break;
-          }
-          break;
-        }
-      case State.FRAG_LOADING_WAITING_RETRY:
-        {
-          var _this$media;
-          const now = self.performance.now();
-          const retryDate = this.retryDate;
-          // if current time is gt than retryDate, or if media seeking let's switch to IDLE state to retry loading
-          if (!retryDate || now >= retryDate || (_this$media = this.media) != null && _this$media.seeking) {
-            this.resetStartWhenNotLoaded(this.level);
-            this.state = State.IDLE;
-          }
-        }
-        break;
-    }
-    if (this.state === State.IDLE) {
-      this.doTickIdle();
+  onLevelLoaded(event, data) {
+    this.mainDetails = data.details;
+    if (this.cachedTrackLoadedData !== null) {
+      this.hls.trigger(Events.AUDIO_TRACK_LOADED, this.cachedTrackLoadedData);
+      this.cachedTrackLoadedData = null;
     }
-    this.onTickEnd();
-  }
-  onTickEnd() {
-    super.onTickEnd();
-    this.checkBuffer();
-    this.checkFragmentChanged();
   }
-  doTickIdle() {
+  onAudioTrackLoaded(event, data) {
+    var _track$details;
+    if (this.mainDetails == null) {
+      this.cachedTrackLoadedData = data;
+      return;
+    }
     const {
-      hls,
-      levelLastLoaded,
-      levels,
-      media
+      levels
     } = this;
     const {
-      config,
-      nextLoadLevel: level
-    } = hls;
-
-    // if start level not parsed yet OR
-    // if video not attached AND start fragment already requested OR start frag prefetch not enabled
-    // exit loop, as we either need more info (level not parsed) or we need media to be attached to load new fragment
-    if (levelLastLoaded === null || !media && (this.startFragRequested || !config.startFragPrefetch)) {
-      return;
-    }
-
-    // If the "main" level is audio-only but we are loading an alternate track in the same group, do not load anything
-    if (this.altAudio && this.audioOnly) {
-      return;
-    }
-    if (!(levels != null && levels[level])) {
+      details: newDetails,
+      id: trackId
+    } = data;
+    if (!levels) {
+      this.warn(`Audio tracks were reset while loading level ${trackId}`);
       return;
     }
-    const levelInfo = levels[level];
-
-    // if buffer length is less than maxBufLen try to load a new fragment
-
-    const bufferInfo = this.getMainFwdBufferInfo();
-    if (bufferInfo === null) {
-      return;
-    }
-    const lastDetails = this.getLevelDetails();
-    if (lastDetails && this._streamEnded(bufferInfo, lastDetails)) {
-      const data = {};
-      if (this.altAudio) {
-        data.type = 'video';
+    this.log(`Audio track ${trackId} loaded [${newDetails.startSN},${newDetails.endSN}]${newDetails.lastPartSn ? `[part-${newDetails.lastPartSn}-${newDetails.lastPartIndex}]` : ''},duration:${newDetails.totalduration}`);
+    const track = levels[trackId];
+    let sliding = 0;
+    if (newDetails.live || (_track$details = track.details) != null && _track$details.live) {
+      this.checkLiveUpdate(newDetails);
+      const mainDetails = this.mainDetails;
+      if (newDetails.deltaUpdateFailed || !mainDetails) {
+        return;
+      }
+      if (!track.details && newDetails.hasProgramDateTime && mainDetails.hasProgramDateTime) {
+        // Make sure our audio rendition is aligned with the "main" rendition, using
+        // pdt as our reference times.
+        alignMediaPlaylistByPDT(newDetails, mainDetails);
+        sliding = newDetails.fragments[0].start;
+      } else {
+        var _this$levelLastLoaded;
+        sliding = this.alignPlaylists(newDetails, track.details, (_this$levelLastLoaded = this.levelLastLoaded) == null ? void 0 : _this$levelLastLoaded.details);
       }
-      this.hls.trigger(Events.BUFFER_EOS, data);
-      this.state = State.ENDED;
-      return;
     }
+    track.details = newDetails;
+    this.levelLastLoaded = track;
 
-    // set next load level : this will trigger a playlist load if needed
-    if (hls.loadLevel !== level && hls.manualLevel === -1) {
-      this.log(`Adapting to level ${level} from level ${this.level}`);
+    // compute start position if we are aligned with the main playlist
+    if (!this.startFragRequested && (this.mainDetails || !newDetails.live)) {
+      this.setStartPosition(track.details, sliding);
     }
-    this.level = hls.nextLoadLevel = level;
-    const levelDetails = levelInfo.details;
-    // if level info not retrieved yet, switch state and wait for level retrieval
-    // if live playlist, ensure that new playlist has been refreshed to avoid loading/try to load
-    // a useless and outdated fragment (that might even introduce load error if it is already out of the live playlist)
-    if (!levelDetails || this.state === State.WAITING_LEVEL || levelDetails.live && this.levelLastLoaded !== level) {
-      this.level = level;
-      this.state = State.WAITING_LEVEL;
-      return;
+    // only switch back to IDLE state if we were waiting for track to start downloading a new fragment
+    if (this.state === State.WAITING_TRACK && !this.waitForCdnTuneIn(newDetails)) {
+      this.state = State.IDLE;
     }
-    const bufferLen = bufferInfo.len;
-
-    // compute max Buffer Length that we could get from this load level, based on level bitrate. don't buffer more than 60 MB and more than 30s
-    const maxBufLen = this.getMaxBufferLength(levelInfo.maxBitrate);
 
-    // Stay idle if we are still with buffer margins
-    if (bufferLen >= maxBufLen) {
+    // trigger handler right now
+    this.tick();
+  }
+  _handleFragmentLoadProgress(data) {
+    var _frag$initSegment;
+    const {
+      frag,
+      part,
+      payload
+    } = data;
+    const {
+      config,
+      trackId,
+      levels
+    } = this;
+    if (!levels) {
+      this.warn(`Audio tracks were reset while fragment load was in progress. Fragment ${frag.sn} of level ${frag.level} will not be buffered`);
       return;
     }
-    if (this.backtrackFragment && this.backtrackFragment.start > bufferInfo.end) {
-      this.backtrackFragment = null;
-    }
-    const targetBufferTime = this.backtrackFragment ? this.backtrackFragment.start : bufferInfo.end;
-    let frag = this.getNextFragment(targetBufferTime, levelDetails);
-    // Avoid backtracking by loading an earlier segment in streams with segments that do not start with a key frame (flagged by `couldBacktrack`)
-    if (this.couldBacktrack && !this.fragPrevious && frag && frag.sn !== 'initSegment' && this.fragmentTracker.getState(frag) !== FragmentState.OK) {
-      var _this$backtrackFragme;
-      const backtrackSn = ((_this$backtrackFragme = this.backtrackFragment) != null ? _this$backtrackFragme : frag).sn;
-      const fragIdx = backtrackSn - levelDetails.startSN;
-      const backtrackFrag = levelDetails.fragments[fragIdx - 1];
-      if (backtrackFrag && frag.cc === backtrackFrag.cc) {
-        frag = backtrackFrag;
-        this.fragmentTracker.removeFragment(backtrackFrag);
-      }
-    } else if (this.backtrackFragment && bufferInfo.len) {
-      this.backtrackFragment = null;
-    }
-    // Avoid loop loading by using nextLoadPosition set for backtracking and skipping consecutive GAP tags
-    if (frag && this.isLoopLoading(frag, targetBufferTime)) {
-      const gapStart = frag.gap;
-      if (!gapStart) {
-        // Cleanup the fragment tracker before trying to find the next unbuffered fragment
-        const type = this.audioOnly && !this.altAudio ? ElementaryStreamTypes.AUDIO : ElementaryStreamTypes.VIDEO;
-        const mediaBuffer = (type === ElementaryStreamTypes.VIDEO ? this.videoBuffer : this.mediaBuffer) || this.media;
-        if (mediaBuffer) {
-          this.afterBufferFlushed(mediaBuffer, type, PlaylistLevelType.MAIN);
-        }
-      }
-      frag = this.getNextFragmentLoopLoading(frag, levelDetails, bufferInfo, PlaylistLevelType.MAIN, maxBufLen);
+    const track = levels[trackId];
+    if (!track) {
+      this.warn('Audio track is undefined on fragment load progress');
+      return;
     }
-    if (!frag) {
+    const details = track.details;
+    if (!details) {
+      this.warn('Audio track details undefined on fragment load progress');
+      this.removeUnbufferedFrags(frag.start);
       return;
     }
-    if (frag.initSegment && !frag.initSegment.data && !this.bitrateTest) {
-      frag = frag.initSegment;
+    const audioCodec = config.defaultAudioCodec || track.audioCodec || 'mp4a.40.2';
+    let transmuxer = this.transmuxer;
+    if (!transmuxer) {
+      transmuxer = this.transmuxer = new TransmuxerInterface(this.hls, PlaylistLevelType.AUDIO, this._handleTransmuxComplete.bind(this), this._handleTransmuxerFlush.bind(this));
     }
-    this.loadFragment(frag, levelInfo, targetBufferTime);
-  }
-  loadFragment(frag, level, targetBufferTime) {
-    // Check if fragment is not loaded
-    const fragState = this.fragmentTracker.getState(frag);
-    this.fragCurrent = frag;
-    if (fragState === FragmentState.NOT_LOADED || fragState === FragmentState.PARTIAL) {
-      if (frag.sn === 'initSegment') {
-        this._loadInitSegment(frag, level);
-      } else if (this.bitrateTest) {
-        this.log(`Fragment ${frag.sn} of level ${frag.level} is being downloaded to test bitrate and will not be buffered`);
-        this._loadBitrateTestFrag(frag, level);
-      } else {
-        this.startFragRequested = true;
-        super.loadFragment(frag, level, targetBufferTime);
-      }
+
+    // Check if we have video initPTS
+    // If not we need to wait for it
+    const initPTS = this.initPTS[frag.cc];
+    const initSegmentData = (_frag$initSegment = frag.initSegment) == null ? void 0 : _frag$initSegment.data;
+    if (initPTS !== undefined) {
+      // this.log(`Transmuxing ${sn} of [${details.startSN} ,${details.endSN}],track ${trackId}`);
+      // time Offset is accurate if level PTS is known, or if playlist is not sliding (not live)
+      const accurateTimeOffset = false; // details.PTSKnown || !details.live;
+      const partIndex = part ? part.index : -1;
+      const partial = partIndex !== -1;
+      const chunkMeta = new ChunkMetadata(frag.level, frag.sn, frag.stats.chunkCount, payload.byteLength, partIndex, partial);
+      transmuxer.push(payload, initSegmentData, audioCodec, '', frag, part, details.totalduration, accurateTimeOffset, chunkMeta, initPTS);
     } else {
-      this.clearTrackerIfNeeded(frag);
+      this.log(`Unknown video PTS for cc ${frag.cc}, waiting for video PTS before demuxing audio frag ${frag.sn} of [${details.startSN} ,${details.endSN}],track ${trackId}`);
+      const {
+        cache
+      } = this.waitingData = this.waitingData || {
+        frag,
+        part,
+        cache: new ChunkCache(),
+        complete: false
+      };
+      cache.push(new Uint8Array(payload));
+      this.waitingVideoCC = this.videoTrackCC;
+      this.state = State.WAITING_INIT_PTS;
     }
   }
-  getBufferedFrag(position) {
-    return this.fragmentTracker.getBufferedFrag(position, PlaylistLevelType.MAIN);
-  }
-  followingBufferedFrag(frag) {
-    if (frag) {
-      // try to get range of next fragment (500ms after this range)
-      return this.getBufferedFrag(frag.end + 0.5);
+  _handleFragmentLoadComplete(fragLoadedData) {
+    if (this.waitingData) {
+      this.waitingData.complete = true;
+      return;
     }
-    return null;
+    super._handleFragmentLoadComplete(fragLoadedData);
   }
-
-  /*
-    on immediate level switch :
-     - pause playback if playing
-     - cancel any pending load request
-     - and trigger a buffer flush
-  */
-  immediateLevelSwitch() {
-    this.abortCurrentFrag();
-    this.flushMainBuffer(0, Number.POSITIVE_INFINITY);
+  onBufferReset( /* event: Events.BUFFER_RESET */
+  ) {
+    // reset reference to sourcebuffers
+    this.mediaBuffer = this.videoBuffer = null;
+    this.loadedmetadata = false;
   }
-
-  /**
-   * try to switch ASAP without breaking video playback:
-   * in order to ensure smooth but quick level switching,
-   * we need to find the next flushable buffer range
-   * we should take into account new segment fetch time
-   */
-  nextLevelSwitch() {
+  onBufferCreated(event, data) {
+    const audioTrack = data.tracks.audio;
+    if (audioTrack) {
+      this.mediaBuffer = audioTrack.buffer || null;
+    }
+    if (data.tracks.video) {
+      this.videoBuffer = data.tracks.video.buffer || null;
+    }
+  }
+  onFragBuffered(event, data) {
     const {
-      levels,
-      media
-    } = this;
-    // ensure that media is defined and that metadata are available (to retrieve currentTime)
-    if (media != null && media.readyState) {
-      let fetchdelay;
-      const fragPlayingCurrent = this.getAppendedFrag(media.currentTime);
-      if (fragPlayingCurrent && fragPlayingCurrent.start > 1) {
-        // flush buffer preceding current fragment (flush until current fragment start offset)
-        // minus 1s to avoid video freezing, that could happen if we flush keyframe of current video ...
-        this.flushMainBuffer(0, fragPlayingCurrent.start - 1);
-      }
-      const levelDetails = this.getLevelDetails();
-      if (levelDetails != null && levelDetails.live) {
-        const bufferInfo = this.getMainFwdBufferInfo();
-        // Do not flush in live stream with low buffer
-        if (!bufferInfo || bufferInfo.len < levelDetails.targetduration * 2) {
-          return;
-        }
-      }
-      if (!media.paused && levels) {
-        // add a safety delay of 1s
-        const nextLevelId = this.hls.nextLoadLevel;
-        const nextLevel = levels[nextLevelId];
-        const fragLastKbps = this.fragLastKbps;
-        if (fragLastKbps && this.fragCurrent) {
-          fetchdelay = this.fragCurrent.duration * nextLevel.maxBitrate / (1000 * fragLastKbps) + 1;
-        } else {
-          fetchdelay = 0;
-        }
-      } else {
-        fetchdelay = 0;
-      }
-      // this.log('fetchdelay:'+fetchdelay);
-      // find buffer range that will be reached once new fragment will be fetched
-      const bufferedFrag = this.getBufferedFrag(media.currentTime + fetchdelay);
-      if (bufferedFrag) {
-        // we can flush buffer range following this one without stalling playback
-        const nextBufferedFrag = this.followingBufferedFrag(bufferedFrag);
-        if (nextBufferedFrag) {
-          // if we are here, we can also cancel any loading/demuxing in progress, as they are useless
-          this.abortCurrentFrag();
-          // start flush position is in next buffered frag. Leave some padding for non-independent segments and smoother playback.
-          const maxStart = nextBufferedFrag.maxStartPTS ? nextBufferedFrag.maxStartPTS : nextBufferedFrag.start;
-          const fragDuration = nextBufferedFrag.duration;
-          const startPts = Math.max(bufferedFrag.end, maxStart + Math.min(Math.max(fragDuration - this.config.maxFragLookUpTolerance, fragDuration * 0.5), fragDuration * 0.75));
-          this.flushMainBuffer(startPts, Number.POSITIVE_INFINITY);
+      frag,
+      part
+    } = data;
+    if (frag.type !== PlaylistLevelType.AUDIO) {
+      if (!this.loadedmetadata && frag.type === PlaylistLevelType.MAIN) {
+        const bufferable = this.videoBuffer || this.media;
+        if (bufferable) {
+          const bufferedTimeRanges = BufferHelper.getBuffered(bufferable);
+          if (bufferedTimeRanges.length) {
+            this.loadedmetadata = true;
+          }
         }
       }
+      return;
     }
-  }
-  abortCurrentFrag() {
-    const fragCurrent = this.fragCurrent;
-    this.fragCurrent = null;
-    this.backtrackFragment = null;
-    if (fragCurrent) {
-      fragCurrent.abortRequests();
-      this.fragmentTracker.removeFragment(fragCurrent);
-    }
-    switch (this.state) {
-      case State.KEY_LOADING:
-      case State.FRAG_LOADING:
-      case State.FRAG_LOADING_WAITING_RETRY:
-      case State.PARSING:
-      case State.PARSED:
-        this.state = State.IDLE;
-        break;
-    }
-    this.nextLoadPosition = this.getLoadPosition();
-  }
-  flushMainBuffer(startOffset, endOffset) {
-    super.flushMainBuffer(startOffset, endOffset, this.altAudio ? 'video' : null);
-  }
-  onMediaAttached(event, data) {
-    super.onMediaAttached(event, data);
-    const media = data.media;
-    this.onvplaying = this.onMediaPlaying.bind(this);
-    this.onvseeked = this.onMediaSeeked.bind(this);
-    media.addEventListener('playing', this.onvplaying);
-    media.addEventListener('seeked', this.onvseeked);
-    this.gapController = new GapController(this.config, media, this.fragmentTracker, this.hls);
-  }
-  onMediaDetaching() {
-    const {
-      media
-    } = this;
-    if (media && this.onvplaying && this.onvseeked) {
-      media.removeEventListener('playing', this.onvplaying);
-      media.removeEventListener('seeked', this.onvseeked);
-      this.onvplaying = this.onvseeked = null;
-      this.videoBuffer = null;
+    if (this.fragContextChanged(frag)) {
+      // If a level switch was requested while a fragment was buffering, it will emit the FRAG_BUFFERED event upon completion
+      // Avoid setting state back to IDLE or concluding the audio switch; otherwise, the switched-to track will not buffer
+      this.warn(`Fragment ${frag.sn}${part ? ' p: ' + part.index : ''} of level ${frag.level} finished buffering, but was aborted. state: ${this.state}, audioSwitch: ${this.switchingTrack ? this.switchingTrack.name : 'false'}`);
+      return;
     }
-    this.fragPlaying = null;
-    if (this.gapController) {
-      this.gapController.destroy();
-      this.gapController = null;
+    if (frag.sn !== 'initSegment') {
+      this.fragPrevious = frag;
+      const track = this.switchingTrack;
+      if (track) {
+        this.bufferedTrack = track;
+        this.switchingTrack = null;
+        this.hls.trigger(Events.AUDIO_TRACK_SWITCHED, _objectSpread2({}, track));
+      }
     }
-    super.onMediaDetaching();
-  }
-  onMediaPlaying() {
-    // tick to speed up FRAG_CHANGED triggering
-    this.tick();
+    this.fragBufferedComplete(frag, part);
   }
-  onMediaSeeked() {
-    const media = this.media;
-    const currentTime = media ? media.currentTime : null;
-    if (isFiniteNumber(currentTime)) {
-      this.log(`Media seeked to ${currentTime.toFixed(3)}`);
-    }
-
-    // If seeked was issued before buffer was appended do not tick immediately
-    const bufferInfo = this.getMainFwdBufferInfo();
-    if (bufferInfo === null || bufferInfo.len === 0) {
-      this.warn(`Main forward buffer length on "seeked" event ${bufferInfo ? bufferInfo.len : 'empty'})`);
+  onError(event, data) {
+    var _data$context;
+    if (data.fatal) {
+      this.state = State.ERROR;
       return;
     }
-
-    // tick to speed up FRAG_CHANGED triggering
-    this.tick();
-  }
-  onManifestLoading() {
-    // reset buffer on manifest loading
-    this.log('Trigger BUFFER_RESET');
-    this.hls.trigger(Events.BUFFER_RESET, undefined);
-    this.fragmentTracker.removeAllFragments();
-    this.couldBacktrack = false;
-    this.startPosition = this.lastCurrentTime = 0;
-    this.levels = this.fragPlaying = this.backtrackFragment = null;
-    this.altAudio = this.audioOnly = false;
-  }
-  onManifestParsed(event, data) {
-    let aac = false;
-    let heaac = false;
-    let codec;
-    data.levels.forEach(level => {
-      // detect if we have different kind of audio codecs used amongst playlists
-      codec = level.audioCodec;
-      if (codec) {
-        if (codec.indexOf('mp4a.40.2') !== -1) {
-          aac = true;
+    switch (data.details) {
+      case ErrorDetails.FRAG_GAP:
+      case ErrorDetails.FRAG_PARSING_ERROR:
+      case ErrorDetails.FRAG_DECRYPT_ERROR:
+      case ErrorDetails.FRAG_LOAD_ERROR:
+      case ErrorDetails.FRAG_LOAD_TIMEOUT:
+      case ErrorDetails.KEY_LOAD_ERROR:
+      case ErrorDetails.KEY_LOAD_TIMEOUT:
+        this.onFragmentOrKeyLoadError(PlaylistLevelType.AUDIO, data);
+        break;
+      case ErrorDetails.AUDIO_TRACK_LOAD_ERROR:
+      case ErrorDetails.AUDIO_TRACK_LOAD_TIMEOUT:
+      case ErrorDetails.LEVEL_PARSING_ERROR:
+        // in case of non fatal error while loading track, if not retrying to load track, switch back to IDLE
+        if (!data.levelRetry && this.state === State.WAITING_TRACK && ((_data$context = data.context) == null ? void 0 : _data$context.type) === PlaylistContextType.AUDIO_TRACK) {
+          this.state = State.IDLE;
+        }
+        break;
+      case ErrorDetails.BUFFER_APPEND_ERROR:
+      case ErrorDetails.BUFFER_FULL_ERROR:
+        if (!data.parent || data.parent !== 'audio') {
+          return;
         }
-        if (codec.indexOf('mp4a.40.5') !== -1) {
-          heaac = true;
+        if (data.details === ErrorDetails.BUFFER_APPEND_ERROR) {
+          this.resetLoadingState();
+          return;
         }
-      }
-    });
-    this.audioCodecSwitch = aac && heaac && !changeTypeSupported();
-    if (this.audioCodecSwitch) {
-      this.log('Both AAC/HE-AAC audio found in levels; declaring level codec as HE-AAC');
+        if (this.reduceLengthAndFlushBuffer(data)) {
+          this.bufferedTrack = null;
+          super.flushMainBuffer(0, Number.POSITIVE_INFINITY, 'audio');
+        }
+        break;
+      case ErrorDetails.INTERNAL_EXCEPTION:
+        this.recoverWorkerError(data);
+        break;
     }
-    this.levels = data.levels;
-    this.startFragRequested = false;
   }
-  onLevelLoading(event, data) {
-    const {
-      levels
-    } = this;
-    if (!levels || this.state !== State.IDLE) {
-      return;
+  onBufferFlushing(event, {
+    type
+  }) {
+    if (type !== ElementaryStreamTypes.VIDEO) {
+      this.flushing = true;
     }
-    const level = levels[data.level];
-    if (!level.details || level.details.live && this.levelLastLoaded !== data.level || this.waitForCdnTuneIn(level.details)) {
-      this.state = State.WAITING_LEVEL;
+  }
+  onBufferFlushed(event, {
+    type
+  }) {
+    if (type !== ElementaryStreamTypes.VIDEO) {
+      this.flushing = false;
+      this.bufferFlushed = true;
+      if (this.state === State.ENDED) {
+        this.state = State.IDLE;
+      }
+      const mediaBuffer = this.mediaBuffer || this.media;
+      if (mediaBuffer) {
+        this.afterBufferFlushed(mediaBuffer, type, PlaylistLevelType.AUDIO);
+        this.tick();
+      }
     }
   }
-  onLevelLoaded(event, data) {
-    var _curLevel$details;
+  _handleTransmuxComplete(transmuxResult) {
+    var _id3$samples;
+    const id = 'audio';
     const {
-      levels
+      hls
     } = this;
-    const newLevelId = data.level;
-    const newDetails = data.details;
-    const duration = newDetails.totalduration;
-    if (!levels) {
-      this.warn(`Levels were reset while loading level ${newLevelId}`);
+    const {
+      remuxResult,
+      chunkMeta
+    } = transmuxResult;
+    const context = this.getCurrentContext(chunkMeta);
+    if (!context) {
+      this.resetWhenMissingContext(chunkMeta);
       return;
     }
-    this.log(`Level ${newLevelId} loaded [${newDetails.startSN},${newDetails.endSN}]${newDetails.lastPartSn ? `[part-${newDetails.lastPartSn}-${newDetails.lastPartIndex}]` : ''}, cc [${newDetails.startCC}, ${newDetails.endCC}] duration:${duration}`);
-    const curLevel = levels[newLevelId];
-    const fragCurrent = this.fragCurrent;
-    if (fragCurrent && (this.state === State.FRAG_LOADING || this.state === State.FRAG_LOADING_WAITING_RETRY)) {
-      if ((fragCurrent.level !== data.level || fragCurrent.urlId !== curLevel.urlId) && fragCurrent.loader) {
-        this.abortCurrentFrag();
-      }
-    }
-    let sliding = 0;
-    if (newDetails.live || (_curLevel$details = curLevel.details) != null && _curLevel$details.live) {
-      this.checkLiveUpdate(newDetails);
-      if (newDetails.deltaUpdateFailed) {
-        return;
-      }
-      sliding = this.alignPlaylists(newDetails, curLevel.details);
-    }
-    // override level info
-    curLevel.details = newDetails;
-    this.levelLastLoaded = newLevelId;
-    this.hls.trigger(Events.LEVEL_UPDATED, {
-      details: newDetails,
-      level: newLevelId
-    });
-
-    // only switch back to IDLE state if we were waiting for level to start downloading a new fragment
-    if (this.state === State.WAITING_LEVEL) {
-      if (this.waitForCdnTuneIn(newDetails)) {
-        // Wait for Low-Latency CDN Tune-in
-        return;
-      }
-      this.state = State.IDLE;
-    }
-    if (!this.startFragRequested) {
-      this.setStartPosition(newDetails, sliding);
-    } else if (newDetails.live) {
-      this.synchronizeToLiveEdge(newDetails);
-    }
-
-    // trigger handler right now
-    this.tick();
-  }
-  _handleFragmentLoadProgress(data) {
-    var _frag$initSegment;
     const {
       frag,
       part,
-      payload
-    } = data;
+      level
+    } = context;
     const {
-      levels
-    } = this;
-    if (!levels) {
-      this.warn(`Levels were reset while fragment load was in progress. Fragment ${frag.sn} of level ${frag.level} will not be buffered`);
-      return;
-    }
-    const currentLevel = levels[frag.level];
-    const details = currentLevel.details;
-    if (!details) {
-      this.warn(`Dropping fragment ${frag.sn} of level ${frag.level} after level details were reset`);
+      details
+    } = level;
+    const {
+      audio,
+      text,
+      id3,
+      initSegment
+    } = remuxResult;
+
+    // Check if the current fragment has been aborted. We check this by first seeing if we're still playing the current level.
+    // If we are, subsequently check if the currently loading fragment (fragCurrent) has changed.
+    if (this.fragContextChanged(frag) || !details) {
       this.fragmentTracker.removeFragment(frag);
       return;
     }
-    const videoCodec = currentLevel.videoCodec;
-
-    // time Offset is accurate if level PTS is known, or if playlist is not sliding (not live)
-    const accurateTimeOffset = details.PTSKnown || !details.live;
-    const initSegmentData = (_frag$initSegment = frag.initSegment) == null ? void 0 : _frag$initSegment.data;
-    const audioCodec = this._getAudioCodec(currentLevel);
-
-    // transmux the MPEG-TS data to ISO-BMFF segments
-    // this.log(`Transmuxing ${frag.sn} of [${details.startSN} ,${details.endSN}],level ${frag.level}, cc ${frag.cc}`);
-    const transmuxer = this.transmuxer = this.transmuxer || new TransmuxerInterface(this.hls, PlaylistLevelType.MAIN, this._handleTransmuxComplete.bind(this), this._handleTransmuxerFlush.bind(this));
-    const partIndex = part ? part.index : -1;
-    const partial = partIndex !== -1;
-    const chunkMeta = new ChunkMetadata(frag.level, frag.sn, frag.stats.chunkCount, payload.byteLength, partIndex, partial);
-    const initPTS = this.initPTS[frag.cc];
-    transmuxer.push(payload, initSegmentData, audioCodec, videoCodec, frag, part, details.totalduration, accurateTimeOffset, chunkMeta, initPTS);
-  }
-  onAudioTrackSwitching(event, data) {
-    // if any URL found on new audio track, it is an alternate audio track
-    const fromAltAudio = this.altAudio;
-    const altAudio = !!data.url;
-    // if we switch on main audio, ensure that main fragment scheduling is synced with media.buffered
-    // don't do anything if we switch to alt audio: audio stream controller is handling it.
-    // we will just have to change buffer scheduling on audioTrackSwitched
-    if (!altAudio) {
-      if (this.mediaBuffer !== this.media) {
-        this.log('Switching on main audio, use media.buffered to schedule main fragment loading');
-        this.mediaBuffer = this.media;
-        const fragCurrent = this.fragCurrent;
-        // we need to refill audio buffer from main: cancel any frag loading to speed up audio switch
-        if (fragCurrent) {
-          this.log('Switching to main audio track, cancel main fragment load');
-          fragCurrent.abortRequests();
-          this.fragmentTracker.removeFragment(fragCurrent);
-        }
-        // destroy transmuxer to force init segment generation (following audio switch)
-        this.resetTransmuxer();
-        // switch to IDLE state to load new fragment
-        this.resetLoadingState();
-      } else if (this.audioOnly) {
-        // Reset audio transmuxer so when switching back to main audio we're not still appending where we left off
-        this.resetTransmuxer();
-      }
-      const hls = this.hls;
-      // If switching from alt to main audio, flush all audio and trigger track switched
-      if (fromAltAudio) {
-        hls.trigger(Events.BUFFER_FLUSHING, {
-          startOffset: 0,
-          endOffset: Number.POSITIVE_INFINITY,
-          type: null
-        });
-        this.fragmentTracker.removeAllFragments();
-      }
-      hls.trigger(Events.AUDIO_TRACK_SWITCHED, data);
+    this.state = State.PARSING;
+    if (this.switchingTrack && audio) {
+      this.completeAudioSwitch(this.switchingTrack);
     }
-  }
-  onAudioTrackSwitched(event, data) {
-    const trackId = data.id;
-    const altAudio = !!this.hls.audioTracks[trackId].url;
-    if (altAudio) {
-      const videoBuffer = this.videoBuffer;
-      // if we switched on alternate audio, ensure that main fragment scheduling is synced with video sourcebuffer buffered
-      if (videoBuffer && this.mediaBuffer !== videoBuffer) {
-        this.log('Switching on alternate audio, use video.buffered to schedule main fragment loading');
-        this.mediaBuffer = videoBuffer;
-      }
+    if (initSegment != null && initSegment.tracks) {
+      const mapFragment = frag.initSegment || frag;
+      this._bufferInitSegment(level, initSegment.tracks, mapFragment, chunkMeta);
+      hls.trigger(Events.FRAG_PARSING_INIT_SEGMENT, {
+        frag: mapFragment,
+        id,
+        tracks: initSegment.tracks
+      });
+      // Only flush audio from old audio tracks when PTS is known on new audio track
     }
-    this.altAudio = altAudio;
-    this.tick();
-  }
-  onBufferCreated(event, data) {
-    const tracks = data.tracks;
-    let mediaTrack;
-    let name;
-    let alternate = false;
-    for (const type in tracks) {
-      const track = tracks[type];
-      if (track.id === 'main') {
-        name = type;
-        mediaTrack = track;
-        // keep video source buffer reference
-        if (type === 'video') {
-          const videoTrack = tracks[type];
-          if (videoTrack) {
-            this.videoBuffer = videoTrack.buffer;
-          }
-        }
-      } else {
-        alternate = true;
+    if (audio) {
+      const {
+        startPTS,
+        endPTS,
+        startDTS,
+        endDTS
+      } = audio;
+      if (part) {
+        part.elementaryStreams[ElementaryStreamTypes.AUDIO] = {
+          startPTS,
+          endPTS,
+          startDTS,
+          endDTS
+        };
       }
+      frag.setElementaryStreamInfo(ElementaryStreamTypes.AUDIO, startPTS, endPTS, startDTS, endDTS);
+      this.bufferFragmentData(audio, frag, part, chunkMeta);
     }
-    if (alternate && mediaTrack) {
-      this.log(`Alternate track found, use ${name}.buffered to schedule main fragment loading`);
-      this.mediaBuffer = mediaTrack.buffer;
-    } else {
-      this.mediaBuffer = this.media;
-    }
-  }
-  onFragBuffered(event, data) {
-    const {
-      frag,
-      part
-    } = data;
-    if (frag && frag.type !== PlaylistLevelType.MAIN) {
-      return;
-    }
-    if (this.fragContextChanged(frag)) {
-      // If a level switch was requested while a fragment was buffering, it will emit the FRAG_BUFFERED event upon completion
-      // Avoid setting state back to IDLE, since that will interfere with a level switch
-      this.warn(`Fragment ${frag.sn}${part ? ' p: ' + part.index : ''} of level ${frag.level} finished buffering, but was aborted. state: ${this.state}`);
-      if (this.state === State.PARSED) {
-        this.state = State.IDLE;
-      }
-      return;
+    if (id3 != null && (_id3$samples = id3.samples) != null && _id3$samples.length) {
+      const emittedID3 = _extends({
+        id,
+        frag,
+        details
+      }, id3);
+      hls.trigger(Events.FRAG_PARSING_METADATA, emittedID3);
     }
-    const stats = part ? part.stats : frag.stats;
-    this.fragLastKbps = Math.round(8 * stats.total / (stats.buffering.end - stats.loading.first));
-    if (frag.sn !== 'initSegment') {
-      this.fragPrevious = frag;
+    if (text) {
+      const emittedText = _extends({
+        id,
+        frag,
+        details
+      }, text);
+      hls.trigger(Events.FRAG_PARSING_USERDATA, emittedText);
     }
-    this.fragBufferedComplete(frag, part);
   }
-  onError(event, data) {
-    var _data$context;
-    if (data.fatal) {
-      this.state = State.ERROR;
+  _bufferInitSegment(currentLevel, tracks, frag, chunkMeta) {
+    if (this.state !== State.PARSING) {
       return;
     }
-    switch (data.details) {
-      case ErrorDetails.FRAG_GAP:
-      case ErrorDetails.FRAG_PARSING_ERROR:
-      case ErrorDetails.FRAG_DECRYPT_ERROR:
-      case ErrorDetails.FRAG_LOAD_ERROR:
-      case ErrorDetails.FRAG_LOAD_TIMEOUT:
-      case ErrorDetails.KEY_LOAD_ERROR:
-      case ErrorDetails.KEY_LOAD_TIMEOUT:
-        this.onFragmentOrKeyLoadError(PlaylistLevelType.MAIN, data);
-        break;
-      case ErrorDetails.LEVEL_LOAD_ERROR:
-      case ErrorDetails.LEVEL_LOAD_TIMEOUT:
-      case ErrorDetails.LEVEL_PARSING_ERROR:
-        // in case of non fatal error while loading level, if level controller is not retrying to load level, switch back to IDLE
-        if (!data.levelRetry && this.state === State.WAITING_LEVEL && ((_data$context = data.context) == null ? void 0 : _data$context.type) === PlaylistContextType.LEVEL) {
-          this.state = State.IDLE;
-        }
-        break;
-      case ErrorDetails.BUFFER_FULL_ERROR:
-        if (!data.parent || data.parent !== 'main') {
-          return;
-        }
-        if (this.reduceLengthAndFlushBuffer(data)) {
-          this.flushMainBuffer(0, Number.POSITIVE_INFINITY);
-        }
-        break;
-      case ErrorDetails.INTERNAL_EXCEPTION:
-        this.recoverWorkerError(data);
-        break;
+    // delete any video track found on audio transmuxer
+    if (tracks.video) {
+      delete tracks.video;
     }
-  }
 
-  // Checks the health of the buffer and attempts to resolve playback stalls.
-  checkBuffer() {
-    const {
-      media,
-      gapController
-    } = this;
-    if (!media || !gapController || !media.readyState) {
-      // Exit early if we don't have media or if the media hasn't buffered anything yet (readyState 0)
+    // include levelCodec in audio and video tracks
+    const track = tracks.audio;
+    if (!track) {
       return;
     }
-    if (this.loadedmetadata || !BufferHelper.getBuffered(media).length) {
-      // Resolve gaps using the main buffer, whose ranges are the intersections of the A/V sourcebuffers
-      const activeFrag = this.state !== State.IDLE ? this.fragCurrent : null;
-      gapController.poll(this.lastCurrentTime, activeFrag);
+    track.id = 'audio';
+    const variantAudioCodecs = currentLevel.audioCodec;
+    this.log(`Init audio buffer, container:${track.container}, codecs[level/parsed]=[${variantAudioCodecs}/${track.codec}]`);
+    // SourceBuffer will use track.levelCodec if defined
+    if (variantAudioCodecs && variantAudioCodecs.split(',').length === 1) {
+      track.levelCodec = variantAudioCodecs;
     }
-    this.lastCurrentTime = media.currentTime;
-  }
-  onFragLoadEmergencyAborted() {
-    this.state = State.IDLE;
-    // if loadedmetadata is not set, it means that we are emergency switch down on first frag
-    // in that case, reset startFragRequested flag
-    if (!this.loadedmetadata) {
-      this.startFragRequested = false;
-      this.nextLoadPosition = this.startPosition;
+    this.hls.trigger(Events.BUFFER_CODECS, tracks);
+    const initSegment = track.initSegment;
+    if (initSegment != null && initSegment.byteLength) {
+      const segment = {
+        type: 'audio',
+        frag,
+        part: null,
+        chunkMeta,
+        parent: frag.type,
+        data: initSegment
+      };
+      this.hls.trigger(Events.BUFFER_APPENDING, segment);
     }
+    // trigger handler right now
     this.tickImmediate();
   }
-  onBufferFlushed(event, {
-    type
-  }) {
-    if (type !== ElementaryStreamTypes.AUDIO || this.audioOnly && !this.altAudio) {
-      const mediaBuffer = (type === ElementaryStreamTypes.VIDEO ? this.videoBuffer : this.mediaBuffer) || this.media;
-      this.afterBufferFlushed(mediaBuffer, type, PlaylistLevelType.MAIN);
+  loadFragment(frag, track, targetBufferTime) {
+    // only load if fragment is not loaded or if in audio switch
+    const fragState = this.fragmentTracker.getState(frag);
+    this.fragCurrent = frag;
+
+    // we force a frag loading in audio switch as fragment tracker might not have evicted previous frags in case of quick audio switch
+    if (this.switchingTrack || fragState === FragmentState.NOT_LOADED || fragState === FragmentState.PARTIAL) {
+      var _track$details2;
+      if (frag.sn === 'initSegment') {
+        this._loadInitSegment(frag, track);
+      } else if ((_track$details2 = track.details) != null && _track$details2.live && !this.initPTS[frag.cc]) {
+        this.log(`Waiting for video PTS in continuity counter ${frag.cc} of live stream before loading audio fragment ${frag.sn} of level ${this.trackId}`);
+        this.state = State.WAITING_INIT_PTS;
+        const mainDetails = this.mainDetails;
+        if (mainDetails && mainDetails.fragments[0].start !== track.details.fragments[0].start) {
+          alignMediaPlaylistByPDT(track.details, mainDetails);
+        }
+      } else {
+        this.startFragRequested = true;
+        super.loadFragment(frag, track, targetBufferTime);
+      }
+    } else {
+      this.clearTrackerIfNeeded(frag);
     }
   }
-  onLevelsUpdated(event, data) {
-    this.levels = data.levels;
-  }
-  swapAudioCodec() {
-    this.audioCodecSwap = !this.audioCodecSwap;
-  }
-
-  /**
-   * Seeks to the set startPosition if not equal to the mediaElement's current time.
-   */
-  seekToStartPos() {
+  flushAudioIfNeeded(switchingTrack) {
     const {
-      media
+      media,
+      bufferedTrack
     } = this;
-    if (!media) {
-      return;
-    }
-    const currentTime = media.currentTime;
-    let startPosition = this.startPosition;
-    // only adjust currentTime if different from startPosition or if startPosition not buffered
-    // at that stage, there should be only one buffered range, as we reach that code after first fragment has been buffered
-    if (startPosition >= 0 && currentTime < startPosition) {
-      if (media.seeking) {
-        this.log(`could not seek to ${startPosition}, already seeking at ${currentTime}`);
-        return;
-      }
-      const buffered = BufferHelper.getBuffered(media);
-      const bufferStart = buffered.length ? buffered.start(0) : 0;
-      const delta = bufferStart - startPosition;
-      if (delta > 0 && (delta < this.config.maxBufferHole || delta < this.config.maxFragLookUpTolerance)) {
-        this.log(`adjusting start position by ${delta} to match buffer start`);
-        startPosition += delta;
-        this.startPosition = startPosition;
-      }
-      this.log(`seek to target start position ${startPosition} from current time ${currentTime}`);
-      media.currentTime = startPosition;
+    const bufferedAttributes = bufferedTrack == null ? void 0 : bufferedTrack.attrs;
+    const switchAttributes = switchingTrack.attrs;
+    if (media && bufferedAttributes && (bufferedAttributes.CHANNELS !== switchAttributes.CHANNELS || bufferedTrack.name !== switchingTrack.name || bufferedTrack.lang !== switchingTrack.lang)) {
+      this.log('Switching audio track : flushing all audio');
+      super.flushMainBuffer(0, Number.POSITIVE_INFINITY, 'audio');
+      this.bufferedTrack = null;
     }
   }
-  _getAudioCodec(currentLevel) {
-    let audioCodec = this.config.defaultAudioCodec || currentLevel.audioCodec;
-    if (this.audioCodecSwap && audioCodec) {
-      this.log('Swapping audio codec');
-      if (audioCodec.indexOf('mp4a.40.5') !== -1) {
-        audioCodec = 'mp4a.40.2';
-      } else {
-        audioCodec = 'mp4a.40.5';
-      }
-    }
-    return audioCodec;
+  completeAudioSwitch(switchingTrack) {
+    const {
+      hls
+    } = this;
+    this.flushAudioIfNeeded(switchingTrack);
+    this.bufferedTrack = switchingTrack;
+    this.switchingTrack = null;
+    hls.trigger(Events.AUDIO_TRACK_SWITCHED, _objectSpread2({}, switchingTrack));
   }
-  _loadBitrateTestFrag(frag, level) {
-    frag.bitrateTest = true;
-    this._doFragLoad(frag, level).then(data => {
-      const {
-        hls
-      } = this;
-      if (!data || this.fragContextChanged(frag)) {
-        return;
-      }
-      level.fragmentError = 0;
-      this.state = State.IDLE;
-      this.startFragRequested = false;
-      this.bitrateTest = false;
-      const stats = frag.stats;
-      // Bitrate tests fragments are neither parsed nor buffered
-      stats.parsing.start = stats.parsing.end = stats.buffering.start = stats.buffering.end = self.performance.now();
-      hls.trigger(Events.FRAG_LOADED, data);
-      frag.bitrateTest = false;
-    });
+}
+
+class AudioTrackController extends BasePlaylistController {
+  constructor(hls) {
+    super(hls, '[audio-track-controller]');
+    this.tracks = [];
+    this.groupIds = null;
+    this.tracksInGroup = [];
+    this.trackId = -1;
+    this.currentTrack = null;
+    this.selectDefaultTrack = true;
+    this.registerListeners();
   }
-  _handleTransmuxComplete(transmuxResult) {
-    var _id3$samples;
-    const id = 'main';
+  registerListeners() {
     const {
       hls
     } = this;
+    hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
+    hls.on(Events.MANIFEST_PARSED, this.onManifestParsed, this);
+    hls.on(Events.LEVEL_LOADING, this.onLevelLoading, this);
+    hls.on(Events.LEVEL_SWITCHING, this.onLevelSwitching, this);
+    hls.on(Events.AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
+    hls.on(Events.ERROR, this.onError, this);
+  }
+  unregisterListeners() {
     const {
-      remuxResult,
-      chunkMeta
-    } = transmuxResult;
-    const context = this.getCurrentContext(chunkMeta);
-    if (!context) {
-      this.resetWhenMissingContext(chunkMeta);
-      return;
-    }
-    const {
-      frag,
-      part,
-      level
-    } = context;
-    const {
-      video,
-      text,
-      id3,
-      initSegment
-    } = remuxResult;
+      hls
+    } = this;
+    hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
+    hls.off(Events.MANIFEST_PARSED, this.onManifestParsed, this);
+    hls.off(Events.LEVEL_LOADING, this.onLevelLoading, this);
+    hls.off(Events.LEVEL_SWITCHING, this.onLevelSwitching, this);
+    hls.off(Events.AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
+    hls.off(Events.ERROR, this.onError, this);
+  }
+  destroy() {
+    this.unregisterListeners();
+    this.tracks.length = 0;
+    this.tracksInGroup.length = 0;
+    this.currentTrack = null;
+    super.destroy();
+  }
+  onManifestLoading() {
+    this.tracks = [];
+    this.tracksInGroup = [];
+    this.groupIds = null;
+    this.currentTrack = null;
+    this.trackId = -1;
+    this.selectDefaultTrack = true;
+  }
+  onManifestParsed(event, data) {
+    this.tracks = data.audioTracks || [];
+  }
+  onAudioTrackLoaded(event, data) {
     const {
+      id,
+      groupId,
       details
-    } = level;
-    // The audio-stream-controller handles audio buffering if Hls.js is playing an alternate audio track
-    const audio = this.altAudio ? undefined : remuxResult.audio;
-
-    // Check if the current fragment has been aborted. We check this by first seeing if we're still playing the current level.
-    // If we are, subsequently check if the currently loading fragment (fragCurrent) has changed.
-    if (this.fragContextChanged(frag)) {
-      this.fragmentTracker.removeFragment(frag);
+    } = data;
+    const trackInActiveGroup = this.tracksInGroup[id];
+    if (!trackInActiveGroup || trackInActiveGroup.groupId !== groupId) {
+      this.warn(`Audio track with id:${id} and group:${groupId} not found in active group ${trackInActiveGroup == null ? void 0 : trackInActiveGroup.groupId}`);
       return;
     }
-    this.state = State.PARSING;
-    if (initSegment) {
-      if (initSegment != null && initSegment.tracks) {
-        const mapFragment = frag.initSegment || frag;
-        this._bufferInitSegment(level, initSegment.tracks, mapFragment, chunkMeta);
-        hls.trigger(Events.FRAG_PARSING_INIT_SEGMENT, {
-          frag: mapFragment,
-          id,
-          tracks: initSegment.tracks
+    const curDetails = trackInActiveGroup.details;
+    trackInActiveGroup.details = data.details;
+    this.log(`Audio track ${id} "${trackInActiveGroup.name}" lang:${trackInActiveGroup.lang} group:${groupId} loaded [${details.startSN}-${details.endSN}]`);
+    if (id === this.trackId) {
+      this.playlistLoaded(id, data, curDetails);
+    }
+  }
+  onLevelLoading(event, data) {
+    this.switchLevel(data.level);
+  }
+  onLevelSwitching(event, data) {
+    this.switchLevel(data.level);
+  }
+  switchLevel(levelIndex) {
+    const levelInfo = this.hls.levels[levelIndex];
+    if (!levelInfo) {
+      return;
+    }
+    const audioGroups = levelInfo.audioGroups || null;
+    const currentGroups = this.groupIds;
+    let currentTrack = this.currentTrack;
+    if (!audioGroups || (currentGroups == null ? void 0 : currentGroups.length) !== (audioGroups == null ? void 0 : audioGroups.length) || audioGroups != null && audioGroups.some(groupId => (currentGroups == null ? void 0 : currentGroups.indexOf(groupId)) === -1)) {
+      this.groupIds = audioGroups;
+      this.trackId = -1;
+      this.currentTrack = null;
+      const audioTracks = this.tracks.filter(track => !audioGroups || audioGroups.indexOf(track.groupId) !== -1);
+      if (audioTracks.length) {
+        // Disable selectDefaultTrack if there are no default tracks
+        if (this.selectDefaultTrack && !audioTracks.some(track => track.default)) {
+          this.selectDefaultTrack = false;
+        }
+        // track.id should match hls.audioTracks index
+        audioTracks.forEach((track, i) => {
+          track.id = i;
         });
+      } else if (!currentTrack && !this.tracksInGroup.length) {
+        // Do not dispatch AUDIO_TRACKS_UPDATED when there were and are no tracks
+        return;
       }
+      this.tracksInGroup = audioTracks;
 
-      // This would be nice if Number.isFinite acted as a typeguard, but it doesn't. See: https://github.com/Microsoft/TypeScript/issues/10038
-      const initPTS = initSegment.initPTS;
-      const timescale = initSegment.timescale;
-      if (isFiniteNumber(initPTS)) {
-        this.initPTS[frag.cc] = {
-          baseTime: initPTS,
-          timescale
-        };
-        hls.trigger(Events.INIT_PTS_FOUND, {
-          frag,
-          id,
-          initPTS,
-          timescale
-        });
+      // Find preferred track
+      const audioPreference = this.hls.config.audioPreference;
+      if (!currentTrack && audioPreference) {
+        const groupIndex = findMatchingOption(audioPreference, audioTracks, audioMatchPredicate);
+        if (groupIndex > -1) {
+          currentTrack = audioTracks[groupIndex];
+        } else {
+          const allIndex = findMatchingOption(audioPreference, this.tracks);
+          currentTrack = this.tracks[allIndex];
+        }
       }
-    }
 
-    // Avoid buffering if backtracking this fragment
-    if (video && details && frag.sn !== 'initSegment') {
-      const prevFrag = details.fragments[frag.sn - 1 - details.startSN];
-      const isFirstFragment = frag.sn === details.startSN;
-      const isFirstInDiscontinuity = !prevFrag || frag.cc > prevFrag.cc;
-      if (remuxResult.independent !== false) {
-        const {
-          startPTS,
-          endPTS,
-          startDTS,
-          endDTS
-        } = video;
-        if (part) {
-          part.elementaryStreams[video.type] = {
-            startPTS,
-            endPTS,
-            startDTS,
-            endDTS
-          };
-        } else {
-          if (video.firstKeyFrame && video.independent && chunkMeta.id === 1 && !isFirstInDiscontinuity) {
-            this.couldBacktrack = true;
-          }
-          if (video.dropped && video.independent) {
-            // Backtrack if dropped frames create a gap after currentTime
+      // Select initial track
+      let trackId = this.findTrackId(currentTrack);
+      if (trackId === -1 && currentTrack) {
+        trackId = this.findTrackId(null);
+      }
 
-            const bufferInfo = this.getMainFwdBufferInfo();
-            const targetBufferTime = (bufferInfo ? bufferInfo.end : this.getLoadPosition()) + this.config.maxBufferHole;
-            const startTime = video.firstKeyFramePTS ? video.firstKeyFramePTS : startPTS;
-            if (!isFirstFragment && targetBufferTime < startTime - this.config.maxBufferHole && !isFirstInDiscontinuity) {
-              this.backtrack(frag);
-              return;
-            } else if (isFirstInDiscontinuity) {
-              // Mark segment with a gap to avoid loop loading
-              frag.gap = true;
-            }
-            // Set video stream start to fragment start so that truncated samples do not distort the timeline, and mark it partial
-            frag.setElementaryStreamInfo(video.type, frag.start, endPTS, frag.start, endDTS, true);
-          }
-        }
-        frag.setElementaryStreamInfo(video.type, startPTS, endPTS, startDTS, endDTS);
-        if (this.backtrackFragment) {
-          this.backtrackFragment = frag;
-        }
-        this.bufferFragmentData(video, frag, part, chunkMeta, isFirstFragment || isFirstInDiscontinuity);
-      } else if (isFirstFragment || isFirstInDiscontinuity) {
-        // Mark segment with a gap to avoid loop loading
-        frag.gap = true;
-      } else {
-        this.backtrack(frag);
-        return;
+      // Dispatch events and load track if needed
+      const audioTracksUpdated = {
+        audioTracks
+      };
+      this.log(`Updating audio tracks, ${audioTracks.length} track(s) found in group(s): ${audioGroups == null ? void 0 : audioGroups.join(',')}`);
+      this.hls.trigger(Events.AUDIO_TRACKS_UPDATED, audioTracksUpdated);
+      const selectedTrackId = this.trackId;
+      if (trackId !== -1 && selectedTrackId === -1) {
+        this.setAudioTrack(trackId);
+      } else if (audioTracks.length && selectedTrackId === -1) {
+        var _this$groupIds;
+        const error = new Error(`No audio track selected for current audio group-ID(s): ${(_this$groupIds = this.groupIds) == null ? void 0 : _this$groupIds.join(',')} track count: ${audioTracks.length}`);
+        this.warn(error.message);
+        this.hls.trigger(Events.ERROR, {
+          type: ErrorTypes.MEDIA_ERROR,
+          details: ErrorDetails.AUDIO_TRACK_LOAD_ERROR,
+          fatal: true,
+          error
+        });
       }
-    }
-    if (audio) {
-      const {
-        startPTS,
-        endPTS,
-        startDTS,
-        endDTS
-      } = audio;
-      if (part) {
-        part.elementaryStreams[ElementaryStreamTypes.AUDIO] = {
-          startPTS,
-          endPTS,
-          startDTS,
-          endDTS
-        };
-      }
-      frag.setElementaryStreamInfo(ElementaryStreamTypes.AUDIO, startPTS, endPTS, startDTS, endDTS);
-      this.bufferFragmentData(audio, frag, part, chunkMeta);
-    }
-    if (details && id3 != null && (_id3$samples = id3.samples) != null && _id3$samples.length) {
-      const emittedID3 = {
-        id,
-        frag,
-        details,
-        samples: id3.samples
-      };
-      hls.trigger(Events.FRAG_PARSING_METADATA, emittedID3);
-    }
-    if (details && text) {
-      const emittedText = {
-        id,
-        frag,
-        details,
-        samples: text.samples
-      };
-      hls.trigger(Events.FRAG_PARSING_USERDATA, emittedText);
+    } else if (this.shouldReloadPlaylist(currentTrack)) {
+      // Retry playlist loading if no playlist is or has been loaded yet
+      this.setAudioTrack(this.trackId);
     }
   }
-  _bufferInitSegment(currentLevel, tracks, frag, chunkMeta) {
-    if (this.state !== State.PARSING) {
+  onError(event, data) {
+    if (data.fatal || !data.context) {
       return;
     }
-    this.audioOnly = !!tracks.audio && !tracks.video;
-
-    // if audio track is expected to come from audio stream controller, discard any coming from main
-    if (this.altAudio && !this.audioOnly) {
-      delete tracks.audio;
-    }
-    // include levelCodec in audio and video tracks
-    const {
-      audio,
-      video,
-      audiovideo
-    } = tracks;
-    if (audio) {
-      let audioCodec = currentLevel.audioCodec;
-      const ua = navigator.userAgent.toLowerCase();
-      if (this.audioCodecSwitch) {
-        if (audioCodec) {
-          if (audioCodec.indexOf('mp4a.40.5') !== -1) {
-            audioCodec = 'mp4a.40.2';
-          } else {
-            audioCodec = 'mp4a.40.5';
-          }
-        }
-        // In the case that AAC and HE-AAC audio codecs are signalled in manifest,
-        // force HE-AAC, as it seems that most browsers prefers it.
-        // don't force HE-AAC if mono stream, or in Firefox
-        if (audio.metadata.channelCount !== 1 && ua.indexOf('firefox') === -1) {
-          audioCodec = 'mp4a.40.5';
-        }
-      }
-      // HE-AAC is broken on Android, always signal audio codec as AAC even if variant manifest states otherwise
-      if (ua.indexOf('android') !== -1 && audio.container !== 'audio/mpeg') {
-        // Exclude mpeg audio
-        audioCodec = 'mp4a.40.2';
-        this.log(`Android: force audio codec to ${audioCodec}`);
-      }
-      if (currentLevel.audioCodec && currentLevel.audioCodec !== audioCodec) {
-        this.log(`Swapping manifest audio codec "${currentLevel.audioCodec}" for "${audioCodec}"`);
-      }
-      audio.levelCodec = audioCodec;
-      audio.id = 'main';
-      this.log(`Init audio buffer, container:${audio.container}, codecs[selected/level/parsed]=[${audioCodec || ''}/${currentLevel.audioCodec || ''}/${audio.codec}]`);
-    }
-    if (video) {
-      video.levelCodec = currentLevel.videoCodec;
-      video.id = 'main';
-      this.log(`Init video buffer, container:${video.container}, codecs[level/parsed]=[${currentLevel.videoCodec || ''}/${video.codec}]`);
-    }
-    if (audiovideo) {
-      this.log(`Init audiovideo buffer, container:${audiovideo.container}, codecs[level/parsed]=[${currentLevel.attrs.CODECS || ''}/${audiovideo.codec}]`);
+    if (data.context.type === PlaylistContextType.AUDIO_TRACK && data.context.id === this.trackId && (!this.groupIds || this.groupIds.indexOf(data.context.groupId) !== -1)) {
+      this.requestScheduled = -1;
+      this.checkRetry(data);
     }
-    this.hls.trigger(Events.BUFFER_CODECS, tracks);
-    // loop through tracks that are going to be provided to bufferController
-    Object.keys(tracks).forEach(trackName => {
-      const track = tracks[trackName];
-      const initSegment = track.initSegment;
-      if (initSegment != null && initSegment.byteLength) {
-        this.hls.trigger(Events.BUFFER_APPENDING, {
-          type: trackName,
-          data: initSegment,
-          frag,
-          part: null,
-          chunkMeta,
-          parent: frag.type
-        });
-      }
-    });
-    // trigger handler right now
-    this.tick();
   }
-  getMainFwdBufferInfo() {
-    return this.getFwdBufferInfo(this.mediaBuffer ? this.mediaBuffer : this.media, PlaylistLevelType.MAIN);
+  get allAudioTracks() {
+    return this.tracks;
   }
-  backtrack(frag) {
-    this.couldBacktrack = true;
-    // Causes findFragments to backtrack through fragments to find the keyframe
-    this.backtrackFragment = frag;
-    this.resetTransmuxer();
-    this.flushBufferGap(frag);
-    this.fragmentTracker.removeFragment(frag);
-    this.fragPrevious = null;
-    this.nextLoadPosition = frag.start;
-    this.state = State.IDLE;
+  get audioTracks() {
+    return this.tracksInGroup;
   }
-  checkFragmentChanged() {
-    const video = this.media;
-    let fragPlayingCurrent = null;
-    if (video && video.readyState > 1 && video.seeking === false) {
-      const currentTime = video.currentTime;
-      /* if video element is in seeked state, currentTime can only increase.
-        (assuming that playback rate is positive ...)
-        As sometimes currentTime jumps back to zero after a
-        media decode error, check this, to avoid seeking back to
-        wrong position after a media decode error
-      */
-
-      if (BufferHelper.isBuffered(video, currentTime)) {
-        fragPlayingCurrent = this.getAppendedFrag(currentTime);
-      } else if (BufferHelper.isBuffered(video, currentTime + 0.1)) {
-        /* ensure that FRAG_CHANGED event is triggered at startup,
-          when first video frame is displayed and playback is paused.
-          add a tolerance of 100ms, in case current position is not buffered,
-          check if current pos+100ms is buffered and use that buffer range
-          for FRAG_CHANGED event reporting */
-        fragPlayingCurrent = this.getAppendedFrag(currentTime + 0.1);
-      }
-      if (fragPlayingCurrent) {
-        this.backtrackFragment = null;
-        const fragPlaying = this.fragPlaying;
-        const fragCurrentLevel = fragPlayingCurrent.level;
-        if (!fragPlaying || fragPlayingCurrent.sn !== fragPlaying.sn || fragPlaying.level !== fragCurrentLevel || fragPlayingCurrent.urlId !== fragPlaying.urlId) {
-          this.fragPlaying = fragPlayingCurrent;
-          this.hls.trigger(Events.FRAG_CHANGED, {
-            frag: fragPlayingCurrent
-          });
-          if (!fragPlaying || fragPlaying.level !== fragCurrentLevel) {
-            this.hls.trigger(Events.LEVEL_SWITCHED, {
-              level: fragCurrentLevel
-            });
+  get audioTrack() {
+    return this.trackId;
+  }
+  set audioTrack(newId) {
+    // If audio track is selected from API then don't choose from the manifest default track
+    this.selectDefaultTrack = false;
+    this.setAudioTrack(newId);
+  }
+  setAudioOption(audioOption) {
+    const hls = this.hls;
+    hls.config.audioPreference = audioOption;
+    if (audioOption) {
+      const allAudioTracks = this.allAudioTracks;
+      this.selectDefaultTrack = false;
+      if (allAudioTracks.length) {
+        // First see if current option matches (no switch op)
+        const currentTrack = this.currentTrack;
+        if (currentTrack && matchesOption(audioOption, currentTrack, audioMatchPredicate)) {
+          return currentTrack;
+        }
+        // Find option in available tracks (tracksInGroup)
+        const groupIndex = findMatchingOption(audioOption, this.tracksInGroup, audioMatchPredicate);
+        if (groupIndex > -1) {
+          const track = this.tracksInGroup[groupIndex];
+          this.setAudioTrack(groupIndex);
+          return track;
+        } else if (currentTrack) {
+          // Find option in nearest level audio group
+          let searchIndex = hls.loadLevel;
+          if (searchIndex === -1) {
+            searchIndex = hls.firstAutoLevel;
+          }
+          const switchIndex = findClosestLevelWithAudioGroup(audioOption, hls.levels, allAudioTracks, searchIndex, audioMatchPredicate);
+          if (switchIndex === -1) {
+            // could not find matching variant
+            return null;
+          }
+          // and switch level to acheive the audio group switch
+          hls.nextLoadLevel = switchIndex;
+        }
+        if (audioOption.channels || audioOption.audioCodec) {
+          // Could not find a match with codec / channels predicate
+          // Find a match without channels or codec
+          const withoutCodecAndChannelsMatch = findMatchingOption(audioOption, allAudioTracks);
+          if (withoutCodecAndChannelsMatch > -1) {
+            return allAudioTracks[withoutCodecAndChannelsMatch];
           }
         }
       }
     }
+    return null;
   }
-  get nextLevel() {
-    const frag = this.nextBufferedFrag;
-    if (frag) {
-      return frag.level;
+  setAudioTrack(newId) {
+    const tracks = this.tracksInGroup;
+
+    // check if level idx is valid
+    if (newId < 0 || newId >= tracks.length) {
+      this.warn(`Invalid audio track id: ${newId}`);
+      return;
     }
-    return -1;
-  }
-  get currentFrag() {
-    const media = this.media;
-    if (media) {
-      return this.fragPlaying || this.getAppendedFrag(media.currentTime);
+
+    // stopping live reloading timer if any
+    this.clearTimer();
+    this.selectDefaultTrack = false;
+    const lastTrack = this.currentTrack;
+    const track = tracks[newId];
+    const trackLoaded = track.details && !track.details.live;
+    if (newId === this.trackId && track === lastTrack && trackLoaded) {
+      return;
     }
-    return null;
+    this.log(`Switching to audio-track ${newId} "${track.name}" lang:${track.lang} group:${track.groupId} channels:${track.channels}`);
+    this.trackId = newId;
+    this.currentTrack = track;
+    this.hls.trigger(Events.AUDIO_TRACK_SWITCHING, _objectSpread2({}, track));
+    // Do not reload track unless live
+    if (trackLoaded) {
+      return;
+    }
+    const hlsUrlParameters = this.switchParams(track.url, lastTrack == null ? void 0 : lastTrack.details);
+    this.loadPlaylist(hlsUrlParameters);
   }
-  get currentProgramDateTime() {
-    const media = this.media;
-    if (media) {
-      const currentTime = media.currentTime;
-      const frag = this.currentFrag;
-      if (frag && isFiniteNumber(currentTime) && isFiniteNumber(frag.programDateTime)) {
-        const epocMs = frag.programDateTime + (currentTime - frag.start) * 1000;
-        return new Date(epocMs);
+  findTrackId(currentTrack) {
+    const audioTracks = this.tracksInGroup;
+    for (let i = 0; i < audioTracks.length; i++) {
+      const track = audioTracks[i];
+      if (this.selectDefaultTrack && !track.default) {
+        continue;
+      }
+      if (!currentTrack || matchesOption(currentTrack, track, audioMatchPredicate)) {
+        return i;
       }
     }
-    return null;
-  }
-  get currentLevel() {
-    const frag = this.currentFrag;
-    if (frag) {
-      return frag.level;
+    if (currentTrack) {
+      const {
+        name,
+        lang,
+        assocLang,
+        characteristics,
+        audioCodec,
+        channels
+      } = currentTrack;
+      for (let i = 0; i < audioTracks.length; i++) {
+        const track = audioTracks[i];
+        if (matchesOption({
+          name,
+          lang,
+          assocLang,
+          characteristics,
+          audioCodec,
+          channels
+        }, track, audioMatchPredicate)) {
+          return i;
+        }
+      }
+      for (let i = 0; i < audioTracks.length; i++) {
+        const track = audioTracks[i];
+        if (mediaAttributesIdentical(currentTrack.attrs, track.attrs, ['LANGUAGE', 'ASSOC-LANGUAGE', 'CHARACTERISTICS'])) {
+          return i;
+        }
+      }
+      for (let i = 0; i < audioTracks.length; i++) {
+        const track = audioTracks[i];
+        if (mediaAttributesIdentical(currentTrack.attrs, track.attrs, ['LANGUAGE'])) {
+          return i;
+        }
+      }
     }
     return -1;
   }
-  get nextBufferedFrag() {
-    const frag = this.currentFrag;
-    if (frag) {
-      return this.followingBufferedFrag(frag);
+  loadPlaylist(hlsUrlParameters) {
+    const audioTrack = this.currentTrack;
+    if (this.shouldLoadPlaylist(audioTrack) && audioTrack) {
+      super.loadPlaylist();
+      const id = audioTrack.id;
+      const groupId = audioTrack.groupId;
+      let url = audioTrack.url;
+      if (hlsUrlParameters) {
+        try {
+          url = hlsUrlParameters.addDirectives(url);
+        } catch (error) {
+          this.warn(`Could not construct new URL with HLS Delivery Directives: ${error}`);
+        }
+      }
+      // track not retrieved yet, or live playlist we need to (re)load it
+      this.log(`loading audio-track playlist ${id} "${audioTrack.name}" lang:${audioTrack.lang} group:${groupId}`);
+      this.clearTimer();
+      this.hls.trigger(Events.AUDIO_TRACK_LOADING, {
+        url,
+        id,
+        groupId,
+        deliveryDirectives: hlsUrlParameters || null
+      });
     }
-    return null;
-  }
-  get forceStartLoad() {
-    return this._forceStartLoad;
   }
 }
 
-/*
- * compute an Exponential Weighted moving average
- * - https://en.wikipedia.org/wiki/Moving_average#Exponential_moving_average
- *  - heavily inspired from shaka-player
- */
-
-class EWMA {
-  //  About half of the estimated value will be from the last |halfLife| samples by weight.
-  constructor(halfLife, estimate = 0, weight = 0) {
-    this.halfLife = void 0;
-    this.alpha_ = void 0;
-    this.estimate_ = void 0;
-    this.totalWeight_ = void 0;
-    this.halfLife = halfLife;
-    // Larger values of alpha expire historical data more slowly.
-    this.alpha_ = halfLife ? Math.exp(Math.log(0.5) / halfLife) : 0;
-    this.estimate_ = estimate;
-    this.totalWeight_ = weight;
-  }
-  sample(weight, value) {
-    const adjAlpha = Math.pow(this.alpha_, weight);
-    this.estimate_ = value * (1 - adjAlpha) + adjAlpha * this.estimate_;
-    this.totalWeight_ += weight;
-  }
-  getTotalWeight() {
-    return this.totalWeight_;
-  }
-  getEstimate() {
-    if (this.alpha_) {
-      const zeroFactor = 1 - Math.pow(this.alpha_, this.totalWeight_);
-      if (zeroFactor) {
-        return this.estimate_ / zeroFactor;
-      }
-    }
-    return this.estimate_;
-  }
-}
-
-/*
- * EWMA Bandwidth Estimator
- *  - heavily inspired from shaka-player
- * Tracks bandwidth samples and estimates available bandwidth.
- * Based on the minimum of two exponentially-weighted moving averages with
- * different half-lives.
- */
+const TICK_INTERVAL$1 = 500; // how often to tick in ms
 
-class EwmaBandWidthEstimator {
-  constructor(slow, fast, defaultEstimate, defaultTTFB = 100) {
-    this.defaultEstimate_ = void 0;
-    this.minWeight_ = void 0;
-    this.minDelayMs_ = void 0;
-    this.slow_ = void 0;
-    this.fast_ = void 0;
-    this.defaultTTFB_ = void 0;
-    this.ttfb_ = void 0;
-    this.defaultEstimate_ = defaultEstimate;
-    this.minWeight_ = 0.001;
-    this.minDelayMs_ = 50;
-    this.slow_ = new EWMA(slow);
-    this.fast_ = new EWMA(fast);
-    this.defaultTTFB_ = defaultTTFB;
-    this.ttfb_ = new EWMA(slow);
-  }
-  update(slow, fast) {
-    const {
-      slow_,
-      fast_,
-      ttfb_
-    } = this;
-    if (slow_.halfLife !== slow) {
-      this.slow_ = new EWMA(slow, slow_.getEstimate(), slow_.getTotalWeight());
-    }
-    if (fast_.halfLife !== fast) {
-      this.fast_ = new EWMA(fast, fast_.getEstimate(), fast_.getTotalWeight());
-    }
-    if (ttfb_.halfLife !== slow) {
-      this.ttfb_ = new EWMA(slow, ttfb_.getEstimate(), ttfb_.getTotalWeight());
-    }
-  }
-  sample(durationMs, numBytes) {
-    durationMs = Math.max(durationMs, this.minDelayMs_);
-    const numBits = 8 * numBytes;
-    // weight is duration in seconds
-    const durationS = durationMs / 1000;
-    // value is bandwidth in bits/s
-    const bandwidthInBps = numBits / durationS;
-    this.fast_.sample(durationS, bandwidthInBps);
-    this.slow_.sample(durationS, bandwidthInBps);
-  }
-  sampleTTFB(ttfb) {
-    // weight is frequency curve applied to TTFB in seconds
-    // (longer times have less weight with expected input under 1 second)
-    const seconds = ttfb / 1000;
-    const weight = Math.sqrt(2) * Math.exp(-Math.pow(seconds, 2) / 2);
-    this.ttfb_.sample(weight, Math.max(ttfb, 5));
-  }
-  canEstimate() {
-    return this.fast_.getTotalWeight() >= this.minWeight_;
-  }
-  getEstimate() {
-    if (this.canEstimate()) {
-      // console.log('slow estimate:'+ Math.round(this.slow_.getEstimate()));
-      // console.log('fast estimate:'+ Math.round(this.fast_.getEstimate()));
-      // Take the minimum of these two estimates.  This should have the effect of
-      // adapting down quickly, but up more slowly.
-      return Math.min(this.fast_.getEstimate(), this.slow_.getEstimate());
-    } else {
-      return this.defaultEstimate_;
-    }
-  }
-  getEstimateTTFB() {
-    if (this.ttfb_.getTotalWeight() >= this.minWeight_) {
-      return this.ttfb_.getEstimate();
-    } else {
-      return this.defaultTTFB_;
-    }
+class SubtitleStreamController extends BaseStreamController {
+  constructor(hls, fragmentTracker, keyLoader) {
+    super(hls, fragmentTracker, keyLoader, '[subtitle-stream-controller]', PlaylistLevelType.SUBTITLE);
+    this.currentTrackId = -1;
+    this.tracksBuffered = [];
+    this.mainDetails = null;
+    this._registerListeners();
   }
-  destroy() {}
-}
-
-class AbrController {
-  constructor(hls) {
-    this.hls = void 0;
-    this.lastLevelLoadSec = 0;
-    this.lastLoadedFragLevel = 0;
-    this._nextAutoLevel = -1;
-    this.timer = -1;
-    this.onCheck = this._abandonRulesCheck.bind(this);
-    this.fragCurrent = null;
-    this.partCurrent = null;
-    this.bitrateTestDelay = 0;
-    this.bwEstimator = void 0;
-    this.hls = hls;
-    const config = hls.config;
-    this.bwEstimator = new EwmaBandWidthEstimator(config.abrEwmaSlowVoD, config.abrEwmaFastVoD, config.abrEwmaDefaultEstimate);
-    this.registerListeners();
+  onHandlerDestroying() {
+    this._unregisterListeners();
+    super.onHandlerDestroying();
+    this.mainDetails = null;
   }
-  registerListeners() {
+  _registerListeners() {
     const {
       hls
     } = this;
-    hls.on(Events.FRAG_LOADING, this.onFragLoading, this);
-    hls.on(Events.FRAG_LOADED, this.onFragLoaded, this);
-    hls.on(Events.FRAG_BUFFERED, this.onFragBuffered, this);
-    hls.on(Events.LEVEL_SWITCHING, this.onLevelSwitching, this);
+    hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
+    hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
+    hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
     hls.on(Events.LEVEL_LOADED, this.onLevelLoaded, this);
+    hls.on(Events.ERROR, this.onError, this);
+    hls.on(Events.SUBTITLE_TRACKS_UPDATED, this.onSubtitleTracksUpdated, this);
+    hls.on(Events.SUBTITLE_TRACK_SWITCH, this.onSubtitleTrackSwitch, this);
+    hls.on(Events.SUBTITLE_TRACK_LOADED, this.onSubtitleTrackLoaded, this);
+    hls.on(Events.SUBTITLE_FRAG_PROCESSED, this.onSubtitleFragProcessed, this);
+    hls.on(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
+    hls.on(Events.FRAG_BUFFERED, this.onFragBuffered, this);
   }
-  unregisterListeners() {
+  _unregisterListeners() {
     const {
       hls
     } = this;
-    hls.off(Events.FRAG_LOADING, this.onFragLoading, this);
-    hls.off(Events.FRAG_LOADED, this.onFragLoaded, this);
-    hls.off(Events.FRAG_BUFFERED, this.onFragBuffered, this);
-    hls.off(Events.LEVEL_SWITCHING, this.onLevelSwitching, this);
+    hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
+    hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
+    hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
     hls.off(Events.LEVEL_LOADED, this.onLevelLoaded, this);
+    hls.off(Events.ERROR, this.onError, this);
+    hls.off(Events.SUBTITLE_TRACKS_UPDATED, this.onSubtitleTracksUpdated, this);
+    hls.off(Events.SUBTITLE_TRACK_SWITCH, this.onSubtitleTrackSwitch, this);
+    hls.off(Events.SUBTITLE_TRACK_LOADED, this.onSubtitleTrackLoaded, this);
+    hls.off(Events.SUBTITLE_FRAG_PROCESSED, this.onSubtitleFragProcessed, this);
+    hls.off(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
+    hls.off(Events.FRAG_BUFFERED, this.onFragBuffered, this);
   }
-  destroy() {
-    this.unregisterListeners();
-    this.clearTimer();
-    // @ts-ignore
-    this.hls = this.onCheck = null;
-    this.fragCurrent = this.partCurrent = null;
-  }
-  onFragLoading(event, data) {
-    var _data$part;
-    const frag = data.frag;
-    if (this.ignoreFragment(frag)) {
-      return;
-    }
-    this.fragCurrent = frag;
-    this.partCurrent = (_data$part = data.part) != null ? _data$part : null;
-    this.clearTimer();
-    this.timer = self.setInterval(this.onCheck, 100);
+  startLoad(startPosition) {
+    this.stopLoad();
+    this.state = State.IDLE;
+    this.setInterval(TICK_INTERVAL$1);
+    this.nextLoadPosition = this.startPosition = this.lastCurrentTime = startPosition;
+    this.tick();
   }
-  onLevelSwitching(event, data) {
-    this.clearTimer();
+  onManifestLoading() {
+    this.mainDetails = null;
+    this.fragmentTracker.removeAllFragments();
   }
-  getTimeToLoadFrag(timeToFirstByteSec, bandwidth, fragSizeBits, isSwitch) {
-    const fragLoadSec = timeToFirstByteSec + fragSizeBits / bandwidth;
-    const playlistLoadSec = isSwitch ? this.lastLevelLoadSec : 0;
-    return fragLoadSec + playlistLoadSec;
+  onMediaDetaching() {
+    this.tracksBuffered = [];
+    super.onMediaDetaching();
   }
   onLevelLoaded(event, data) {
-    const config = this.hls.config;
-    const {
-      total,
-      bwEstimate
-    } = data.stats;
-    // Total is the bytelength and bwEstimate in bits/sec
-    if (isFiniteNumber(total) && isFiniteNumber(bwEstimate)) {
-      this.lastLevelLoadSec = 8 * total / bwEstimate;
-    }
-    if (data.details.live) {
-      this.bwEstimator.update(config.abrEwmaSlowLive, config.abrEwmaFastLive);
-    } else {
-      this.bwEstimator.update(config.abrEwmaSlowVoD, config.abrEwmaFastVoD);
-    }
+    this.mainDetails = data.details;
   }
-
-  /*
-      This method monitors the download rate of the current fragment, and will downswitch if that fragment will not load
-      quickly enough to prevent underbuffering
-    */
-  _abandonRulesCheck() {
-    const {
-      fragCurrent: frag,
-      partCurrent: part,
-      hls
-    } = this;
+  onSubtitleFragProcessed(event, data) {
     const {
-      autoLevelEnabled,
-      media
-    } = hls;
-    if (!frag || !media) {
-      return;
-    }
-    const now = performance.now();
-    const stats = part ? part.stats : frag.stats;
-    const duration = part ? part.duration : frag.duration;
-    const timeLoading = now - stats.loading.start;
-    // If frag loading is aborted, complete, or from lowest level, stop timer and return
-    if (stats.aborted || stats.loaded && stats.loaded === stats.total || frag.level === 0) {
-      this.clearTimer();
-      // reset forced auto level value so that next level will be selected
-      this._nextAutoLevel = -1;
-      return;
-    }
-
-    // This check only runs if we're in ABR mode and actually playing
-    if (!autoLevelEnabled || media.paused || !media.playbackRate || !media.readyState) {
-      return;
-    }
-    const bufferInfo = hls.mainForwardBufferInfo;
-    if (bufferInfo === null) {
+      frag,
+      success
+    } = data;
+    this.fragPrevious = frag;
+    this.state = State.IDLE;
+    if (!success) {
       return;
     }
-    const ttfbEstimate = this.bwEstimator.getEstimateTTFB();
-    const playbackRate = Math.abs(media.playbackRate);
-    // To maintain stable adaptive playback, only begin monitoring frag loading after half or more of its playback duration has passed
-    if (timeLoading <= Math.max(ttfbEstimate, 1000 * (duration / (playbackRate * 2)))) {
+    const buffered = this.tracksBuffered[this.currentTrackId];
+    if (!buffered) {
       return;
     }
 
-    // bufferStarvationDelay is an estimate of the amount time (in seconds) it will take to exhaust the buffer
-    const bufferStarvationDelay = bufferInfo.len / playbackRate;
-    // Only downswitch if less than 2 fragment lengths are buffered
-    if (bufferStarvationDelay >= 2 * duration / playbackRate) {
-      return;
+    // Create/update a buffered array matching the interface used by BufferHelper.bufferedInfo
+    // so we can re-use the logic used to detect how much has been buffered
+    let timeRange;
+    const fragStart = frag.start;
+    for (let i = 0; i < buffered.length; i++) {
+      if (fragStart >= buffered[i].start && fragStart <= buffered[i].end) {
+        timeRange = buffered[i];
+        break;
+      }
     }
-    const ttfb = stats.loading.first ? stats.loading.first - stats.loading.start : -1;
-    const loadedFirstByte = stats.loaded && ttfb > -1;
-    const bwEstimate = this.bwEstimator.getEstimate();
-    const {
-      levels,
-      minAutoLevel
-    } = hls;
-    const level = levels[frag.level];
-    const expectedLen = stats.total || Math.max(stats.loaded, Math.round(duration * level.maxBitrate / 8));
-    let timeStreaming = timeLoading - ttfb;
-    if (timeStreaming < 1 && loadedFirstByte) {
-      timeStreaming = Math.min(timeLoading, stats.loaded * 8 / bwEstimate);
-    }
-    const loadRate = loadedFirstByte ? stats.loaded * 1000 / timeStreaming : 0;
-    // fragLoadDelay is an estimate of the time (in seconds) it will take to buffer the remainder of the fragment
-    const fragLoadedDelay = loadRate ? (expectedLen - stats.loaded) / loadRate : expectedLen * 8 / bwEstimate + ttfbEstimate / 1000;
-    // Only downswitch if the time to finish loading the current fragment is greater than the amount of buffer left
-    if (fragLoadedDelay <= bufferStarvationDelay) {
-      return;
+    const fragEnd = frag.start + frag.duration;
+    if (timeRange) {
+      timeRange.end = fragEnd;
+    } else {
+      timeRange = {
+        start: fragStart,
+        end: fragEnd
+      };
+      buffered.push(timeRange);
     }
-    const bwe = loadRate ? loadRate * 8 : bwEstimate;
-    let fragLevelNextLoadedDelay = Number.POSITIVE_INFINITY;
-    let nextLoadLevel;
-    // Iterate through lower level and try to find the largest one that avoids rebuffering
-    for (nextLoadLevel = frag.level - 1; nextLoadLevel > minAutoLevel; nextLoadLevel--) {
-      // compute time to load next fragment at lower level
-      // 8 = bits per byte (bps/Bps)
-      const levelNextBitrate = levels[nextLoadLevel].maxBitrate;
-      fragLevelNextLoadedDelay = this.getTimeToLoadFrag(ttfbEstimate / 1000, bwe, duration * levelNextBitrate, !levels[nextLoadLevel].details);
-      if (fragLevelNextLoadedDelay < bufferStarvationDelay) {
-        break;
+    this.fragmentTracker.fragBuffered(frag);
+    this.fragBufferedComplete(frag, null);
+  }
+  onBufferFlushing(event, data) {
+    const {
+      startOffset,
+      endOffset
+    } = data;
+    if (startOffset === 0 && endOffset !== Number.POSITIVE_INFINITY) {
+      const endOffsetSubtitles = endOffset - 1;
+      if (endOffsetSubtitles <= 0) {
+        return;
       }
+      data.endOffsetSubtitles = Math.max(0, endOffsetSubtitles);
+      this.tracksBuffered.forEach(buffered => {
+        for (let i = 0; i < buffered.length;) {
+          if (buffered[i].end <= endOffsetSubtitles) {
+            buffered.shift();
+            continue;
+          } else if (buffered[i].start < endOffsetSubtitles) {
+            buffered[i].start = endOffsetSubtitles;
+          } else {
+            break;
+          }
+          i++;
+        }
+      });
+      this.fragmentTracker.removeFragmentsInRange(startOffset, endOffsetSubtitles, PlaylistLevelType.SUBTITLE);
     }
-    // Only emergency switch down if it takes less time to load a new fragment at lowest level instead of continuing
-    // to load the current one
-    if (fragLevelNextLoadedDelay >= fragLoadedDelay) {
-      return;
+  }
+  onFragBuffered(event, data) {
+    if (!this.loadedmetadata && data.frag.type === PlaylistLevelType.MAIN) {
+      var _this$media;
+      if ((_this$media = this.media) != null && _this$media.buffered.length) {
+        this.loadedmetadata = true;
+      }
     }
+  }
 
-    // if estimated load time of new segment is completely unreasonable, ignore and do not emergency switch down
-    if (fragLevelNextLoadedDelay > duration * 10) {
-      return;
-    }
-    hls.nextLoadLevel = nextLoadLevel;
-    if (loadedFirstByte) {
-      // If there has been loading progress, sample bandwidth using loading time offset by minimum TTFB time
-      this.bwEstimator.sample(timeLoading - Math.min(ttfbEstimate, ttfb), stats.loaded);
-    } else {
-      // If there has been no loading progress, sample TTFB
-      this.bwEstimator.sampleTTFB(timeLoading);
-    }
-    this.clearTimer();
-    logger.warn(`[abr] Fragment ${frag.sn}${part ? ' part ' + part.index : ''} of level ${frag.level} is loading too slowly;
-      Time to underbuffer: ${bufferStarvationDelay.toFixed(3)} s
-      Estimated load time for current fragment: ${fragLoadedDelay.toFixed(3)} s
-      Estimated load time for down switch fragment: ${fragLevelNextLoadedDelay.toFixed(3)} s
-      TTFB estimate: ${ttfb}
-      Current BW estimate: ${isFiniteNumber(bwEstimate) ? (bwEstimate / 1024).toFixed(3) : 'Unknown'} Kb/s
-      New BW estimate: ${(this.bwEstimator.getEstimate() / 1024).toFixed(3)} Kb/s
-      Aborting and switching to level ${nextLoadLevel}`);
-    if (frag.loader) {
-      this.fragCurrent = this.partCurrent = null;
-      frag.abortRequests();
+  // If something goes wrong, proceed to next frag, if we were processing one.
+  onError(event, data) {
+    const frag = data.frag;
+    if ((frag == null ? void 0 : frag.type) === PlaylistLevelType.SUBTITLE) {
+      if (this.fragCurrent) {
+        this.fragCurrent.abortRequests();
+      }
+      if (this.state !== State.STOPPED) {
+        this.state = State.IDLE;
+      }
     }
-    hls.trigger(Events.FRAG_LOAD_EMERGENCY_ABORTED, {
-      frag,
-      part,
-      stats
-    });
   }
-  onFragLoaded(event, {
-    frag,
-    part
+
+  // Got all new subtitle levels.
+  onSubtitleTracksUpdated(event, {
+    subtitleTracks
   }) {
-    const stats = part ? part.stats : frag.stats;
-    if (frag.type === PlaylistLevelType.MAIN) {
-      this.bwEstimator.sampleTTFB(stats.loading.first - stats.loading.start);
+    if (!this.levels || subtitleOptionsIdentical(this.levels, subtitleTracks)) {
+      this.levels = subtitleTracks.map(mediaPlaylist => new Level(mediaPlaylist));
+      return;
     }
-    if (this.ignoreFragment(frag)) {
+    this.tracksBuffered = [];
+    this.levels = subtitleTracks.map(mediaPlaylist => {
+      const level = new Level(mediaPlaylist);
+      this.tracksBuffered[level.id] = [];
+      return level;
+    });
+    this.fragmentTracker.removeFragmentsInRange(0, Number.POSITIVE_INFINITY, PlaylistLevelType.SUBTITLE);
+    this.fragPrevious = null;
+    this.mediaBuffer = null;
+  }
+  onSubtitleTrackSwitch(event, data) {
+    var _this$levels;
+    this.currentTrackId = data.id;
+    if (!((_this$levels = this.levels) != null && _this$levels.length) || this.currentTrackId === -1) {
+      this.clearInterval();
       return;
     }
-    // stop monitoring bw once frag loaded
-    this.clearTimer();
-    // store level id after successful fragment load
-    this.lastLoadedFragLevel = frag.level;
-    // reset forced auto level value so that next level will be selected
-    this._nextAutoLevel = -1;
 
-    // compute level average bitrate
-    if (this.hls.config.abrMaxWithRealBitrate) {
-      const duration = part ? part.duration : frag.duration;
-      const level = this.hls.levels[frag.level];
-      const loadedBytes = (level.loaded ? level.loaded.bytes : 0) + stats.loaded;
-      const loadedDuration = (level.loaded ? level.loaded.duration : 0) + duration;
-      level.loaded = {
-        bytes: loadedBytes,
-        duration: loadedDuration
-      };
-      level.realBitrate = Math.round(8 * loadedBytes / loadedDuration);
+    // Check if track has the necessary details to load fragments
+    const currentTrack = this.levels[this.currentTrackId];
+    if (currentTrack != null && currentTrack.details) {
+      this.mediaBuffer = this.mediaBufferTimeRanges;
+    } else {
+      this.mediaBuffer = null;
     }
-    if (frag.bitrateTest) {
-      const fragBufferedData = {
-        stats,
-        frag,
-        part,
-        id: frag.type
-      };
-      this.onFragBuffered(Events.FRAG_BUFFERED, fragBufferedData);
-      frag.bitrateTest = false;
+    if (currentTrack) {
+      this.setInterval(TICK_INTERVAL$1);
     }
   }
-  onFragBuffered(event, data) {
+
+  // Got a new set of subtitle fragments.
+  onSubtitleTrackLoaded(event, data) {
+    var _track$details;
     const {
-      frag,
-      part
+      currentTrackId,
+      levels
+    } = this;
+    const {
+      details: newDetails,
+      id: trackId
     } = data;
-    const stats = part != null && part.stats.loaded ? part.stats : frag.stats;
-    if (stats.aborted) {
+    if (!levels) {
+      this.warn(`Subtitle tracks were reset while loading level ${trackId}`);
       return;
     }
-    if (this.ignoreFragment(frag)) {
+    const track = levels[currentTrackId];
+    if (trackId >= levels.length || trackId !== currentTrackId || !track) {
       return;
     }
-    // Use the difference between parsing and request instead of buffering and request to compute fragLoadingProcessing;
-    // rationale is that buffer appending only happens once media is attached. This can happen when config.startFragPrefetch
-    // is used. If we used buffering in that case, our BW estimate sample will be very large.
-    const processingMs = stats.parsing.end - stats.loading.start - Math.min(stats.loading.first - stats.loading.start, this.bwEstimator.getEstimateTTFB());
-    this.bwEstimator.sample(processingMs, stats.loaded);
-    stats.bwEstimate = this.bwEstimator.getEstimate();
-    if (frag.bitrateTest) {
-      this.bitrateTestDelay = processingMs / 1000;
-    } else {
-      this.bitrateTestDelay = 0;
-    }
-  }
-  ignoreFragment(frag) {
-    // Only count non-alt-audio frags which were actually buffered in our BW calculations
-    return frag.type !== PlaylistLevelType.MAIN || frag.sn === 'initSegment';
-  }
-  clearTimer() {
-    self.clearInterval(this.timer);
-  }
-
-  // return next auto level
-  get nextAutoLevel() {
-    const forcedAutoLevel = this._nextAutoLevel;
-    const bwEstimator = this.bwEstimator;
-    // in case next auto level has been forced, and bw not available or not reliable, return forced value
-    if (forcedAutoLevel !== -1 && !bwEstimator.canEstimate()) {
-      return forcedAutoLevel;
-    }
-
-    // compute next level using ABR logic
-    let nextABRAutoLevel = this.getNextABRAutoLevel();
-    // use forced auto level when ABR selected level has errored
-    if (forcedAutoLevel !== -1) {
-      const levels = this.hls.levels;
-      if (levels.length > Math.max(forcedAutoLevel, nextABRAutoLevel) && levels[forcedAutoLevel].loadError <= levels[nextABRAutoLevel].loadError) {
-        return forcedAutoLevel;
+    this.log(`Subtitle track ${trackId} loaded [${newDetails.startSN},${newDetails.endSN}]${newDetails.lastPartSn ? `[part-${newDetails.lastPartSn}-${newDetails.lastPartIndex}]` : ''},duration:${newDetails.totalduration}`);
+    this.mediaBuffer = this.mediaBufferTimeRanges;
+    let sliding = 0;
+    if (newDetails.live || (_track$details = track.details) != null && _track$details.live) {
+      const mainDetails = this.mainDetails;
+      if (newDetails.deltaUpdateFailed || !mainDetails) {
+        return;
+      }
+      const mainSlidingStartFragment = mainDetails.fragments[0];
+      if (!track.details) {
+        if (newDetails.hasProgramDateTime && mainDetails.hasProgramDateTime) {
+          alignMediaPlaylistByPDT(newDetails, mainDetails);
+          sliding = newDetails.fragments[0].start;
+        } else if (mainSlidingStartFragment) {
+          // line up live playlist with main so that fragments in range are loaded
+          sliding = mainSlidingStartFragment.start;
+          addSliding(newDetails, sliding);
+        }
+      } else {
+        var _this$levelLastLoaded;
+        sliding = this.alignPlaylists(newDetails, track.details, (_this$levelLastLoaded = this.levelLastLoaded) == null ? void 0 : _this$levelLastLoaded.details);
+        if (sliding === 0 && mainSlidingStartFragment) {
+          // realign with main when there is no overlap with last refresh
+          sliding = mainSlidingStartFragment.start;
+          addSliding(newDetails, sliding);
+        }
       }
     }
-    // if forced auto level has been defined, use it to cap ABR computed quality level
-    if (forcedAutoLevel !== -1) {
-      nextABRAutoLevel = Math.min(forcedAutoLevel, nextABRAutoLevel);
+    track.details = newDetails;
+    this.levelLastLoaded = track;
+    if (!this.startFragRequested && (this.mainDetails || !newDetails.live)) {
+      this.setStartPosition(track.details, sliding);
     }
-    return nextABRAutoLevel;
-  }
-  getNextABRAutoLevel() {
-    const {
-      fragCurrent,
-      partCurrent,
-      hls
-    } = this;
-    const {
-      maxAutoLevel,
-      config,
-      minAutoLevel,
-      media
-    } = hls;
-    const currentFragDuration = partCurrent ? partCurrent.duration : fragCurrent ? fragCurrent.duration : 0;
 
-    // playbackRate is the absolute value of the playback rate; if media.playbackRate is 0, we use 1 to load as
-    // if we're playing back at the normal rate.
-    const playbackRate = media && media.playbackRate !== 0 ? Math.abs(media.playbackRate) : 1.0;
-    const avgbw = this.bwEstimator ? this.bwEstimator.getEstimate() : config.abrEwmaDefaultEstimate;
-    // bufferStarvationDelay is the wall-clock time left until the playback buffer is exhausted.
-    const bufferInfo = hls.mainForwardBufferInfo;
-    const bufferStarvationDelay = (bufferInfo ? bufferInfo.len : 0) / playbackRate;
+    // trigger handler right now
+    this.tick();
 
-    // First, look to see if we can find a level matching with our avg bandwidth AND that could also guarantee no rebuffering at all
-    let bestLevel = this.findBestLevel(avgbw, minAutoLevel, maxAutoLevel, bufferStarvationDelay, config.abrBandWidthFactor, config.abrBandWidthUpFactor);
-    if (bestLevel >= 0) {
-      return bestLevel;
-    }
-    logger.trace(`[abr] ${bufferStarvationDelay ? 'rebuffering expected' : 'buffer is empty'}, finding optimal quality level`);
-    // not possible to get rid of rebuffering ... let's try to find level that will guarantee less than maxStarvationDelay of rebuffering
-    // if no matching level found, logic will return 0
-    let maxStarvationDelay = currentFragDuration ? Math.min(currentFragDuration, config.maxStarvationDelay) : config.maxStarvationDelay;
-    let bwFactor = config.abrBandWidthFactor;
-    let bwUpFactor = config.abrBandWidthUpFactor;
-    if (!bufferStarvationDelay) {
-      // in case buffer is empty, let's check if previous fragment was loaded to perform a bitrate test
-      const bitrateTestDelay = this.bitrateTestDelay;
-      if (bitrateTestDelay) {
-        // if it is the case, then we need to adjust our max starvation delay using maxLoadingDelay config value
-        // max video loading delay used in  automatic start level selection :
-        // in that mode ABR controller will ensure that video loading time (ie the time to fetch the first fragment at lowest quality level +
-        // the time to fetch the fragment at the appropriate quality level is less than ```maxLoadingDelay``` )
-        // cap maxLoadingDelay and ensure it is not bigger 'than bitrate test' frag duration
-        const maxLoadingDelay = currentFragDuration ? Math.min(currentFragDuration, config.maxLoadingDelay) : config.maxLoadingDelay;
-        maxStarvationDelay = maxLoadingDelay - bitrateTestDelay;
-        logger.trace(`[abr] bitrate test took ${Math.round(1000 * bitrateTestDelay)}ms, set first fragment max fetchDuration to ${Math.round(1000 * maxStarvationDelay)} ms`);
-        // don't use conservative factor on bitrate test
-        bwFactor = bwUpFactor = 1;
+    // If playlist is misaligned because of bad PDT or drift, delete details to resync with main on reload
+    if (newDetails.live && !this.fragCurrent && this.media && this.state === State.IDLE) {
+      const foundFrag = findFragmentByPTS(null, newDetails.fragments, this.media.currentTime, 0);
+      if (!foundFrag) {
+        this.warn('Subtitle playlist not aligned with playback');
+        track.details = undefined;
       }
     }
-    bestLevel = this.findBestLevel(avgbw, minAutoLevel, maxAutoLevel, bufferStarvationDelay + maxStarvationDelay, bwFactor, bwUpFactor);
-    return Math.max(bestLevel, 0);
   }
-  findBestLevel(currentBw, minAutoLevel, maxAutoLevel, maxFetchDuration, bwFactor, bwUpFactor) {
-    var _level$details;
+  _handleFragmentLoadComplete(fragLoadedData) {
     const {
-      fragCurrent,
-      partCurrent,
-      lastLoadedFragLevel: currentLevel
-    } = this;
-    const {
-      levels
-    } = this.hls;
-    const level = levels[currentLevel];
-    const live = !!(level != null && (_level$details = level.details) != null && _level$details.live);
-    const currentCodecSet = level == null ? void 0 : level.codecSet;
-    const currentFragDuration = partCurrent ? partCurrent.duration : fragCurrent ? fragCurrent.duration : 0;
-    const ttfbEstimateSec = this.bwEstimator.getEstimateTTFB() / 1000;
-    let levelSkippedMin = minAutoLevel;
-    let levelSkippedMax = -1;
-    for (let i = maxAutoLevel; i >= minAutoLevel; i--) {
-      const levelInfo = levels[i];
-      if (!levelInfo || currentCodecSet && levelInfo.codecSet !== currentCodecSet) {
-        if (levelInfo) {
-          levelSkippedMin = Math.min(i, levelSkippedMin);
-          levelSkippedMax = Math.max(i, levelSkippedMax);
-        }
-        continue;
+      frag,
+      payload
+    } = fragLoadedData;
+    const decryptData = frag.decryptdata;
+    const hls = this.hls;
+    if (this.fragContextChanged(frag)) {
+      return;
+    }
+    // check to see if the payload needs to be decrypted
+    if (payload && payload.byteLength > 0 && decryptData != null && decryptData.key && decryptData.iv && decryptData.method === 'AES-128') {
+      const startTime = performance.now();
+      // decrypt the subtitles
+      this.decrypter.decrypt(new Uint8Array(payload), decryptData.key.buffer, decryptData.iv.buffer).catch(err => {
+        hls.trigger(Events.ERROR, {
+          type: ErrorTypes.MEDIA_ERROR,
+          details: ErrorDetails.FRAG_DECRYPT_ERROR,
+          fatal: false,
+          error: err,
+          reason: err.message,
+          frag
+        });
+        throw err;
+      }).then(decryptedData => {
+        const endTime = performance.now();
+        hls.trigger(Events.FRAG_DECRYPTED, {
+          frag,
+          payload: decryptedData,
+          stats: {
+            tstart: startTime,
+            tdecrypt: endTime
+          }
+        });
+      }).catch(err => {
+        this.warn(`${err.name}: ${err.message}`);
+        this.state = State.IDLE;
+      });
+    }
+  }
+  doTick() {
+    if (!this.media) {
+      this.state = State.IDLE;
+      return;
+    }
+    if (this.state === State.IDLE) {
+      const {
+        currentTrackId,
+        levels
+      } = this;
+      const track = levels == null ? void 0 : levels[currentTrackId];
+      if (!track || !levels.length || !track.details) {
+        return;
       }
-      if (levelSkippedMax !== -1) {
-        logger.trace(`[abr] Skipped level(s) ${levelSkippedMin}-${levelSkippedMax} with CODECS:"${levels[levelSkippedMax].attrs.CODECS}"; not compatible with "${level.attrs.CODECS}"`);
+      const {
+        config
+      } = this;
+      const currentTime = this.getLoadPosition();
+      const bufferedInfo = BufferHelper.bufferedInfo(this.tracksBuffered[this.currentTrackId] || [], currentTime, config.maxBufferHole);
+      const {
+        end: targetBufferTime,
+        len: bufferLen
+      } = bufferedInfo;
+      const mainBufferInfo = this.getFwdBufferInfo(this.media, PlaylistLevelType.MAIN);
+      const trackDetails = track.details;
+      const maxBufLen = this.getMaxBufferLength(mainBufferInfo == null ? void 0 : mainBufferInfo.len) + trackDetails.levelTargetDuration;
+      if (bufferLen > maxBufLen) {
+        return;
       }
-      const levelDetails = levelInfo.details;
-      const avgDuration = (partCurrent ? levelDetails == null ? void 0 : levelDetails.partTarget : levelDetails == null ? void 0 : levelDetails.averagetargetduration) || currentFragDuration;
-      let adjustedbw;
-      // follow algorithm captured from stagefright :
-      // https://android.googlesource.com/platform/frameworks/av/+/master/media/libstagefright/httplive/LiveSession.cpp
-      // Pick the highest bandwidth stream below or equal to estimated bandwidth.
-      // consider only 80% of the available bandwidth, but if we are switching up,
-      // be even more conservative (70%) to avoid overestimating and immediately
-      // switching back.
-      if (i <= currentLevel) {
-        adjustedbw = bwFactor * currentBw;
+      const fragments = trackDetails.fragments;
+      const fragLen = fragments.length;
+      const end = trackDetails.edge;
+      let foundFrag = null;
+      const fragPrevious = this.fragPrevious;
+      if (targetBufferTime < end) {
+        const tolerance = config.maxFragLookUpTolerance;
+        const lookupTolerance = targetBufferTime > end - tolerance ? 0 : tolerance;
+        foundFrag = findFragmentByPTS(fragPrevious, fragments, Math.max(fragments[0].start, targetBufferTime), lookupTolerance);
+        if (!foundFrag && fragPrevious && fragPrevious.start < fragments[0].start) {
+          foundFrag = fragments[0];
+        }
       } else {
-        adjustedbw = bwUpFactor * currentBw;
+        foundFrag = fragments[fragLen - 1];
       }
-      const bitrate = levels[i].maxBitrate;
-      const fetchDuration = this.getTimeToLoadFrag(ttfbEstimateSec, adjustedbw, bitrate * avgDuration, levelDetails === undefined);
-      logger.trace(`[abr] level:${i} adjustedbw-bitrate:${Math.round(adjustedbw - bitrate)} avgDuration:${avgDuration.toFixed(1)} maxFetchDuration:${maxFetchDuration.toFixed(1)} fetchDuration:${fetchDuration.toFixed(1)}`);
-      // if adjusted bw is greater than level bitrate AND
-      if (adjustedbw > bitrate && (
-      // fragment fetchDuration unknown OR live stream OR fragment fetchDuration less than max allowed fetch duration, then this level matches
-      // we don't account for max Fetch Duration for live streams, this is to avoid switching down when near the edge of live sliding window ...
-      // special case to support startLevel = -1 (bitrateTest) on live streams : in that case we should not exit loop so that findBestLevel will return -1
-      fetchDuration === 0 || !isFiniteNumber(fetchDuration) || live && !this.bitrateTestDelay || fetchDuration < maxFetchDuration)) {
-        // as we are looping from highest to lowest, this will return the best achievable quality level
-        return i;
+      if (!foundFrag) {
+        return;
+      }
+      foundFrag = this.mapToInitFragWhenRequired(foundFrag);
+      if (foundFrag.sn !== 'initSegment') {
+        // Load earlier fragment in same discontinuity to make up for misaligned playlists and cues that extend beyond end of segment
+        const curSNIdx = foundFrag.sn - trackDetails.startSN;
+        const prevFrag = fragments[curSNIdx - 1];
+        if (prevFrag && prevFrag.cc === foundFrag.cc && this.fragmentTracker.getState(prevFrag) === FragmentState.NOT_LOADED) {
+          foundFrag = prevFrag;
+        }
+      }
+      if (this.fragmentTracker.getState(foundFrag) === FragmentState.NOT_LOADED) {
+        // only load if fragment is not loaded
+        this.loadFragment(foundFrag, track, targetBufferTime);
       }
     }
-    // not enough time budget even with quality level 0 ... rebuffering might happen
-    return -1;
-  }
-  set nextAutoLevel(nextLevel) {
-    this._nextAutoLevel = nextLevel;
-  }
-}
-
-class ChunkCache {
-  constructor() {
-    this.chunks = [];
-    this.dataLength = 0;
   }
-  push(chunk) {
-    this.chunks.push(chunk);
-    this.dataLength += chunk.length;
+  getMaxBufferLength(mainBufferLength) {
+    const maxConfigBuffer = super.getMaxBufferLength();
+    if (!mainBufferLength) {
+      return maxConfigBuffer;
+    }
+    return Math.max(maxConfigBuffer, mainBufferLength);
   }
-  flush() {
-    const {
-      chunks,
-      dataLength
-    } = this;
-    let result;
-    if (!chunks.length) {
-      return new Uint8Array(0);
-    } else if (chunks.length === 1) {
-      result = chunks[0];
+  loadFragment(frag, level, targetBufferTime) {
+    this.fragCurrent = frag;
+    if (frag.sn === 'initSegment') {
+      this._loadInitSegment(frag, level);
     } else {
-      result = concatUint8Arrays(chunks, dataLength);
+      this.startFragRequested = true;
+      super.loadFragment(frag, level, targetBufferTime);
     }
-    this.reset();
-    return result;
   }
-  reset() {
-    this.chunks.length = 0;
-    this.dataLength = 0;
+  get mediaBufferTimeRanges() {
+    return new BufferableInstance(this.tracksBuffered[this.currentTrackId] || []);
   }
 }
-function concatUint8Arrays(chunks, dataLength) {
-  const result = new Uint8Array(dataLength);
-  let offset = 0;
-  for (let i = 0; i < chunks.length; i++) {
-    const chunk = chunks[i];
-    result.set(chunk, offset);
-    offset += chunk.length;
+class BufferableInstance {
+  constructor(timeranges) {
+    this.buffered = void 0;
+    const getRange = (name, index, length) => {
+      index = index >>> 0;
+      if (index > length - 1) {
+        throw new DOMException(`Failed to execute '${name}' on 'TimeRanges': The index provided (${index}) is greater than the maximum bound (${length})`);
+      }
+      return timeranges[index][name];
+    };
+    this.buffered = {
+      get length() {
+        return timeranges.length;
+      },
+      end(index) {
+        return getRange('end', index, timeranges.length);
+      },
+      start(index) {
+        return getRange('start', index, timeranges.length);
+      }
+    };
   }
-  return result;
 }
 
-const TICK_INTERVAL$1 = 100; // how often to tick in ms
-
-class AudioStreamController extends BaseStreamController {
-  constructor(hls, fragmentTracker, keyLoader) {
-    super(hls, fragmentTracker, keyLoader, '[audio-stream-controller]', PlaylistLevelType.AUDIO);
-    this.videoBuffer = null;
-    this.videoTrackCC = -1;
-    this.waitingVideoCC = -1;
-    this.bufferedTrack = null;
-    this.switchingTrack = null;
+class SubtitleTrackController extends BasePlaylistController {
+  constructor(hls) {
+    super(hls, '[subtitle-track-controller]');
+    this.media = null;
+    this.tracks = [];
+    this.groupIds = null;
+    this.tracksInGroup = [];
     this.trackId = -1;
-    this.waitingData = null;
-    this.mainDetails = null;
-    this.bufferFlushed = false;
-    this.cachedTrackLoadedData = null;
-    this._registerListeners();
+    this.currentTrack = null;
+    this.selectDefaultTrack = true;
+    this.queuedDefaultTrack = -1;
+    this.asyncPollTrackChange = () => this.pollTrackChange(0);
+    this.useTextTrackPolling = false;
+    this.subtitlePollingInterval = -1;
+    this._subtitleDisplay = true;
+    this.onTextTracksChanged = () => {
+      if (!this.useTextTrackPolling) {
+        self.clearInterval(this.subtitlePollingInterval);
+      }
+      // Media is undefined when switching streams via loadSource()
+      if (!this.media || !this.hls.config.renderTextTracksNatively) {
+        return;
+      }
+      let textTrack = null;
+      const tracks = filterSubtitleTracks(this.media.textTracks);
+      for (let i = 0; i < tracks.length; i++) {
+        if (tracks[i].mode === 'hidden') {
+          // Do not break in case there is a following track with showing.
+          textTrack = tracks[i];
+        } else if (tracks[i].mode === 'showing') {
+          textTrack = tracks[i];
+          break;
+        }
+      }
+
+      // Find internal track index for TextTrack
+      const trackId = this.findTrackForTextTrack(textTrack);
+      if (this.subtitleTrack !== trackId) {
+        this.setSubtitleTrack(trackId);
+      }
+    };
+    this.registerListeners();
   }
-  onHandlerDestroying() {
-    this._unregisterListeners();
-    this.mainDetails = null;
-    this.bufferedTrack = null;
-    this.switchingTrack = null;
+  destroy() {
+    this.unregisterListeners();
+    this.tracks.length = 0;
+    this.tracksInGroup.length = 0;
+    this.currentTrack = null;
+    this.onTextTracksChanged = this.asyncPollTrackChange = null;
+    super.destroy();
   }
-  _registerListeners() {
+  get subtitleDisplay() {
+    return this._subtitleDisplay;
+  }
+  set subtitleDisplay(value) {
+    this._subtitleDisplay = value;
+    if (this.trackId > -1) {
+      this.toggleTrackModes();
+    }
+  }
+  registerListeners() {
     const {
       hls
     } = this;
     hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
     hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
     hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
-    hls.on(Events.LEVEL_LOADED, this.onLevelLoaded, this);
-    hls.on(Events.AUDIO_TRACKS_UPDATED, this.onAudioTracksUpdated, this);
-    hls.on(Events.AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
-    hls.on(Events.AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
+    hls.on(Events.MANIFEST_PARSED, this.onManifestParsed, this);
+    hls.on(Events.LEVEL_LOADING, this.onLevelLoading, this);
+    hls.on(Events.LEVEL_SWITCHING, this.onLevelSwitching, this);
+    hls.on(Events.SUBTITLE_TRACK_LOADED, this.onSubtitleTrackLoaded, this);
     hls.on(Events.ERROR, this.onError, this);
-    hls.on(Events.BUFFER_RESET, this.onBufferReset, this);
-    hls.on(Events.BUFFER_CREATED, this.onBufferCreated, this);
-    hls.on(Events.BUFFER_FLUSHED, this.onBufferFlushed, this);
-    hls.on(Events.INIT_PTS_FOUND, this.onInitPtsFound, this);
-    hls.on(Events.FRAG_BUFFERED, this.onFragBuffered, this);
   }
-  _unregisterListeners() {
+  unregisterListeners() {
     const {
       hls
     } = this;
     hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
     hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
     hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
-    hls.off(Events.LEVEL_LOADED, this.onLevelLoaded, this);
-    hls.off(Events.AUDIO_TRACKS_UPDATED, this.onAudioTracksUpdated, this);
-    hls.off(Events.AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
-    hls.off(Events.AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
+    hls.off(Events.MANIFEST_PARSED, this.onManifestParsed, this);
+    hls.off(Events.LEVEL_LOADING, this.onLevelLoading, this);
+    hls.off(Events.LEVEL_SWITCHING, this.onLevelSwitching, this);
+    hls.off(Events.SUBTITLE_TRACK_LOADED, this.onSubtitleTrackLoaded, this);
     hls.off(Events.ERROR, this.onError, this);
-    hls.off(Events.BUFFER_RESET, this.onBufferReset, this);
-    hls.off(Events.BUFFER_CREATED, this.onBufferCreated, this);
-    hls.off(Events.BUFFER_FLUSHED, this.onBufferFlushed, this);
-    hls.off(Events.INIT_PTS_FOUND, this.onInitPtsFound, this);
-    hls.off(Events.FRAG_BUFFERED, this.onFragBuffered, this);
   }
 
-  // INIT_PTS_FOUND is triggered when the video track parsed in the stream-controller has a new PTS value
-  onInitPtsFound(event, {
-    frag,
-    id,
-    initPTS,
-    timescale
-  }) {
-    // Always update the new INIT PTS
-    // Can change due level switch
-    if (id === 'main') {
-      const cc = frag.cc;
-      this.initPTS[frag.cc] = {
-        baseTime: initPTS,
-        timescale
-      };
-      this.log(`InitPTS for cc: ${cc} found from main: ${initPTS}`);
-      this.videoTrackCC = cc;
-      // If we are waiting, tick immediately to unblock audio fragment transmuxing
-      if (this.state === State.WAITING_INIT_PTS) {
-        this.tick();
-      }
-    }
-  }
-  startLoad(startPosition) {
-    if (!this.levels) {
-      this.startPosition = startPosition;
-      this.state = State.STOPPED;
+  // Listen for subtitle track change, then extract the current track ID.
+  onMediaAttached(event, data) {
+    this.media = data.media;
+    if (!this.media) {
       return;
     }
-    const lastCurrentTime = this.lastCurrentTime;
-    this.stopLoad();
-    this.setInterval(TICK_INTERVAL$1);
-    if (lastCurrentTime > 0 && startPosition === -1) {
-      this.log(`Override startPosition with lastCurrentTime @${lastCurrentTime.toFixed(3)}`);
-      startPosition = lastCurrentTime;
-      this.state = State.IDLE;
+    if (this.queuedDefaultTrack > -1) {
+      this.subtitleTrack = this.queuedDefaultTrack;
+      this.queuedDefaultTrack = -1;
+    }
+    this.useTextTrackPolling = !(this.media.textTracks && 'onchange' in this.media.textTracks);
+    if (this.useTextTrackPolling) {
+      this.pollTrackChange(500);
     } else {
-      this.loadedmetadata = false;
-      this.state = State.WAITING_TRACK;
+      this.media.textTracks.addEventListener('change', this.asyncPollTrackChange);
     }
-    this.nextLoadPosition = this.startPosition = this.lastCurrentTime = startPosition;
-    this.tick();
   }
-  doTick() {
-    switch (this.state) {
-      case State.IDLE:
-        this.doTickIdle();
-        break;
-      case State.WAITING_TRACK:
-        {
-          var _levels$trackId;
-          const {
-            levels,
-            trackId
-          } = this;
-          const details = levels == null ? void 0 : (_levels$trackId = levels[trackId]) == null ? void 0 : _levels$trackId.details;
-          if (details) {
-            if (this.waitForCdnTuneIn(details)) {
-              break;
-            }
-            this.state = State.WAITING_INIT_PTS;
-          }
-          break;
-        }
-      case State.FRAG_LOADING_WAITING_RETRY:
-        {
-          var _this$media;
-          const now = performance.now();
-          const retryDate = this.retryDate;
-          // if current time is gt than retryDate, or if media seeking let's switch to IDLE state to retry loading
-          if (!retryDate || now >= retryDate || (_this$media = this.media) != null && _this$media.seeking) {
-            this.log('RetryDate reached, switch back to IDLE state');
-            this.resetStartWhenNotLoaded(this.trackId);
-            this.state = State.IDLE;
-          }
-          break;
-        }
-      case State.WAITING_INIT_PTS:
-        {
-          // Ensure we don't get stuck in the WAITING_INIT_PTS state if the waiting frag CC doesn't match any initPTS
-          const waitingData = this.waitingData;
-          if (waitingData) {
-            const {
-              frag,
-              part,
-              cache,
-              complete
-            } = waitingData;
-            if (this.initPTS[frag.cc] !== undefined) {
-              this.waitingData = null;
-              this.waitingVideoCC = -1;
-              this.state = State.FRAG_LOADING;
-              const payload = cache.flush();
-              const data = {
-                frag,
-                part,
-                payload,
-                networkDetails: null
-              };
-              this._handleFragmentLoadProgress(data);
-              if (complete) {
-                super._handleFragmentLoadComplete(data);
-              }
-            } else if (this.videoTrackCC !== this.waitingVideoCC) {
-              // Drop waiting fragment if videoTrackCC has changed since waitingFragment was set and initPTS was not found
-              this.log(`Waiting fragment cc (${frag.cc}) cancelled because video is at cc ${this.videoTrackCC}`);
-              this.clearWaitingFragment();
-            } else {
-              // Drop waiting fragment if an earlier fragment is needed
-              const pos = this.getLoadPosition();
-              const bufferInfo = BufferHelper.bufferInfo(this.mediaBuffer, pos, this.config.maxBufferHole);
-              const waitingFragmentAtPosition = fragmentWithinToleranceTest(bufferInfo.end, this.config.maxFragLookUpTolerance, frag);
-              if (waitingFragmentAtPosition < 0) {
-                this.log(`Waiting fragment cc (${frag.cc}) @ ${frag.start} cancelled because another fragment at ${bufferInfo.end} is needed`);
-                this.clearWaitingFragment();
-              }
-            }
-          } else {
-            this.state = State.IDLE;
-          }
-        }
-    }
-    this.onTickEnd();
+  pollTrackChange(timeout) {
+    self.clearInterval(this.subtitlePollingInterval);
+    this.subtitlePollingInterval = self.setInterval(this.onTextTracksChanged, timeout);
   }
-  clearWaitingFragment() {
-    const waitingData = this.waitingData;
-    if (waitingData) {
-      this.fragmentTracker.removeFragment(waitingData.frag);
-      this.waitingData = null;
-      this.waitingVideoCC = -1;
-      this.state = State.IDLE;
+  onMediaDetaching() {
+    if (!this.media) {
+      return;
+    }
+    self.clearInterval(this.subtitlePollingInterval);
+    if (!this.useTextTrackPolling) {
+      this.media.textTracks.removeEventListener('change', this.asyncPollTrackChange);
+    }
+    if (this.trackId > -1) {
+      this.queuedDefaultTrack = this.trackId;
     }
+    const textTracks = filterSubtitleTracks(this.media.textTracks);
+    // Clear loaded cues on media detachment from tracks
+    textTracks.forEach(track => {
+      clearCurrentCues(track);
+    });
+    // Disable all subtitle tracks before detachment so when reattached only tracks in that content are enabled.
+    this.subtitleTrack = -1;
+    this.media = null;
   }
-  resetLoadingState() {
-    this.clearWaitingFragment();
-    super.resetLoadingState();
+  onManifestLoading() {
+    this.tracks = [];
+    this.groupIds = null;
+    this.tracksInGroup = [];
+    this.trackId = -1;
+    this.currentTrack = null;
+    this.selectDefaultTrack = true;
   }
-  onTickEnd() {
+
+  // Fired whenever a new manifest is loaded.
+  onManifestParsed(event, data) {
+    this.tracks = data.subtitleTracks;
+  }
+  onSubtitleTrackLoaded(event, data) {
     const {
-      media
-    } = this;
-    if (!(media != null && media.readyState)) {
-      // Exit early if we don't have media or if the media hasn't buffered anything yet (readyState 0)
+      id,
+      groupId,
+      details
+    } = data;
+    const trackInActiveGroup = this.tracksInGroup[id];
+    if (!trackInActiveGroup || trackInActiveGroup.groupId !== groupId) {
+      this.warn(`Subtitle track with id:${id} and group:${groupId} not found in active group ${trackInActiveGroup == null ? void 0 : trackInActiveGroup.groupId}`);
       return;
     }
-    this.lastCurrentTime = media.currentTime;
+    const curDetails = trackInActiveGroup.details;
+    trackInActiveGroup.details = data.details;
+    this.log(`Subtitle track ${id} "${trackInActiveGroup.name}" lang:${trackInActiveGroup.lang} group:${groupId} loaded [${details.startSN}-${details.endSN}]`);
+    if (id === this.trackId) {
+      this.playlistLoaded(id, data, curDetails);
+    }
   }
-  doTickIdle() {
-    const {
-      hls,
-      levels,
-      media,
-      trackId
-    } = this;
-    const config = hls.config;
-    if (!(levels != null && levels[trackId])) {
+  onLevelLoading(event, data) {
+    this.switchLevel(data.level);
+  }
+  onLevelSwitching(event, data) {
+    this.switchLevel(data.level);
+  }
+  switchLevel(levelIndex) {
+    const levelInfo = this.hls.levels[levelIndex];
+    if (!levelInfo) {
       return;
     }
+    const subtitleGroups = levelInfo.subtitleGroups || null;
+    const currentGroups = this.groupIds;
+    let currentTrack = this.currentTrack;
+    if (!subtitleGroups || (currentGroups == null ? void 0 : currentGroups.length) !== (subtitleGroups == null ? void 0 : subtitleGroups.length) || subtitleGroups != null && subtitleGroups.some(groupId => (currentGroups == null ? void 0 : currentGroups.indexOf(groupId)) === -1)) {
+      this.groupIds = subtitleGroups;
+      this.trackId = -1;
+      this.currentTrack = null;
+      const subtitleTracks = this.tracks.filter(track => !subtitleGroups || subtitleGroups.indexOf(track.groupId) !== -1);
+      if (subtitleTracks.length) {
+        // Disable selectDefaultTrack if there are no default tracks
+        if (this.selectDefaultTrack && !subtitleTracks.some(track => track.default)) {
+          this.selectDefaultTrack = false;
+        }
+        // track.id should match hls.audioTracks index
+        subtitleTracks.forEach((track, i) => {
+          track.id = i;
+        });
+      } else if (!currentTrack && !this.tracksInGroup.length) {
+        // Do not dispatch SUBTITLE_TRACKS_UPDATED when there were and are no tracks
+        return;
+      }
+      this.tracksInGroup = subtitleTracks;
 
-    // if video not attached AND
-    // start fragment already requested OR start frag prefetch not enabled
-    // exit loop
-    // => if media not attached but start frag prefetch is enabled and start frag not requested yet, we will not exit loop
-    if (!media && (this.startFragRequested || !config.startFragPrefetch)) {
-      return;
-    }
-    const levelInfo = levels[trackId];
-    const trackDetails = levelInfo.details;
-    if (!trackDetails || trackDetails.live && this.levelLastLoaded !== trackId || this.waitForCdnTuneIn(trackDetails)) {
-      this.state = State.WAITING_TRACK;
-      return;
+      // Find preferred track
+      const subtitlePreference = this.hls.config.subtitlePreference;
+      if (!currentTrack && subtitlePreference) {
+        this.selectDefaultTrack = false;
+        const groupIndex = findMatchingOption(subtitlePreference, subtitleTracks);
+        if (groupIndex > -1) {
+          currentTrack = subtitleTracks[groupIndex];
+        } else {
+          const allIndex = findMatchingOption(subtitlePreference, this.tracks);
+          currentTrack = this.tracks[allIndex];
+        }
+      }
+
+      // Select initial track
+      let trackId = this.findTrackId(currentTrack);
+      if (trackId === -1 && currentTrack) {
+        trackId = this.findTrackId(null);
+      }
+
+      // Dispatch events and load track if needed
+      const subtitleTracksUpdated = {
+        subtitleTracks
+      };
+      this.log(`Updating subtitle tracks, ${subtitleTracks.length} track(s) found in "${subtitleGroups == null ? void 0 : subtitleGroups.join(',')}" group-id`);
+      this.hls.trigger(Events.SUBTITLE_TRACKS_UPDATED, subtitleTracksUpdated);
+      if (trackId !== -1 && this.trackId === -1) {
+        this.setSubtitleTrack(trackId);
+      }
+    } else if (this.shouldReloadPlaylist(currentTrack)) {
+      // Retry playlist loading if no playlist is or has been loaded yet
+      this.setSubtitleTrack(this.trackId);
     }
-    const bufferable = this.mediaBuffer ? this.mediaBuffer : this.media;
-    if (this.bufferFlushed && bufferable) {
-      this.bufferFlushed = false;
-      this.afterBufferFlushed(bufferable, ElementaryStreamTypes.AUDIO, PlaylistLevelType.AUDIO);
-    }
-    const bufferInfo = this.getFwdBufferInfo(bufferable, PlaylistLevelType.AUDIO);
-    if (bufferInfo === null) {
-      return;
-    }
-    const {
-      bufferedTrack,
-      switchingTrack
-    } = this;
-    if (!switchingTrack && this._streamEnded(bufferInfo, trackDetails)) {
-      hls.trigger(Events.BUFFER_EOS, {
-        type: 'audio'
-      });
-      this.state = State.ENDED;
-      return;
-    }
-    const mainBufferInfo = this.getFwdBufferInfo(this.videoBuffer ? this.videoBuffer : this.media, PlaylistLevelType.MAIN);
-    const bufferLen = bufferInfo.len;
-    const maxBufLen = this.getMaxBufferLength(mainBufferInfo == null ? void 0 : mainBufferInfo.len);
-
-    // if buffer length is less than maxBufLen try to load a new fragment
-    if (bufferLen >= maxBufLen && !switchingTrack) {
-      return;
-    }
-    const fragments = trackDetails.fragments;
-    const start = fragments[0].start;
-    let targetBufferTime = bufferInfo.end;
-    if (switchingTrack && media) {
-      const pos = this.getLoadPosition();
-      if (bufferedTrack && switchingTrack.attrs !== bufferedTrack.attrs) {
-        targetBufferTime = pos;
+  }
+  findTrackId(currentTrack) {
+    const tracks = this.tracksInGroup;
+    const selectDefault = this.selectDefaultTrack;
+    for (let i = 0; i < tracks.length; i++) {
+      const track = tracks[i];
+      if (selectDefault && !track.default || !selectDefault && !currentTrack) {
+        continue;
       }
-      // if currentTime (pos) is less than alt audio playlist start time, it means that alt audio is ahead of currentTime
-      if (trackDetails.PTSKnown && pos < start) {
-        // if everything is buffered from pos to start or if audio buffer upfront, let's seek to start
-        if (bufferInfo.end > start || bufferInfo.nextStart) {
-          this.log('Alt audio track ahead of main track, seek to start of alt audio track');
-          media.currentTime = start + 0.05;
-        }
+      if (!currentTrack || matchesOption(track, currentTrack)) {
+        return i;
       }
     }
-    let frag = this.getNextFragment(targetBufferTime, trackDetails);
-    let atGap = false;
-    // Avoid loop loading by using nextLoadPosition set for backtracking and skipping consecutive GAP tags
-    if (frag && this.isLoopLoading(frag, targetBufferTime)) {
-      atGap = !!frag.gap;
-      frag = this.getNextFragmentLoopLoading(frag, trackDetails, bufferInfo, PlaylistLevelType.MAIN, maxBufLen);
-    }
-    if (!frag) {
-      this.bufferFlushed = true;
-      return;
-    }
-
-    // Buffer audio up to one target duration ahead of main buffer
-    const atBufferSyncLimit = mainBufferInfo && frag.start > mainBufferInfo.end + trackDetails.targetduration;
-    if (atBufferSyncLimit ||
-    // Or wait for main buffer after buffing some audio
-    !(mainBufferInfo != null && mainBufferInfo.len) && bufferInfo.len) {
-      // Check fragment-tracker for main fragments since GAP segments do not show up in bufferInfo
-      const mainFrag = this.getAppendedFrag(frag.start, PlaylistLevelType.MAIN);
-      if (mainFrag === null) {
-        return;
+    if (currentTrack) {
+      for (let i = 0; i < tracks.length; i++) {
+        const track = tracks[i];
+        if (mediaAttributesIdentical(currentTrack.attrs, track.attrs, ['LANGUAGE', 'ASSOC-LANGUAGE', 'CHARACTERISTICS'])) {
+          return i;
+        }
       }
-      // Bridge gaps in main buffer
-      atGap || (atGap = !!mainFrag.gap || !!atBufferSyncLimit && mainBufferInfo.len === 0);
-      if (atBufferSyncLimit && !atGap || atGap && bufferInfo.nextStart && bufferInfo.nextStart < mainFrag.end) {
-        return;
+      for (let i = 0; i < tracks.length; i++) {
+        const track = tracks[i];
+        if (mediaAttributesIdentical(currentTrack.attrs, track.attrs, ['LANGUAGE'])) {
+          return i;
+        }
       }
     }
-    this.loadFragment(frag, levelInfo, targetBufferTime);
+    return -1;
   }
-  getMaxBufferLength(mainBufferLength) {
-    const maxConfigBuffer = super.getMaxBufferLength();
-    if (!mainBufferLength) {
-      return maxConfigBuffer;
+  findTrackForTextTrack(textTrack) {
+    if (textTrack) {
+      const tracks = this.tracksInGroup;
+      for (let i = 0; i < tracks.length; i++) {
+        const track = tracks[i];
+        if (subtitleTrackMatchesTextTrack(track, textTrack)) {
+          return i;
+        }
+      }
     }
-    return Math.min(Math.max(maxConfigBuffer, mainBufferLength), this.config.maxMaxBufferLength);
-  }
-  onMediaDetaching() {
-    this.videoBuffer = null;
-    super.onMediaDetaching();
-  }
-  onAudioTracksUpdated(event, {
-    audioTracks
-  }) {
-    this.resetTransmuxer();
-    this.levels = audioTracks.map(mediaPlaylist => new Level(mediaPlaylist));
+    return -1;
   }
-  onAudioTrackSwitching(event, data) {
-    // if any URL found on new audio track, it is an alternate audio track
-    const altAudio = !!data.url;
-    this.trackId = data.id;
-    const {
-      fragCurrent
-    } = this;
-    if (fragCurrent) {
-      fragCurrent.abortRequests();
-      this.removeUnbufferedFrags(fragCurrent.start);
+  onError(event, data) {
+    if (data.fatal || !data.context) {
+      return;
     }
-    this.resetLoadingState();
-    // destroy useless transmuxer when switching audio to main
-    if (!altAudio) {
-      this.resetTransmuxer();
-    } else {
-      // switching to audio track, start timer if not already started
-      this.setInterval(TICK_INTERVAL$1);
+    if (data.context.type === PlaylistContextType.SUBTITLE_TRACK && data.context.id === this.trackId && (!this.groupIds || this.groupIds.indexOf(data.context.groupId) !== -1)) {
+      this.checkRetry(data);
     }
+  }
+  get allSubtitleTracks() {
+    return this.tracks;
+  }
 
-    // should we switch tracks ?
-    if (altAudio) {
-      this.switchingTrack = data;
-      // main audio track are handled by stream-controller, just do something if switching to alt audio track
-      this.state = State.IDLE;
-    } else {
-      this.switchingTrack = null;
-      this.bufferedTrack = data;
-      this.state = State.STOPPED;
-    }
-    this.tick();
+  /** get alternate subtitle tracks list from playlist **/
+  get subtitleTracks() {
+    return this.tracksInGroup;
   }
-  onManifestLoading() {
-    this.fragmentTracker.removeAllFragments();
-    this.startPosition = this.lastCurrentTime = 0;
-    this.bufferFlushed = false;
-    this.levels = this.mainDetails = this.waitingData = this.bufferedTrack = this.cachedTrackLoadedData = this.switchingTrack = null;
-    this.startFragRequested = false;
-    this.trackId = this.videoTrackCC = this.waitingVideoCC = -1;
+
+  /** get/set index of the selected subtitle track (based on index in subtitle track lists) **/
+  get subtitleTrack() {
+    return this.trackId;
   }
-  onLevelLoaded(event, data) {
-    this.mainDetails = data.details;
-    if (this.cachedTrackLoadedData !== null) {
-      this.hls.trigger(Events.AUDIO_TRACK_LOADED, this.cachedTrackLoadedData);
-      this.cachedTrackLoadedData = null;
+  set subtitleTrack(newId) {
+    this.selectDefaultTrack = false;
+    this.setSubtitleTrack(newId);
+  }
+  setSubtitleOption(subtitleOption) {
+    this.hls.config.subtitlePreference = subtitleOption;
+    if (subtitleOption) {
+      const allSubtitleTracks = this.allSubtitleTracks;
+      this.selectDefaultTrack = false;
+      if (allSubtitleTracks.length) {
+        // First see if current option matches (no switch op)
+        const currentTrack = this.currentTrack;
+        if (currentTrack && matchesOption(subtitleOption, currentTrack)) {
+          return currentTrack;
+        }
+        // Find option in current group
+        const groupIndex = findMatchingOption(subtitleOption, this.tracksInGroup);
+        if (groupIndex > -1) {
+          const track = this.tracksInGroup[groupIndex];
+          this.setSubtitleTrack(groupIndex);
+          return track;
+        } else if (currentTrack) {
+          // If this is not the initial selection return null
+          // option should have matched one in active group
+          return null;
+        } else {
+          // Find the option in all tracks for initial selection
+          const allIndex = findMatchingOption(subtitleOption, allSubtitleTracks);
+          if (allIndex > -1) {
+            return allSubtitleTracks[allIndex];
+          }
+        }
+      }
     }
+    return null;
   }
-  onAudioTrackLoaded(event, data) {
-    var _track$details;
-    if (this.mainDetails == null) {
-      this.cachedTrackLoadedData = data;
-      return;
+  loadPlaylist(hlsUrlParameters) {
+    super.loadPlaylist();
+    const currentTrack = this.currentTrack;
+    if (this.shouldLoadPlaylist(currentTrack) && currentTrack) {
+      const id = currentTrack.id;
+      const groupId = currentTrack.groupId;
+      let url = currentTrack.url;
+      if (hlsUrlParameters) {
+        try {
+          url = hlsUrlParameters.addDirectives(url);
+        } catch (error) {
+          this.warn(`Could not construct new URL with HLS Delivery Directives: ${error}`);
+        }
+      }
+      this.log(`Loading subtitle playlist for id ${id}`);
+      this.hls.trigger(Events.SUBTITLE_TRACK_LOADING, {
+        url,
+        id,
+        groupId,
+        deliveryDirectives: hlsUrlParameters || null
+      });
     }
+  }
+
+  /**
+   * Disables the old subtitleTrack and sets current mode on the next subtitleTrack.
+   * This operates on the DOM textTracks.
+   * A value of -1 will disable all subtitle tracks.
+   */
+  toggleTrackModes() {
     const {
-      levels
+      media
     } = this;
-    const {
-      details: newDetails,
-      id: trackId
-    } = data;
-    if (!levels) {
-      this.warn(`Audio tracks were reset while loading level ${trackId}`);
+    if (!media) {
       return;
     }
-    this.log(`Track ${trackId} loaded [${newDetails.startSN},${newDetails.endSN}]${newDetails.lastPartSn ? `[part-${newDetails.lastPartSn}-${newDetails.lastPartIndex}]` : ''},duration:${newDetails.totalduration}`);
-    const track = levels[trackId];
-    let sliding = 0;
-    if (newDetails.live || (_track$details = track.details) != null && _track$details.live) {
-      this.checkLiveUpdate(newDetails);
-      const mainDetails = this.mainDetails;
-      if (newDetails.deltaUpdateFailed || !mainDetails) {
-        return;
+    const textTracks = filterSubtitleTracks(media.textTracks);
+    const currentTrack = this.currentTrack;
+    let nextTrack;
+    if (currentTrack) {
+      nextTrack = textTracks.filter(textTrack => subtitleTrackMatchesTextTrack(currentTrack, textTrack))[0];
+      if (!nextTrack) {
+        this.warn(`Unable to find subtitle TextTrack with name "${currentTrack.name}" and language "${currentTrack.lang}"`);
       }
-      if (!track.details && newDetails.hasProgramDateTime && mainDetails.hasProgramDateTime) {
-        // Make sure our audio rendition is aligned with the "main" rendition, using
-        // pdt as our reference times.
-        alignMediaPlaylistByPDT(newDetails, mainDetails);
-        sliding = newDetails.fragments[0].start;
-      } else {
-        sliding = this.alignPlaylists(newDetails, track.details);
+    }
+    [].slice.call(textTracks).forEach(track => {
+      if (track.mode !== 'disabled' && track !== nextTrack) {
+        track.mode = 'disabled';
+      }
+    });
+    if (nextTrack) {
+      const mode = this.subtitleDisplay ? 'showing' : 'hidden';
+      if (nextTrack.mode !== mode) {
+        nextTrack.mode = mode;
       }
     }
-    track.details = newDetails;
-    this.levelLastLoaded = trackId;
+  }
 
-    // compute start position if we are aligned with the main playlist
-    if (!this.startFragRequested && (this.mainDetails || !newDetails.live)) {
-      this.setStartPosition(track.details, sliding);
-    }
-    // only switch back to IDLE state if we were waiting for track to start downloading a new fragment
-    if (this.state === State.WAITING_TRACK && !this.waitForCdnTuneIn(newDetails)) {
-      this.state = State.IDLE;
-    }
+  /**
+   * This method is responsible for validating the subtitle index and periodically reloading if live.
+   * Dispatches the SUBTITLE_TRACK_SWITCH event, which instructs the subtitle-stream-controller to load the selected track.
+   */
+  setSubtitleTrack(newId) {
+    const tracks = this.tracksInGroup;
 
-    // trigger handler right now
-    this.tick();
-  }
-  _handleFragmentLoadProgress(data) {
-    var _frag$initSegment;
-    const {
-      frag,
-      part,
-      payload
-    } = data;
-    const {
-      config,
-      trackId,
-      levels
-    } = this;
-    if (!levels) {
-      this.warn(`Audio tracks were reset while fragment load was in progress. Fragment ${frag.sn} of level ${frag.level} will not be buffered`);
+    // setting this.subtitleTrack will trigger internal logic
+    // if media has not been attached yet, it will fail
+    // we keep a reference to the default track id
+    // and we'll set subtitleTrack when onMediaAttached is triggered
+    if (!this.media) {
+      this.queuedDefaultTrack = newId;
       return;
     }
-    const track = levels[trackId];
-    if (!track) {
-      this.warn('Audio track is undefined on fragment load progress');
+
+    // exit if track id as already set or invalid
+    if (newId < -1 || newId >= tracks.length || !isFiniteNumber(newId)) {
+      this.warn(`Invalid subtitle track id: ${newId}`);
       return;
     }
-    const details = track.details;
-    if (!details) {
-      this.warn('Audio track details undefined on fragment load progress');
-      this.removeUnbufferedFrags(frag.start);
+
+    // stopping live reloading timer if any
+    this.clearTimer();
+    this.selectDefaultTrack = false;
+    const lastTrack = this.currentTrack;
+    const track = tracks[newId] || null;
+    this.trackId = newId;
+    this.currentTrack = track;
+    this.toggleTrackModes();
+    if (!track) {
+      // switch to -1
+      this.hls.trigger(Events.SUBTITLE_TRACK_SWITCH, {
+        id: newId
+      });
       return;
     }
-    const audioCodec = config.defaultAudioCodec || track.audioCodec || 'mp4a.40.2';
-    let transmuxer = this.transmuxer;
-    if (!transmuxer) {
-      transmuxer = this.transmuxer = new TransmuxerInterface(this.hls, PlaylistLevelType.AUDIO, this._handleTransmuxComplete.bind(this), this._handleTransmuxerFlush.bind(this));
+    const trackLoaded = !!track.details && !track.details.live;
+    if (newId === this.trackId && track === lastTrack && trackLoaded) {
+      return;
     }
+    this.log(`Switching to subtitle-track ${newId}` + (track ? ` "${track.name}" lang:${track.lang} group:${track.groupId}` : ''));
+    const {
+      id,
+      groupId = '',
+      name,
+      type,
+      url
+    } = track;
+    this.hls.trigger(Events.SUBTITLE_TRACK_SWITCH, {
+      id,
+      groupId,
+      name,
+      type,
+      url
+    });
+    const hlsUrlParameters = this.switchParams(track.url, lastTrack == null ? void 0 : lastTrack.details);
+    this.loadPlaylist(hlsUrlParameters);
+  }
+}
 
-    // Check if we have video initPTS
-    // If not we need to wait for it
-    const initPTS = this.initPTS[frag.cc];
-    const initSegmentData = (_frag$initSegment = frag.initSegment) == null ? void 0 : _frag$initSegment.data;
-    if (initPTS !== undefined) {
-      // this.log(`Transmuxing ${sn} of [${details.startSN} ,${details.endSN}],track ${trackId}`);
-      // time Offset is accurate if level PTS is known, or if playlist is not sliding (not live)
-      const accurateTimeOffset = false; // details.PTSKnown || !details.live;
-      const partIndex = part ? part.index : -1;
-      const partial = partIndex !== -1;
-      const chunkMeta = new ChunkMetadata(frag.level, frag.sn, frag.stats.chunkCount, payload.byteLength, partIndex, partial);
-      transmuxer.push(payload, initSegmentData, audioCodec, '', frag, part, details.totalduration, accurateTimeOffset, chunkMeta, initPTS);
-    } else {
-      this.log(`Unknown video PTS for cc ${frag.cc}, waiting for video PTS before demuxing audio frag ${frag.sn} of [${details.startSN} ,${details.endSN}],track ${trackId}`);
-      const {
-        cache
-      } = this.waitingData = this.waitingData || {
-        frag,
-        part,
-        cache: new ChunkCache(),
-        complete: false
-      };
-      cache.push(new Uint8Array(payload));
-      this.waitingVideoCC = this.videoTrackCC;
-      this.state = State.WAITING_INIT_PTS;
-    }
+class BufferOperationQueue {
+  constructor(sourceBufferReference) {
+    this.buffers = void 0;
+    this.queues = {
+      video: [],
+      audio: [],
+      audiovideo: []
+    };
+    this.buffers = sourceBufferReference;
   }
-  _handleFragmentLoadComplete(fragLoadedData) {
-    if (this.waitingData) {
-      this.waitingData.complete = true;
-      return;
+  append(operation, type, pending) {
+    const queue = this.queues[type];
+    queue.push(operation);
+    if (queue.length === 1 && !pending) {
+      this.executeNext(type);
     }
-    super._handleFragmentLoadComplete(fragLoadedData);
   }
-  onBufferReset( /* event: Events.BUFFER_RESET */
-  ) {
-    // reset reference to sourcebuffers
-    this.mediaBuffer = this.videoBuffer = null;
-    this.loadedmetadata = false;
+  insertAbort(operation, type) {
+    const queue = this.queues[type];
+    queue.unshift(operation);
+    this.executeNext(type);
   }
-  onBufferCreated(event, data) {
-    const audioTrack = data.tracks.audio;
-    if (audioTrack) {
-      this.mediaBuffer = audioTrack.buffer || null;
-    }
-    if (data.tracks.video) {
-      this.videoBuffer = data.tracks.video.buffer || null;
-    }
+  appendBlocker(type) {
+    let execute;
+    const promise = new Promise(resolve => {
+      execute = resolve;
+    });
+    const operation = {
+      execute,
+      onStart: () => {},
+      onComplete: () => {},
+      onError: () => {}
+    };
+    this.append(operation, type);
+    return promise;
   }
-  onFragBuffered(event, data) {
-    const {
-      frag,
-      part
-    } = data;
-    if (frag.type !== PlaylistLevelType.AUDIO) {
-      if (!this.loadedmetadata && frag.type === PlaylistLevelType.MAIN) {
-        const bufferable = this.videoBuffer || this.media;
-        if (bufferable) {
-          const bufferedTimeRanges = BufferHelper.getBuffered(bufferable);
-          if (bufferedTimeRanges.length) {
-            this.loadedmetadata = true;
-          }
+  executeNext(type) {
+    const queue = this.queues[type];
+    if (queue.length) {
+      const operation = queue[0];
+      try {
+        // Operations are expected to result in an 'updateend' event being fired. If not, the queue will lock. Operations
+        // which do not end with this event must call _onSBUpdateEnd manually
+        operation.execute();
+      } catch (error) {
+        logger.warn(`[buffer-operation-queue]: Exception executing "${type}" SourceBuffer operation: ${error}`);
+        operation.onError(error);
+
+        // Only shift the current operation off, otherwise the updateend handler will do this for us
+        const sb = this.buffers[type];
+        if (!(sb != null && sb.updating)) {
+          this.shiftAndExecuteNext(type);
         }
       }
-      return;
-    }
-    if (this.fragContextChanged(frag)) {
-      // If a level switch was requested while a fragment was buffering, it will emit the FRAG_BUFFERED event upon completion
-      // Avoid setting state back to IDLE or concluding the audio switch; otherwise, the switched-to track will not buffer
-      this.warn(`Fragment ${frag.sn}${part ? ' p: ' + part.index : ''} of level ${frag.level} finished buffering, but was aborted. state: ${this.state}, audioSwitch: ${this.switchingTrack ? this.switchingTrack.name : 'false'}`);
-      return;
-    }
-    if (frag.sn !== 'initSegment') {
-      this.fragPrevious = frag;
-      const track = this.switchingTrack;
-      if (track) {
-        this.bufferedTrack = track;
-        this.switchingTrack = null;
-        this.hls.trigger(Events.AUDIO_TRACK_SWITCHED, _objectSpread2({}, track));
-      }
     }
-    this.fragBufferedComplete(frag, part);
   }
-  onError(event, data) {
-    var _data$context;
-    if (data.fatal) {
-      this.state = State.ERROR;
-      return;
-    }
-    switch (data.details) {
-      case ErrorDetails.FRAG_GAP:
-      case ErrorDetails.FRAG_PARSING_ERROR:
-      case ErrorDetails.FRAG_DECRYPT_ERROR:
-      case ErrorDetails.FRAG_LOAD_ERROR:
-      case ErrorDetails.FRAG_LOAD_TIMEOUT:
-      case ErrorDetails.KEY_LOAD_ERROR:
-      case ErrorDetails.KEY_LOAD_TIMEOUT:
-        this.onFragmentOrKeyLoadError(PlaylistLevelType.AUDIO, data);
-        break;
-      case ErrorDetails.AUDIO_TRACK_LOAD_ERROR:
-      case ErrorDetails.AUDIO_TRACK_LOAD_TIMEOUT:
-      case ErrorDetails.LEVEL_PARSING_ERROR:
-        // in case of non fatal error while loading track, if not retrying to load track, switch back to IDLE
-        if (!data.levelRetry && this.state === State.WAITING_TRACK && ((_data$context = data.context) == null ? void 0 : _data$context.type) === PlaylistContextType.AUDIO_TRACK) {
-          this.state = State.IDLE;
-        }
-        break;
-      case ErrorDetails.BUFFER_FULL_ERROR:
-        if (!data.parent || data.parent !== 'audio') {
-          return;
-        }
-        if (this.reduceLengthAndFlushBuffer(data)) {
-          this.bufferedTrack = null;
-          super.flushMainBuffer(0, Number.POSITIVE_INFINITY, 'audio');
-        }
-        break;
-      case ErrorDetails.INTERNAL_EXCEPTION:
-        this.recoverWorkerError(data);
-        break;
-    }
+  shiftAndExecuteNext(type) {
+    this.queues[type].shift();
+    this.executeNext(type);
   }
-  onBufferFlushed(event, {
-    type
-  }) {
-    if (type === ElementaryStreamTypes.AUDIO) {
-      this.bufferFlushed = true;
-      if (this.state === State.ENDED) {
-        this.state = State.IDLE;
-      }
-    }
+  current(type) {
+    return this.queues[type][0];
   }
-  _handleTransmuxComplete(transmuxResult) {
-    var _id3$samples;
-    const id = 'audio';
-    const {
-      hls
-    } = this;
-    const {
-      remuxResult,
-      chunkMeta
-    } = transmuxResult;
-    const context = this.getCurrentContext(chunkMeta);
-    if (!context) {
-      this.resetWhenMissingContext(chunkMeta);
-      return;
-    }
-    const {
-      frag,
-      part,
-      level
-    } = context;
-    const {
-      details
-    } = level;
-    const {
-      audio,
-      text,
-      id3,
-      initSegment
-    } = remuxResult;
-
-    // Check if the current fragment has been aborted. We check this by first seeing if we're still playing the current level.
-    // If we are, subsequently check if the currently loading fragment (fragCurrent) has changed.
-    if (this.fragContextChanged(frag) || !details) {
-      this.fragmentTracker.removeFragment(frag);
-      return;
-    }
-    this.state = State.PARSING;
-    if (this.switchingTrack && audio) {
-      this.completeAudioSwitch(this.switchingTrack);
-    }
-    if (initSegment != null && initSegment.tracks) {
-      const mapFragment = frag.initSegment || frag;
-      this._bufferInitSegment(initSegment.tracks, mapFragment, chunkMeta);
-      hls.trigger(Events.FRAG_PARSING_INIT_SEGMENT, {
-        frag: mapFragment,
-        id,
-        tracks: initSegment.tracks
-      });
-      // Only flush audio from old audio tracks when PTS is known on new audio track
-    }
+}
 
-    if (audio) {
-      const {
-        startPTS,
-        endPTS,
-        startDTS,
-        endDTS
-      } = audio;
-      if (part) {
-        part.elementaryStreams[ElementaryStreamTypes.AUDIO] = {
-          startPTS,
-          endPTS,
-          startDTS,
-          endDTS
-        };
+const VIDEO_CODEC_PROFILE_REPLACE = /(avc[1234]|hvc1|hev1|dvh[1e]|vp09|av01)(?:\.[^.,]+)+/;
+class BufferController {
+  constructor(hls) {
+    // The level details used to determine duration, target-duration and live
+    this.details = null;
+    // cache the self generated object url to detect hijack of video tag
+    this._objectUrl = null;
+    // A queue of buffer operations which require the SourceBuffer to not be updating upon execution
+    this.operationQueue = void 0;
+    // References to event listeners for each SourceBuffer, so that they can be referenced for event removal
+    this.listeners = void 0;
+    this.hls = void 0;
+    // The number of BUFFER_CODEC events received before any sourceBuffers are created
+    this.bufferCodecEventsExpected = 0;
+    // The total number of BUFFER_CODEC events received
+    this._bufferCodecEventsTotal = 0;
+    // A reference to the attached media element
+    this.media = null;
+    // A reference to the active media source
+    this.mediaSource = null;
+    // Last MP3 audio chunk appended
+    this.lastMpegAudioChunk = null;
+    this.appendSource = void 0;
+    // counters
+    this.appendErrors = {
+      audio: 0,
+      video: 0,
+      audiovideo: 0
+    };
+    this.tracks = {};
+    this.pendingTracks = {};
+    this.sourceBuffer = void 0;
+    this.log = void 0;
+    this.warn = void 0;
+    this.error = void 0;
+    this._onEndStreaming = event => {
+      if (!this.hls) {
+        return;
       }
-      frag.setElementaryStreamInfo(ElementaryStreamTypes.AUDIO, startPTS, endPTS, startDTS, endDTS);
-      this.bufferFragmentData(audio, frag, part, chunkMeta);
-    }
-    if (id3 != null && (_id3$samples = id3.samples) != null && _id3$samples.length) {
-      const emittedID3 = _extends({
-        id,
-        frag,
-        details
-      }, id3);
-      hls.trigger(Events.FRAG_PARSING_METADATA, emittedID3);
-    }
-    if (text) {
-      const emittedText = _extends({
-        id,
-        frag,
-        details
-      }, text);
-      hls.trigger(Events.FRAG_PARSING_USERDATA, emittedText);
-    }
-  }
-  _bufferInitSegment(tracks, frag, chunkMeta) {
-    if (this.state !== State.PARSING) {
-      return;
-    }
-    // delete any video track found on audio transmuxer
-    if (tracks.video) {
-      delete tracks.video;
-    }
-
-    // include levelCodec in audio and video tracks
-    const track = tracks.audio;
-    if (!track) {
-      return;
-    }
-    track.levelCodec = track.codec;
-    track.id = 'audio';
-    this.log(`Init audio buffer, container:${track.container}, codecs[parsed]=[${track.codec}]`);
-    this.hls.trigger(Events.BUFFER_CODECS, tracks);
-    const initSegment = track.initSegment;
-    if (initSegment != null && initSegment.byteLength) {
-      const segment = {
-        type: 'audio',
-        frag,
-        part: null,
-        chunkMeta,
-        parent: frag.type,
-        data: initSegment
-      };
-      this.hls.trigger(Events.BUFFER_APPENDING, segment);
-    }
-    // trigger handler right now
-    this.tick();
-  }
-  loadFragment(frag, track, targetBufferTime) {
-    // only load if fragment is not loaded or if in audio switch
-    const fragState = this.fragmentTracker.getState(frag);
-    this.fragCurrent = frag;
-
-    // we force a frag loading in audio switch as fragment tracker might not have evicted previous frags in case of quick audio switch
-    if (this.switchingTrack || fragState === FragmentState.NOT_LOADED || fragState === FragmentState.PARTIAL) {
-      var _track$details2;
-      if (frag.sn === 'initSegment') {
-        this._loadInitSegment(frag, track);
-      } else if ((_track$details2 = track.details) != null && _track$details2.live && !this.initPTS[frag.cc]) {
-        this.log(`Waiting for video PTS in continuity counter ${frag.cc} of live stream before loading audio fragment ${frag.sn} of level ${this.trackId}`);
-        this.state = State.WAITING_INIT_PTS;
-      } else {
-        this.startFragRequested = true;
-        super.loadFragment(frag, track, targetBufferTime);
+      this.hls.pauseBuffering();
+    };
+    this._onStartStreaming = event => {
+      if (!this.hls) {
+        return;
       }
-    } else {
-      this.clearTrackerIfNeeded(frag);
-    }
+      this.hls.resumeBuffering();
+    };
+    // Keep as arrow functions so that we can directly reference these functions directly as event listeners
+    this._onMediaSourceOpen = () => {
+      const {
+        media,
+        mediaSource
+      } = this;
+      this.log('Media source opened');
+      if (media) {
+        media.removeEventListener('emptied', this._onMediaEmptied);
+        this.updateMediaElementDuration();
+        this.hls.trigger(Events.MEDIA_ATTACHED, {
+          media,
+          mediaSource: mediaSource
+        });
+      }
+      if (mediaSource) {
+        // once received, don't listen anymore to sourceopen event
+        mediaSource.removeEventListener('sourceopen', this._onMediaSourceOpen);
+      }
+      this.checkPendingTracks();
+    };
+    this._onMediaSourceClose = () => {
+      this.log('Media source closed');
+    };
+    this._onMediaSourceEnded = () => {
+      this.log('Media source ended');
+    };
+    this._onMediaEmptied = () => {
+      const {
+        mediaSrc,
+        _objectUrl
+      } = this;
+      if (mediaSrc !== _objectUrl) {
+        logger.error(`Media element src was set while attaching MediaSource (${_objectUrl} > ${mediaSrc})`);
+      }
+    };
+    this.hls = hls;
+    const logPrefix = '[buffer-controller]';
+    this.appendSource = hls.config.preferManagedMediaSource;
+    this.log = logger.log.bind(logger, logPrefix);
+    this.warn = logger.warn.bind(logger, logPrefix);
+    this.error = logger.error.bind(logger, logPrefix);
+    this._initSourceBuffer();
+    this.registerListeners();
   }
-  completeAudioSwitch(switchingTrack) {
-    const {
-      hls,
-      media,
-      bufferedTrack
-    } = this;
-    const bufferedAttributes = bufferedTrack == null ? void 0 : bufferedTrack.attrs;
-    const switchAttributes = switchingTrack.attrs;
-    if (media && bufferedAttributes && (bufferedAttributes.CHANNELS !== switchAttributes.CHANNELS || bufferedAttributes.NAME !== switchAttributes.NAME || bufferedAttributes.LANGUAGE !== switchAttributes.LANGUAGE)) {
-      this.log('Switching audio track : flushing all audio');
-      super.flushMainBuffer(0, Number.POSITIVE_INFINITY, 'audio');
-    }
-    this.bufferedTrack = switchingTrack;
-    this.switchingTrack = null;
-    hls.trigger(Events.AUDIO_TRACK_SWITCHED, _objectSpread2({}, switchingTrack));
+  hasSourceTypes() {
+    return this.getSourceBufferTypes().length > 0 || Object.keys(this.pendingTracks).length > 0;
   }
-}
-
-class AudioTrackController extends BasePlaylistController {
-  constructor(hls) {
-    super(hls, '[audio-track-controller]');
-    this.tracks = [];
-    this.groupId = null;
-    this.tracksInGroup = [];
-    this.trackId = -1;
-    this.currentTrack = null;
-    this.selectDefaultTrack = true;
-    this.registerListeners();
+  destroy() {
+    this.unregisterListeners();
+    this.details = null;
+    this.lastMpegAudioChunk = null;
+    // @ts-ignore
+    this.hls = null;
   }
   registerListeners() {
     const {
       hls
     } = this;
+    hls.on(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
+    hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
     hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
     hls.on(Events.MANIFEST_PARSED, this.onManifestParsed, this);
-    hls.on(Events.LEVEL_LOADING, this.onLevelLoading, this);
-    hls.on(Events.LEVEL_SWITCHING, this.onLevelSwitching, this);
-    hls.on(Events.AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
-    hls.on(Events.ERROR, this.onError, this);
+    hls.on(Events.BUFFER_RESET, this.onBufferReset, this);
+    hls.on(Events.BUFFER_APPENDING, this.onBufferAppending, this);
+    hls.on(Events.BUFFER_CODECS, this.onBufferCodecs, this);
+    hls.on(Events.BUFFER_EOS, this.onBufferEos, this);
+    hls.on(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
+    hls.on(Events.LEVEL_UPDATED, this.onLevelUpdated, this);
+    hls.on(Events.FRAG_PARSED, this.onFragParsed, this);
+    hls.on(Events.FRAG_CHANGED, this.onFragChanged, this);
   }
   unregisterListeners() {
     const {
       hls
     } = this;
+    hls.off(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
+    hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
     hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
     hls.off(Events.MANIFEST_PARSED, this.onManifestParsed, this);
-    hls.off(Events.LEVEL_LOADING, this.onLevelLoading, this);
-    hls.off(Events.LEVEL_SWITCHING, this.onLevelSwitching, this);
-    hls.off(Events.AUDIO_TRACK_LOADED, this.onAudioTrackLoaded, this);
-    hls.off(Events.ERROR, this.onError, this);
+    hls.off(Events.BUFFER_RESET, this.onBufferReset, this);
+    hls.off(Events.BUFFER_APPENDING, this.onBufferAppending, this);
+    hls.off(Events.BUFFER_CODECS, this.onBufferCodecs, this);
+    hls.off(Events.BUFFER_EOS, this.onBufferEos, this);
+    hls.off(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
+    hls.off(Events.LEVEL_UPDATED, this.onLevelUpdated, this);
+    hls.off(Events.FRAG_PARSED, this.onFragParsed, this);
+    hls.off(Events.FRAG_CHANGED, this.onFragChanged, this);
   }
-  destroy() {
-    this.unregisterListeners();
-    this.tracks.length = 0;
-    this.tracksInGroup.length = 0;
-    this.currentTrack = null;
-    super.destroy();
+  _initSourceBuffer() {
+    this.sourceBuffer = {};
+    this.operationQueue = new BufferOperationQueue(this.sourceBuffer);
+    this.listeners = {
+      audio: [],
+      video: [],
+      audiovideo: []
+    };
+    this.appendErrors = {
+      audio: 0,
+      video: 0,
+      audiovideo: 0
+    };
+    this.lastMpegAudioChunk = null;
   }
   onManifestLoading() {
-    this.tracks = [];
-    this.groupId = null;
-    this.tracksInGroup = [];
-    this.trackId = -1;
-    this.currentTrack = null;
-    this.selectDefaultTrack = true;
+    this.bufferCodecEventsExpected = this._bufferCodecEventsTotal = 0;
+    this.details = null;
   }
   onManifestParsed(event, data) {
-    this.tracks = data.audioTracks || [];
-  }
-  onAudioTrackLoaded(event, data) {
-    const {
-      id,
-      groupId,
-      details
-    } = data;
-    const trackInActiveGroup = this.tracksInGroup[id];
-    if (!trackInActiveGroup || trackInActiveGroup.groupId !== groupId) {
-      this.warn(`Track with id:${id} and group:${groupId} not found in active group ${trackInActiveGroup.groupId}`);
-      return;
-    }
-    const curDetails = trackInActiveGroup.details;
-    trackInActiveGroup.details = data.details;
-    this.log(`audio-track ${id} "${trackInActiveGroup.name}" lang:${trackInActiveGroup.lang} group:${groupId} loaded [${details.startSN}-${details.endSN}]`);
-    if (id === this.trackId) {
-      this.playlistLoaded(id, data, curDetails);
+    // in case of alt audio 2 BUFFER_CODECS events will be triggered, one per stream controller
+    // sourcebuffers will be created all at once when the expected nb of tracks will be reached
+    // in case alt audio is not used, only one BUFFER_CODEC event will be fired from main stream controller
+    // it will contain the expected nb of source buffers, no need to compute it
+    let codecEvents = 2;
+    if (data.audio && !data.video || !data.altAudio || !true) {
+      codecEvents = 1;
     }
+    this.bufferCodecEventsExpected = this._bufferCodecEventsTotal = codecEvents;
+    this.log(`${this.bufferCodecEventsExpected} bufferCodec event(s) expected`);
   }
-  onLevelLoading(event, data) {
-    this.switchLevel(data.level);
-  }
-  onLevelSwitching(event, data) {
-    this.switchLevel(data.level);
-  }
-  switchLevel(levelIndex) {
-    const levelInfo = this.hls.levels[levelIndex];
-    if (!(levelInfo != null && levelInfo.audioGroupIds)) {
-      return;
-    }
-    const audioGroupId = levelInfo.audioGroupIds[levelInfo.urlId];
-    if (this.groupId !== audioGroupId) {
-      this.groupId = audioGroupId || null;
-      const audioTracks = this.tracks.filter(track => !audioGroupId || track.groupId === audioGroupId);
-
-      // Disable selectDefaultTrack if there are no default tracks
-      if (this.selectDefaultTrack && !audioTracks.some(track => track.default)) {
-        this.selectDefaultTrack = false;
-      }
-      this.tracksInGroup = audioTracks;
-      const audioTracksUpdated = {
-        audioTracks
-      };
-      this.log(`Updating audio tracks, ${audioTracks.length} track(s) found in group:${audioGroupId}`);
-      this.hls.trigger(Events.AUDIO_TRACKS_UPDATED, audioTracksUpdated);
-      this.selectInitialTrack();
-    } else if (this.shouldReloadPlaylist(this.currentTrack)) {
-      // Retry playlist loading if no playlist is or has been loaded yet
-      this.setAudioTrack(this.trackId);
-    }
-  }
-  onError(event, data) {
-    if (data.fatal || !data.context) {
-      return;
-    }
-    if (data.context.type === PlaylistContextType.AUDIO_TRACK && data.context.id === this.trackId && data.context.groupId === this.groupId) {
-      this.requestScheduled = -1;
-      this.checkRetry(data);
+  onMediaAttaching(event, data) {
+    const media = this.media = data.media;
+    const MediaSource = getMediaSource(this.appendSource);
+    if (media && MediaSource) {
+      var _ms$constructor;
+      const ms = this.mediaSource = new MediaSource();
+      this.log(`created media source: ${(_ms$constructor = ms.constructor) == null ? void 0 : _ms$constructor.name}`);
+      // MediaSource listeners are arrow functions with a lexical scope, and do not need to be bound
+      ms.addEventListener('sourceopen', this._onMediaSourceOpen);
+      ms.addEventListener('sourceended', this._onMediaSourceEnded);
+      ms.addEventListener('sourceclose', this._onMediaSourceClose);
+      ms.addEventListener('startstreaming', this._onStartStreaming);
+      ms.addEventListener('endstreaming', this._onEndStreaming);
+
+      // cache the locally generated object url
+      const objectUrl = this._objectUrl = self.URL.createObjectURL(ms);
+      // link video and media Source
+      if (this.appendSource) {
+        try {
+          media.removeAttribute('src');
+          // ManagedMediaSource will not open without disableRemotePlayback set to false or source alternatives
+          const MMS = self.ManagedMediaSource;
+          media.disableRemotePlayback = media.disableRemotePlayback || MMS && ms instanceof MMS;
+          removeSourceChildren(media);
+          addSource(media, objectUrl);
+          media.load();
+        } catch (error) {
+          media.src = objectUrl;
+        }
+      } else {
+        media.src = objectUrl;
+      }
+      media.addEventListener('emptied', this._onMediaEmptied);
     }
   }
-  get audioTracks() {
-    return this.tracksInGroup;
-  }
-  get audioTrack() {
-    return this.trackId;
-  }
-  set audioTrack(newId) {
-    // If audio track is selected from API then don't choose from the manifest default track
-    this.selectDefaultTrack = false;
-    this.setAudioTrack(newId);
-  }
-  setAudioTrack(newId) {
-    const tracks = this.tracksInGroup;
+  onMediaDetaching() {
+    const {
+      media,
+      mediaSource,
+      _objectUrl
+    } = this;
+    if (mediaSource) {
+      this.log('media source detaching');
+      if (mediaSource.readyState === 'open') {
+        try {
+          // endOfStream could trigger exception if any sourcebuffer is in updating state
+          // we don't really care about checking sourcebuffer state here,
+          // as we are anyway detaching the MediaSource
+          // let's just avoid this exception to propagate
+          mediaSource.endOfStream();
+        } catch (err) {
+          this.warn(`onMediaDetaching: ${err.message} while calling endOfStream`);
+        }
+      }
+      // Clean up the SourceBuffers by invoking onBufferReset
+      this.onBufferReset();
+      mediaSource.removeEventListener('sourceopen', this._onMediaSourceOpen);
+      mediaSource.removeEventListener('sourceended', this._onMediaSourceEnded);
+      mediaSource.removeEventListener('sourceclose', this._onMediaSourceClose);
+      mediaSource.removeEventListener('startstreaming', this._onStartStreaming);
+      mediaSource.removeEventListener('endstreaming', this._onEndStreaming);
 
-    // check if level idx is valid
-    if (newId < 0 || newId >= tracks.length) {
-      this.warn('Invalid id passed to audio-track controller');
-      return;
-    }
+      // Detach properly the MediaSource from the HTMLMediaElement as
+      // suggested in https://github.com/w3c/media-source/issues/53.
+      if (media) {
+        media.removeEventListener('emptied', this._onMediaEmptied);
+        if (_objectUrl) {
+          self.URL.revokeObjectURL(_objectUrl);
+        }
 
-    // stopping live reloading timer if any
-    this.clearTimer();
-    const lastTrack = this.currentTrack;
-    tracks[this.trackId];
-    const track = tracks[newId];
-    const {
-      groupId,
-      name
-    } = track;
-    this.log(`Switching to audio-track ${newId} "${name}" lang:${track.lang} group:${groupId}`);
-    this.trackId = newId;
-    this.currentTrack = track;
-    this.selectDefaultTrack = false;
-    this.hls.trigger(Events.AUDIO_TRACK_SWITCHING, _objectSpread2({}, track));
-    // Do not reload track unless live
-    if (track.details && !track.details.live) {
-      return;
+        // clean up video tag src only if it's our own url. some external libraries might
+        // hijack the video tag and change its 'src' without destroying the Hls instance first
+        if (this.mediaSrc === _objectUrl) {
+          media.removeAttribute('src');
+          if (this.appendSource) {
+            removeSourceChildren(media);
+          }
+          media.load();
+        } else {
+          this.warn('media|source.src was changed by a third party - skip cleanup');
+        }
+      }
+      this.mediaSource = null;
+      this.media = null;
+      this._objectUrl = null;
+      this.bufferCodecEventsExpected = this._bufferCodecEventsTotal;
+      this.pendingTracks = {};
+      this.tracks = {};
     }
-    const hlsUrlParameters = this.switchParams(track.url, lastTrack == null ? void 0 : lastTrack.details);
-    this.loadPlaylist(hlsUrlParameters);
+    this.hls.trigger(Events.MEDIA_DETACHED, undefined);
   }
-  selectInitialTrack() {
-    const audioTracks = this.tracksInGroup;
-    const trackId = this.findTrackId(this.currentTrack) | this.findTrackId(null);
-    if (trackId !== -1) {
-      this.setAudioTrack(trackId);
-    } else {
-      const error = new Error(`No track found for running audio group-ID: ${this.groupId} track count: ${audioTracks.length}`);
-      this.warn(error.message);
-      this.hls.trigger(Events.ERROR, {
-        type: ErrorTypes.MEDIA_ERROR,
-        details: ErrorDetails.AUDIO_TRACK_LOAD_ERROR,
-        fatal: true,
-        error
-      });
-    }
+  onBufferReset() {
+    this.getSourceBufferTypes().forEach(type => {
+      this.resetBuffer(type);
+    });
+    this._initSourceBuffer();
   }
-  findTrackId(currentTrack) {
-    const audioTracks = this.tracksInGroup;
-    for (let i = 0; i < audioTracks.length; i++) {
-      const track = audioTracks[i];
-      if (!this.selectDefaultTrack || track.default) {
-        if (!currentTrack || currentTrack.attrs['STABLE-RENDITION-ID'] !== undefined && currentTrack.attrs['STABLE-RENDITION-ID'] === track.attrs['STABLE-RENDITION-ID']) {
-          return track.id;
-        }
-        if (currentTrack.name === track.name && currentTrack.lang === track.lang) {
-          return track.id;
+  resetBuffer(type) {
+    const sb = this.sourceBuffer[type];
+    try {
+      if (sb) {
+        var _this$mediaSource;
+        this.removeBufferListeners(type);
+        // Synchronously remove the SB from the map before the next call in order to prevent an async function from
+        // accessing it
+        this.sourceBuffer[type] = undefined;
+        if ((_this$mediaSource = this.mediaSource) != null && _this$mediaSource.sourceBuffers.length) {
+          this.mediaSource.removeSourceBuffer(sb);
         }
       }
+    } catch (err) {
+      this.warn(`onBufferReset ${type}`, err);
     }
-    return -1;
   }
-  loadPlaylist(hlsUrlParameters) {
-    super.loadPlaylist();
-    const audioTrack = this.tracksInGroup[this.trackId];
-    if (this.shouldLoadPlaylist(audioTrack)) {
-      const id = audioTrack.id;
-      const groupId = audioTrack.groupId;
-      let url = audioTrack.url;
-      if (hlsUrlParameters) {
-        try {
-          url = hlsUrlParameters.addDirectives(url);
-        } catch (error) {
-          this.warn(`Could not construct new URL with HLS Delivery Directives: ${error}`);
+  onBufferCodecs(event, data) {
+    const sourceBufferCount = this.getSourceBufferTypes().length;
+    const trackNames = Object.keys(data);
+    trackNames.forEach(trackName => {
+      if (sourceBufferCount) {
+        // check if SourceBuffer codec needs to change
+        const track = this.tracks[trackName];
+        if (track && typeof track.buffer.changeType === 'function') {
+          var _trackCodec;
+          const {
+            id,
+            codec,
+            levelCodec,
+            container,
+            metadata
+          } = data[trackName];
+          const currentCodecFull = pickMostCompleteCodecName(track.codec, track.levelCodec);
+          const currentCodec = currentCodecFull == null ? void 0 : currentCodecFull.replace(VIDEO_CODEC_PROFILE_REPLACE, '$1');
+          let trackCodec = pickMostCompleteCodecName(codec, levelCodec);
+          const nextCodec = (_trackCodec = trackCodec) == null ? void 0 : _trackCodec.replace(VIDEO_CODEC_PROFILE_REPLACE, '$1');
+          if (trackCodec && currentCodec !== nextCodec) {
+            if (trackName.slice(0, 5) === 'audio') {
+              trackCodec = getCodecCompatibleName(trackCodec, this.hls.config.preferManagedMediaSource);
+            }
+            const mimeType = `${container};codecs=${trackCodec}`;
+            this.appendChangeType(trackName, mimeType);
+            this.log(`switching codec ${currentCodecFull} to ${trackCodec}`);
+            this.tracks[trackName] = {
+              buffer: track.buffer,
+              codec,
+              container,
+              levelCodec,
+              metadata,
+              id
+            };
+          }
         }
+      } else {
+        // if source buffer(s) not created yet, appended buffer tracks in this.pendingTracks
+        this.pendingTracks[trackName] = data[trackName];
       }
-      // track not retrieved yet, or live playlist we need to (re)load it
-      this.log(`loading audio-track playlist ${id} "${audioTrack.name}" lang:${audioTrack.lang} group:${groupId}`);
-      this.clearTimer();
-      this.hls.trigger(Events.AUDIO_TRACK_LOADING, {
-        url,
-        id,
-        groupId,
-        deliveryDirectives: hlsUrlParameters || null
-      });
-    }
-  }
-}
+    });
 
-function subtitleOptionsIdentical(trackList1, trackList2) {
-  if (trackList1.length !== trackList2.length) {
-    return false;
-  }
-  for (let i = 0; i < trackList1.length; i++) {
-    if (!subtitleAttributesIdentical(trackList1[i].attrs, trackList2[i].attrs)) {
-      return false;
+    // if sourcebuffers already created, do nothing ...
+    if (sourceBufferCount) {
+      return;
+    }
+    const bufferCodecEventsExpected = Math.max(this.bufferCodecEventsExpected - 1, 0);
+    if (this.bufferCodecEventsExpected !== bufferCodecEventsExpected) {
+      this.log(`${bufferCodecEventsExpected} bufferCodec event(s) expected ${trackNames.join(',')}`);
+      this.bufferCodecEventsExpected = bufferCodecEventsExpected;
+    }
+    if (this.mediaSource && this.mediaSource.readyState === 'open') {
+      this.checkPendingTracks();
     }
   }
-  return true;
-}
-function subtitleAttributesIdentical(attrs1, attrs2) {
-  // Media options with the same rendition ID must be bit identical
-  const stableRenditionId = attrs1['STABLE-RENDITION-ID'];
-  if (stableRenditionId) {
-    return stableRenditionId === attrs2['STABLE-RENDITION-ID'];
-  }
-  // When rendition ID is not present, compare attributes
-  return !['LANGUAGE', 'NAME', 'CHARACTERISTICS', 'AUTOSELECT', 'DEFAULT', 'FORCED'].some(subtitleAttribute => attrs1[subtitleAttribute] !== attrs2[subtitleAttribute]);
-}
-
-const TICK_INTERVAL = 500; // how often to tick in ms
-
-class SubtitleStreamController extends BaseStreamController {
-  constructor(hls, fragmentTracker, keyLoader) {
-    super(hls, fragmentTracker, keyLoader, '[subtitle-stream-controller]', PlaylistLevelType.SUBTITLE);
-    this.levels = [];
-    this.currentTrackId = -1;
-    this.tracksBuffered = [];
-    this.mainDetails = null;
-    this._registerListeners();
-  }
-  onHandlerDestroying() {
-    this._unregisterListeners();
-    this.mainDetails = null;
-  }
-  _registerListeners() {
+  appendChangeType(type, mimeType) {
     const {
-      hls
+      operationQueue
     } = this;
-    hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-    hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-    hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
-    hls.on(Events.LEVEL_LOADED, this.onLevelLoaded, this);
-    hls.on(Events.ERROR, this.onError, this);
-    hls.on(Events.SUBTITLE_TRACKS_UPDATED, this.onSubtitleTracksUpdated, this);
-    hls.on(Events.SUBTITLE_TRACK_SWITCH, this.onSubtitleTrackSwitch, this);
-    hls.on(Events.SUBTITLE_TRACK_LOADED, this.onSubtitleTrackLoaded, this);
-    hls.on(Events.SUBTITLE_FRAG_PROCESSED, this.onSubtitleFragProcessed, this);
-    hls.on(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
-    hls.on(Events.FRAG_BUFFERED, this.onFragBuffered, this);
+    const operation = {
+      execute: () => {
+        const sb = this.sourceBuffer[type];
+        if (sb) {
+          this.log(`changing ${type} sourceBuffer type to ${mimeType}`);
+          sb.changeType(mimeType);
+        }
+        operationQueue.shiftAndExecuteNext(type);
+      },
+      onStart: () => {},
+      onComplete: () => {},
+      onError: error => {
+        this.warn(`Failed to change ${type} SourceBuffer type`, error);
+      }
+    };
+    operationQueue.append(operation, type, !!this.pendingTracks[type]);
   }
-  _unregisterListeners() {
+  onBufferAppending(event, eventData) {
     const {
-      hls
+      hls,
+      operationQueue,
+      tracks
     } = this;
-    hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-    hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-    hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
-    hls.off(Events.LEVEL_LOADED, this.onLevelLoaded, this);
-    hls.off(Events.ERROR, this.onError, this);
-    hls.off(Events.SUBTITLE_TRACKS_UPDATED, this.onSubtitleTracksUpdated, this);
-    hls.off(Events.SUBTITLE_TRACK_SWITCH, this.onSubtitleTrackSwitch, this);
-    hls.off(Events.SUBTITLE_TRACK_LOADED, this.onSubtitleTrackLoaded, this);
-    hls.off(Events.SUBTITLE_FRAG_PROCESSED, this.onSubtitleFragProcessed, this);
-    hls.off(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
-    hls.off(Events.FRAG_BUFFERED, this.onFragBuffered, this);
-  }
-  startLoad(startPosition) {
-    this.stopLoad();
-    this.state = State.IDLE;
-    this.setInterval(TICK_INTERVAL);
-    this.nextLoadPosition = this.startPosition = this.lastCurrentTime = startPosition;
-    this.tick();
-  }
-  onManifestLoading() {
-    this.mainDetails = null;
-    this.fragmentTracker.removeAllFragments();
-  }
-  onMediaDetaching() {
-    this.tracksBuffered = [];
-    super.onMediaDetaching();
-  }
-  onLevelLoaded(event, data) {
-    this.mainDetails = data.details;
-  }
-  onSubtitleFragProcessed(event, data) {
     const {
+      data,
+      type,
       frag,
-      success
-    } = data;
-    this.fragPrevious = frag;
-    this.state = State.IDLE;
-    if (!success) {
-      return;
+      part,
+      chunkMeta
+    } = eventData;
+    const chunkStats = chunkMeta.buffering[type];
+    const bufferAppendingStart = self.performance.now();
+    chunkStats.start = bufferAppendingStart;
+    const fragBuffering = frag.stats.buffering;
+    const partBuffering = part ? part.stats.buffering : null;
+    if (fragBuffering.start === 0) {
+      fragBuffering.start = bufferAppendingStart;
     }
-    const buffered = this.tracksBuffered[this.currentTrackId];
-    if (!buffered) {
-      return;
+    if (partBuffering && partBuffering.start === 0) {
+      partBuffering.start = bufferAppendingStart;
     }
 
-    // Create/update a buffered array matching the interface used by BufferHelper.bufferedInfo
-    // so we can re-use the logic used to detect how much has been buffered
-    let timeRange;
+    // TODO: Only update timestampOffset when audio/mpeg fragment or part is not contiguous with previously appended
+    // Adjusting `SourceBuffer.timestampOffset` (desired point in the timeline where the next frames should be appended)
+    // in Chrome browser when we detect MPEG audio container and time delta between level PTS and `SourceBuffer.timestampOffset`
+    // is greater than 100ms (this is enough to handle seek for VOD or level change for LIVE videos).
+    // More info here: https://github.com/video-dev/hls.js/issues/332#issuecomment-257986486
+    const audioTrack = tracks.audio;
+    let checkTimestampOffset = false;
+    if (type === 'audio' && (audioTrack == null ? void 0 : audioTrack.container) === 'audio/mpeg') {
+      checkTimestampOffset = !this.lastMpegAudioChunk || chunkMeta.id === 1 || this.lastMpegAudioChunk.sn !== chunkMeta.sn;
+      this.lastMpegAudioChunk = chunkMeta;
+    }
     const fragStart = frag.start;
-    for (let i = 0; i < buffered.length; i++) {
-      if (fragStart >= buffered[i].start && fragStart <= buffered[i].end) {
-        timeRange = buffered[i];
-        break;
+    const operation = {
+      execute: () => {
+        chunkStats.executeStart = self.performance.now();
+        if (checkTimestampOffset) {
+          const sb = this.sourceBuffer[type];
+          if (sb) {
+            const delta = fragStart - sb.timestampOffset;
+            if (Math.abs(delta) >= 0.1) {
+              this.log(`Updating audio SourceBuffer timestampOffset to ${fragStart} (delta: ${delta}) sn: ${frag.sn})`);
+              sb.timestampOffset = fragStart;
+            }
+          }
+        }
+        this.appendExecutor(data, type);
+      },
+      onStart: () => {
+        // logger.debug(`[buffer-controller]: ${type} SourceBuffer updatestart`);
+      },
+      onComplete: () => {
+        // logger.debug(`[buffer-controller]: ${type} SourceBuffer updateend`);
+        const end = self.performance.now();
+        chunkStats.executeEnd = chunkStats.end = end;
+        if (fragBuffering.first === 0) {
+          fragBuffering.first = end;
+        }
+        if (partBuffering && partBuffering.first === 0) {
+          partBuffering.first = end;
+        }
+        const {
+          sourceBuffer
+        } = this;
+        const timeRanges = {};
+        for (const type in sourceBuffer) {
+          timeRanges[type] = BufferHelper.getBuffered(sourceBuffer[type]);
+        }
+        this.appendErrors[type] = 0;
+        if (type === 'audio' || type === 'video') {
+          this.appendErrors.audiovideo = 0;
+        } else {
+          this.appendErrors.audio = 0;
+          this.appendErrors.video = 0;
+        }
+        this.hls.trigger(Events.BUFFER_APPENDED, {
+          type,
+          frag,
+          part,
+          chunkMeta,
+          parent: frag.type,
+          timeRanges
+        });
+      },
+      onError: error => {
+        // in case any error occured while appending, put back segment in segments table
+        const event = {
+          type: ErrorTypes.MEDIA_ERROR,
+          parent: frag.type,
+          details: ErrorDetails.BUFFER_APPEND_ERROR,
+          sourceBufferName: type,
+          frag,
+          part,
+          chunkMeta,
+          error,
+          err: error,
+          fatal: false
+        };
+        if (error.code === DOMException.QUOTA_EXCEEDED_ERR) {
+          // QuotaExceededError: http://www.w3.org/TR/html5/infrastructure.html#quotaexceedederror
+          // let's stop appending any segments, and report BUFFER_FULL_ERROR error
+          event.details = ErrorDetails.BUFFER_FULL_ERROR;
+        } else {
+          const appendErrorCount = ++this.appendErrors[type];
+          event.details = ErrorDetails.BUFFER_APPEND_ERROR;
+          /* with UHD content, we could get loop of quota exceeded error until
+            browser is able to evict some data from sourcebuffer. Retrying can help recover.
+          */
+          this.warn(`Failed ${appendErrorCount}/${hls.config.appendErrorMaxRetry} times to append segment in "${type}" sourceBuffer`);
+          if (appendErrorCount >= hls.config.appendErrorMaxRetry) {
+            event.fatal = true;
+          }
+        }
+        hls.trigger(Events.ERROR, event);
       }
-    }
-    const fragEnd = frag.start + frag.duration;
-    if (timeRange) {
-      timeRange.end = fragEnd;
-    } else {
-      timeRange = {
-        start: fragStart,
-        end: fragEnd
-      };
-      buffered.push(timeRange);
-    }
-    this.fragmentTracker.fragBuffered(frag);
+    };
+    operationQueue.append(operation, type, !!this.pendingTracks[type]);
   }
   onBufferFlushing(event, data) {
     const {
-      startOffset,
-      endOffset
-    } = data;
-    if (startOffset === 0 && endOffset !== Number.POSITIVE_INFINITY) {
-      const endOffsetSubtitles = endOffset - 1;
-      if (endOffsetSubtitles <= 0) {
-        return;
+      operationQueue
+    } = this;
+    const flushOperation = type => ({
+      execute: this.removeExecutor.bind(this, type, data.startOffset, data.endOffset),
+      onStart: () => {
+        // logger.debug(`[buffer-controller]: Started flushing ${data.startOffset} -> ${data.endOffset} for ${type} Source Buffer`);
+      },
+      onComplete: () => {
+        // logger.debug(`[buffer-controller]: Finished flushing ${data.startOffset} -> ${data.endOffset} for ${type} Source Buffer`);
+        this.hls.trigger(Events.BUFFER_FLUSHED, {
+          type
+        });
+      },
+      onError: error => {
+        this.warn(`Failed to remove from ${type} SourceBuffer`, error);
       }
-      data.endOffsetSubtitles = Math.max(0, endOffsetSubtitles);
-      this.tracksBuffered.forEach(buffered => {
-        for (let i = 0; i < buffered.length;) {
-          if (buffered[i].end <= endOffsetSubtitles) {
-            buffered.shift();
-            continue;
-          } else if (buffered[i].start < endOffsetSubtitles) {
-            buffered[i].start = endOffsetSubtitles;
-          } else {
-            break;
-          }
-          i++;
-        }
+    });
+    if (data.type) {
+      operationQueue.append(flushOperation(data.type), data.type);
+    } else {
+      this.getSourceBufferTypes().forEach(type => {
+        operationQueue.append(flushOperation(type), type);
       });
-      this.fragmentTracker.removeFragmentsInRange(startOffset, endOffsetSubtitles, PlaylistLevelType.SUBTITLE);
     }
   }
-  onFragBuffered(event, data) {
-    if (!this.loadedmetadata && data.frag.type === PlaylistLevelType.MAIN) {
-      var _this$media;
-      if ((_this$media = this.media) != null && _this$media.buffered.length) {
-        this.loadedmetadata = true;
+  onFragParsed(event, data) {
+    const {
+      frag,
+      part
+    } = data;
+    const buffersAppendedTo = [];
+    const elementaryStreams = part ? part.elementaryStreams : frag.elementaryStreams;
+    if (elementaryStreams[ElementaryStreamTypes.AUDIOVIDEO]) {
+      buffersAppendedTo.push('audiovideo');
+    } else {
+      if (elementaryStreams[ElementaryStreamTypes.AUDIO]) {
+        buffersAppendedTo.push('audio');
       }
-    }
-  }
-
-  // If something goes wrong, proceed to next frag, if we were processing one.
-  onError(event, data) {
-    const frag = data.frag;
-    if ((frag == null ? void 0 : frag.type) === PlaylistLevelType.SUBTITLE) {
-      if (this.fragCurrent) {
-        this.fragCurrent.abortRequests();
+      if (elementaryStreams[ElementaryStreamTypes.VIDEO]) {
+        buffersAppendedTo.push('video');
       }
-      if (this.state !== State.STOPPED) {
-        this.state = State.IDLE;
+    }
+    const onUnblocked = () => {
+      const now = self.performance.now();
+      frag.stats.buffering.end = now;
+      if (part) {
+        part.stats.buffering.end = now;
       }
+      const stats = part ? part.stats : frag.stats;
+      this.hls.trigger(Events.FRAG_BUFFERED, {
+        frag,
+        part,
+        stats,
+        id: frag.type
+      });
+    };
+    if (buffersAppendedTo.length === 0) {
+      this.warn(`Fragments must have at least one ElementaryStreamType set. type: ${frag.type} level: ${frag.level} sn: ${frag.sn}`);
     }
+    this.blockBuffers(onUnblocked, buffersAppendedTo);
   }
-
-  // Got all new subtitle levels.
-  onSubtitleTracksUpdated(event, {
-    subtitleTracks
-  }) {
-    if (subtitleOptionsIdentical(this.levels, subtitleTracks)) {
-      this.levels = subtitleTracks.map(mediaPlaylist => new Level(mediaPlaylist));
-      return;
-    }
-    this.tracksBuffered = [];
-    this.levels = subtitleTracks.map(mediaPlaylist => {
-      const level = new Level(mediaPlaylist);
-      this.tracksBuffered[level.id] = [];
-      return level;
-    });
-    this.fragmentTracker.removeFragmentsInRange(0, Number.POSITIVE_INFINITY, PlaylistLevelType.SUBTITLE);
-    this.fragPrevious = null;
-    this.mediaBuffer = null;
+  onFragChanged(event, data) {
+    this.trimBuffers();
   }
-  onSubtitleTrackSwitch(event, data) {
-    this.currentTrackId = data.id;
-    if (!this.levels.length || this.currentTrackId === -1) {
-      this.clearInterval();
-      return;
-    }
 
-    // Check if track has the necessary details to load fragments
-    const currentTrack = this.levels[this.currentTrackId];
-    if (currentTrack != null && currentTrack.details) {
-      this.mediaBuffer = this.mediaBufferTimeRanges;
-    } else {
-      this.mediaBuffer = null;
+  // on BUFFER_EOS mark matching sourcebuffer(s) as ended and trigger checkEos()
+  // an undefined data.type will mark all buffers as EOS.
+  onBufferEos(event, data) {
+    const ended = this.getSourceBufferTypes().reduce((acc, type) => {
+      const sb = this.sourceBuffer[type];
+      if (sb && (!data.type || data.type === type)) {
+        sb.ending = true;
+        if (!sb.ended) {
+          sb.ended = true;
+          this.log(`${type} sourceBuffer now EOS`);
+        }
+      }
+      return acc && !!(!sb || sb.ended);
+    }, true);
+    if (ended) {
+      this.log(`Queueing mediaSource.endOfStream()`);
+      this.blockBuffers(() => {
+        this.getSourceBufferTypes().forEach(type => {
+          const sb = this.sourceBuffer[type];
+          if (sb) {
+            sb.ending = false;
+          }
+        });
+        const {
+          mediaSource
+        } = this;
+        if (!mediaSource || mediaSource.readyState !== 'open') {
+          if (mediaSource) {
+            this.log(`Could not call mediaSource.endOfStream(). mediaSource.readyState: ${mediaSource.readyState}`);
+          }
+          return;
+        }
+        this.log(`Calling mediaSource.endOfStream()`);
+        // Allow this to throw and be caught by the enqueueing function
+        mediaSource.endOfStream();
+      });
     }
-    if (currentTrack) {
-      this.setInterval(TICK_INTERVAL);
+  }
+  onLevelUpdated(event, {
+    details
+  }) {
+    if (!details.fragments.length) {
+      return;
+    }
+    this.details = details;
+    if (this.getSourceBufferTypes().length) {
+      this.blockBuffers(this.updateMediaElementDuration.bind(this));
+    } else {
+      this.updateMediaElementDuration();
     }
   }
-
-  // Got a new set of subtitle fragments.
-  onSubtitleTrackLoaded(event, data) {
-    var _track$details;
-    const {
-      details: newDetails,
-      id: trackId
-    } = data;
+  trimBuffers() {
     const {
-      currentTrackId,
-      levels
+      hls,
+      details,
+      media
     } = this;
-    if (!levels.length) {
+    if (!media || details === null) {
       return;
     }
-    const track = levels[currentTrackId];
-    if (trackId >= levels.length || trackId !== currentTrackId || !track) {
+    const sourceBufferTypes = this.getSourceBufferTypes();
+    if (!sourceBufferTypes.length) {
       return;
     }
-    this.mediaBuffer = this.mediaBufferTimeRanges;
-    let sliding = 0;
-    if (newDetails.live || (_track$details = track.details) != null && _track$details.live) {
-      const mainDetails = this.mainDetails;
-      if (newDetails.deltaUpdateFailed || !mainDetails) {
-        return;
+    const config = hls.config;
+    const currentTime = media.currentTime;
+    const targetDuration = details.levelTargetDuration;
+
+    // Support for deprecated liveBackBufferLength
+    const backBufferLength = details.live && config.liveBackBufferLength !== null ? config.liveBackBufferLength : config.backBufferLength;
+    if (isFiniteNumber(backBufferLength) && backBufferLength > 0) {
+      const maxBackBufferLength = Math.max(backBufferLength, targetDuration);
+      const targetBackBufferPosition = Math.floor(currentTime / targetDuration) * targetDuration - maxBackBufferLength;
+      this.flushBackBuffer(currentTime, targetDuration, targetBackBufferPosition);
+    }
+    if (isFiniteNumber(config.frontBufferFlushThreshold) && config.frontBufferFlushThreshold > 0) {
+      const frontBufferLength = Math.max(config.maxBufferLength, config.frontBufferFlushThreshold);
+      const maxFrontBufferLength = Math.max(frontBufferLength, targetDuration);
+      const targetFrontBufferPosition = Math.floor(currentTime / targetDuration) * targetDuration + maxFrontBufferLength;
+      this.flushFrontBuffer(currentTime, targetDuration, targetFrontBufferPosition);
+    }
+  }
+  flushBackBuffer(currentTime, targetDuration, targetBackBufferPosition) {
+    const {
+      details,
+      sourceBuffer
+    } = this;
+    const sourceBufferTypes = this.getSourceBufferTypes();
+    sourceBufferTypes.forEach(type => {
+      const sb = sourceBuffer[type];
+      if (sb) {
+        const buffered = BufferHelper.getBuffered(sb);
+        // when target buffer start exceeds actual buffer start
+        if (buffered.length > 0 && targetBackBufferPosition > buffered.start(0)) {
+          this.hls.trigger(Events.BACK_BUFFER_REACHED, {
+            bufferEnd: targetBackBufferPosition
+          });
+
+          // Support for deprecated event:
+          if (details != null && details.live) {
+            this.hls.trigger(Events.LIVE_BACK_BUFFER_REACHED, {
+              bufferEnd: targetBackBufferPosition
+            });
+          } else if (sb.ended && buffered.end(buffered.length - 1) - currentTime < targetDuration * 2) {
+            this.log(`Cannot flush ${type} back buffer while SourceBuffer is in ended state`);
+            return;
+          }
+          this.hls.trigger(Events.BUFFER_FLUSHING, {
+            startOffset: 0,
+            endOffset: targetBackBufferPosition,
+            type
+          });
+        }
       }
-      const mainSlidingStartFragment = mainDetails.fragments[0];
-      if (!track.details) {
-        if (newDetails.hasProgramDateTime && mainDetails.hasProgramDateTime) {
-          alignMediaPlaylistByPDT(newDetails, mainDetails);
-          sliding = newDetails.fragments[0].start;
-        } else if (mainSlidingStartFragment) {
-          // line up live playlist with main so that fragments in range are loaded
-          sliding = mainSlidingStartFragment.start;
-          addSliding(newDetails, sliding);
+    });
+  }
+  flushFrontBuffer(currentTime, targetDuration, targetFrontBufferPosition) {
+    const {
+      sourceBuffer
+    } = this;
+    const sourceBufferTypes = this.getSourceBufferTypes();
+    sourceBufferTypes.forEach(type => {
+      const sb = sourceBuffer[type];
+      if (sb) {
+        const buffered = BufferHelper.getBuffered(sb);
+        const numBufferedRanges = buffered.length;
+        // The buffer is either empty or contiguous
+        if (numBufferedRanges < 2) {
+          return;
         }
-      } else {
-        sliding = this.alignPlaylists(newDetails, track.details);
-        if (sliding === 0 && mainSlidingStartFragment) {
-          // realign with main when there is no overlap with last refresh
-          sliding = mainSlidingStartFragment.start;
-          addSliding(newDetails, sliding);
+        const bufferStart = buffered.start(numBufferedRanges - 1);
+        const bufferEnd = buffered.end(numBufferedRanges - 1);
+        // No flush if we can tolerate the current buffer length or the current buffer range we would flush is contiguous with current position
+        if (targetFrontBufferPosition > bufferStart || currentTime >= bufferStart && currentTime <= bufferEnd) {
+          return;
+        } else if (sb.ended && currentTime - bufferEnd < 2 * targetDuration) {
+          this.log(`Cannot flush ${type} front buffer while SourceBuffer is in ended state`);
+          return;
         }
+        this.hls.trigger(Events.BUFFER_FLUSHING, {
+          startOffset: bufferStart,
+          endOffset: Infinity,
+          type
+        });
       }
+    });
+  }
+
+  /**
+   * Update Media Source duration to current level duration or override to Infinity if configuration parameter
+   * 'liveDurationInfinity` is set to `true`
+   * More details: https://github.com/video-dev/hls.js/issues/355
+   */
+  updateMediaElementDuration() {
+    if (!this.details || !this.media || !this.mediaSource || this.mediaSource.readyState !== 'open') {
+      return;
     }
-    track.details = newDetails;
-    this.levelLastLoaded = trackId;
-    if (!this.startFragRequested && (this.mainDetails || !newDetails.live)) {
-      this.setStartPosition(track.details, sliding);
+    const {
+      details,
+      hls,
+      media,
+      mediaSource
+    } = this;
+    const levelDuration = details.fragments[0].start + details.totalduration;
+    const mediaDuration = media.duration;
+    const msDuration = isFiniteNumber(mediaSource.duration) ? mediaSource.duration : 0;
+    if (details.live && hls.config.liveDurationInfinity) {
+      // Override duration to Infinity
+      mediaSource.duration = Infinity;
+      this.updateSeekableRange(details);
+    } else if (levelDuration > msDuration && levelDuration > mediaDuration || !isFiniteNumber(mediaDuration)) {
+      // levelDuration was the last value we set.
+      // not using mediaSource.duration as the browser may tweak this value
+      // only update Media Source duration if its value increase, this is to avoid
+      // flushing already buffered portion when switching between quality level
+      this.log(`Updating Media Source duration to ${levelDuration.toFixed(3)}`);
+      mediaSource.duration = levelDuration;
     }
-
-    // trigger handler right now
-    this.tick();
-
-    // If playlist is misaligned because of bad PDT or drift, delete details to resync with main on reload
-    if (newDetails.live && !this.fragCurrent && this.media && this.state === State.IDLE) {
-      const foundFrag = findFragmentByPTS(null, newDetails.fragments, this.media.currentTime, 0);
-      if (!foundFrag) {
-        this.warn('Subtitle playlist not aligned with playback');
-        track.details = undefined;
-      }
+  }
+  updateSeekableRange(levelDetails) {
+    const mediaSource = this.mediaSource;
+    const fragments = levelDetails.fragments;
+    const len = fragments.length;
+    if (len && levelDetails.live && mediaSource != null && mediaSource.setLiveSeekableRange) {
+      const start = Math.max(0, fragments[0].start);
+      const end = Math.max(start, start + levelDetails.totalduration);
+      this.log(`Media Source duration is set to ${mediaSource.duration}. Setting seekable range to ${start}-${end}.`);
+      mediaSource.setLiveSeekableRange(start, end);
     }
   }
-  _handleFragmentLoadComplete(fragLoadedData) {
+  checkPendingTracks() {
     const {
-      frag,
-      payload
-    } = fragLoadedData;
-    const decryptData = frag.decryptdata;
-    const hls = this.hls;
-    if (this.fragContextChanged(frag)) {
-      return;
-    }
-    // check to see if the payload needs to be decrypted
-    if (payload && payload.byteLength > 0 && decryptData && decryptData.key && decryptData.iv && decryptData.method === 'AES-128') {
-      const startTime = performance.now();
-      // decrypt the subtitles
-      this.decrypter.decrypt(new Uint8Array(payload), decryptData.key.buffer, decryptData.iv.buffer).catch(err => {
-        hls.trigger(Events.ERROR, {
-          type: ErrorTypes.MEDIA_ERROR,
-          details: ErrorDetails.FRAG_DECRYPT_ERROR,
-          fatal: false,
-          error: err,
-          reason: err.message,
-          frag
+      bufferCodecEventsExpected,
+      operationQueue,
+      pendingTracks
+    } = this;
+
+    // Check if we've received all of the expected bufferCodec events. When none remain, create all the sourceBuffers at once.
+    // This is important because the MSE spec allows implementations to throw QuotaExceededErrors if creating new sourceBuffers after
+    // data has been appended to existing ones.
+    // 2 tracks is the max (one for audio, one for video). If we've reach this max go ahead and create the buffers.
+    const pendingTracksCount = Object.keys(pendingTracks).length;
+    if (pendingTracksCount && (!bufferCodecEventsExpected || pendingTracksCount === 2 || 'audiovideo' in pendingTracks)) {
+      // ok, let's create them now !
+      this.createSourceBuffers(pendingTracks);
+      this.pendingTracks = {};
+      // append any pending segments now !
+      const buffers = this.getSourceBufferTypes();
+      if (buffers.length) {
+        this.hls.trigger(Events.BUFFER_CREATED, {
+          tracks: this.tracks
         });
-        throw err;
-      }).then(decryptedData => {
-        const endTime = performance.now();
-        hls.trigger(Events.FRAG_DECRYPTED, {
-          frag,
-          payload: decryptedData,
-          stats: {
-            tstart: startTime,
-            tdecrypt: endTime
-          }
+        buffers.forEach(type => {
+          operationQueue.executeNext(type);
         });
-      }).catch(err => {
-        this.warn(`${err.name}: ${err.message}`);
-        this.state = State.IDLE;
-      });
+      } else {
+        const error = new Error('could not create source buffer for media codec(s)');
+        this.hls.trigger(Events.ERROR, {
+          type: ErrorTypes.MEDIA_ERROR,
+          details: ErrorDetails.BUFFER_INCOMPATIBLE_CODECS_ERROR,
+          fatal: true,
+          error,
+          reason: error.message
+        });
+      }
     }
   }
-  doTick() {
-    if (!this.media) {
-      this.state = State.IDLE;
-      return;
+  createSourceBuffers(tracks) {
+    const {
+      sourceBuffer,
+      mediaSource
+    } = this;
+    if (!mediaSource) {
+      throw Error('createSourceBuffers called when mediaSource was null');
     }
-    if (this.state === State.IDLE) {
-      const {
-        currentTrackId,
-        levels
-      } = this;
-      const track = levels[currentTrackId];
-      if (!levels.length || !track || !track.details) {
-        return;
-      }
-      const {
-        config
-      } = this;
-      const currentTime = this.getLoadPosition();
-      const bufferedInfo = BufferHelper.bufferedInfo(this.tracksBuffered[this.currentTrackId] || [], currentTime, config.maxBufferHole);
-      const {
-        end: targetBufferTime,
-        len: bufferLen
-      } = bufferedInfo;
-      const mainBufferInfo = this.getFwdBufferInfo(this.media, PlaylistLevelType.MAIN);
-      const trackDetails = track.details;
-      const maxBufLen = this.getMaxBufferLength(mainBufferInfo == null ? void 0 : mainBufferInfo.len) + trackDetails.levelTargetDuration;
-      if (bufferLen > maxBufLen) {
-        return;
-      }
-      const fragments = trackDetails.fragments;
-      const fragLen = fragments.length;
-      const end = trackDetails.edge;
-      let foundFrag = null;
-      const fragPrevious = this.fragPrevious;
-      if (targetBufferTime < end) {
-        const tolerance = config.maxFragLookUpTolerance;
-        const lookupTolerance = targetBufferTime > end - tolerance ? 0 : tolerance;
-        foundFrag = findFragmentByPTS(fragPrevious, fragments, Math.max(fragments[0].start, targetBufferTime), lookupTolerance);
-        if (!foundFrag && fragPrevious && fragPrevious.start < fragments[0].start) {
-          foundFrag = fragments[0];
+    for (const trackName in tracks) {
+      if (!sourceBuffer[trackName]) {
+        const track = tracks[trackName];
+        if (!track) {
+          throw Error(`source buffer exists for track ${trackName}, however track does not`);
         }
-      } else {
-        foundFrag = fragments[fragLen - 1];
-      }
-      if (!foundFrag) {
-        return;
-      }
-      foundFrag = this.mapToInitFragWhenRequired(foundFrag);
-      if (foundFrag.sn !== 'initSegment') {
-        // Load earlier fragment in same discontinuity to make up for misaligned playlists and cues that extend beyond end of segment
-        const curSNIdx = foundFrag.sn - trackDetails.startSN;
-        const prevFrag = fragments[curSNIdx - 1];
-        if (prevFrag && prevFrag.cc === foundFrag.cc && this.fragmentTracker.getState(prevFrag) === FragmentState.NOT_LOADED) {
-          foundFrag = prevFrag;
+        // use levelCodec as first priority
+        let codec = track.levelCodec || track.codec;
+        if (codec) {
+          if (trackName.slice(0, 5) === 'audio') {
+            codec = getCodecCompatibleName(codec, this.hls.config.preferManagedMediaSource);
+          }
+        }
+        const mimeType = `${track.container};codecs=${codec}`;
+        this.log(`creating sourceBuffer(${mimeType})`);
+        try {
+          const sb = sourceBuffer[trackName] = mediaSource.addSourceBuffer(mimeType);
+          const sbName = trackName;
+          this.addBufferListener(sbName, 'updatestart', this._onSBUpdateStart);
+          this.addBufferListener(sbName, 'updateend', this._onSBUpdateEnd);
+          this.addBufferListener(sbName, 'error', this._onSBUpdateError);
+          // ManagedSourceBuffer bufferedchange event
+          this.addBufferListener(sbName, 'bufferedchange', (type, event) => {
+            // If media was ejected check for a change. Added ranges are redundant with changes on 'updateend' event.
+            const removedRanges = event.removedRanges;
+            if (removedRanges != null && removedRanges.length) {
+              this.hls.trigger(Events.BUFFER_FLUSHED, {
+                type: trackName
+              });
+            }
+          });
+          this.tracks[trackName] = {
+            buffer: sb,
+            codec: codec,
+            container: track.container,
+            levelCodec: track.levelCodec,
+            metadata: track.metadata,
+            id: track.id
+          };
+        } catch (err) {
+          this.error(`error while trying to add sourceBuffer: ${err.message}`);
+          this.hls.trigger(Events.ERROR, {
+            type: ErrorTypes.MEDIA_ERROR,
+            details: ErrorDetails.BUFFER_ADD_CODEC_ERROR,
+            fatal: false,
+            error: err,
+            sourceBufferName: trackName,
+            mimeType: mimeType
+          });
         }
       }
-      if (this.fragmentTracker.getState(foundFrag) === FragmentState.NOT_LOADED) {
-        // only load if fragment is not loaded
-        this.loadFragment(foundFrag, track, targetBufferTime);
-      }
-    }
-  }
-  getMaxBufferLength(mainBufferLength) {
-    const maxConfigBuffer = super.getMaxBufferLength();
-    if (!mainBufferLength) {
-      return maxConfigBuffer;
-    }
-    return Math.max(maxConfigBuffer, mainBufferLength);
-  }
-  loadFragment(frag, level, targetBufferTime) {
-    this.fragCurrent = frag;
-    if (frag.sn === 'initSegment') {
-      this._loadInitSegment(frag, level);
-    } else {
-      this.startFragRequested = true;
-      super.loadFragment(frag, level, targetBufferTime);
     }
   }
-  get mediaBufferTimeRanges() {
-    return new BufferableInstance(this.tracksBuffered[this.currentTrackId] || []);
-  }
-}
-class BufferableInstance {
-  constructor(timeranges) {
-    this.buffered = void 0;
-    const getRange = (name, index, length) => {
-      index = index >>> 0;
-      if (index > length - 1) {
-        throw new DOMException(`Failed to execute '${name}' on 'TimeRanges': The index provided (${index}) is greater than the maximum bound (${length})`);
-      }
-      return timeranges[index][name];
-    };
-    this.buffered = {
-      get length() {
-        return timeranges.length;
-      },
-      end(index) {
-        return getRange('end', index, timeranges.length);
-      },
-      start(index) {
-        return getRange('start', index, timeranges.length);
-      }
-    };
-  }
-}
-
-class SubtitleTrackController extends BasePlaylistController {
-  constructor(hls) {
-    super(hls, '[subtitle-track-controller]');
-    this.media = null;
-    this.tracks = [];
-    this.groupId = null;
-    this.tracksInGroup = [];
-    this.trackId = -1;
-    this.selectDefaultTrack = true;
-    this.queuedDefaultTrack = -1;
-    this.trackChangeListener = () => this.onTextTracksChanged();
-    this.asyncPollTrackChange = () => this.pollTrackChange(0);
-    this.useTextTrackPolling = false;
-    this.subtitlePollingInterval = -1;
-    this._subtitleDisplay = true;
-    this.registerListeners();
-  }
-  destroy() {
-    this.unregisterListeners();
-    this.tracks.length = 0;
-    this.tracksInGroup.length = 0;
-    this.trackChangeListener = this.asyncPollTrackChange = null;
-    super.destroy();
-  }
-  get subtitleDisplay() {
-    return this._subtitleDisplay;
-  }
-  set subtitleDisplay(value) {
-    this._subtitleDisplay = value;
-    if (this.trackId > -1) {
-      this.toggleTrackModes(this.trackId);
-    }
+  get mediaSrc() {
+    var _this$media;
+    const media = ((_this$media = this.media) == null ? void 0 : _this$media.firstChild) || this.media;
+    return media == null ? void 0 : media.src;
   }
-  registerListeners() {
+  _onSBUpdateStart(type) {
     const {
-      hls
+      operationQueue
     } = this;
-    hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-    hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-    hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
-    hls.on(Events.MANIFEST_PARSED, this.onManifestParsed, this);
-    hls.on(Events.LEVEL_LOADING, this.onLevelLoading, this);
-    hls.on(Events.LEVEL_SWITCHING, this.onLevelSwitching, this);
-    hls.on(Events.SUBTITLE_TRACK_LOADED, this.onSubtitleTrackLoaded, this);
-    hls.on(Events.ERROR, this.onError, this);
+    const operation = operationQueue.current(type);
+    operation.onStart();
   }
-  unregisterListeners() {
+  _onSBUpdateEnd(type) {
+    var _this$mediaSource2;
+    if (((_this$mediaSource2 = this.mediaSource) == null ? void 0 : _this$mediaSource2.readyState) === 'closed') {
+      this.resetBuffer(type);
+      return;
+    }
     const {
-      hls
+      operationQueue
     } = this;
-    hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-    hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-    hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
-    hls.off(Events.MANIFEST_PARSED, this.onManifestParsed, this);
-    hls.off(Events.LEVEL_LOADING, this.onLevelLoading, this);
-    hls.off(Events.LEVEL_SWITCHING, this.onLevelSwitching, this);
-    hls.off(Events.SUBTITLE_TRACK_LOADED, this.onSubtitleTrackLoaded, this);
-    hls.off(Events.ERROR, this.onError, this);
+    const operation = operationQueue.current(type);
+    operation.onComplete();
+    operationQueue.shiftAndExecuteNext(type);
+  }
+  _onSBUpdateError(type, event) {
+    var _this$mediaSource3;
+    const error = new Error(`${type} SourceBuffer error. MediaSource readyState: ${(_this$mediaSource3 = this.mediaSource) == null ? void 0 : _this$mediaSource3.readyState}`);
+    this.error(`${error}`, event);
+    // according to http://www.w3.org/TR/media-source/#sourcebuffer-append-error
+    // SourceBuffer errors are not necessarily fatal; if so, the HTMLMediaElement will fire an error event
+    this.hls.trigger(Events.ERROR, {
+      type: ErrorTypes.MEDIA_ERROR,
+      details: ErrorDetails.BUFFER_APPENDING_ERROR,
+      sourceBufferName: type,
+      error,
+      fatal: false
+    });
+    // updateend is always fired after error, so we'll allow that to shift the current operation off of the queue
+    const operation = this.operationQueue.current(type);
+    if (operation) {
+      operation.onError(error);
+    }
   }
 
-  // Listen for subtitle track change, then extract the current track ID.
-  onMediaAttached(event, data) {
-    this.media = data.media;
-    if (!this.media) {
+  // This method must result in an updateend event; if remove is not called, _onSBUpdateEnd must be called manually
+  removeExecutor(type, startOffset, endOffset) {
+    const {
+      media,
+      mediaSource,
+      operationQueue,
+      sourceBuffer
+    } = this;
+    const sb = sourceBuffer[type];
+    if (!media || !mediaSource || !sb) {
+      this.warn(`Attempting to remove from the ${type} SourceBuffer, but it does not exist`);
+      operationQueue.shiftAndExecuteNext(type);
       return;
     }
-    if (this.queuedDefaultTrack > -1) {
-      this.subtitleTrack = this.queuedDefaultTrack;
-      this.queuedDefaultTrack = -1;
-    }
-    this.useTextTrackPolling = !(this.media.textTracks && 'onchange' in this.media.textTracks);
-    if (this.useTextTrackPolling) {
-      this.pollTrackChange(500);
+    const mediaDuration = isFiniteNumber(media.duration) ? media.duration : Infinity;
+    const msDuration = isFiniteNumber(mediaSource.duration) ? mediaSource.duration : Infinity;
+    const removeStart = Math.max(0, startOffset);
+    const removeEnd = Math.min(endOffset, mediaDuration, msDuration);
+    if (removeEnd > removeStart && (!sb.ending || sb.ended)) {
+      sb.ended = false;
+      this.log(`Removing [${removeStart},${removeEnd}] from the ${type} SourceBuffer`);
+      sb.remove(removeStart, removeEnd);
     } else {
-      this.media.textTracks.addEventListener('change', this.asyncPollTrackChange);
+      // Cycle the queue
+      operationQueue.shiftAndExecuteNext(type);
     }
   }
-  pollTrackChange(timeout) {
-    self.clearInterval(this.subtitlePollingInterval);
-    this.subtitlePollingInterval = self.setInterval(this.trackChangeListener, timeout);
-  }
-  onMediaDetaching() {
-    if (!this.media) {
+
+  // This method must result in an updateend event; if append is not called, _onSBUpdateEnd must be called manually
+  appendExecutor(data, type) {
+    const sb = this.sourceBuffer[type];
+    if (!sb) {
+      if (!this.pendingTracks[type]) {
+        throw new Error(`Attempting to append to the ${type} SourceBuffer, but it does not exist`);
+      }
       return;
     }
-    self.clearInterval(this.subtitlePollingInterval);
-    if (!this.useTextTrackPolling) {
-      this.media.textTracks.removeEventListener('change', this.asyncPollTrackChange);
-    }
-    if (this.trackId > -1) {
-      this.queuedDefaultTrack = this.trackId;
-    }
-    const textTracks = filterSubtitleTracks(this.media.textTracks);
-    // Clear loaded cues on media detachment from tracks
-    textTracks.forEach(track => {
-      clearCurrentCues(track);
-    });
-    // Disable all subtitle tracks before detachment so when reattached only tracks in that content are enabled.
-    this.subtitleTrack = -1;
-    this.media = null;
-  }
-  onManifestLoading() {
-    this.tracks = [];
-    this.groupId = null;
-    this.tracksInGroup = [];
-    this.trackId = -1;
-    this.selectDefaultTrack = true;
+    sb.ended = false;
+    sb.appendBuffer(data);
   }
 
-  // Fired whenever a new manifest is loaded.
-  onManifestParsed(event, data) {
-    this.tracks = data.subtitleTracks;
-  }
-  onSubtitleTrackLoaded(event, data) {
-    const {
-      id,
-      details
-    } = data;
-    const {
-      trackId
-    } = this;
-    const currentTrack = this.tracksInGroup[trackId];
-    if (!currentTrack) {
-      this.warn(`Invalid subtitle track id ${id}`);
-      return;
-    }
-    const curDetails = currentTrack.details;
-    currentTrack.details = data.details;
-    this.log(`subtitle track ${id} loaded [${details.startSN}-${details.endSN}]`);
-    if (id === this.trackId) {
-      this.playlistLoaded(id, data, curDetails);
-    }
-  }
-  onLevelLoading(event, data) {
-    this.switchLevel(data.level);
-  }
-  onLevelSwitching(event, data) {
-    this.switchLevel(data.level);
-  }
-  switchLevel(levelIndex) {
-    const levelInfo = this.hls.levels[levelIndex];
-    if (!(levelInfo != null && levelInfo.textGroupIds)) {
-      return;
-    }
-    const textGroupId = levelInfo.textGroupIds[levelInfo.urlId];
-    const lastTrack = this.tracksInGroup ? this.tracksInGroup[this.trackId] : undefined;
-    if (this.groupId !== textGroupId) {
-      const subtitleTracks = this.tracks.filter(track => !textGroupId || track.groupId === textGroupId);
-      this.tracksInGroup = subtitleTracks;
-      const initialTrackId = this.findTrackId(lastTrack == null ? void 0 : lastTrack.name) || this.findTrackId();
-      this.groupId = textGroupId || null;
-      const subtitleTracksUpdated = {
-        subtitleTracks
-      };
-      this.log(`Updating subtitle tracks, ${subtitleTracks.length} track(s) found in "${textGroupId}" group-id`);
-      this.hls.trigger(Events.SUBTITLE_TRACKS_UPDATED, subtitleTracksUpdated);
-      if (initialTrackId !== -1) {
-        this.setSubtitleTrack(initialTrackId, lastTrack);
-      }
-    } else if (this.shouldReloadPlaylist(lastTrack)) {
-      // Retry playlist loading if no playlist is or has been loaded yet
-      this.setSubtitleTrack(this.trackId, lastTrack);
-    }
-  }
-  findTrackId(name) {
-    const textTracks = this.tracksInGroup;
-    for (let i = 0; i < textTracks.length; i++) {
-      const track = textTracks[i];
-      if (!this.selectDefaultTrack || track.default) {
-        if (!name || name === track.name) {
-          return track.id;
-        }
-      }
-    }
-    return -1;
-  }
-  onError(event, data) {
-    if (data.fatal || !data.context) {
+  // Enqueues an operation to each SourceBuffer queue which, upon execution, resolves a promise. When all promises
+  // resolve, the onUnblocked function is executed. Functions calling this method do not need to unblock the queue
+  // upon completion, since we already do it here
+  blockBuffers(onUnblocked, buffers = this.getSourceBufferTypes()) {
+    if (!buffers.length) {
+      this.log('Blocking operation requested, but no SourceBuffers exist');
+      Promise.resolve().then(onUnblocked);
       return;
     }
-    if (data.context.type === PlaylistContextType.SUBTITLE_TRACK && data.context.id === this.trackId && data.context.groupId === this.groupId) {
-      this.checkRetry(data);
-    }
-  }
-
-  /** get alternate subtitle tracks list from playlist **/
-  get subtitleTracks() {
-    return this.tracksInGroup;
-  }
+    const {
+      operationQueue
+    } = this;
 
-  /** get/set index of the selected subtitle track (based on index in subtitle track lists) **/
-  get subtitleTrack() {
-    return this.trackId;
-  }
-  set subtitleTrack(newId) {
-    this.selectDefaultTrack = false;
-    const lastTrack = this.tracksInGroup ? this.tracksInGroup[this.trackId] : undefined;
-    this.setSubtitleTrack(newId, lastTrack);
-  }
-  loadPlaylist(hlsUrlParameters) {
-    super.loadPlaylist();
-    const currentTrack = this.tracksInGroup[this.trackId];
-    if (this.shouldLoadPlaylist(currentTrack)) {
-      const id = currentTrack.id;
-      const groupId = currentTrack.groupId;
-      let url = currentTrack.url;
-      if (hlsUrlParameters) {
-        try {
-          url = hlsUrlParameters.addDirectives(url);
-        } catch (error) {
-          this.warn(`Could not construct new URL with HLS Delivery Directives: ${error}`);
+    // logger.debug(`[buffer-controller]: Blocking ${buffers} SourceBuffer`);
+    const blockingOperations = buffers.map(type => operationQueue.appendBlocker(type));
+    Promise.all(blockingOperations).then(() => {
+      // logger.debug(`[buffer-controller]: Blocking operation resolved; unblocking ${buffers} SourceBuffer`);
+      onUnblocked();
+      buffers.forEach(type => {
+        const sb = this.sourceBuffer[type];
+        // Only cycle the queue if the SB is not updating. There's a bug in Chrome which sets the SB updating flag to
+        // true when changing the MediaSource duration (https://bugs.chromium.org/p/chromium/issues/detail?id=959359&can=2&q=mediasource%20duration)
+        // While this is a workaround, it's probably useful to have around
+        if (!(sb != null && sb.updating)) {
+          operationQueue.shiftAndExecuteNext(type);
         }
-      }
-      this.log(`Loading subtitle playlist for id ${id}`);
-      this.hls.trigger(Events.SUBTITLE_TRACK_LOADING, {
-        url,
-        id,
-        groupId,
-        deliveryDirectives: hlsUrlParameters || null
       });
-    }
+    });
   }
-
-  /**
-   * Disables the old subtitleTrack and sets current mode on the next subtitleTrack.
-   * This operates on the DOM textTracks.
-   * A value of -1 will disable all subtitle tracks.
-   */
-  toggleTrackModes(newId) {
-    const {
-      media,
-      trackId
-    } = this;
-    if (!media) {
-      return;
-    }
-    const textTracks = filterSubtitleTracks(media.textTracks);
-    const groupTracks = textTracks.filter(track => track.groupId === this.groupId);
-    if (newId === -1) {
-      [].slice.call(textTracks).forEach(track => {
-        track.mode = 'disabled';
-      });
-    } else {
-      const oldTrack = groupTracks[trackId];
-      if (oldTrack) {
-        oldTrack.mode = 'disabled';
-      }
-    }
-    const nextTrack = groupTracks[newId];
-    if (nextTrack) {
-      nextTrack.mode = this.subtitleDisplay ? 'showing' : 'hidden';
-    }
+  getSourceBufferTypes() {
+    return Object.keys(this.sourceBuffer);
   }
-
-  /**
-   * This method is responsible for validating the subtitle index and periodically reloading if live.
-   * Dispatches the SUBTITLE_TRACK_SWITCH event, which instructs the subtitle-stream-controller to load the selected track.
-   */
-  setSubtitleTrack(newId, lastTrack) {
-    var _tracks$newId;
-    const tracks = this.tracksInGroup;
-
-    // setting this.subtitleTrack will trigger internal logic
-    // if media has not been attached yet, it will fail
-    // we keep a reference to the default track id
-    // and we'll set subtitleTrack when onMediaAttached is triggered
-    if (!this.media) {
-      this.queuedDefaultTrack = newId;
-      return;
-    }
-    if (this.trackId !== newId) {
-      this.toggleTrackModes(newId);
-    }
-
-    // exit if track id as already set or invalid
-    if (this.trackId === newId && (newId === -1 || (_tracks$newId = tracks[newId]) != null && _tracks$newId.details) || newId < -1 || newId >= tracks.length) {
+  addBufferListener(type, event, fn) {
+    const buffer = this.sourceBuffer[type];
+    if (!buffer) {
       return;
     }
-
-    // stopping live reloading timer if any
-    this.clearTimer();
-    const track = tracks[newId];
-    this.log(`Switching to subtitle-track ${newId}` + (track ? ` "${track.name}" lang:${track.lang} group:${track.groupId}` : ''));
-    this.trackId = newId;
-    if (track) {
-      const {
-        id,
-        groupId = '',
-        name,
-        type,
-        url
-      } = track;
-      this.hls.trigger(Events.SUBTITLE_TRACK_SWITCH, {
-        id,
-        groupId,
-        name,
-        type,
-        url
-      });
-      const hlsUrlParameters = this.switchParams(track.url, lastTrack == null ? void 0 : lastTrack.details);
-      this.loadPlaylist(hlsUrlParameters);
-    } else {
-      // switch to -1
-      this.hls.trigger(Events.SUBTITLE_TRACK_SWITCH, {
-        id: newId
-      });
-    }
+    const listener = fn.bind(this, type);
+    this.listeners[type].push({
+      event,
+      listener
+    });
+    buffer.addEventListener(event, listener);
   }
-  onTextTracksChanged() {
-    if (!this.useTextTrackPolling) {
-      self.clearInterval(this.subtitlePollingInterval);
-    }
-    // Media is undefined when switching streams via loadSource()
-    if (!this.media || !this.hls.config.renderTextTracksNatively) {
+  removeBufferListeners(type) {
+    const buffer = this.sourceBuffer[type];
+    if (!buffer) {
       return;
     }
-    let trackId = -1;
-    const tracks = filterSubtitleTracks(this.media.textTracks);
-    for (let id = 0; id < tracks.length; id++) {
-      if (tracks[id].mode === 'hidden') {
-        // Do not break in case there is a following track with showing.
-        trackId = id;
-      } else if (tracks[id].mode === 'showing') {
-        trackId = id;
-        break;
-      }
-    }
-
-    // Setting current subtitleTrack will invoke code.
-    if (this.subtitleTrack !== trackId) {
-      this.subtitleTrack = trackId;
-    }
+    this.listeners[type].forEach(l => {
+      buffer.removeEventListener(l.event, l.listener);
+    });
   }
 }
-function filterSubtitleTracks(textTrackList) {
-  const tracks = [];
-  for (let i = 0; i < textTrackList.length; i++) {
-    const track = textTrackList[i];
-    // Edge adds a track without a label; we don't want to use it
-    if ((track.kind === 'subtitles' || track.kind === 'captions') && track.label) {
-      tracks.push(textTrackList[i]);
-    }
-  }
-  return tracks;
+function removeSourceChildren(node) {
+  const sourceChildren = node.querySelectorAll('source');
+  [].slice.call(sourceChildren).forEach(source => {
+    node.removeChild(source);
+  });
+}
+function addSource(media, url) {
+  const source = self.document.createElement('source');
+  source.type = 'video/mp4';
+  source.src = url;
+  media.appendChild(source);
 }
 
-class BufferOperationQueue {
-  constructor(sourceBufferReference) {
-    this.buffers = void 0;
-    this.queues = {
-      video: [],
-      audio: [],
-      audiovideo: []
-    };
-    this.buffers = sourceBufferReference;
-  }
-  append(operation, type) {
-    const queue = this.queues[type];
-    queue.push(operation);
-    if (queue.length === 1 && this.buffers[type]) {
-      this.executeNext(type);
-    }
-  }
-  insertAbort(operation, type) {
-    const queue = this.queues[type];
-    queue.unshift(operation);
-    this.executeNext(type);
-  }
-  appendBlocker(type) {
-    let execute;
-    const promise = new Promise(resolve => {
-      execute = resolve;
-    });
-    const operation = {
-      execute,
-      onStart: () => {},
-      onComplete: () => {},
-      onError: () => {}
-    };
-    this.append(operation, type);
-    return promise;
-  }
-  executeNext(type) {
-    const {
-      buffers,
-      queues
-    } = this;
-    const sb = buffers[type];
-    const queue = queues[type];
-    if (queue.length) {
-      const operation = queue[0];
-      try {
-        // Operations are expected to result in an 'updateend' event being fired. If not, the queue will lock. Operations
-        // which do not end with this event must call _onSBUpdateEnd manually
-        operation.execute();
-      } catch (e) {
-        logger.warn('[buffer-operation-queue]: Unhandled exception executing the current operation');
-        operation.onError(e);
+/**
+ *
+ * This code was ported from the dash.js project at:
+ *   https://github.com/Dash-Industry-Forum/dash.js/blob/development/externals/cea608-parser.js
+ *   https://github.com/Dash-Industry-Forum/dash.js/commit/8269b26a761e0853bb21d78780ed945144ecdd4d#diff-71bc295a2d6b6b7093a1d3290d53a4b2
+ *
+ * The original copyright appears below:
+ *
+ * The copyright in this software is being made available under the BSD License,
+ * included below. This software may be subject to other third party and contributor
+ * rights, including patent rights, and no such rights are granted under this license.
+ *
+ * Copyright (c) 2015-2016, DASH Industry Forum.
+ * All rights reserved.
+ *
+ * Redistribution and use in source and binary forms, with or without modification,
+ * are permitted provided that the following conditions are met:
+ *  1. Redistributions of source code must retain the above copyright notice, this
+ *  list of conditions and the following disclaimer.
+ *  * Redistributions in binary form must reproduce the above copyright notice,
+ *  this list of conditions and the following disclaimer in the documentation and/or
+ *  other materials provided with the distribution.
+ *  2. Neither the name of Dash Industry Forum nor the names of its
+ *  contributors may be used to endorse or promote products derived from this software
+ *  without specific prior written permission.
+ *
+ *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND ANY
+ *  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ *  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+ *  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ *  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
+ *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
+ *  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ *  POSSIBILITY OF SUCH DAMAGE.
+ */
+/**
+ *  Exceptions from regular ASCII. CodePoints are mapped to UTF-16 codes
+ */
+
+const specialCea608CharsCodes = {
+  0x2a: 0xe1,
+  // lowercase a, acute accent
+  0x5c: 0xe9,
+  // lowercase e, acute accent
+  0x5e: 0xed,
+  // lowercase i, acute accent
+  0x5f: 0xf3,
+  // lowercase o, acute accent
+  0x60: 0xfa,
+  // lowercase u, acute accent
+  0x7b: 0xe7,
+  // lowercase c with cedilla
+  0x7c: 0xf7,
+  // division symbol
+  0x7d: 0xd1,
+  // uppercase N tilde
+  0x7e: 0xf1,
+  // lowercase n tilde
+  0x7f: 0x2588,
+  // Full block
+  // THIS BLOCK INCLUDES THE 16 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
+  // THAT COME FROM HI BYTE=0x11 AND LOW BETWEEN 0x30 AND 0x3F
+  // THIS MEANS THAT \x50 MUST BE ADDED TO THE VALUES
+  0x80: 0xae,
+  // Registered symbol (R)
+  0x81: 0xb0,
+  // degree sign
+  0x82: 0xbd,
+  // 1/2 symbol
+  0x83: 0xbf,
+  // Inverted (open) question mark
+  0x84: 0x2122,
+  // Trademark symbol (TM)
+  0x85: 0xa2,
+  // Cents symbol
+  0x86: 0xa3,
+  // Pounds sterling
+  0x87: 0x266a,
+  // Music 8'th note
+  0x88: 0xe0,
+  // lowercase a, grave accent
+  0x89: 0x20,
+  // transparent space (regular)
+  0x8a: 0xe8,
+  // lowercase e, grave accent
+  0x8b: 0xe2,
+  // lowercase a, circumflex accent
+  0x8c: 0xea,
+  // lowercase e, circumflex accent
+  0x8d: 0xee,
+  // lowercase i, circumflex accent
+  0x8e: 0xf4,
+  // lowercase o, circumflex accent
+  0x8f: 0xfb,
+  // lowercase u, circumflex accent
+  // THIS BLOCK INCLUDES THE 32 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
+  // THAT COME FROM HI BYTE=0x12 AND LOW BETWEEN 0x20 AND 0x3F
+  0x90: 0xc1,
+  // capital letter A with acute
+  0x91: 0xc9,
+  // capital letter E with acute
+  0x92: 0xd3,
+  // capital letter O with acute
+  0x93: 0xda,
+  // capital letter U with acute
+  0x94: 0xdc,
+  // capital letter U with diaresis
+  0x95: 0xfc,
+  // lowercase letter U with diaeresis
+  0x96: 0x2018,
+  // opening single quote
+  0x97: 0xa1,
+  // inverted exclamation mark
+  0x98: 0x2a,
+  // asterisk
+  0x99: 0x2019,
+  // closing single quote
+  0x9a: 0x2501,
+  // box drawings heavy horizontal
+  0x9b: 0xa9,
+  // copyright sign
+  0x9c: 0x2120,
+  // Service mark
+  0x9d: 0x2022,
+  // (round) bullet
+  0x9e: 0x201c,
+  // Left double quotation mark
+  0x9f: 0x201d,
+  // Right double quotation mark
+  0xa0: 0xc0,
+  // uppercase A, grave accent
+  0xa1: 0xc2,
+  // uppercase A, circumflex
+  0xa2: 0xc7,
+  // uppercase C with cedilla
+  0xa3: 0xc8,
+  // uppercase E, grave accent
+  0xa4: 0xca,
+  // uppercase E, circumflex
+  0xa5: 0xcb,
+  // capital letter E with diaresis
+  0xa6: 0xeb,
+  // lowercase letter e with diaresis
+  0xa7: 0xce,
+  // uppercase I, circumflex
+  0xa8: 0xcf,
+  // uppercase I, with diaresis
+  0xa9: 0xef,
+  // lowercase i, with diaresis
+  0xaa: 0xd4,
+  // uppercase O, circumflex
+  0xab: 0xd9,
+  // uppercase U, grave accent
+  0xac: 0xf9,
+  // lowercase u, grave accent
+  0xad: 0xdb,
+  // uppercase U, circumflex
+  0xae: 0xab,
+  // left-pointing double angle quotation mark
+  0xaf: 0xbb,
+  // right-pointing double angle quotation mark
+  // THIS BLOCK INCLUDES THE 32 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
+  // THAT COME FROM HI BYTE=0x13 AND LOW BETWEEN 0x20 AND 0x3F
+  0xb0: 0xc3,
+  // Uppercase A, tilde
+  0xb1: 0xe3,
+  // Lowercase a, tilde
+  0xb2: 0xcd,
+  // Uppercase I, acute accent
+  0xb3: 0xcc,
+  // Uppercase I, grave accent
+  0xb4: 0xec,
+  // Lowercase i, grave accent
+  0xb5: 0xd2,
+  // Uppercase O, grave accent
+  0xb6: 0xf2,
+  // Lowercase o, grave accent
+  0xb7: 0xd5,
+  // Uppercase O, tilde
+  0xb8: 0xf5,
+  // Lowercase o, tilde
+  0xb9: 0x7b,
+  // Open curly brace
+  0xba: 0x7d,
+  // Closing curly brace
+  0xbb: 0x5c,
+  // Backslash
+  0xbc: 0x5e,
+  // Caret
+  0xbd: 0x5f,
+  // Underscore
+  0xbe: 0x7c,
+  // Pipe (vertical line)
+  0xbf: 0x223c,
+  // Tilde operator
+  0xc0: 0xc4,
+  // Uppercase A, umlaut
+  0xc1: 0xe4,
+  // Lowercase A, umlaut
+  0xc2: 0xd6,
+  // Uppercase O, umlaut
+  0xc3: 0xf6,
+  // Lowercase o, umlaut
+  0xc4: 0xdf,
+  // Esszett (sharp S)
+  0xc5: 0xa5,
+  // Yen symbol
+  0xc6: 0xa4,
+  // Generic currency sign
+  0xc7: 0x2503,
+  // Box drawings heavy vertical
+  0xc8: 0xc5,
+  // Uppercase A, ring
+  0xc9: 0xe5,
+  // Lowercase A, ring
+  0xca: 0xd8,
+  // Uppercase O, stroke
+  0xcb: 0xf8,
+  // Lowercase o, strok
+  0xcc: 0x250f,
+  // Box drawings heavy down and right
+  0xcd: 0x2513,
+  // Box drawings heavy down and left
+  0xce: 0x2517,
+  // Box drawings heavy up and right
+  0xcf: 0x251b // Box drawings heavy up and left
+};
+
+/**
+ * Utils
+ */
+const getCharForByte = function getCharForByte(byte) {
+  let charCode = byte;
+  if (specialCea608CharsCodes.hasOwnProperty(byte)) {
+    charCode = specialCea608CharsCodes[byte];
+  }
+  return String.fromCharCode(charCode);
+};
+const NR_ROWS = 15;
+const NR_COLS = 100;
+// Tables to look up row from PAC data
+const rowsLowCh1 = {
+  0x11: 1,
+  0x12: 3,
+  0x15: 5,
+  0x16: 7,
+  0x17: 9,
+  0x10: 11,
+  0x13: 12,
+  0x14: 14
+};
+const rowsHighCh1 = {
+  0x11: 2,
+  0x12: 4,
+  0x15: 6,
+  0x16: 8,
+  0x17: 10,
+  0x13: 13,
+  0x14: 15
+};
+const rowsLowCh2 = {
+  0x19: 1,
+  0x1a: 3,
+  0x1d: 5,
+  0x1e: 7,
+  0x1f: 9,
+  0x18: 11,
+  0x1b: 12,
+  0x1c: 14
+};
+const rowsHighCh2 = {
+  0x19: 2,
+  0x1a: 4,
+  0x1d: 6,
+  0x1e: 8,
+  0x1f: 10,
+  0x1b: 13,
+  0x1c: 15
+};
+const backgroundColors = ['white', 'green', 'blue', 'cyan', 'red', 'yellow', 'magenta', 'black', 'transparent'];
+class CaptionsLogger {
+  constructor() {
+    this.time = null;
+    this.verboseLevel = 0;
+  }
+  log(severity, msg) {
+    if (this.verboseLevel >= severity) {
+      const m = typeof msg === 'function' ? msg() : msg;
+      logger.log(`${this.time} [${severity}] ${m}`);
+    }
+  }
+}
+const numArrayToHexArray = function numArrayToHexArray(numArray) {
+  const hexArray = [];
+  for (let j = 0; j < numArray.length; j++) {
+    hexArray.push(numArray[j].toString(16));
+  }
+  return hexArray;
+};
+class PenState {
+  constructor() {
+    this.foreground = 'white';
+    this.underline = false;
+    this.italics = false;
+    this.background = 'black';
+    this.flash = false;
+  }
+  reset() {
+    this.foreground = 'white';
+    this.underline = false;
+    this.italics = false;
+    this.background = 'black';
+    this.flash = false;
+  }
+  setStyles(styles) {
+    const attribs = ['foreground', 'underline', 'italics', 'background', 'flash'];
+    for (let i = 0; i < attribs.length; i++) {
+      const style = attribs[i];
+      if (styles.hasOwnProperty(style)) {
+        this[style] = styles[style];
+      }
+    }
+  }
+  isDefault() {
+    return this.foreground === 'white' && !this.underline && !this.italics && this.background === 'black' && !this.flash;
+  }
+  equals(other) {
+    return this.foreground === other.foreground && this.underline === other.underline && this.italics === other.italics && this.background === other.background && this.flash === other.flash;
+  }
+  copy(newPenState) {
+    this.foreground = newPenState.foreground;
+    this.underline = newPenState.underline;
+    this.italics = newPenState.italics;
+    this.background = newPenState.background;
+    this.flash = newPenState.flash;
+  }
+  toString() {
+    return 'color=' + this.foreground + ', underline=' + this.underline + ', italics=' + this.italics + ', background=' + this.background + ', flash=' + this.flash;
+  }
+}
+
+/**
+ * Unicode character with styling and background.
+ * @constructor
+ */
+class StyledUnicodeChar {
+  constructor() {
+    this.uchar = ' ';
+    this.penState = new PenState();
+  }
+  reset() {
+    this.uchar = ' ';
+    this.penState.reset();
+  }
+  setChar(uchar, newPenState) {
+    this.uchar = uchar;
+    this.penState.copy(newPenState);
+  }
+  setPenState(newPenState) {
+    this.penState.copy(newPenState);
+  }
+  equals(other) {
+    return this.uchar === other.uchar && this.penState.equals(other.penState);
+  }
+  copy(newChar) {
+    this.uchar = newChar.uchar;
+    this.penState.copy(newChar.penState);
+  }
+  isEmpty() {
+    return this.uchar === ' ' && this.penState.isDefault();
+  }
+}
+
+/**
+ * CEA-608 row consisting of NR_COLS instances of StyledUnicodeChar.
+ * @constructor
+ */
+class Row {
+  constructor(logger) {
+    this.chars = [];
+    this.pos = 0;
+    this.currPenState = new PenState();
+    this.cueStartTime = null;
+    this.logger = void 0;
+    for (let i = 0; i < NR_COLS; i++) {
+      this.chars.push(new StyledUnicodeChar());
+    }
+    this.logger = logger;
+  }
+  equals(other) {
+    for (let i = 0; i < NR_COLS; i++) {
+      if (!this.chars[i].equals(other.chars[i])) {
+        return false;
+      }
+    }
+    return true;
+  }
+  copy(other) {
+    for (let i = 0; i < NR_COLS; i++) {
+      this.chars[i].copy(other.chars[i]);
+    }
+  }
+  isEmpty() {
+    let empty = true;
+    for (let i = 0; i < NR_COLS; i++) {
+      if (!this.chars[i].isEmpty()) {
+        empty = false;
+        break;
+      }
+    }
+    return empty;
+  }
+
+  /**
+   *  Set the cursor to a valid column.
+   */
+  setCursor(absPos) {
+    if (this.pos !== absPos) {
+      this.pos = absPos;
+    }
+    if (this.pos < 0) {
+      this.logger.log(3, 'Negative cursor position ' + this.pos);
+      this.pos = 0;
+    } else if (this.pos > NR_COLS) {
+      this.logger.log(3, 'Too large cursor position ' + this.pos);
+      this.pos = NR_COLS;
+    }
+  }
+
+  /**
+   * Move the cursor relative to current position.
+   */
+  moveCursor(relPos) {
+    const newPos = this.pos + relPos;
+    if (relPos > 1) {
+      for (let i = this.pos + 1; i < newPos + 1; i++) {
+        this.chars[i].setPenState(this.currPenState);
+      }
+    }
+    this.setCursor(newPos);
+  }
+
+  /**
+   * Backspace, move one step back and clear character.
+   */
+  backSpace() {
+    this.moveCursor(-1);
+    this.chars[this.pos].setChar(' ', this.currPenState);
+  }
+  insertChar(byte) {
+    if (byte >= 0x90) {
+      // Extended char
+      this.backSpace();
+    }
+    const char = getCharForByte(byte);
+    if (this.pos >= NR_COLS) {
+      this.logger.log(0, () => 'Cannot insert ' + byte.toString(16) + ' (' + char + ') at position ' + this.pos + '. Skipping it!');
+      return;
+    }
+    this.chars[this.pos].setChar(char, this.currPenState);
+    this.moveCursor(1);
+  }
+  clearFromPos(startPos) {
+    let i;
+    for (i = startPos; i < NR_COLS; i++) {
+      this.chars[i].reset();
+    }
+  }
+  clear() {
+    this.clearFromPos(0);
+    this.pos = 0;
+    this.currPenState.reset();
+  }
+  clearToEndOfRow() {
+    this.clearFromPos(this.pos);
+  }
+  getTextString() {
+    const chars = [];
+    let empty = true;
+    for (let i = 0; i < NR_COLS; i++) {
+      const char = this.chars[i].uchar;
+      if (char !== ' ') {
+        empty = false;
+      }
+      chars.push(char);
+    }
+    if (empty) {
+      return '';
+    } else {
+      return chars.join('');
+    }
+  }
+  setPenStyles(styles) {
+    this.currPenState.setStyles(styles);
+    const currChar = this.chars[this.pos];
+    currChar.setPenState(this.currPenState);
+  }
+}
+
+/**
+ * Keep a CEA-608 screen of 32x15 styled characters
+ * @constructor
+ */
+class CaptionScreen {
+  constructor(logger) {
+    this.rows = [];
+    this.currRow = NR_ROWS - 1;
+    this.nrRollUpRows = null;
+    this.lastOutputScreen = null;
+    this.logger = void 0;
+    for (let i = 0; i < NR_ROWS; i++) {
+      this.rows.push(new Row(logger));
+    }
+    this.logger = logger;
+  }
+  reset() {
+    for (let i = 0; i < NR_ROWS; i++) {
+      this.rows[i].clear();
+    }
+    this.currRow = NR_ROWS - 1;
+  }
+  equals(other) {
+    let equal = true;
+    for (let i = 0; i < NR_ROWS; i++) {
+      if (!this.rows[i].equals(other.rows[i])) {
+        equal = false;
+        break;
+      }
+    }
+    return equal;
+  }
+  copy(other) {
+    for (let i = 0; i < NR_ROWS; i++) {
+      this.rows[i].copy(other.rows[i]);
+    }
+  }
+  isEmpty() {
+    let empty = true;
+    for (let i = 0; i < NR_ROWS; i++) {
+      if (!this.rows[i].isEmpty()) {
+        empty = false;
+        break;
+      }
+    }
+    return empty;
+  }
+  backSpace() {
+    const row = this.rows[this.currRow];
+    row.backSpace();
+  }
+  clearToEndOfRow() {
+    const row = this.rows[this.currRow];
+    row.clearToEndOfRow();
+  }
+
+  /**
+   * Insert a character (without styling) in the current row.
+   */
+  insertChar(char) {
+    const row = this.rows[this.currRow];
+    row.insertChar(char);
+  }
+  setPen(styles) {
+    const row = this.rows[this.currRow];
+    row.setPenStyles(styles);
+  }
+  moveCursor(relPos) {
+    const row = this.rows[this.currRow];
+    row.moveCursor(relPos);
+  }
+  setCursor(absPos) {
+    this.logger.log(2, 'setCursor: ' + absPos);
+    const row = this.rows[this.currRow];
+    row.setCursor(absPos);
+  }
+  setPAC(pacData) {
+    this.logger.log(2, () => 'pacData = ' + JSON.stringify(pacData));
+    let newRow = pacData.row - 1;
+    if (this.nrRollUpRows && newRow < this.nrRollUpRows - 1) {
+      newRow = this.nrRollUpRows - 1;
+    }
+
+    // Make sure this only affects Roll-up Captions by checking this.nrRollUpRows
+    if (this.nrRollUpRows && this.currRow !== newRow) {
+      // clear all rows first
+      for (let i = 0; i < NR_ROWS; i++) {
+        this.rows[i].clear();
+      }
+
+      // Copy this.nrRollUpRows rows from lastOutputScreen and place it in the newRow location
+      // topRowIndex - the start of rows to copy (inclusive index)
+      const topRowIndex = this.currRow + 1 - this.nrRollUpRows;
+      // We only copy if the last position was already shown.
+      // We use the cueStartTime value to check this.
+      const lastOutputScreen = this.lastOutputScreen;
+      if (lastOutputScreen) {
+        const prevLineTime = lastOutputScreen.rows[topRowIndex].cueStartTime;
+        const time = this.logger.time;
+        if (prevLineTime !== null && time !== null && prevLineTime < time) {
+          for (let i = 0; i < this.nrRollUpRows; i++) {
+            this.rows[newRow - this.nrRollUpRows + i + 1].copy(lastOutputScreen.rows[topRowIndex + i]);
+          }
+        }
+      }
+    }
+    this.currRow = newRow;
+    const row = this.rows[this.currRow];
+    if (pacData.indent !== null) {
+      const indent = pacData.indent;
+      const prevPos = Math.max(indent - 1, 0);
+      row.setCursor(pacData.indent);
+      pacData.color = row.chars[prevPos].penState.foreground;
+    }
+    const styles = {
+      foreground: pacData.color,
+      underline: pacData.underline,
+      italics: pacData.italics,
+      background: 'black',
+      flash: false
+    };
+    this.setPen(styles);
+  }
+
+  /**
+   * Set background/extra foreground, but first do back_space, and then insert space (backwards compatibility).
+   */
+  setBkgData(bkgData) {
+    this.logger.log(2, () => 'bkgData = ' + JSON.stringify(bkgData));
+    this.backSpace();
+    this.setPen(bkgData);
+    this.insertChar(0x20); // Space
+  }
+  setRollUpRows(nrRows) {
+    this.nrRollUpRows = nrRows;
+  }
+  rollUp() {
+    if (this.nrRollUpRows === null) {
+      this.logger.log(3, 'roll_up but nrRollUpRows not set yet');
+      return; // Not properly setup
+    }
+    this.logger.log(1, () => this.getDisplayText());
+    const topRowIndex = this.currRow + 1 - this.nrRollUpRows;
+    const topRow = this.rows.splice(topRowIndex, 1)[0];
+    topRow.clear();
+    this.rows.splice(this.currRow, 0, topRow);
+    this.logger.log(2, 'Rolling up');
+    // this.logger.log(VerboseLevel.TEXT, this.get_display_text())
+  }
+
+  /**
+   * Get all non-empty rows with as unicode text.
+   */
+  getDisplayText(asOneRow) {
+    asOneRow = asOneRow || false;
+    const displayText = [];
+    let text = '';
+    let rowNr = -1;
+    for (let i = 0; i < NR_ROWS; i++) {
+      const rowText = this.rows[i].getTextString();
+      if (rowText) {
+        rowNr = i + 1;
+        if (asOneRow) {
+          displayText.push('Row ' + rowNr + ": '" + rowText + "'");
+        } else {
+          displayText.push(rowText.trim());
+        }
+      }
+    }
+    if (displayText.length > 0) {
+      if (asOneRow) {
+        text = '[' + displayText.join(' | ') + ']';
+      } else {
+        text = displayText.join('\n');
+      }
+    }
+    return text;
+  }
+  getTextAndFormat() {
+    return this.rows;
+  }
+}
+
+// var modes = ['MODE_ROLL-UP', 'MODE_POP-ON', 'MODE_PAINT-ON', 'MODE_TEXT'];
+
+class Cea608Channel {
+  constructor(channelNumber, outputFilter, logger) {
+    this.chNr = void 0;
+    this.outputFilter = void 0;
+    this.mode = void 0;
+    this.verbose = void 0;
+    this.displayedMemory = void 0;
+    this.nonDisplayedMemory = void 0;
+    this.lastOutputScreen = void 0;
+    this.currRollUpRow = void 0;
+    this.writeScreen = void 0;
+    this.cueStartTime = void 0;
+    this.logger = void 0;
+    this.chNr = channelNumber;
+    this.outputFilter = outputFilter;
+    this.mode = null;
+    this.verbose = 0;
+    this.displayedMemory = new CaptionScreen(logger);
+    this.nonDisplayedMemory = new CaptionScreen(logger);
+    this.lastOutputScreen = new CaptionScreen(logger);
+    this.currRollUpRow = this.displayedMemory.rows[NR_ROWS - 1];
+    this.writeScreen = this.displayedMemory;
+    this.mode = null;
+    this.cueStartTime = null; // Keeps track of where a cue started.
+    this.logger = logger;
+  }
+  reset() {
+    this.mode = null;
+    this.displayedMemory.reset();
+    this.nonDisplayedMemory.reset();
+    this.lastOutputScreen.reset();
+    this.outputFilter.reset();
+    this.currRollUpRow = this.displayedMemory.rows[NR_ROWS - 1];
+    this.writeScreen = this.displayedMemory;
+    this.mode = null;
+    this.cueStartTime = null;
+  }
+  getHandler() {
+    return this.outputFilter;
+  }
+  setHandler(newHandler) {
+    this.outputFilter = newHandler;
+  }
+  setPAC(pacData) {
+    this.writeScreen.setPAC(pacData);
+  }
+  setBkgData(bkgData) {
+    this.writeScreen.setBkgData(bkgData);
+  }
+  setMode(newMode) {
+    if (newMode === this.mode) {
+      return;
+    }
+    this.mode = newMode;
+    this.logger.log(2, () => 'MODE=' + newMode);
+    if (this.mode === 'MODE_POP-ON') {
+      this.writeScreen = this.nonDisplayedMemory;
+    } else {
+      this.writeScreen = this.displayedMemory;
+      this.writeScreen.reset();
+    }
+    if (this.mode !== 'MODE_ROLL-UP') {
+      this.displayedMemory.nrRollUpRows = null;
+      this.nonDisplayedMemory.nrRollUpRows = null;
+    }
+    this.mode = newMode;
+  }
+  insertChars(chars) {
+    for (let i = 0; i < chars.length; i++) {
+      this.writeScreen.insertChar(chars[i]);
+    }
+    const screen = this.writeScreen === this.displayedMemory ? 'DISP' : 'NON_DISP';
+    this.logger.log(2, () => screen + ': ' + this.writeScreen.getDisplayText(true));
+    if (this.mode === 'MODE_PAINT-ON' || this.mode === 'MODE_ROLL-UP') {
+      this.logger.log(1, () => 'DISPLAYED: ' + this.displayedMemory.getDisplayText(true));
+      this.outputDataUpdate();
+    }
+  }
+  ccRCL() {
+    // Resume Caption Loading (switch mode to Pop On)
+    this.logger.log(2, 'RCL - Resume Caption Loading');
+    this.setMode('MODE_POP-ON');
+  }
+  ccBS() {
+    // BackSpace
+    this.logger.log(2, 'BS - BackSpace');
+    if (this.mode === 'MODE_TEXT') {
+      return;
+    }
+    this.writeScreen.backSpace();
+    if (this.writeScreen === this.displayedMemory) {
+      this.outputDataUpdate();
+    }
+  }
+  ccAOF() {
+    // Reserved (formerly Alarm Off)
+  }
+  ccAON() {
+    // Reserved (formerly Alarm On)
+  }
+  ccDER() {
+    // Delete to End of Row
+    this.logger.log(2, 'DER- Delete to End of Row');
+    this.writeScreen.clearToEndOfRow();
+    this.outputDataUpdate();
+  }
+  ccRU(nrRows) {
+    // Roll-Up Captions-2,3,or 4 Rows
+    this.logger.log(2, 'RU(' + nrRows + ') - Roll Up');
+    this.writeScreen = this.displayedMemory;
+    this.setMode('MODE_ROLL-UP');
+    this.writeScreen.setRollUpRows(nrRows);
+  }
+  ccFON() {
+    // Flash On
+    this.logger.log(2, 'FON - Flash On');
+    this.writeScreen.setPen({
+      flash: true
+    });
+  }
+  ccRDC() {
+    // Resume Direct Captioning (switch mode to PaintOn)
+    this.logger.log(2, 'RDC - Resume Direct Captioning');
+    this.setMode('MODE_PAINT-ON');
+  }
+  ccTR() {
+    // Text Restart in text mode (not supported, however)
+    this.logger.log(2, 'TR');
+    this.setMode('MODE_TEXT');
+  }
+  ccRTD() {
+    // Resume Text Display in Text mode (not supported, however)
+    this.logger.log(2, 'RTD');
+    this.setMode('MODE_TEXT');
+  }
+  ccEDM() {
+    // Erase Displayed Memory
+    this.logger.log(2, 'EDM - Erase Displayed Memory');
+    this.displayedMemory.reset();
+    this.outputDataUpdate(true);
+  }
+  ccCR() {
+    // Carriage Return
+    this.logger.log(2, 'CR - Carriage Return');
+    this.writeScreen.rollUp();
+    this.outputDataUpdate(true);
+  }
+  ccENM() {
+    // Erase Non-Displayed Memory
+    this.logger.log(2, 'ENM - Erase Non-displayed Memory');
+    this.nonDisplayedMemory.reset();
+  }
+  ccEOC() {
+    // End of Caption (Flip Memories)
+    this.logger.log(2, 'EOC - End Of Caption');
+    if (this.mode === 'MODE_POP-ON') {
+      const tmp = this.displayedMemory;
+      this.displayedMemory = this.nonDisplayedMemory;
+      this.nonDisplayedMemory = tmp;
+      this.writeScreen = this.nonDisplayedMemory;
+      this.logger.log(1, () => 'DISP: ' + this.displayedMemory.getDisplayText());
+    }
+    this.outputDataUpdate(true);
+  }
+  ccTO(nrCols) {
+    // Tab Offset 1,2, or 3 columns
+    this.logger.log(2, 'TO(' + nrCols + ') - Tab Offset');
+    this.writeScreen.moveCursor(nrCols);
+  }
+  ccMIDROW(secondByte) {
+    // Parse MIDROW command
+    const styles = {
+      flash: false
+    };
+    styles.underline = secondByte % 2 === 1;
+    styles.italics = secondByte >= 0x2e;
+    if (!styles.italics) {
+      const colorIndex = Math.floor(secondByte / 2) - 0x10;
+      const colors = ['white', 'green', 'blue', 'cyan', 'red', 'yellow', 'magenta'];
+      styles.foreground = colors[colorIndex];
+    } else {
+      styles.foreground = 'white';
+    }
+    this.logger.log(2, 'MIDROW: ' + JSON.stringify(styles));
+    this.writeScreen.setPen(styles);
+  }
+  outputDataUpdate(dispatch = false) {
+    const time = this.logger.time;
+    if (time === null) {
+      return;
+    }
+    if (this.outputFilter) {
+      if (this.cueStartTime === null && !this.displayedMemory.isEmpty()) {
+        // Start of a new cue
+        this.cueStartTime = time;
+      } else {
+        if (!this.displayedMemory.equals(this.lastOutputScreen)) {
+          this.outputFilter.newCue(this.cueStartTime, time, this.lastOutputScreen);
+          if (dispatch && this.outputFilter.dispatchCue) {
+            this.outputFilter.dispatchCue();
+          }
+          this.cueStartTime = this.displayedMemory.isEmpty() ? null : time;
+        }
+      }
+      this.lastOutputScreen.copy(this.displayedMemory);
+    }
+  }
+  cueSplitAtTime(t) {
+    if (this.outputFilter) {
+      if (!this.displayedMemory.isEmpty()) {
+        if (this.outputFilter.newCue) {
+          this.outputFilter.newCue(this.cueStartTime, t, this.displayedMemory);
+        }
+        this.cueStartTime = t;
+      }
+    }
+  }
+}
 
-        // Only shift the current operation off, otherwise the updateend handler will do this for us
-        if (!(sb != null && sb.updating)) {
-          queue.shift();
-          this.executeNext(type);
+// Will be 1 or 2 when parsing captions
+
+class Cea608Parser {
+  constructor(field, out1, out2) {
+    this.channels = void 0;
+    this.currentChannel = 0;
+    this.cmdHistory = createCmdHistory();
+    this.logger = void 0;
+    const logger = this.logger = new CaptionsLogger();
+    this.channels = [null, new Cea608Channel(field, out1, logger), new Cea608Channel(field + 1, out2, logger)];
+  }
+  getHandler(channel) {
+    return this.channels[channel].getHandler();
+  }
+  setHandler(channel, newHandler) {
+    this.channels[channel].setHandler(newHandler);
+  }
+
+  /**
+   * Add data for time t in forms of list of bytes (unsigned ints). The bytes are treated as pairs.
+   */
+  addData(time, byteList) {
+    let cmdFound;
+    let a;
+    let b;
+    let charsFound = false;
+    this.logger.time = time;
+    for (let i = 0; i < byteList.length; i += 2) {
+      a = byteList[i] & 0x7f;
+      b = byteList[i + 1] & 0x7f;
+      if (a === 0 && b === 0) {
+        continue;
+      } else {
+        this.logger.log(3, '[' + numArrayToHexArray([byteList[i], byteList[i + 1]]) + '] -> (' + numArrayToHexArray([a, b]) + ')');
+      }
+      cmdFound = this.parseCmd(a, b);
+      if (!cmdFound) {
+        cmdFound = this.parseMidrow(a, b);
+      }
+      if (!cmdFound) {
+        cmdFound = this.parsePAC(a, b);
+      }
+      if (!cmdFound) {
+        cmdFound = this.parseBackgroundAttributes(a, b);
+      }
+      if (!cmdFound) {
+        charsFound = this.parseChars(a, b);
+        if (charsFound) {
+          const currChNr = this.currentChannel;
+          if (currChNr && currChNr > 0) {
+            const channel = this.channels[currChNr];
+            channel.insertChars(charsFound);
+          } else {
+            this.logger.log(2, 'No channel found yet. TEXT-MODE?');
+          }
         }
       }
+      if (!cmdFound && !charsFound) {
+        this.logger.log(2, "Couldn't parse cleaned data " + numArrayToHexArray([a, b]) + ' orig: ' + numArrayToHexArray([byteList[i], byteList[i + 1]]));
+      }
+    }
+  }
+
+  /**
+   * Parse Command.
+   * @returns True if a command was found
+   */
+  parseCmd(a, b) {
+    const {
+      cmdHistory
+    } = this;
+    const cond1 = (a === 0x14 || a === 0x1c || a === 0x15 || a === 0x1d) && b >= 0x20 && b <= 0x2f;
+    const cond2 = (a === 0x17 || a === 0x1f) && b >= 0x21 && b <= 0x23;
+    if (!(cond1 || cond2)) {
+      return false;
+    }
+    if (hasCmdRepeated(a, b, cmdHistory)) {
+      setLastCmd(null, null, cmdHistory);
+      this.logger.log(3, 'Repeated command (' + numArrayToHexArray([a, b]) + ') is dropped');
+      return true;
+    }
+    const chNr = a === 0x14 || a === 0x15 || a === 0x17 ? 1 : 2;
+    const channel = this.channels[chNr];
+    if (a === 0x14 || a === 0x15 || a === 0x1c || a === 0x1d) {
+      if (b === 0x20) {
+        channel.ccRCL();
+      } else if (b === 0x21) {
+        channel.ccBS();
+      } else if (b === 0x22) {
+        channel.ccAOF();
+      } else if (b === 0x23) {
+        channel.ccAON();
+      } else if (b === 0x24) {
+        channel.ccDER();
+      } else if (b === 0x25) {
+        channel.ccRU(2);
+      } else if (b === 0x26) {
+        channel.ccRU(3);
+      } else if (b === 0x27) {
+        channel.ccRU(4);
+      } else if (b === 0x28) {
+        channel.ccFON();
+      } else if (b === 0x29) {
+        channel.ccRDC();
+      } else if (b === 0x2a) {
+        channel.ccTR();
+      } else if (b === 0x2b) {
+        channel.ccRTD();
+      } else if (b === 0x2c) {
+        channel.ccEDM();
+      } else if (b === 0x2d) {
+        channel.ccCR();
+      } else if (b === 0x2e) {
+        channel.ccENM();
+      } else if (b === 0x2f) {
+        channel.ccEOC();
+      }
+    } else {
+      // a == 0x17 || a == 0x1F
+      channel.ccTO(b - 0x20);
     }
+    setLastCmd(a, b, cmdHistory);
+    this.currentChannel = chNr;
+    return true;
   }
-  shiftAndExecuteNext(type) {
-    this.queues[type].shift();
-    this.executeNext(type);
-  }
-  current(type) {
-    return this.queues[type][0];
-  }
-}
-
-const MediaSource = getMediaSource();
-const VIDEO_CODEC_PROFILE_REPACE = /([ha]vc.)(?:\.[^.,]+)+/;
-class BufferController {
-  // The level details used to determine duration, target-duration and live
-
-  // cache the self generated object url to detect hijack of video tag
-
-  // A queue of buffer operations which require the SourceBuffer to not be updating upon execution
-
-  // References to event listeners for each SourceBuffer, so that they can be referenced for event removal
-
-  // The number of BUFFER_CODEC events received before any sourceBuffers are created
 
-  // The total number of BUFFER_CODEC events received
-
-  // A reference to the attached media element
-
-  // A reference to the active media source
-
-  // Last MP3 audio chunk appended
-
-  // counters
-
-  constructor(hls) {
-    this.details = null;
-    this._objectUrl = null;
-    this.operationQueue = void 0;
-    this.listeners = void 0;
-    this.hls = void 0;
-    this.bufferCodecEventsExpected = 0;
-    this._bufferCodecEventsTotal = 0;
-    this.media = null;
-    this.mediaSource = null;
-    this.lastMpegAudioChunk = null;
-    this.appendError = 0;
-    this.tracks = {};
-    this.pendingTracks = {};
-    this.sourceBuffer = void 0;
-    // Keep as arrow functions so that we can directly reference these functions directly as event listeners
-    this._onMediaSourceOpen = () => {
-      const {
-        media,
-        mediaSource
-      } = this;
-      logger.log('[buffer-controller]: Media source opened');
-      if (media) {
-        media.removeEventListener('emptied', this._onMediaEmptied);
-        this.updateMediaElementDuration();
-        this.hls.trigger(Events.MEDIA_ATTACHED, {
-          media
-        });
+  /**
+   * Parse midrow styling command
+   */
+  parseMidrow(a, b) {
+    let chNr = 0;
+    if ((a === 0x11 || a === 0x19) && b >= 0x20 && b <= 0x2f) {
+      if (a === 0x11) {
+        chNr = 1;
+      } else {
+        chNr = 2;
       }
-      if (mediaSource) {
-        // once received, don't listen anymore to sourceopen event
-        mediaSource.removeEventListener('sourceopen', this._onMediaSourceOpen);
+      if (chNr !== this.currentChannel) {
+        this.logger.log(0, 'Mismatch channel in midrow parsing');
+        return false;
       }
-      this.checkPendingTracks();
-    };
-    this._onMediaSourceClose = () => {
-      logger.log('[buffer-controller]: Media source closed');
-    };
-    this._onMediaSourceEnded = () => {
-      logger.log('[buffer-controller]: Media source ended');
-    };
-    this._onMediaEmptied = () => {
-      const {
-        media,
-        _objectUrl
-      } = this;
-      if (media && media.src !== _objectUrl) {
-        logger.error(`Media element src was set while attaching MediaSource (${_objectUrl} > ${media.src})`);
+      const channel = this.channels[chNr];
+      if (!channel) {
+        return false;
       }
-    };
-    this.hls = hls;
-    this._initSourceBuffer();
-    this.registerListeners();
+      channel.ccMIDROW(b);
+      this.logger.log(3, 'MIDROW (' + numArrayToHexArray([a, b]) + ')');
+      return true;
+    }
+    return false;
   }
-  hasSourceTypes() {
-    return this.getSourceBufferTypes().length > 0 || Object.keys(this.pendingTracks).length > 0;
+
+  /**
+   * Parse Preable Access Codes (Table 53).
+   * @returns {Boolean} Tells if PAC found
+   */
+  parsePAC(a, b) {
+    let row;
+    const cmdHistory = this.cmdHistory;
+    const case1 = (a >= 0x11 && a <= 0x17 || a >= 0x19 && a <= 0x1f) && b >= 0x40 && b <= 0x7f;
+    const case2 = (a === 0x10 || a === 0x18) && b >= 0x40 && b <= 0x5f;
+    if (!(case1 || case2)) {
+      return false;
+    }
+    if (hasCmdRepeated(a, b, cmdHistory)) {
+      setLastCmd(null, null, cmdHistory);
+      return true; // Repeated commands are dropped (once)
+    }
+    const chNr = a <= 0x17 ? 1 : 2;
+    if (b >= 0x40 && b <= 0x5f) {
+      row = chNr === 1 ? rowsLowCh1[a] : rowsLowCh2[a];
+    } else {
+      // 0x60 <= b <= 0x7F
+      row = chNr === 1 ? rowsHighCh1[a] : rowsHighCh2[a];
+    }
+    const channel = this.channels[chNr];
+    if (!channel) {
+      return false;
+    }
+    channel.setPAC(this.interpretPAC(row, b));
+    setLastCmd(a, b, cmdHistory);
+    this.currentChannel = chNr;
+    return true;
   }
-  destroy() {
-    this.unregisterListeners();
-    this.details = null;
-    this.lastMpegAudioChunk = null;
+
+  /**
+   * Interpret the second byte of the pac, and return the information.
+   * @returns pacData with style parameters
+   */
+  interpretPAC(row, byte) {
+    let pacIndex;
+    const pacData = {
+      color: null,
+      italics: false,
+      indent: null,
+      underline: false,
+      row: row
+    };
+    if (byte > 0x5f) {
+      pacIndex = byte - 0x60;
+    } else {
+      pacIndex = byte - 0x40;
+    }
+    pacData.underline = (pacIndex & 1) === 1;
+    if (pacIndex <= 0xd) {
+      pacData.color = ['white', 'green', 'blue', 'cyan', 'red', 'yellow', 'magenta', 'white'][Math.floor(pacIndex / 2)];
+    } else if (pacIndex <= 0xf) {
+      pacData.italics = true;
+      pacData.color = 'white';
+    } else {
+      pacData.indent = Math.floor((pacIndex - 0x10) / 2) * 4;
+    }
+    return pacData; // Note that row has zero offset. The spec uses 1.
   }
-  registerListeners() {
-    const {
-      hls
-    } = this;
-    hls.on(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
-    hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-    hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
-    hls.on(Events.MANIFEST_PARSED, this.onManifestParsed, this);
-    hls.on(Events.BUFFER_RESET, this.onBufferReset, this);
-    hls.on(Events.BUFFER_APPENDING, this.onBufferAppending, this);
-    hls.on(Events.BUFFER_CODECS, this.onBufferCodecs, this);
-    hls.on(Events.BUFFER_EOS, this.onBufferEos, this);
-    hls.on(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
-    hls.on(Events.LEVEL_UPDATED, this.onLevelUpdated, this);
-    hls.on(Events.FRAG_PARSED, this.onFragParsed, this);
-    hls.on(Events.FRAG_CHANGED, this.onFragChanged, this);
+
+  /**
+   * Parse characters.
+   * @returns An array with 1 to 2 codes corresponding to chars, if found. null otherwise.
+   */
+  parseChars(a, b) {
+    let channelNr;
+    let charCodes = null;
+    let charCode1 = null;
+    if (a >= 0x19) {
+      channelNr = 2;
+      charCode1 = a - 8;
+    } else {
+      channelNr = 1;
+      charCode1 = a;
+    }
+    if (charCode1 >= 0x11 && charCode1 <= 0x13) {
+      // Special character
+      let oneCode;
+      if (charCode1 === 0x11) {
+        oneCode = b + 0x50;
+      } else if (charCode1 === 0x12) {
+        oneCode = b + 0x70;
+      } else {
+        oneCode = b + 0x90;
+      }
+      this.logger.log(2, "Special char '" + getCharForByte(oneCode) + "' in channel " + channelNr);
+      charCodes = [oneCode];
+    } else if (a >= 0x20 && a <= 0x7f) {
+      charCodes = b === 0 ? [a] : [a, b];
+    }
+    if (charCodes) {
+      const hexCodes = numArrayToHexArray(charCodes);
+      this.logger.log(3, 'Char codes =  ' + hexCodes.join(','));
+      setLastCmd(a, b, this.cmdHistory);
+    }
+    return charCodes;
+  }
+
+  /**
+   * Parse extended background attributes as well as new foreground color black.
+   * @returns True if background attributes are found
+   */
+  parseBackgroundAttributes(a, b) {
+    const case1 = (a === 0x10 || a === 0x18) && b >= 0x20 && b <= 0x2f;
+    const case2 = (a === 0x17 || a === 0x1f) && b >= 0x2d && b <= 0x2f;
+    if (!(case1 || case2)) {
+      return false;
+    }
+    let index;
+    const bkgData = {};
+    if (a === 0x10 || a === 0x18) {
+      index = Math.floor((b - 0x20) / 2);
+      bkgData.background = backgroundColors[index];
+      if (b % 2 === 1) {
+        bkgData.background = bkgData.background + '_semi';
+      }
+    } else if (b === 0x2d) {
+      bkgData.background = 'transparent';
+    } else {
+      bkgData.foreground = 'black';
+      if (b === 0x2f) {
+        bkgData.underline = true;
+      }
+    }
+    const chNr = a <= 0x17 ? 1 : 2;
+    const channel = this.channels[chNr];
+    channel.setBkgData(bkgData);
+    setLastCmd(a, b, this.cmdHistory);
+    return true;
   }
-  unregisterListeners() {
-    const {
-      hls
-    } = this;
-    hls.off(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
-    hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-    hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
-    hls.off(Events.MANIFEST_PARSED, this.onManifestParsed, this);
-    hls.off(Events.BUFFER_RESET, this.onBufferReset, this);
-    hls.off(Events.BUFFER_APPENDING, this.onBufferAppending, this);
-    hls.off(Events.BUFFER_CODECS, this.onBufferCodecs, this);
-    hls.off(Events.BUFFER_EOS, this.onBufferEos, this);
-    hls.off(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
-    hls.off(Events.LEVEL_UPDATED, this.onLevelUpdated, this);
-    hls.off(Events.FRAG_PARSED, this.onFragParsed, this);
-    hls.off(Events.FRAG_CHANGED, this.onFragChanged, this);
+
+  /**
+   * Reset state of parser and its channels.
+   */
+  reset() {
+    for (let i = 0; i < Object.keys(this.channels).length; i++) {
+      const channel = this.channels[i];
+      if (channel) {
+        channel.reset();
+      }
+    }
+    this.cmdHistory = createCmdHistory();
   }
-  _initSourceBuffer() {
-    this.sourceBuffer = {};
-    this.operationQueue = new BufferOperationQueue(this.sourceBuffer);
-    this.listeners = {
-      audio: [],
-      video: [],
-      audiovideo: []
-    };
-    this.lastMpegAudioChunk = null;
+
+  /**
+   * Trigger the generation of a cue, and the start of a new one if displayScreens are not empty.
+   */
+  cueSplitAtTime(t) {
+    for (let i = 0; i < this.channels.length; i++) {
+      const channel = this.channels[i];
+      if (channel) {
+        channel.cueSplitAtTime(t);
+      }
+    }
   }
-  onManifestLoading() {
-    this.bufferCodecEventsExpected = this._bufferCodecEventsTotal = 0;
-    this.details = null;
+}
+function setLastCmd(a, b, cmdHistory) {
+  cmdHistory.a = a;
+  cmdHistory.b = b;
+}
+function hasCmdRepeated(a, b, cmdHistory) {
+  return cmdHistory.a === a && cmdHistory.b === b;
+}
+function createCmdHistory() {
+  return {
+    a: null,
+    b: null
+  };
+}
+
+class OutputFilter {
+  constructor(timelineController, trackName) {
+    this.timelineController = void 0;
+    this.cueRanges = [];
+    this.trackName = void 0;
+    this.startTime = null;
+    this.endTime = null;
+    this.screen = null;
+    this.timelineController = timelineController;
+    this.trackName = trackName;
   }
-  onManifestParsed(event, data) {
-    // in case of alt audio 2 BUFFER_CODECS events will be triggered, one per stream controller
-    // sourcebuffers will be created all at once when the expected nb of tracks will be reached
-    // in case alt audio is not used, only one BUFFER_CODEC event will be fired from main stream controller
-    // it will contain the expected nb of source buffers, no need to compute it
-    let codecEvents = 2;
-    if (data.audio && !data.video || !data.altAudio || !true) {
-      codecEvents = 1;
+  dispatchCue() {
+    if (this.startTime === null) {
+      return;
     }
-    this.bufferCodecEventsExpected = this._bufferCodecEventsTotal = codecEvents;
-    logger.log(`${this.bufferCodecEventsExpected} bufferCodec event(s) expected`);
+    this.timelineController.addCues(this.trackName, this.startTime, this.endTime, this.screen, this.cueRanges);
+    this.startTime = null;
   }
-  onMediaAttaching(event, data) {
-    const media = this.media = data.media;
-    if (media && MediaSource) {
-      const ms = this.mediaSource = new MediaSource();
-      // MediaSource listeners are arrow functions with a lexical scope, and do not need to be bound
-      ms.addEventListener('sourceopen', this._onMediaSourceOpen);
-      ms.addEventListener('sourceended', this._onMediaSourceEnded);
-      ms.addEventListener('sourceclose', this._onMediaSourceClose);
-      // link video and media Source
-      media.src = self.URL.createObjectURL(ms);
-      // cache the locally generated object url
-      this._objectUrl = media.src;
-      media.addEventListener('emptied', this._onMediaEmptied);
+  newCue(startTime, endTime, screen) {
+    if (this.startTime === null || this.startTime > startTime) {
+      this.startTime = startTime;
     }
+    this.endTime = endTime;
+    this.screen = screen;
+    this.timelineController.createCaptionsTrack(this.trackName);
   }
-  onMediaDetaching() {
-    const {
-      media,
-      mediaSource,
-      _objectUrl
-    } = this;
-    if (mediaSource) {
-      logger.log('[buffer-controller]: media source detaching');
-      if (mediaSource.readyState === 'open') {
-        try {
-          // endOfStream could trigger exception if any sourcebuffer is in updating state
-          // we don't really care about checking sourcebuffer state here,
-          // as we are anyway detaching the MediaSource
-          // let's just avoid this exception to propagate
-          mediaSource.endOfStream();
-        } catch (err) {
-          logger.warn(`[buffer-controller]: onMediaDetaching: ${err.message} while calling endOfStream`);
-        }
-      }
-      // Clean up the SourceBuffers by invoking onBufferReset
-      this.onBufferReset();
-      mediaSource.removeEventListener('sourceopen', this._onMediaSourceOpen);
-      mediaSource.removeEventListener('sourceended', this._onMediaSourceEnded);
-      mediaSource.removeEventListener('sourceclose', this._onMediaSourceClose);
+  reset() {
+    this.cueRanges = [];
+    this.startTime = null;
+  }
+}
 
-      // Detach properly the MediaSource from the HTMLMediaElement as
-      // suggested in https://github.com/w3c/media-source/issues/53.
-      if (media) {
-        media.removeEventListener('emptied', this._onMediaEmptied);
-        if (_objectUrl) {
-          self.URL.revokeObjectURL(_objectUrl);
-        }
+/**
+ * Copyright 2013 vtt.js Contributors
+ *
+ * Licensed under the Apache License, Version 2.0 (the 'License');
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ *   http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an 'AS IS' BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
 
-        // clean up video tag src only if it's our own url. some external libraries might
-        // hijack the video tag and change its 'src' without destroying the Hls instance first
-        if (media.src === _objectUrl) {
-          media.removeAttribute('src');
-          media.load();
-        } else {
-          logger.warn('[buffer-controller]: media.src was changed by a third party - skip cleanup');
-        }
-      }
-      this.mediaSource = null;
-      this.media = null;
-      this._objectUrl = null;
-      this.bufferCodecEventsExpected = this._bufferCodecEventsTotal;
-      this.pendingTracks = {};
-      this.tracks = {};
+var VTTCue = (function () {
+  if (optionalSelf != null && optionalSelf.VTTCue) {
+    return self.VTTCue;
+  }
+  const AllowedDirections = ['', 'lr', 'rl'];
+  const AllowedAlignments = ['start', 'middle', 'end', 'left', 'right'];
+  function isAllowedValue(allowed, value) {
+    if (typeof value !== 'string') {
+      return false;
     }
-    this.hls.trigger(Events.MEDIA_DETACHED, undefined);
+    // necessary for assuring the generic conforms to the Array interface
+    if (!Array.isArray(allowed)) {
+      return false;
+    }
+    // reset the type so that the next narrowing works well
+    const lcValue = value.toLowerCase();
+    // use the allow list to narrow the type to a specific subset of strings
+    if (~allowed.indexOf(lcValue)) {
+      return lcValue;
+    }
+    return false;
   }
-  onBufferReset() {
-    this.getSourceBufferTypes().forEach(type => {
-      const sb = this.sourceBuffer[type];
-      try {
-        if (sb) {
-          this.removeBufferListeners(type);
-          if (this.mediaSource) {
-            this.mediaSource.removeSourceBuffer(sb);
-          }
-          // Synchronously remove the SB from the map before the next call in order to prevent an async function from
-          // accessing it
-          this.sourceBuffer[type] = undefined;
-        }
-      } catch (err) {
-        logger.warn(`[buffer-controller]: Failed to reset the ${type} buffer`, err);
-      }
-    });
-    this._initSourceBuffer();
+  function findDirectionSetting(value) {
+    return isAllowedValue(AllowedDirections, value);
   }
-  onBufferCodecs(event, data) {
-    const sourceBufferCount = this.getSourceBufferTypes().length;
-    Object.keys(data).forEach(trackName => {
-      if (sourceBufferCount) {
-        // check if SourceBuffer codec needs to change
-        const track = this.tracks[trackName];
-        if (track && typeof track.buffer.changeType === 'function') {
-          const {
-            id,
-            codec,
-            levelCodec,
-            container,
-            metadata
-          } = data[trackName];
-          const currentCodec = (track.levelCodec || track.codec).replace(VIDEO_CODEC_PROFILE_REPACE, '$1');
-          const nextCodec = (levelCodec || codec).replace(VIDEO_CODEC_PROFILE_REPACE, '$1');
-          if (currentCodec !== nextCodec) {
-            const mimeType = `${container};codecs=${levelCodec || codec}`;
-            this.appendChangeType(trackName, mimeType);
-            logger.log(`[buffer-controller]: switching codec ${currentCodec} to ${nextCodec}`);
-            this.tracks[trackName] = {
-              buffer: track.buffer,
-              codec,
-              container,
-              levelCodec,
-              metadata,
-              id
-            };
-          }
-        }
-      } else {
-        // if source buffer(s) not created yet, appended buffer tracks in this.pendingTracks
-        this.pendingTracks[trackName] = data[trackName];
+  function findAlignSetting(value) {
+    return isAllowedValue(AllowedAlignments, value);
+  }
+  function extend(obj, ...rest) {
+    let i = 1;
+    for (; i < arguments.length; i++) {
+      const cobj = arguments[i];
+      for (const p in cobj) {
+        obj[p] = cobj[p];
       }
-    });
-
-    // if sourcebuffers already created, do nothing ...
-    if (sourceBufferCount) {
-      return;
-    }
-    this.bufferCodecEventsExpected = Math.max(this.bufferCodecEventsExpected - 1, 0);
-    if (this.mediaSource && this.mediaSource.readyState === 'open') {
-      this.checkPendingTracks();
     }
+    return obj;
   }
-  appendChangeType(type, mimeType) {
-    const {
-      operationQueue
-    } = this;
-    const operation = {
-      execute: () => {
-        const sb = this.sourceBuffer[type];
-        if (sb) {
-          logger.log(`[buffer-controller]: changing ${type} sourceBuffer type to ${mimeType}`);
-          sb.changeType(mimeType);
-        }
-        operationQueue.shiftAndExecuteNext(type);
-      },
-      onStart: () => {},
-      onComplete: () => {},
-      onError: e => {
-        logger.warn(`[buffer-controller]: Failed to change ${type} SourceBuffer type`, e);
-      }
+  function VTTCue(startTime, endTime, text) {
+    const cue = this;
+    const baseObj = {
+      enumerable: true
     };
-    operationQueue.append(operation, type);
-  }
-  onBufferAppending(event, eventData) {
-    const {
-      hls,
-      operationQueue,
-      tracks
-    } = this;
-    const {
-      data,
-      type,
-      frag,
-      part,
-      chunkMeta
-    } = eventData;
-    const chunkStats = chunkMeta.buffering[type];
-    const bufferAppendingStart = self.performance.now();
-    chunkStats.start = bufferAppendingStart;
-    const fragBuffering = frag.stats.buffering;
-    const partBuffering = part ? part.stats.buffering : null;
-    if (fragBuffering.start === 0) {
-      fragBuffering.start = bufferAppendingStart;
-    }
-    if (partBuffering && partBuffering.start === 0) {
-      partBuffering.start = bufferAppendingStart;
-    }
+    /**
+     * Shim implementation specific properties. These properties are not in
+     * the spec.
+     */
 
-    // TODO: Only update timestampOffset when audio/mpeg fragment or part is not contiguous with previously appended
-    // Adjusting `SourceBuffer.timestampOffset` (desired point in the timeline where the next frames should be appended)
-    // in Chrome browser when we detect MPEG audio container and time delta between level PTS and `SourceBuffer.timestampOffset`
-    // is greater than 100ms (this is enough to handle seek for VOD or level change for LIVE videos).
-    // More info here: https://github.com/video-dev/hls.js/issues/332#issuecomment-257986486
-    const audioTrack = tracks.audio;
-    let checkTimestampOffset = false;
-    if (type === 'audio' && (audioTrack == null ? void 0 : audioTrack.container) === 'audio/mpeg') {
-      checkTimestampOffset = !this.lastMpegAudioChunk || chunkMeta.id === 1 || this.lastMpegAudioChunk.sn !== chunkMeta.sn;
-      this.lastMpegAudioChunk = chunkMeta;
-    }
-    const fragStart = frag.start;
-    const operation = {
-      execute: () => {
-        chunkStats.executeStart = self.performance.now();
-        if (checkTimestampOffset) {
-          const sb = this.sourceBuffer[type];
-          if (sb) {
-            const delta = fragStart - sb.timestampOffset;
-            if (Math.abs(delta) >= 0.1) {
-              logger.log(`[buffer-controller]: Updating audio SourceBuffer timestampOffset to ${fragStart} (delta: ${delta}) sn: ${frag.sn})`);
-              sb.timestampOffset = fragStart;
-            }
-          }
-        }
-        this.appendExecutor(data, type);
+    // Lets us know when the VTTCue's data has changed in such a way that we need
+    // to recompute its display state. This lets us compute its display state
+    // lazily.
+    cue.hasBeenReset = false;
+
+    /**
+     * VTTCue and TextTrackCue properties
+     * http://dev.w3.org/html5/webvtt/#vttcue-interface
+     */
+
+    let _id = '';
+    let _pauseOnExit = false;
+    let _startTime = startTime;
+    let _endTime = endTime;
+    let _text = text;
+    let _region = null;
+    let _vertical = '';
+    let _snapToLines = true;
+    let _line = 'auto';
+    let _lineAlign = 'start';
+    let _position = 50;
+    let _positionAlign = 'middle';
+    let _size = 50;
+    let _align = 'middle';
+    Object.defineProperty(cue, 'id', extend({}, baseObj, {
+      get: function () {
+        return _id;
       },
-      onStart: () => {
-        // logger.debug(`[buffer-controller]: ${type} SourceBuffer updatestart`);
+      set: function (value) {
+        _id = '' + value;
+      }
+    }));
+    Object.defineProperty(cue, 'pauseOnExit', extend({}, baseObj, {
+      get: function () {
+        return _pauseOnExit;
       },
-      onComplete: () => {
-        // logger.debug(`[buffer-controller]: ${type} SourceBuffer updateend`);
-        const end = self.performance.now();
-        chunkStats.executeEnd = chunkStats.end = end;
-        if (fragBuffering.first === 0) {
-          fragBuffering.first = end;
-        }
-        if (partBuffering && partBuffering.first === 0) {
-          partBuffering.first = end;
-        }
-        const {
-          sourceBuffer
-        } = this;
-        const timeRanges = {};
-        for (const type in sourceBuffer) {
-          timeRanges[type] = BufferHelper.getBuffered(sourceBuffer[type]);
-        }
-        this.appendError = 0;
-        this.hls.trigger(Events.BUFFER_APPENDED, {
-          type,
-          frag,
-          part,
-          chunkMeta,
-          parent: frag.type,
-          timeRanges
-        });
+      set: function (value) {
+        _pauseOnExit = !!value;
+      }
+    }));
+    Object.defineProperty(cue, 'startTime', extend({}, baseObj, {
+      get: function () {
+        return _startTime;
       },
-      onError: err => {
-        // in case any error occured while appending, put back segment in segments table
-        logger.error(`[buffer-controller]: Error encountered while trying to append to the ${type} SourceBuffer`, err);
-        const event = {
-          type: ErrorTypes.MEDIA_ERROR,
-          parent: frag.type,
-          details: ErrorDetails.BUFFER_APPEND_ERROR,
-          frag,
-          part,
-          chunkMeta,
-          error: err,
-          err,
-          fatal: false
-        };
-        if (err.code === DOMException.QUOTA_EXCEEDED_ERR) {
-          // QuotaExceededError: http://www.w3.org/TR/html5/infrastructure.html#quotaexceedederror
-          // let's stop appending any segments, and report BUFFER_FULL_ERROR error
-          event.details = ErrorDetails.BUFFER_FULL_ERROR;
-        } else {
-          this.appendError++;
-          event.details = ErrorDetails.BUFFER_APPEND_ERROR;
-          /* with UHD content, we could get loop of quota exceeded error until
-            browser is able to evict some data from sourcebuffer. Retrying can help recover.
-          */
-          if (this.appendError > hls.config.appendErrorMaxRetry) {
-            logger.error(`[buffer-controller]: Failed ${hls.config.appendErrorMaxRetry} times to append segment in sourceBuffer`);
-            event.fatal = true;
-          }
+      set: function (value) {
+        if (typeof value !== 'number') {
+          throw new TypeError('Start time must be set to a number.');
         }
-        hls.trigger(Events.ERROR, event);
+        _startTime = value;
+        this.hasBeenReset = true;
       }
-    };
-    operationQueue.append(operation, type);
-  }
-  onBufferFlushing(event, data) {
-    const {
-      operationQueue
-    } = this;
-    const flushOperation = type => ({
-      execute: this.removeExecutor.bind(this, type, data.startOffset, data.endOffset),
-      onStart: () => {
-        // logger.debug(`[buffer-controller]: Started flushing ${data.startOffset} -> ${data.endOffset} for ${type} Source Buffer`);
+    }));
+    Object.defineProperty(cue, 'endTime', extend({}, baseObj, {
+      get: function () {
+        return _endTime;
       },
-      onComplete: () => {
-        // logger.debug(`[buffer-controller]: Finished flushing ${data.startOffset} -> ${data.endOffset} for ${type} Source Buffer`);
-        this.hls.trigger(Events.BUFFER_FLUSHED, {
-          type
-        });
+      set: function (value) {
+        if (typeof value !== 'number') {
+          throw new TypeError('End time must be set to a number.');
+        }
+        _endTime = value;
+        this.hasBeenReset = true;
+      }
+    }));
+    Object.defineProperty(cue, 'text', extend({}, baseObj, {
+      get: function () {
+        return _text;
       },
-      onError: e => {
-        logger.warn(`[buffer-controller]: Failed to remove from ${type} SourceBuffer`, e);
+      set: function (value) {
+        _text = '' + value;
+        this.hasBeenReset = true;
       }
-    });
-    if (data.type) {
-      operationQueue.append(flushOperation(data.type), data.type);
-    } else {
-      this.getSourceBufferTypes().forEach(type => {
-        operationQueue.append(flushOperation(type), type);
-      });
-    }
-  }
-  onFragParsed(event, data) {
-    const {
-      frag,
-      part
-    } = data;
-    const buffersAppendedTo = [];
-    const elementaryStreams = part ? part.elementaryStreams : frag.elementaryStreams;
-    if (elementaryStreams[ElementaryStreamTypes.AUDIOVIDEO]) {
-      buffersAppendedTo.push('audiovideo');
-    } else {
-      if (elementaryStreams[ElementaryStreamTypes.AUDIO]) {
-        buffersAppendedTo.push('audio');
+    }));
+
+    // todo: implement VTTRegion polyfill?
+    Object.defineProperty(cue, 'region', extend({}, baseObj, {
+      get: function () {
+        return _region;
+      },
+      set: function (value) {
+        _region = value;
+        this.hasBeenReset = true;
       }
-      if (elementaryStreams[ElementaryStreamTypes.VIDEO]) {
-        buffersAppendedTo.push('video');
+    }));
+    Object.defineProperty(cue, 'vertical', extend({}, baseObj, {
+      get: function () {
+        return _vertical;
+      },
+      set: function (value) {
+        const setting = findDirectionSetting(value);
+        // Have to check for false because the setting an be an empty string.
+        if (setting === false) {
+          throw new SyntaxError('An invalid or illegal string was specified.');
+        }
+        _vertical = setting;
+        this.hasBeenReset = true;
       }
-    }
-    const onUnblocked = () => {
-      const now = self.performance.now();
-      frag.stats.buffering.end = now;
-      if (part) {
-        part.stats.buffering.end = now;
+    }));
+    Object.defineProperty(cue, 'snapToLines', extend({}, baseObj, {
+      get: function () {
+        return _snapToLines;
+      },
+      set: function (value) {
+        _snapToLines = !!value;
+        this.hasBeenReset = true;
       }
-      const stats = part ? part.stats : frag.stats;
-      this.hls.trigger(Events.FRAG_BUFFERED, {
-        frag,
-        part,
-        stats,
-        id: frag.type
-      });
-    };
-    if (buffersAppendedTo.length === 0) {
-      logger.warn(`Fragments must have at least one ElementaryStreamType set. type: ${frag.type} level: ${frag.level} sn: ${frag.sn}`);
-    }
-    this.blockBuffers(onUnblocked, buffersAppendedTo);
-  }
-  onFragChanged(event, data) {
-    this.flushBackBuffer();
-  }
-
-  // on BUFFER_EOS mark matching sourcebuffer(s) as ended and trigger checkEos()
-  // an undefined data.type will mark all buffers as EOS.
-  onBufferEos(event, data) {
-    const ended = this.getSourceBufferTypes().reduce((acc, type) => {
-      const sb = this.sourceBuffer[type];
-      if (sb && (!data.type || data.type === type)) {
-        sb.ending = true;
-        if (!sb.ended) {
-          sb.ended = true;
-          logger.log(`[buffer-controller]: ${type} sourceBuffer now EOS`);
+    }));
+    Object.defineProperty(cue, 'line', extend({}, baseObj, {
+      get: function () {
+        return _line;
+      },
+      set: function (value) {
+        if (typeof value !== 'number' && value !== 'auto') {
+          throw new SyntaxError('An invalid number or illegal string was specified.');
         }
+        _line = value;
+        this.hasBeenReset = true;
       }
-      return acc && !!(!sb || sb.ended);
-    }, true);
-    if (ended) {
-      logger.log(`[buffer-controller]: Queueing mediaSource.endOfStream()`);
-      this.blockBuffers(() => {
-        this.getSourceBufferTypes().forEach(type => {
-          const sb = this.sourceBuffer[type];
-          if (sb) {
-            sb.ending = false;
-          }
-        });
-        const {
-          mediaSource
-        } = this;
-        if (!mediaSource || mediaSource.readyState !== 'open') {
-          if (mediaSource) {
-            logger.info(`[buffer-controller]: Could not call mediaSource.endOfStream(). mediaSource.readyState: ${mediaSource.readyState}`);
-          }
-          return;
+    }));
+    Object.defineProperty(cue, 'lineAlign', extend({}, baseObj, {
+      get: function () {
+        return _lineAlign;
+      },
+      set: function (value) {
+        const setting = findAlignSetting(value);
+        if (!setting) {
+          throw new SyntaxError('An invalid or illegal string was specified.');
         }
-        logger.log(`[buffer-controller]: Calling mediaSource.endOfStream()`);
-        // Allow this to throw and be caught by the enqueueing function
-        mediaSource.endOfStream();
-      });
-    }
-  }
-  onLevelUpdated(event, {
-    details
-  }) {
-    if (!details.fragments.length) {
-      return;
-    }
-    this.details = details;
-    if (this.getSourceBufferTypes().length) {
-      this.blockBuffers(this.updateMediaElementDuration.bind(this));
-    } else {
-      this.updateMediaElementDuration();
-    }
-  }
-  flushBackBuffer() {
-    const {
-      hls,
-      details,
-      media,
-      sourceBuffer
-    } = this;
-    if (!media || details === null) {
-      return;
-    }
-    const sourceBufferTypes = this.getSourceBufferTypes();
-    if (!sourceBufferTypes.length) {
-      return;
-    }
-
-    // Support for deprecated liveBackBufferLength
-    const backBufferLength = details.live && hls.config.liveBackBufferLength !== null ? hls.config.liveBackBufferLength : hls.config.backBufferLength;
-    if (!isFiniteNumber(backBufferLength) || backBufferLength < 0) {
-      return;
-    }
-    const currentTime = media.currentTime;
-    const targetDuration = details.levelTargetDuration;
-    const maxBackBufferLength = Math.max(backBufferLength, targetDuration);
-    const targetBackBufferPosition = Math.floor(currentTime / targetDuration) * targetDuration - maxBackBufferLength;
-    sourceBufferTypes.forEach(type => {
-      const sb = sourceBuffer[type];
-      if (sb) {
-        const buffered = BufferHelper.getBuffered(sb);
-        // when target buffer start exceeds actual buffer start
-        if (buffered.length > 0 && targetBackBufferPosition > buffered.start(0)) {
-          hls.trigger(Events.BACK_BUFFER_REACHED, {
-            bufferEnd: targetBackBufferPosition
-          });
-
-          // Support for deprecated event:
-          if (details.live) {
-            hls.trigger(Events.LIVE_BACK_BUFFER_REACHED, {
-              bufferEnd: targetBackBufferPosition
-            });
-          } else if (sb.ended && buffered.end(buffered.length - 1) - currentTime < targetDuration * 2) {
-            logger.info(`[buffer-controller]: Cannot flush ${type} back buffer while SourceBuffer is in ended state`);
-            return;
-          }
-          hls.trigger(Events.BUFFER_FLUSHING, {
-            startOffset: 0,
-            endOffset: targetBackBufferPosition,
-            type
-          });
+        _lineAlign = setting;
+        this.hasBeenReset = true;
+      }
+    }));
+    Object.defineProperty(cue, 'position', extend({}, baseObj, {
+      get: function () {
+        return _position;
+      },
+      set: function (value) {
+        if (value < 0 || value > 100) {
+          throw new Error('Position must be between 0 and 100.');
         }
+        _position = value;
+        this.hasBeenReset = true;
       }
-    });
-  }
-
-  /**
-   * Update Media Source duration to current level duration or override to Infinity if configuration parameter
-   * 'liveDurationInfinity` is set to `true`
-   * More details: https://github.com/video-dev/hls.js/issues/355
-   */
-  updateMediaElementDuration() {
-    if (!this.details || !this.media || !this.mediaSource || this.mediaSource.readyState !== 'open') {
-      return;
-    }
-    const {
-      details,
-      hls,
-      media,
-      mediaSource
-    } = this;
-    const levelDuration = details.fragments[0].start + details.totalduration;
-    const mediaDuration = media.duration;
-    const msDuration = isFiniteNumber(mediaSource.duration) ? mediaSource.duration : 0;
-    if (details.live && hls.config.liveDurationInfinity) {
-      // Override duration to Infinity
-      logger.log('[buffer-controller]: Media Source duration is set to Infinity');
-      mediaSource.duration = Infinity;
-      this.updateSeekableRange(details);
-    } else if (levelDuration > msDuration && levelDuration > mediaDuration || !isFiniteNumber(mediaDuration)) {
-      // levelDuration was the last value we set.
-      // not using mediaSource.duration as the browser may tweak this value
-      // only update Media Source duration if its value increase, this is to avoid
-      // flushing already buffered portion when switching between quality level
-      logger.log(`[buffer-controller]: Updating Media Source duration to ${levelDuration.toFixed(3)}`);
-      mediaSource.duration = levelDuration;
-    }
-  }
-  updateSeekableRange(levelDetails) {
-    const mediaSource = this.mediaSource;
-    const fragments = levelDetails.fragments;
-    const len = fragments.length;
-    if (len && levelDetails.live && mediaSource != null && mediaSource.setLiveSeekableRange) {
-      const start = Math.max(0, fragments[0].start);
-      const end = Math.max(start, start + levelDetails.totalduration);
-      mediaSource.setLiveSeekableRange(start, end);
-    }
-  }
-  checkPendingTracks() {
-    const {
-      bufferCodecEventsExpected,
-      operationQueue,
-      pendingTracks
-    } = this;
-
-    // Check if we've received all of the expected bufferCodec events. When none remain, create all the sourceBuffers at once.
-    // This is important because the MSE spec allows implementations to throw QuotaExceededErrors if creating new sourceBuffers after
-    // data has been appended to existing ones.
-    // 2 tracks is the max (one for audio, one for video). If we've reach this max go ahead and create the buffers.
-    const pendingTracksCount = Object.keys(pendingTracks).length;
-    if (pendingTracksCount && !bufferCodecEventsExpected || pendingTracksCount === 2) {
-      // ok, let's create them now !
-      this.createSourceBuffers(pendingTracks);
-      this.pendingTracks = {};
-      // append any pending segments now !
-      const buffers = this.getSourceBufferTypes();
-      if (buffers.length) {
-        this.hls.trigger(Events.BUFFER_CREATED, {
-          tracks: this.tracks
-        });
-        buffers.forEach(type => {
-          operationQueue.executeNext(type);
-        });
-      } else {
-        const error = new Error('could not create source buffer for media codec(s)');
-        this.hls.trigger(Events.ERROR, {
-          type: ErrorTypes.MEDIA_ERROR,
-          details: ErrorDetails.BUFFER_INCOMPATIBLE_CODECS_ERROR,
-          fatal: true,
-          error,
-          reason: error.message
-        });
+    }));
+    Object.defineProperty(cue, 'positionAlign', extend({}, baseObj, {
+      get: function () {
+        return _positionAlign;
+      },
+      set: function (value) {
+        const setting = findAlignSetting(value);
+        if (!setting) {
+          throw new SyntaxError('An invalid or illegal string was specified.');
+        }
+        _positionAlign = setting;
+        this.hasBeenReset = true;
       }
-    }
-  }
-  createSourceBuffers(tracks) {
-    const {
-      sourceBuffer,
-      mediaSource
-    } = this;
-    if (!mediaSource) {
-      throw Error('createSourceBuffers called when mediaSource was null');
-    }
-    for (const trackName in tracks) {
-      if (!sourceBuffer[trackName]) {
-        const track = tracks[trackName];
-        if (!track) {
-          throw Error(`source buffer exists for track ${trackName}, however track does not`);
+    }));
+    Object.defineProperty(cue, 'size', extend({}, baseObj, {
+      get: function () {
+        return _size;
+      },
+      set: function (value) {
+        if (value < 0 || value > 100) {
+          throw new Error('Size must be between 0 and 100.');
         }
-        // use levelCodec as first priority
-        const codec = track.levelCodec || track.codec;
-        const mimeType = `${track.container};codecs=${codec}`;
-        logger.log(`[buffer-controller]: creating sourceBuffer(${mimeType})`);
-        try {
-          const sb = sourceBuffer[trackName] = mediaSource.addSourceBuffer(mimeType);
-          const sbName = trackName;
-          this.addBufferListener(sbName, 'updatestart', this._onSBUpdateStart);
-          this.addBufferListener(sbName, 'updateend', this._onSBUpdateEnd);
-          this.addBufferListener(sbName, 'error', this._onSBUpdateError);
-          this.tracks[trackName] = {
-            buffer: sb,
-            codec: codec,
-            container: track.container,
-            levelCodec: track.levelCodec,
-            metadata: track.metadata,
-            id: track.id
-          };
-        } catch (err) {
-          logger.error(`[buffer-controller]: error while trying to add sourceBuffer: ${err.message}`);
-          this.hls.trigger(Events.ERROR, {
-            type: ErrorTypes.MEDIA_ERROR,
-            details: ErrorDetails.BUFFER_ADD_CODEC_ERROR,
-            fatal: false,
-            error: err,
-            mimeType: mimeType
-          });
+        _size = value;
+        this.hasBeenReset = true;
+      }
+    }));
+    Object.defineProperty(cue, 'align', extend({}, baseObj, {
+      get: function () {
+        return _align;
+      },
+      set: function (value) {
+        const setting = findAlignSetting(value);
+        if (!setting) {
+          throw new SyntaxError('An invalid or illegal string was specified.');
         }
+        _align = setting;
+        this.hasBeenReset = true;
       }
+    }));
+
+    /**
+     * Other <track> spec defined properties
+     */
+
+    // http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#text-track-cue-display-state
+    cue.displayState = undefined;
+  }
+
+  /**
+   * VTTCue methods
+   */
+
+  VTTCue.prototype.getCueAsHTML = function () {
+    // Assume WebVTT.convertCueToDOMTree is on the global.
+    const WebVTT = self.WebVTT;
+    return WebVTT.convertCueToDOMTree(self, this.text);
+  };
+  // this is a polyfill hack
+  return VTTCue;
+})();
+
+/*
+ * Source: https://github.com/mozilla/vtt.js/blob/master/dist/vtt.js
+ */
+
+class StringDecoder {
+  // eslint-disable-next-line @typescript-eslint/no-unused-vars
+  decode(data, options) {
+    if (!data) {
+      return '';
+    }
+    if (typeof data !== 'string') {
+      throw new Error('Error - expected string data.');
     }
+    return decodeURIComponent(encodeURIComponent(data));
   }
-  _onSBUpdateStart(type) {
-    const {
-      operationQueue
-    } = this;
-    const operation = operationQueue.current(type);
-    operation.onStart();
+}
+
+// Try to parse input as a time stamp.
+function parseTimeStamp(input) {
+  function computeSeconds(h, m, s, f) {
+    return (h | 0) * 3600 + (m | 0) * 60 + (s | 0) + parseFloat(f || 0);
   }
-  _onSBUpdateEnd(type) {
-    const {
-      operationQueue
-    } = this;
-    const operation = operationQueue.current(type);
-    operation.onComplete();
-    operationQueue.shiftAndExecuteNext(type);
+  const m = input.match(/^(?:(\d+):)?(\d{2}):(\d{2})(\.\d+)?/);
+  if (!m) {
+    return null;
   }
-  _onSBUpdateError(type, event) {
-    const error = new Error(`${type} SourceBuffer error`);
-    logger.error(`[buffer-controller]: ${error}`, event);
-    // according to http://www.w3.org/TR/media-source/#sourcebuffer-append-error
-    // SourceBuffer errors are not necessarily fatal; if so, the HTMLMediaElement will fire an error event
-    this.hls.trigger(Events.ERROR, {
-      type: ErrorTypes.MEDIA_ERROR,
-      details: ErrorDetails.BUFFER_APPENDING_ERROR,
-      error,
-      fatal: false
-    });
-    // updateend is always fired after error, so we'll allow that to shift the current operation off of the queue
-    const operation = this.operationQueue.current(type);
-    if (operation) {
-      operation.onError(event);
-    }
+  if (parseFloat(m[2]) > 59) {
+    // Timestamp takes the form of [hours]:[minutes].[milliseconds]
+    // First position is hours as it's over 59.
+    return computeSeconds(m[2], m[3], 0, m[4]);
   }
+  // Timestamp takes the form of [hours (optional)]:[minutes]:[seconds].[milliseconds]
+  return computeSeconds(m[1], m[2], m[3], m[4]);
+}
 
-  // This method must result in an updateend event; if remove is not called, _onSBUpdateEnd must be called manually
-  removeExecutor(type, startOffset, endOffset) {
-    const {
-      media,
-      mediaSource,
-      operationQueue,
-      sourceBuffer
-    } = this;
-    const sb = sourceBuffer[type];
-    if (!media || !mediaSource || !sb) {
-      logger.warn(`[buffer-controller]: Attempting to remove from the ${type} SourceBuffer, but it does not exist`);
-      operationQueue.shiftAndExecuteNext(type);
-      return;
-    }
-    const mediaDuration = isFiniteNumber(media.duration) ? media.duration : Infinity;
-    const msDuration = isFiniteNumber(mediaSource.duration) ? mediaSource.duration : Infinity;
-    const removeStart = Math.max(0, startOffset);
-    const removeEnd = Math.min(endOffset, mediaDuration, msDuration);
-    if (removeEnd > removeStart && !sb.ending) {
-      sb.ended = false;
-      logger.log(`[buffer-controller]: Removing [${removeStart},${removeEnd}] from the ${type} SourceBuffer`);
-      sb.remove(removeStart, removeEnd);
-    } else {
-      // Cycle the queue
-      operationQueue.shiftAndExecuteNext(type);
+// A settings object holds key/value pairs and will ignore anything but the first
+// assignment to a specific key.
+class Settings {
+  constructor() {
+    this.values = Object.create(null);
+  }
+  // Only accept the first assignment to any key.
+  set(k, v) {
+    if (!this.get(k) && v !== '') {
+      this.values[k] = v;
     }
   }
-
-  // This method must result in an updateend event; if append is not called, _onSBUpdateEnd must be called manually
-  appendExecutor(data, type) {
-    const {
-      operationQueue,
-      sourceBuffer
-    } = this;
-    const sb = sourceBuffer[type];
-    if (!sb) {
-      logger.warn(`[buffer-controller]: Attempting to append to the ${type} SourceBuffer, but it does not exist`);
-      operationQueue.shiftAndExecuteNext(type);
-      return;
+  // Return the value for a key, or a default value.
+  // If 'defaultKey' is passed then 'dflt' is assumed to be an object with
+  // a number of possible default values as properties where 'defaultKey' is
+  // the key of the property that will be chosen; otherwise it's assumed to be
+  // a single value.
+  get(k, dflt, defaultKey) {
+    if (defaultKey) {
+      return this.has(k) ? this.values[k] : dflt[defaultKey];
     }
-    sb.ended = false;
-    sb.appendBuffer(data);
+    return this.has(k) ? this.values[k] : dflt;
   }
-
-  // Enqueues an operation to each SourceBuffer queue which, upon execution, resolves a promise. When all promises
-  // resolve, the onUnblocked function is executed. Functions calling this method do not need to unblock the queue
-  // upon completion, since we already do it here
-  blockBuffers(onUnblocked, buffers = this.getSourceBufferTypes()) {
-    if (!buffers.length) {
-      logger.log('[buffer-controller]: Blocking operation requested, but no SourceBuffers exist');
-      Promise.resolve().then(onUnblocked);
-      return;
+  // Check whether we have a value for a key.
+  has(k) {
+    return k in this.values;
+  }
+  // Accept a setting if its one of the given alternatives.
+  alt(k, v, a) {
+    for (let n = 0; n < a.length; ++n) {
+      if (v === a[n]) {
+        this.set(k, v);
+        break;
+      }
     }
-    const {
-      operationQueue
-    } = this;
-
-    // logger.debug(`[buffer-controller]: Blocking ${buffers} SourceBuffer`);
-    const blockingOperations = buffers.map(type => operationQueue.appendBlocker(type));
-    Promise.all(blockingOperations).then(() => {
-      // logger.debug(`[buffer-controller]: Blocking operation resolved; unblocking ${buffers} SourceBuffer`);
-      onUnblocked();
-      buffers.forEach(type => {
-        const sb = this.sourceBuffer[type];
-        // Only cycle the queue if the SB is not updating. There's a bug in Chrome which sets the SB updating flag to
-        // true when changing the MediaSource duration (https://bugs.chromium.org/p/chromium/issues/detail?id=959359&can=2&q=mediasource%20duration)
-        // While this is a workaround, it's probably useful to have around
-        if (!(sb != null && sb.updating)) {
-          operationQueue.shiftAndExecuteNext(type);
-        }
-      });
-    });
   }
-  getSourceBufferTypes() {
-    return Object.keys(this.sourceBuffer);
+  // Accept a setting if its a valid (signed) integer.
+  integer(k, v) {
+    if (/^-?\d+$/.test(v)) {
+      // integer
+      this.set(k, parseInt(v, 10));
+    }
   }
-  addBufferListener(type, event, fn) {
-    const buffer = this.sourceBuffer[type];
-    if (!buffer) {
-      return;
+  // Accept a setting if its a valid percentage.
+  percent(k, v) {
+    if (/^([\d]{1,3})(\.[\d]*)?%$/.test(v)) {
+      const percent = parseFloat(v);
+      if (percent >= 0 && percent <= 100) {
+        this.set(k, percent);
+        return true;
+      }
     }
-    const listener = fn.bind(this, type);
-    this.listeners[type].push({
-      event,
-      listener
-    });
-    buffer.addEventListener(event, listener);
+    return false;
   }
-  removeBufferListeners(type) {
-    const buffer = this.sourceBuffer[type];
-    if (!buffer) {
-      return;
+}
+
+// Helper function to parse input into groups separated by 'groupDelim', and
+// interpret each group as a key/value pair separated by 'keyValueDelim'.
+function parseOptions(input, callback, keyValueDelim, groupDelim) {
+  const groups = groupDelim ? input.split(groupDelim) : [input];
+  for (const i in groups) {
+    if (typeof groups[i] !== 'string') {
+      continue;
     }
-    this.listeners[type].forEach(l => {
-      buffer.removeEventListener(l.event, l.listener);
-    });
+    const kv = groups[i].split(keyValueDelim);
+    if (kv.length !== 2) {
+      continue;
+    }
+    const k = kv[0];
+    const v = kv[1];
+    callback(k, v);
   }
 }
+const defaults = new VTTCue(0, 0, '');
+// 'middle' was changed to 'center' in the spec: https://github.com/w3c/webvtt/pull/244
+//  Safari doesn't yet support this change, but FF and Chrome do.
+const center = defaults.align === 'middle' ? 'middle' : 'center';
+function parseCue(input, cue, regionList) {
+  // Remember the original input if we need to throw an error.
+  const oInput = input;
+  // 4.1 WebVTT timestamp
+  function consumeTimeStamp() {
+    const ts = parseTimeStamp(input);
+    if (ts === null) {
+      throw new Error('Malformed timestamp: ' + oInput);
+    }
 
-/**
- *
- * This code was ported from the dash.js project at:
- *   https://github.com/Dash-Industry-Forum/dash.js/blob/development/externals/cea608-parser.js
- *   https://github.com/Dash-Industry-Forum/dash.js/commit/8269b26a761e0853bb21d78780ed945144ecdd4d#diff-71bc295a2d6b6b7093a1d3290d53a4b2
- *
- * The original copyright appears below:
- *
- * The copyright in this software is being made available under the BSD License,
- * included below. This software may be subject to other third party and contributor
- * rights, including patent rights, and no such rights are granted under this license.
- *
- * Copyright (c) 2015-2016, DASH Industry Forum.
- * All rights reserved.
- *
- * Redistribution and use in source and binary forms, with or without modification,
- * are permitted provided that the following conditions are met:
- *  1. Redistributions of source code must retain the above copyright notice, this
- *  list of conditions and the following disclaimer.
- *  * Redistributions in binary form must reproduce the above copyright notice,
- *  this list of conditions and the following disclaimer in the documentation and/or
- *  other materials provided with the distribution.
- *  2. Neither the name of Dash Industry Forum nor the names of its
- *  contributors may be used to endorse or promote products derived from this software
- *  without specific prior written permission.
- *
- *  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS AS IS AND ANY
- *  EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- *  WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- *  IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
- *  INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- *  NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR
- *  PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY,
- *  WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
- *  ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
- *  POSSIBILITY OF SUCH DAMAGE.
- */
-/**
- *  Exceptions from regular ASCII. CodePoints are mapped to UTF-16 codes
- */
+    // Remove time stamp from input.
+    input = input.replace(/^[^\sa-zA-Z-]+/, '');
+    return ts;
+  }
 
-const specialCea608CharsCodes = {
-  0x2a: 0xe1,
-  // lowercase a, acute accent
-  0x5c: 0xe9,
-  // lowercase e, acute accent
-  0x5e: 0xed,
-  // lowercase i, acute accent
-  0x5f: 0xf3,
-  // lowercase o, acute accent
-  0x60: 0xfa,
-  // lowercase u, acute accent
-  0x7b: 0xe7,
-  // lowercase c with cedilla
-  0x7c: 0xf7,
-  // division symbol
-  0x7d: 0xd1,
-  // uppercase N tilde
-  0x7e: 0xf1,
-  // lowercase n tilde
-  0x7f: 0x2588,
-  // Full block
-  // THIS BLOCK INCLUDES THE 16 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
-  // THAT COME FROM HI BYTE=0x11 AND LOW BETWEEN 0x30 AND 0x3F
-  // THIS MEANS THAT \x50 MUST BE ADDED TO THE VALUES
-  0x80: 0xae,
-  // Registered symbol (R)
-  0x81: 0xb0,
-  // degree sign
-  0x82: 0xbd,
-  // 1/2 symbol
-  0x83: 0xbf,
-  // Inverted (open) question mark
-  0x84: 0x2122,
-  // Trademark symbol (TM)
-  0x85: 0xa2,
-  // Cents symbol
-  0x86: 0xa3,
-  // Pounds sterling
-  0x87: 0x266a,
-  // Music 8'th note
-  0x88: 0xe0,
-  // lowercase a, grave accent
-  0x89: 0x20,
-  // transparent space (regular)
-  0x8a: 0xe8,
-  // lowercase e, grave accent
-  0x8b: 0xe2,
-  // lowercase a, circumflex accent
-  0x8c: 0xea,
-  // lowercase e, circumflex accent
-  0x8d: 0xee,
-  // lowercase i, circumflex accent
-  0x8e: 0xf4,
-  // lowercase o, circumflex accent
-  0x8f: 0xfb,
-  // lowercase u, circumflex accent
-  // THIS BLOCK INCLUDES THE 32 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
-  // THAT COME FROM HI BYTE=0x12 AND LOW BETWEEN 0x20 AND 0x3F
-  0x90: 0xc1,
-  // capital letter A with acute
-  0x91: 0xc9,
-  // capital letter E with acute
-  0x92: 0xd3,
-  // capital letter O with acute
-  0x93: 0xda,
-  // capital letter U with acute
-  0x94: 0xdc,
-  // capital letter U with diaresis
-  0x95: 0xfc,
-  // lowercase letter U with diaeresis
-  0x96: 0x2018,
-  // opening single quote
-  0x97: 0xa1,
-  // inverted exclamation mark
-  0x98: 0x2a,
-  // asterisk
-  0x99: 0x2019,
-  // closing single quote
-  0x9a: 0x2501,
-  // box drawings heavy horizontal
-  0x9b: 0xa9,
-  // copyright sign
-  0x9c: 0x2120,
-  // Service mark
-  0x9d: 0x2022,
-  // (round) bullet
-  0x9e: 0x201c,
-  // Left double quotation mark
-  0x9f: 0x201d,
-  // Right double quotation mark
-  0xa0: 0xc0,
-  // uppercase A, grave accent
-  0xa1: 0xc2,
-  // uppercase A, circumflex
-  0xa2: 0xc7,
-  // uppercase C with cedilla
-  0xa3: 0xc8,
-  // uppercase E, grave accent
-  0xa4: 0xca,
-  // uppercase E, circumflex
-  0xa5: 0xcb,
-  // capital letter E with diaresis
-  0xa6: 0xeb,
-  // lowercase letter e with diaresis
-  0xa7: 0xce,
-  // uppercase I, circumflex
-  0xa8: 0xcf,
-  // uppercase I, with diaresis
-  0xa9: 0xef,
-  // lowercase i, with diaresis
-  0xaa: 0xd4,
-  // uppercase O, circumflex
-  0xab: 0xd9,
-  // uppercase U, grave accent
-  0xac: 0xf9,
-  // lowercase u, grave accent
-  0xad: 0xdb,
-  // uppercase U, circumflex
-  0xae: 0xab,
-  // left-pointing double angle quotation mark
-  0xaf: 0xbb,
-  // right-pointing double angle quotation mark
-  // THIS BLOCK INCLUDES THE 32 EXTENDED (TWO-BYTE) LINE 21 CHARACTERS
-  // THAT COME FROM HI BYTE=0x13 AND LOW BETWEEN 0x20 AND 0x3F
-  0xb0: 0xc3,
-  // Uppercase A, tilde
-  0xb1: 0xe3,
-  // Lowercase a, tilde
-  0xb2: 0xcd,
-  // Uppercase I, acute accent
-  0xb3: 0xcc,
-  // Uppercase I, grave accent
-  0xb4: 0xec,
-  // Lowercase i, grave accent
-  0xb5: 0xd2,
-  // Uppercase O, grave accent
-  0xb6: 0xf2,
-  // Lowercase o, grave accent
-  0xb7: 0xd5,
-  // Uppercase O, tilde
-  0xb8: 0xf5,
-  // Lowercase o, tilde
-  0xb9: 0x7b,
-  // Open curly brace
-  0xba: 0x7d,
-  // Closing curly brace
-  0xbb: 0x5c,
-  // Backslash
-  0xbc: 0x5e,
-  // Caret
-  0xbd: 0x5f,
-  // Underscore
-  0xbe: 0x7c,
-  // Pipe (vertical line)
-  0xbf: 0x223c,
-  // Tilde operator
-  0xc0: 0xc4,
-  // Uppercase A, umlaut
-  0xc1: 0xe4,
-  // Lowercase A, umlaut
-  0xc2: 0xd6,
-  // Uppercase O, umlaut
-  0xc3: 0xf6,
-  // Lowercase o, umlaut
-  0xc4: 0xdf,
-  // Esszett (sharp S)
-  0xc5: 0xa5,
-  // Yen symbol
-  0xc6: 0xa4,
-  // Generic currency sign
-  0xc7: 0x2503,
-  // Box drawings heavy vertical
-  0xc8: 0xc5,
-  // Uppercase A, ring
-  0xc9: 0xe5,
-  // Lowercase A, ring
-  0xca: 0xd8,
-  // Uppercase O, stroke
-  0xcb: 0xf8,
-  // Lowercase o, strok
-  0xcc: 0x250f,
-  // Box drawings heavy down and right
-  0xcd: 0x2513,
-  // Box drawings heavy down and left
-  0xce: 0x2517,
-  // Box drawings heavy up and right
-  0xcf: 0x251b // Box drawings heavy up and left
-};
+  // 4.4.2 WebVTT cue settings
+  function consumeCueSettings(input, cue) {
+    const settings = new Settings();
+    parseOptions(input, function (k, v) {
+      let vals;
+      switch (k) {
+        case 'region':
+          // Find the last region we parsed with the same region id.
+          for (let i = regionList.length - 1; i >= 0; i--) {
+            if (regionList[i].id === v) {
+              settings.set(k, regionList[i].region);
+              break;
+            }
+          }
+          break;
+        case 'vertical':
+          settings.alt(k, v, ['rl', 'lr']);
+          break;
+        case 'line':
+          vals = v.split(',');
+          settings.integer(k, vals[0]);
+          if (settings.percent(k, vals[0])) {
+            settings.set('snapToLines', false);
+          }
+          settings.alt(k, vals[0], ['auto']);
+          if (vals.length === 2) {
+            settings.alt('lineAlign', vals[1], ['start', center, 'end']);
+          }
+          break;
+        case 'position':
+          vals = v.split(',');
+          settings.percent(k, vals[0]);
+          if (vals.length === 2) {
+            settings.alt('positionAlign', vals[1], ['start', center, 'end', 'line-left', 'line-right', 'auto']);
+          }
+          break;
+        case 'size':
+          settings.percent(k, v);
+          break;
+        case 'align':
+          settings.alt(k, v, ['start', center, 'end', 'left', 'right']);
+          break;
+      }
+    }, /:/, /\s/);
 
-/**
- * Utils
- */
-const getCharForByte = function getCharForByte(byte) {
-  let charCode = byte;
-  if (specialCea608CharsCodes.hasOwnProperty(byte)) {
-    charCode = specialCea608CharsCodes[byte];
+    // Apply default values for any missing fields.
+    cue.region = settings.get('region', null);
+    cue.vertical = settings.get('vertical', '');
+    let line = settings.get('line', 'auto');
+    if (line === 'auto' && defaults.line === -1) {
+      // set numeric line number for Safari
+      line = -1;
+    }
+    cue.line = line;
+    cue.lineAlign = settings.get('lineAlign', 'start');
+    cue.snapToLines = settings.get('snapToLines', true);
+    cue.size = settings.get('size', 100);
+    cue.align = settings.get('align', center);
+    let position = settings.get('position', 'auto');
+    if (position === 'auto' && defaults.position === 50) {
+      // set numeric position for Safari
+      position = cue.align === 'start' || cue.align === 'left' ? 0 : cue.align === 'end' || cue.align === 'right' ? 100 : 50;
+    }
+    cue.position = position;
   }
-  return String.fromCharCode(charCode);
-};
-const NR_ROWS = 15;
-const NR_COLS = 100;
-// Tables to look up row from PAC data
-const rowsLowCh1 = {
-  0x11: 1,
-  0x12: 3,
-  0x15: 5,
-  0x16: 7,
-  0x17: 9,
-  0x10: 11,
-  0x13: 12,
-  0x14: 14
-};
-const rowsHighCh1 = {
-  0x11: 2,
-  0x12: 4,
-  0x15: 6,
-  0x16: 8,
-  0x17: 10,
-  0x13: 13,
-  0x14: 15
-};
-const rowsLowCh2 = {
-  0x19: 1,
-  0x1a: 3,
-  0x1d: 5,
-  0x1e: 7,
-  0x1f: 9,
-  0x18: 11,
-  0x1b: 12,
-  0x1c: 14
-};
-const rowsHighCh2 = {
-  0x19: 2,
-  0x1a: 4,
-  0x1d: 6,
-  0x1e: 8,
-  0x1f: 10,
-  0x1b: 13,
-  0x1c: 15
-};
-const backgroundColors = ['white', 'green', 'blue', 'cyan', 'red', 'yellow', 'magenta', 'black', 'transparent'];
-class CaptionsLogger {
+  function skipWhitespace() {
+    input = input.replace(/^\s+/, '');
+  }
+
+  // 4.1 WebVTT cue timings.
+  skipWhitespace();
+  cue.startTime = consumeTimeStamp(); // (1) collect cue start time
+  skipWhitespace();
+  if (input.slice(0, 3) !== '-->') {
+    // (3) next characters must match '-->'
+    throw new Error("Malformed time stamp (time stamps must be separated by '-->'): " + oInput);
+  }
+  input = input.slice(3);
+  skipWhitespace();
+  cue.endTime = consumeTimeStamp(); // (5) collect cue end time
+
+  // 4.1 WebVTT cue settings list.
+  skipWhitespace();
+  consumeCueSettings(input, cue);
+}
+function fixLineBreaks(input) {
+  return input.replace(/<br(?: \/)?>/gi, '\n');
+}
+class VTTParser {
   constructor() {
-    this.time = null;
-    this.verboseLevel = 0;
+    this.state = 'INITIAL';
+    this.buffer = '';
+    this.decoder = new StringDecoder();
+    this.regionList = [];
+    this.cue = null;
+    this.oncue = void 0;
+    this.onparsingerror = void 0;
+    this.onflush = void 0;
+  }
+  parse(data) {
+    const _this = this;
+
+    // If there is no data then we won't decode it, but will just try to parse
+    // whatever is in buffer already. This may occur in circumstances, for
+    // example when flush() is called.
+    if (data) {
+      // Try to decode the data that we received.
+      _this.buffer += _this.decoder.decode(data, {
+        stream: true
+      });
+    }
+    function collectNextLine() {
+      let buffer = _this.buffer;
+      let pos = 0;
+      buffer = fixLineBreaks(buffer);
+      while (pos < buffer.length && buffer[pos] !== '\r' && buffer[pos] !== '\n') {
+        ++pos;
+      }
+      const line = buffer.slice(0, pos);
+      // Advance the buffer early in case we fail below.
+      if (buffer[pos] === '\r') {
+        ++pos;
+      }
+      if (buffer[pos] === '\n') {
+        ++pos;
+      }
+      _this.buffer = buffer.slice(pos);
+      return line;
+    }
+
+    // 3.2 WebVTT metadata header syntax
+    function parseHeader(input) {
+      parseOptions(input, function (k, v) {
+        // switch (k) {
+        // case 'region':
+        // 3.3 WebVTT region metadata header syntax
+        // console.log('parse region', v);
+        // parseRegion(v);
+        // break;
+        // }
+      }, /:/);
+    }
+
+    // 5.1 WebVTT file parsing.
+    try {
+      let line = '';
+      if (_this.state === 'INITIAL') {
+        // We can't start parsing until we have the first line.
+        if (!/\r\n|\n/.test(_this.buffer)) {
+          return this;
+        }
+        line = collectNextLine();
+        // strip of UTF-8 BOM if any
+        // https://en.wikipedia.org/wiki/Byte_order_mark#UTF-8
+        const m = line.match(/^()?WEBVTT([ \t].*)?$/);
+        if (!(m != null && m[0])) {
+          throw new Error('Malformed WebVTT signature.');
+        }
+        _this.state = 'HEADER';
+      }
+      let alreadyCollectedLine = false;
+      while (_this.buffer) {
+        // We can't parse a line until we have the full line.
+        if (!/\r\n|\n/.test(_this.buffer)) {
+          return this;
+        }
+        if (!alreadyCollectedLine) {
+          line = collectNextLine();
+        } else {
+          alreadyCollectedLine = false;
+        }
+        switch (_this.state) {
+          case 'HEADER':
+            // 13-18 - Allow a header (metadata) under the WEBVTT line.
+            if (/:/.test(line)) {
+              parseHeader(line);
+            } else if (!line) {
+              // An empty line terminates the header and starts the body (cues).
+              _this.state = 'ID';
+            }
+            continue;
+          case 'NOTE':
+            // Ignore NOTE blocks.
+            if (!line) {
+              _this.state = 'ID';
+            }
+            continue;
+          case 'ID':
+            // Check for the start of NOTE blocks.
+            if (/^NOTE($|[ \t])/.test(line)) {
+              _this.state = 'NOTE';
+              break;
+            }
+            // 19-29 - Allow any number of line terminators, then initialize new cue values.
+            if (!line) {
+              continue;
+            }
+            _this.cue = new VTTCue(0, 0, '');
+            _this.state = 'CUE';
+            // 30-39 - Check if self line contains an optional identifier or timing data.
+            if (line.indexOf('-->') === -1) {
+              _this.cue.id = line;
+              continue;
+            }
+          // Process line as start of a cue.
+          /* falls through */
+          case 'CUE':
+            // 40 - Collect cue timings and settings.
+            if (!_this.cue) {
+              _this.state = 'BADCUE';
+              continue;
+            }
+            try {
+              parseCue(line, _this.cue, _this.regionList);
+            } catch (e) {
+              // In case of an error ignore rest of the cue.
+              _this.cue = null;
+              _this.state = 'BADCUE';
+              continue;
+            }
+            _this.state = 'CUETEXT';
+            continue;
+          case 'CUETEXT':
+            {
+              const hasSubstring = line.indexOf('-->') !== -1;
+              // 34 - If we have an empty line then report the cue.
+              // 35 - If we have the special substring '-->' then report the cue,
+              // but do not collect the line as we need to process the current
+              // one as a new cue.
+              if (!line || hasSubstring && (alreadyCollectedLine = true)) {
+                // We are done parsing self cue.
+                if (_this.oncue && _this.cue) {
+                  _this.oncue(_this.cue);
+                }
+                _this.cue = null;
+                _this.state = 'ID';
+                continue;
+              }
+              if (_this.cue === null) {
+                continue;
+              }
+              if (_this.cue.text) {
+                _this.cue.text += '\n';
+              }
+              _this.cue.text += line;
+            }
+            continue;
+          case 'BADCUE':
+            // 54-62 - Collect and discard the remaining cue.
+            if (!line) {
+              _this.state = 'ID';
+            }
+        }
+      }
+    } catch (e) {
+      // If we are currently parsing a cue, report what we have.
+      if (_this.state === 'CUETEXT' && _this.cue && _this.oncue) {
+        _this.oncue(_this.cue);
+      }
+      _this.cue = null;
+      // Enter BADWEBVTT state if header was not parsed correctly otherwise
+      // another exception occurred so enter BADCUE state.
+      _this.state = _this.state === 'INITIAL' ? 'BADWEBVTT' : 'BADCUE';
+    }
+    return this;
   }
-  log(severity, msg) {
-    if (this.verboseLevel >= severity) {
-      const m = typeof msg === 'function' ? msg() : msg;
-      logger.log(`${this.time} [${severity}] ${m}`);
+  flush() {
+    const _this = this;
+    try {
+      // Finish decoding the stream.
+      // _this.buffer += _this.decoder.decode();
+      // Synthesize the end of the current cue or region.
+      if (_this.cue || _this.state === 'HEADER') {
+        _this.buffer += '\n\n';
+        _this.parse();
+      }
+      // If we've flushed, parsed, and we're still on the INITIAL state then
+      // that means we don't have enough of the stream to parse the first
+      // line.
+      if (_this.state === 'INITIAL' || _this.state === 'BADWEBVTT') {
+        throw new Error('Malformed WebVTT signature.');
+      }
+    } catch (e) {
+      if (_this.onparsingerror) {
+        _this.onparsingerror(e);
+      }
     }
+    if (_this.onflush) {
+      _this.onflush();
+    }
+    return this;
   }
 }
-const numArrayToHexArray = function numArrayToHexArray(numArray) {
-  const hexArray = [];
-  for (let j = 0; j < numArray.length; j++) {
-    hexArray.push(numArray[j].toString(16));
+
+const LINEBREAKS = /\r\n|\n\r|\n|\r/g;
+
+// String.prototype.startsWith is not supported in IE11
+const startsWith = function startsWith(inputString, searchString, position = 0) {
+  return inputString.slice(position, position + searchString.length) === searchString;
+};
+const cueString2millis = function cueString2millis(timeString) {
+  let ts = parseInt(timeString.slice(-3));
+  const secs = parseInt(timeString.slice(-6, -4));
+  const mins = parseInt(timeString.slice(-9, -7));
+  const hours = timeString.length > 9 ? parseInt(timeString.substring(0, timeString.indexOf(':'))) : 0;
+  if (!isFiniteNumber(ts) || !isFiniteNumber(secs) || !isFiniteNumber(mins) || !isFiniteNumber(hours)) {
+    throw Error(`Malformed X-TIMESTAMP-MAP: Local:${timeString}`);
   }
-  return hexArray;
+  ts += 1000 * secs;
+  ts += 60 * 1000 * mins;
+  ts += 60 * 60 * 1000 * hours;
+  return ts;
 };
-class PenState {
-  constructor(foreground, underline, italics, background, flash) {
-    this.foreground = void 0;
-    this.underline = void 0;
-    this.italics = void 0;
-    this.background = void 0;
-    this.flash = void 0;
-    this.foreground = foreground || 'white';
-    this.underline = underline || false;
-    this.italics = italics || false;
-    this.background = background || 'black';
-    this.flash = flash || false;
+
+// From https://github.com/darkskyapp/string-hash
+const hash = function hash(text) {
+  let _hash = 5381;
+  let i = text.length;
+  while (i) {
+    _hash = _hash * 33 ^ text.charCodeAt(--i);
   }
-  reset() {
-    this.foreground = 'white';
-    this.underline = false;
-    this.italics = false;
-    this.background = 'black';
-    this.flash = false;
+  return (_hash >>> 0).toString();
+};
+
+// Create a unique hash id for a cue based on start/end times and text.
+// This helps timeline-controller to avoid showing repeated captions.
+function generateCueId(startTime, endTime, text) {
+  return hash(startTime.toString()) + hash(endTime.toString()) + hash(text);
+}
+const calculateOffset = function calculateOffset(vttCCs, cc, presentationTime) {
+  let currCC = vttCCs[cc];
+  let prevCC = vttCCs[currCC.prevCC];
+
+  // This is the first discontinuity or cues have been processed since the last discontinuity
+  // Offset = current discontinuity time
+  if (!prevCC || !prevCC.new && currCC.new) {
+    vttCCs.ccOffset = vttCCs.presentationOffset = currCC.start;
+    currCC.new = false;
+    return;
   }
-  setStyles(styles) {
-    const attribs = ['foreground', 'underline', 'italics', 'background', 'flash'];
-    for (let i = 0; i < attribs.length; i++) {
-      const style = attribs[i];
-      if (styles.hasOwnProperty(style)) {
-        this[style] = styles[style];
+
+  // There have been discontinuities since cues were last parsed.
+  // Offset = time elapsed
+  while ((_prevCC = prevCC) != null && _prevCC.new) {
+    var _prevCC;
+    vttCCs.ccOffset += currCC.start - prevCC.start;
+    currCC.new = false;
+    currCC = prevCC;
+    prevCC = vttCCs[currCC.prevCC];
+  }
+  vttCCs.presentationOffset = presentationTime;
+};
+function parseWebVTT(vttByteArray, initPTS, vttCCs, cc, timeOffset, callBack, errorCallBack) {
+  const parser = new VTTParser();
+  // Convert byteArray into string, replacing any somewhat exotic linefeeds with "\n", then split on that character.
+  // Uint8Array.prototype.reduce is not implemented in IE11
+  const vttLines = utf8ArrayToStr(new Uint8Array(vttByteArray)).trim().replace(LINEBREAKS, '\n').split('\n');
+  const cues = [];
+  const init90kHz = initPTS ? toMpegTsClockFromTimescale(initPTS.baseTime, initPTS.timescale) : 0;
+  let cueTime = '00:00.000';
+  let timestampMapMPEGTS = 0;
+  let timestampMapLOCAL = 0;
+  let parsingError;
+  let inHeader = true;
+  parser.oncue = function (cue) {
+    // Adjust cue timing; clamp cues to start no earlier than - and drop cues that don't end after - 0 on timeline.
+    const currCC = vttCCs[cc];
+    let cueOffset = vttCCs.ccOffset;
+
+    // Calculate subtitle PTS offset
+    const webVttMpegTsMapOffset = (timestampMapMPEGTS - init90kHz) / 90000;
+
+    // Update offsets for new discontinuities
+    if (currCC != null && currCC.new) {
+      if (timestampMapLOCAL !== undefined) {
+        // When local time is provided, offset = discontinuity start time - local time
+        cueOffset = vttCCs.ccOffset = currCC.start;
+      } else {
+        calculateOffset(vttCCs, cc, webVttMpegTsMapOffset);
       }
     }
-  }
-  isDefault() {
-    return this.foreground === 'white' && !this.underline && !this.italics && this.background === 'black' && !this.flash;
-  }
-  equals(other) {
-    return this.foreground === other.foreground && this.underline === other.underline && this.italics === other.italics && this.background === other.background && this.flash === other.flash;
-  }
-  copy(newPenState) {
-    this.foreground = newPenState.foreground;
-    this.underline = newPenState.underline;
-    this.italics = newPenState.italics;
-    this.background = newPenState.background;
-    this.flash = newPenState.flash;
-  }
-  toString() {
-    return 'color=' + this.foreground + ', underline=' + this.underline + ', italics=' + this.italics + ', background=' + this.background + ', flash=' + this.flash;
-  }
+    if (webVttMpegTsMapOffset) {
+      if (!initPTS) {
+        parsingError = new Error('Missing initPTS for VTT MPEGTS');
+        return;
+      }
+      // If we have MPEGTS, offset = presentation time + discontinuity offset
+      cueOffset = webVttMpegTsMapOffset - vttCCs.presentationOffset;
+    }
+    const duration = cue.endTime - cue.startTime;
+    const startTime = normalizePts((cue.startTime + cueOffset - timestampMapLOCAL) * 90000, timeOffset * 90000) / 90000;
+    cue.startTime = Math.max(startTime, 0);
+    cue.endTime = Math.max(startTime + duration, 0);
+
+    //trim trailing webvtt block whitespaces
+    const text = cue.text.trim();
+
+    // Fix encoding of special characters
+    cue.text = decodeURIComponent(encodeURIComponent(text));
+
+    // If the cue was not assigned an id from the VTT file (line above the content), create one.
+    if (!cue.id) {
+      cue.id = generateCueId(cue.startTime, cue.endTime, text);
+    }
+    if (cue.endTime > 0) {
+      cues.push(cue);
+    }
+  };
+  parser.onparsingerror = function (error) {
+    parsingError = error;
+  };
+  parser.onflush = function () {
+    if (parsingError) {
+      errorCallBack(parsingError);
+      return;
+    }
+    callBack(cues);
+  };
+
+  // Go through contents line by line.
+  vttLines.forEach(line => {
+    if (inHeader) {
+      // Look for X-TIMESTAMP-MAP in header.
+      if (startsWith(line, 'X-TIMESTAMP-MAP=')) {
+        // Once found, no more are allowed anyway, so stop searching.
+        inHeader = false;
+        // Extract LOCAL and MPEGTS.
+        line.slice(16).split(',').forEach(timestamp => {
+          if (startsWith(timestamp, 'LOCAL:')) {
+            cueTime = timestamp.slice(6);
+          } else if (startsWith(timestamp, 'MPEGTS:')) {
+            timestampMapMPEGTS = parseInt(timestamp.slice(7));
+          }
+        });
+        try {
+          // Convert cue time to seconds
+          timestampMapLOCAL = cueString2millis(cueTime) / 1000;
+        } catch (error) {
+          parsingError = error;
+        }
+        // Return without parsing X-TIMESTAMP-MAP line.
+        return;
+      } else if (line === '') {
+        inHeader = false;
+      }
+    }
+    // Parse line by default.
+    parser.parse(line + '\n');
+  });
+  parser.flush();
 }
 
-/**
- * Unicode character with styling and background.
- * @constructor
- */
-class StyledUnicodeChar {
-  constructor(uchar, foreground, underline, italics, background, flash) {
-    this.uchar = void 0;
-    this.penState = void 0;
-    this.uchar = uchar || ' '; // unicode character
-    this.penState = new PenState(foreground, underline, italics, background, flash);
-  }
-  reset() {
-    this.uchar = ' ';
-    this.penState.reset();
-  }
-  setChar(uchar, newPenState) {
-    this.uchar = uchar;
-    this.penState.copy(newPenState);
-  }
-  setPenState(newPenState) {
-    this.penState.copy(newPenState);
-  }
-  equals(other) {
-    return this.uchar === other.uchar && this.penState.equals(other.penState);
-  }
-  copy(newChar) {
-    this.uchar = newChar.uchar;
-    this.penState.copy(newChar.penState);
+const IMSC1_CODEC = 'stpp.ttml.im1t';
+
+// Time format: h:m:s:frames(.subframes)
+const HMSF_REGEX = /^(\d{2,}):(\d{2}):(\d{2}):(\d{2})\.?(\d+)?$/;
+
+// Time format: hours, minutes, seconds, milliseconds, frames, ticks
+const TIME_UNIT_REGEX = /^(\d*(?:\.\d*)?)(h|m|s|ms|f|t)$/;
+const textAlignToLineAlign = {
+  left: 'start',
+  center: 'center',
+  right: 'end',
+  start: 'start',
+  end: 'end'
+};
+function parseIMSC1(payload, initPTS, callBack, errorCallBack) {
+  const results = findBox(new Uint8Array(payload), ['mdat']);
+  if (results.length === 0) {
+    errorCallBack(new Error('Could not parse IMSC1 mdat'));
+    return;
   }
-  isEmpty() {
-    return this.uchar === ' ' && this.penState.isDefault();
+  const ttmlList = results.map(mdat => utf8ArrayToStr(mdat));
+  const syncTime = toTimescaleFromScale(initPTS.baseTime, 1, initPTS.timescale);
+  try {
+    ttmlList.forEach(ttml => callBack(parseTTML(ttml, syncTime)));
+  } catch (error) {
+    errorCallBack(error);
   }
 }
-
-/**
- * CEA-608 row consisting of NR_COLS instances of StyledUnicodeChar.
- * @constructor
- */
-class Row {
-  constructor(logger) {
-    this.chars = void 0;
-    this.pos = void 0;
-    this.currPenState = void 0;
-    this.cueStartTime = void 0;
-    this.logger = void 0;
-    this.chars = [];
-    for (let i = 0; i < NR_COLS; i++) {
-      this.chars.push(new StyledUnicodeChar());
-    }
-    this.logger = logger;
-    this.pos = 0;
-    this.currPenState = new PenState();
+function parseTTML(ttml, syncTime) {
+  const parser = new DOMParser();
+  const xmlDoc = parser.parseFromString(ttml, 'text/xml');
+  const tt = xmlDoc.getElementsByTagName('tt')[0];
+  if (!tt) {
+    throw new Error('Invalid ttml');
   }
-  equals(other) {
-    let equal = true;
-    for (let i = 0; i < NR_COLS; i++) {
-      if (!this.chars[i].equals(other.chars[i])) {
-        equal = false;
-        break;
-      }
+  const defaultRateInfo = {
+    frameRate: 30,
+    subFrameRate: 1,
+    frameRateMultiplier: 0,
+    tickRate: 0
+  };
+  const rateInfo = Object.keys(defaultRateInfo).reduce((result, key) => {
+    result[key] = tt.getAttribute(`ttp:${key}`) || defaultRateInfo[key];
+    return result;
+  }, {});
+  const trim = tt.getAttribute('xml:space') !== 'preserve';
+  const styleElements = collectionToDictionary(getElementCollection(tt, 'styling', 'style'));
+  const regionElements = collectionToDictionary(getElementCollection(tt, 'layout', 'region'));
+  const cueElements = getElementCollection(tt, 'body', '[begin]');
+  return [].map.call(cueElements, cueElement => {
+    const cueText = getTextContent(cueElement, trim);
+    if (!cueText || !cueElement.hasAttribute('begin')) {
+      return null;
     }
-    return equal;
-  }
-  copy(other) {
-    for (let i = 0; i < NR_COLS; i++) {
-      this.chars[i].copy(other.chars[i]);
+    const startTime = parseTtmlTime(cueElement.getAttribute('begin'), rateInfo);
+    const duration = parseTtmlTime(cueElement.getAttribute('dur'), rateInfo);
+    let endTime = parseTtmlTime(cueElement.getAttribute('end'), rateInfo);
+    if (startTime === null) {
+      throw timestampParsingError(cueElement);
     }
-  }
-  isEmpty() {
-    let empty = true;
-    for (let i = 0; i < NR_COLS; i++) {
-      if (!this.chars[i].isEmpty()) {
-        empty = false;
-        break;
+    if (endTime === null) {
+      if (duration === null) {
+        throw timestampParsingError(cueElement);
+      }
+      endTime = startTime + duration;
+    }
+    const cue = new VTTCue(startTime - syncTime, endTime - syncTime, cueText);
+    cue.id = generateCueId(cue.startTime, cue.endTime, cue.text);
+    const region = regionElements[cueElement.getAttribute('region')];
+    const style = styleElements[cueElement.getAttribute('style')];
+
+    // Apply styles to cue
+    const styles = getTtmlStyles(region, style, styleElements);
+    const {
+      textAlign
+    } = styles;
+    if (textAlign) {
+      // cue.positionAlign not settable in FF~2016
+      const lineAlign = textAlignToLineAlign[textAlign];
+      if (lineAlign) {
+        cue.lineAlign = lineAlign;
       }
+      cue.align = textAlign;
     }
-    return empty;
+    _extends(cue, styles);
+    return cue;
+  }).filter(cue => cue !== null);
+}
+function getElementCollection(fromElement, parentName, childName) {
+  const parent = fromElement.getElementsByTagName(parentName)[0];
+  if (parent) {
+    return [].slice.call(parent.querySelectorAll(childName));
   }
-
-  /**
-   *  Set the cursor to a valid column.
-   */
-  setCursor(absPos) {
-    if (this.pos !== absPos) {
-      this.pos = absPos;
+  return [];
+}
+function collectionToDictionary(elementsWithId) {
+  return elementsWithId.reduce((dict, element) => {
+    const id = element.getAttribute('xml:id');
+    if (id) {
+      dict[id] = element;
     }
-    if (this.pos < 0) {
-      this.logger.log(3, 'Negative cursor position ' + this.pos);
-      this.pos = 0;
-    } else if (this.pos > NR_COLS) {
-      this.logger.log(3, 'Too large cursor position ' + this.pos);
-      this.pos = NR_COLS;
+    return dict;
+  }, {});
+}
+function getTextContent(element, trim) {
+  return [].slice.call(element.childNodes).reduce((str, node, i) => {
+    var _node$childNodes;
+    if (node.nodeName === 'br' && i) {
+      return str + '\n';
+    }
+    if ((_node$childNodes = node.childNodes) != null && _node$childNodes.length) {
+      return getTextContent(node, trim);
+    } else if (trim) {
+      return str + node.textContent.trim().replace(/\s+/g, ' ');
+    }
+    return str + node.textContent;
+  }, '');
+}
+function getTtmlStyles(region, style, styleElements) {
+  const ttsNs = 'http://www.w3.org/ns/ttml#styling';
+  let regionStyle = null;
+  const styleAttributes = ['displayAlign', 'textAlign', 'color', 'backgroundColor', 'fontSize', 'fontFamily'
+  // 'fontWeight',
+  // 'lineHeight',
+  // 'wrapOption',
+  // 'fontStyle',
+  // 'direction',
+  // 'writingMode'
+  ];
+  const regionStyleName = region != null && region.hasAttribute('style') ? region.getAttribute('style') : null;
+  if (regionStyleName && styleElements.hasOwnProperty(regionStyleName)) {
+    regionStyle = styleElements[regionStyleName];
+  }
+  return styleAttributes.reduce((styles, name) => {
+    const value = getAttributeNS(style, ttsNs, name) || getAttributeNS(region, ttsNs, name) || getAttributeNS(regionStyle, ttsNs, name);
+    if (value) {
+      styles[name] = value;
     }
+    return styles;
+  }, {});
+}
+function getAttributeNS(element, ns, name) {
+  if (!element) {
+    return null;
   }
-
-  /**
-   * Move the cursor relative to current position.
-   */
-  moveCursor(relPos) {
-    const newPos = this.pos + relPos;
-    if (relPos > 1) {
-      for (let i = this.pos + 1; i < newPos + 1; i++) {
-        this.chars[i].setPenState(this.currPenState);
-      }
+  return element.hasAttributeNS(ns, name) ? element.getAttributeNS(ns, name) : null;
+}
+function timestampParsingError(node) {
+  return new Error(`Could not parse ttml timestamp ${node}`);
+}
+function parseTtmlTime(timeAttributeValue, rateInfo) {
+  if (!timeAttributeValue) {
+    return null;
+  }
+  let seconds = parseTimeStamp(timeAttributeValue);
+  if (seconds === null) {
+    if (HMSF_REGEX.test(timeAttributeValue)) {
+      seconds = parseHoursMinutesSecondsFrames(timeAttributeValue, rateInfo);
+    } else if (TIME_UNIT_REGEX.test(timeAttributeValue)) {
+      seconds = parseTimeUnits(timeAttributeValue, rateInfo);
     }
-    this.setCursor(newPos);
   }
+  return seconds;
+}
+function parseHoursMinutesSecondsFrames(timeAttributeValue, rateInfo) {
+  const m = HMSF_REGEX.exec(timeAttributeValue);
+  const frames = (m[4] | 0) + (m[5] | 0) / rateInfo.subFrameRate;
+  return (m[1] | 0) * 3600 + (m[2] | 0) * 60 + (m[3] | 0) + frames / rateInfo.frameRate;
+}
+function parseTimeUnits(timeAttributeValue, rateInfo) {
+  const m = TIME_UNIT_REGEX.exec(timeAttributeValue);
+  const value = Number(m[1]);
+  const unit = m[2];
+  switch (unit) {
+    case 'h':
+      return value * 3600;
+    case 'm':
+      return value * 60;
+    case 'ms':
+      return value * 1000;
+    case 'f':
+      return value / rateInfo.frameRate;
+    case 't':
+      return value / rateInfo.tickRate;
+  }
+  return value;
+}
 
-  /**
-   * Backspace, move one step back and clear character.
-   */
-  backSpace() {
-    this.moveCursor(-1);
-    this.chars[this.pos].setChar(' ', this.currPenState);
+class TimelineController {
+  constructor(hls) {
+    this.hls = void 0;
+    this.media = null;
+    this.config = void 0;
+    this.enabled = true;
+    this.Cues = void 0;
+    this.textTracks = [];
+    this.tracks = [];
+    this.initPTS = [];
+    this.unparsedVttFrags = [];
+    this.captionsTracks = {};
+    this.nonNativeCaptionsTracks = {};
+    this.cea608Parser1 = void 0;
+    this.cea608Parser2 = void 0;
+    this.lastCc = -1;
+    // Last video (CEA-608) fragment CC
+    this.lastSn = -1;
+    // Last video (CEA-608) fragment MSN
+    this.lastPartIndex = -1;
+    // Last video (CEA-608) fragment Part Index
+    this.prevCC = -1;
+    // Last subtitle fragment CC
+    this.vttCCs = newVTTCCs();
+    this.captionsProperties = void 0;
+    this.hls = hls;
+    this.config = hls.config;
+    this.Cues = hls.config.cueHandler;
+    this.captionsProperties = {
+      textTrack1: {
+        label: this.config.captionsTextTrack1Label,
+        languageCode: this.config.captionsTextTrack1LanguageCode
+      },
+      textTrack2: {
+        label: this.config.captionsTextTrack2Label,
+        languageCode: this.config.captionsTextTrack2LanguageCode
+      },
+      textTrack3: {
+        label: this.config.captionsTextTrack3Label,
+        languageCode: this.config.captionsTextTrack3LanguageCode
+      },
+      textTrack4: {
+        label: this.config.captionsTextTrack4Label,
+        languageCode: this.config.captionsTextTrack4LanguageCode
+      }
+    };
+    hls.on(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
+    hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
+    hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
+    hls.on(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
+    hls.on(Events.SUBTITLE_TRACKS_UPDATED, this.onSubtitleTracksUpdated, this);
+    hls.on(Events.FRAG_LOADING, this.onFragLoading, this);
+    hls.on(Events.FRAG_LOADED, this.onFragLoaded, this);
+    hls.on(Events.FRAG_PARSING_USERDATA, this.onFragParsingUserdata, this);
+    hls.on(Events.FRAG_DECRYPTED, this.onFragDecrypted, this);
+    hls.on(Events.INIT_PTS_FOUND, this.onInitPtsFound, this);
+    hls.on(Events.SUBTITLE_TRACKS_CLEARED, this.onSubtitleTracksCleared, this);
+    hls.on(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
   }
-  insertChar(byte) {
-    if (byte >= 0x90) {
-      // Extended char
-      this.backSpace();
-    }
-    const char = getCharForByte(byte);
-    if (this.pos >= NR_COLS) {
-      this.logger.log(0, () => 'Cannot insert ' + byte.toString(16) + ' (' + char + ') at position ' + this.pos + '. Skipping it!');
-      return;
-    }
-    this.chars[this.pos].setChar(char, this.currPenState);
-    this.moveCursor(1);
+  destroy() {
+    const {
+      hls
+    } = this;
+    hls.off(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
+    hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
+    hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
+    hls.off(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
+    hls.off(Events.SUBTITLE_TRACKS_UPDATED, this.onSubtitleTracksUpdated, this);
+    hls.off(Events.FRAG_LOADING, this.onFragLoading, this);
+    hls.off(Events.FRAG_LOADED, this.onFragLoaded, this);
+    hls.off(Events.FRAG_PARSING_USERDATA, this.onFragParsingUserdata, this);
+    hls.off(Events.FRAG_DECRYPTED, this.onFragDecrypted, this);
+    hls.off(Events.INIT_PTS_FOUND, this.onInitPtsFound, this);
+    hls.off(Events.SUBTITLE_TRACKS_CLEARED, this.onSubtitleTracksCleared, this);
+    hls.off(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
+    // @ts-ignore
+    this.hls = this.config = null;
+    this.cea608Parser1 = this.cea608Parser2 = undefined;
   }
-  clearFromPos(startPos) {
-    let i;
-    for (i = startPos; i < NR_COLS; i++) {
-      this.chars[i].reset();
+  initCea608Parsers() {
+    if (this.config.enableCEA708Captions && (!this.cea608Parser1 || !this.cea608Parser2)) {
+      const channel1 = new OutputFilter(this, 'textTrack1');
+      const channel2 = new OutputFilter(this, 'textTrack2');
+      const channel3 = new OutputFilter(this, 'textTrack3');
+      const channel4 = new OutputFilter(this, 'textTrack4');
+      this.cea608Parser1 = new Cea608Parser(1, channel1, channel2);
+      this.cea608Parser2 = new Cea608Parser(3, channel3, channel4);
     }
   }
-  clear() {
-    this.clearFromPos(0);
-    this.pos = 0;
-    this.currPenState.reset();
-  }
-  clearToEndOfRow() {
-    this.clearFromPos(this.pos);
-  }
-  getTextString() {
-    const chars = [];
-    let empty = true;
-    for (let i = 0; i < NR_COLS; i++) {
-      const char = this.chars[i].uchar;
-      if (char !== ' ') {
-        empty = false;
+  addCues(trackName, startTime, endTime, screen, cueRanges) {
+    // skip cues which overlap more than 50% with previously parsed time ranges
+    let merged = false;
+    for (let i = cueRanges.length; i--;) {
+      const cueRange = cueRanges[i];
+      const overlap = intersection(cueRange[0], cueRange[1], startTime, endTime);
+      if (overlap >= 0) {
+        cueRange[0] = Math.min(cueRange[0], startTime);
+        cueRange[1] = Math.max(cueRange[1], endTime);
+        merged = true;
+        if (overlap / (endTime - startTime) > 0.5) {
+          return;
+        }
       }
-      chars.push(char);
     }
-    if (empty) {
-      return '';
+    if (!merged) {
+      cueRanges.push([startTime, endTime]);
+    }
+    if (this.config.renderTextTracksNatively) {
+      const track = this.captionsTracks[trackName];
+      this.Cues.newCue(track, startTime, endTime, screen);
     } else {
-      return chars.join('');
+      const cues = this.Cues.newCue(null, startTime, endTime, screen);
+      this.hls.trigger(Events.CUES_PARSED, {
+        type: 'captions',
+        cues,
+        track: trackName
+      });
     }
   }
-  setPenStyles(styles) {
-    this.currPenState.setStyles(styles);
-    const currChar = this.chars[this.pos];
-    currChar.setPenState(this.currPenState);
-  }
-}
 
-/**
- * Keep a CEA-608 screen of 32x15 styled characters
- * @constructor
- */
-class CaptionScreen {
-  constructor(logger) {
-    this.rows = void 0;
-    this.currRow = void 0;
-    this.nrRollUpRows = void 0;
-    this.lastOutputScreen = void 0;
-    this.logger = void 0;
-    this.rows = [];
-    for (let i = 0; i < NR_ROWS; i++) {
-      this.rows.push(new Row(logger));
-    } // Note that we use zero-based numbering (0-14)
+  // Triggered when an initial PTS is found; used for synchronisation of WebVTT.
+  onInitPtsFound(event, {
+    frag,
+    id,
+    initPTS,
+    timescale
+  }) {
+    const {
+      unparsedVttFrags
+    } = this;
+    if (id === 'main') {
+      this.initPTS[frag.cc] = {
+        baseTime: initPTS,
+        timescale
+      };
+    }
 
-    this.logger = logger;
-    this.currRow = NR_ROWS - 1;
-    this.nrRollUpRows = null;
-    this.lastOutputScreen = null;
-    this.reset();
-  }
-  reset() {
-    for (let i = 0; i < NR_ROWS; i++) {
-      this.rows[i].clear();
+    // Due to asynchronous processing, initial PTS may arrive later than the first VTT fragments are loaded.
+    // Parse any unparsed fragments upon receiving the initial PTS.
+    if (unparsedVttFrags.length) {
+      this.unparsedVttFrags = [];
+      unparsedVttFrags.forEach(frag => {
+        this.onFragLoaded(Events.FRAG_LOADED, frag);
+      });
     }
-    this.currRow = NR_ROWS - 1;
   }
-  equals(other) {
-    let equal = true;
-    for (let i = 0; i < NR_ROWS; i++) {
-      if (!this.rows[i].equals(other.rows[i])) {
-        equal = false;
-        break;
+  getExistingTrack(label, language) {
+    const {
+      media
+    } = this;
+    if (media) {
+      for (let i = 0; i < media.textTracks.length; i++) {
+        const textTrack = media.textTracks[i];
+        if (canReuseVttTextTrack(textTrack, {
+          name: label,
+          lang: language,
+          attrs: {}
+        })) {
+          return textTrack;
+        }
       }
     }
-    return equal;
+    return null;
   }
-  copy(other) {
-    for (let i = 0; i < NR_ROWS; i++) {
-      this.rows[i].copy(other.rows[i]);
+  createCaptionsTrack(trackName) {
+    if (this.config.renderTextTracksNatively) {
+      this.createNativeTrack(trackName);
+    } else {
+      this.createNonNativeTrack(trackName);
     }
   }
-  isEmpty() {
-    let empty = true;
-    for (let i = 0; i < NR_ROWS; i++) {
-      if (!this.rows[i].isEmpty()) {
-        empty = false;
-        break;
+  createNativeTrack(trackName) {
+    if (this.captionsTracks[trackName]) {
+      return;
+    }
+    const {
+      captionsProperties,
+      captionsTracks,
+      media
+    } = this;
+    const {
+      label,
+      languageCode
+    } = captionsProperties[trackName];
+    // Enable reuse of existing text track.
+    const existingTrack = this.getExistingTrack(label, languageCode);
+    if (!existingTrack) {
+      const textTrack = this.createTextTrack('captions', label, languageCode);
+      if (textTrack) {
+        // Set a special property on the track so we know it's managed by Hls.js
+        textTrack[trackName] = true;
+        captionsTracks[trackName] = textTrack;
       }
+    } else {
+      captionsTracks[trackName] = existingTrack;
+      clearCurrentCues(captionsTracks[trackName]);
+      sendAddTrackEvent(captionsTracks[trackName], media);
     }
-    return empty;
-  }
-  backSpace() {
-    const row = this.rows[this.currRow];
-    row.backSpace();
   }
-  clearToEndOfRow() {
-    const row = this.rows[this.currRow];
-    row.clearToEndOfRow();
+  createNonNativeTrack(trackName) {
+    if (this.nonNativeCaptionsTracks[trackName]) {
+      return;
+    }
+    // Create a list of a single track for the provider to consume
+    const trackProperties = this.captionsProperties[trackName];
+    if (!trackProperties) {
+      return;
+    }
+    const label = trackProperties.label;
+    const track = {
+      _id: trackName,
+      label,
+      kind: 'captions',
+      default: trackProperties.media ? !!trackProperties.media.default : false,
+      closedCaptions: trackProperties.media
+    };
+    this.nonNativeCaptionsTracks[trackName] = track;
+    this.hls.trigger(Events.NON_NATIVE_TEXT_TRACKS_FOUND, {
+      tracks: [track]
+    });
   }
-
-  /**
-   * Insert a character (without styling) in the current row.
-   */
-  insertChar(char) {
-    const row = this.rows[this.currRow];
-    row.insertChar(char);
+  createTextTrack(kind, label, lang) {
+    const media = this.media;
+    if (!media) {
+      return;
+    }
+    return media.addTextTrack(kind, label, lang);
   }
-  setPen(styles) {
-    const row = this.rows[this.currRow];
-    row.setPenStyles(styles);
+  onMediaAttaching(event, data) {
+    this.media = data.media;
+    this._cleanTracks();
   }
-  moveCursor(relPos) {
-    const row = this.rows[this.currRow];
-    row.moveCursor(relPos);
+  onMediaDetaching() {
+    const {
+      captionsTracks
+    } = this;
+    Object.keys(captionsTracks).forEach(trackName => {
+      clearCurrentCues(captionsTracks[trackName]);
+      delete captionsTracks[trackName];
+    });
+    this.nonNativeCaptionsTracks = {};
   }
-  setCursor(absPos) {
-    this.logger.log(2, 'setCursor: ' + absPos);
-    const row = this.rows[this.currRow];
-    row.setCursor(absPos);
+  onManifestLoading() {
+    // Detect discontinuity in video fragment (CEA-608) parsing
+    this.lastCc = -1;
+    this.lastSn = -1;
+    this.lastPartIndex = -1;
+    // Detect discontinuity in subtitle manifests
+    this.prevCC = -1;
+    this.vttCCs = newVTTCCs();
+    // Reset tracks
+    this._cleanTracks();
+    this.tracks = [];
+    this.captionsTracks = {};
+    this.nonNativeCaptionsTracks = {};
+    this.textTracks = [];
+    this.unparsedVttFrags = [];
+    this.initPTS = [];
+    if (this.cea608Parser1 && this.cea608Parser2) {
+      this.cea608Parser1.reset();
+      this.cea608Parser2.reset();
+    }
   }
-  setPAC(pacData) {
-    this.logger.log(2, () => 'pacData = ' + JSON.stringify(pacData));
-    let newRow = pacData.row - 1;
-    if (this.nrRollUpRows && newRow < this.nrRollUpRows - 1) {
-      newRow = this.nrRollUpRows - 1;
+  _cleanTracks() {
+    // clear outdated subtitles
+    const {
+      media
+    } = this;
+    if (!media) {
+      return;
     }
-
-    // Make sure this only affects Roll-up Captions by checking this.nrRollUpRows
-    if (this.nrRollUpRows && this.currRow !== newRow) {
-      // clear all rows first
-      for (let i = 0; i < NR_ROWS; i++) {
-        this.rows[i].clear();
+    const textTracks = media.textTracks;
+    if (textTracks) {
+      for (let i = 0; i < textTracks.length; i++) {
+        clearCurrentCues(textTracks[i]);
       }
-
-      // Copy this.nrRollUpRows rows from lastOutputScreen and place it in the newRow location
-      // topRowIndex - the start of rows to copy (inclusive index)
-      const topRowIndex = this.currRow + 1 - this.nrRollUpRows;
-      // We only copy if the last position was already shown.
-      // We use the cueStartTime value to check this.
-      const lastOutputScreen = this.lastOutputScreen;
-      if (lastOutputScreen) {
-        const prevLineTime = lastOutputScreen.rows[topRowIndex].cueStartTime;
-        const time = this.logger.time;
-        if (prevLineTime && time !== null && prevLineTime < time) {
-          for (let i = 0; i < this.nrRollUpRows; i++) {
-            this.rows[newRow - this.nrRollUpRows + i + 1].copy(lastOutputScreen.rows[topRowIndex + i]);
+    }
+  }
+  onSubtitleTracksUpdated(event, data) {
+    const tracks = data.subtitleTracks || [];
+    const hasIMSC1 = tracks.some(track => track.textCodec === IMSC1_CODEC);
+    if (this.config.enableWebVTT || hasIMSC1 && this.config.enableIMSC1) {
+      const listIsIdentical = subtitleOptionsIdentical(this.tracks, tracks);
+      if (listIsIdentical) {
+        this.tracks = tracks;
+        return;
+      }
+      this.textTracks = [];
+      this.tracks = tracks;
+      if (this.config.renderTextTracksNatively) {
+        const media = this.media;
+        const inUseTracks = media ? filterSubtitleTracks(media.textTracks) : null;
+        this.tracks.forEach((track, index) => {
+          // Reuse tracks with the same label and lang, but do not reuse 608/708 tracks
+          let textTrack;
+          if (inUseTracks) {
+            let inUseTrack = null;
+            for (let i = 0; i < inUseTracks.length; i++) {
+              if (inUseTracks[i] && canReuseVttTextTrack(inUseTracks[i], track)) {
+                inUseTrack = inUseTracks[i];
+                inUseTracks[i] = null;
+                break;
+              }
+            }
+            if (inUseTrack) {
+              textTrack = inUseTrack;
+            }
+          }
+          if (textTrack) {
+            clearCurrentCues(textTrack);
+          } else {
+            const textTrackKind = captionsOrSubtitlesFromCharacteristics(track);
+            textTrack = this.createTextTrack(textTrackKind, track.name, track.lang);
+            if (textTrack) {
+              textTrack.mode = 'disabled';
+            }
+          }
+          if (textTrack) {
+            this.textTracks.push(textTrack);
+          }
+        });
+        // Warn when video element has captions or subtitle TextTracks carried over from another source
+        if (inUseTracks != null && inUseTracks.length) {
+          const unusedTextTracks = inUseTracks.filter(t => t !== null).map(t => t.label);
+          if (unusedTextTracks.length) {
+            logger.warn(`Media element contains unused subtitle tracks: ${unusedTextTracks.join(', ')}. Replace media element for each source to clear TextTracks and captions menu.`);
           }
         }
+      } else if (this.tracks.length) {
+        // Create a list of tracks for the provider to consume
+        const tracksList = this.tracks.map(track => {
+          return {
+            label: track.name,
+            kind: track.type.toLowerCase(),
+            default: track.default,
+            subtitleTrack: track
+          };
+        });
+        this.hls.trigger(Events.NON_NATIVE_TEXT_TRACKS_FOUND, {
+          tracks: tracksList
+        });
       }
     }
-    this.currRow = newRow;
-    const row = this.rows[this.currRow];
-    if (pacData.indent !== null) {
-      const indent = pacData.indent;
-      const prevPos = Math.max(indent - 1, 0);
-      row.setCursor(pacData.indent);
-      pacData.color = row.chars[prevPos].penState.foreground;
-    }
-    const styles = {
-      foreground: pacData.color,
-      underline: pacData.underline,
-      italics: pacData.italics,
-      background: 'black',
-      flash: false
-    };
-    this.setPen(styles);
-  }
-
-  /**
-   * Set background/extra foreground, but first do back_space, and then insert space (backwards compatibility).
-   */
-  setBkgData(bkgData) {
-    this.logger.log(2, () => 'bkgData = ' + JSON.stringify(bkgData));
-    this.backSpace();
-    this.setPen(bkgData);
-    this.insertChar(0x20); // Space
-  }
-
-  setRollUpRows(nrRows) {
-    this.nrRollUpRows = nrRows;
   }
-  rollUp() {
-    if (this.nrRollUpRows === null) {
-      this.logger.log(3, 'roll_up but nrRollUpRows not set yet');
-      return; // Not properly setup
+  onManifestLoaded(event, data) {
+    if (this.config.enableCEA708Captions && data.captions) {
+      data.captions.forEach(captionsTrack => {
+        const instreamIdMatch = /(?:CC|SERVICE)([1-4])/.exec(captionsTrack.instreamId);
+        if (!instreamIdMatch) {
+          return;
+        }
+        const trackName = `textTrack${instreamIdMatch[1]}`;
+        const trackProperties = this.captionsProperties[trackName];
+        if (!trackProperties) {
+          return;
+        }
+        trackProperties.label = captionsTrack.name;
+        if (captionsTrack.lang) {
+          // optional attribute
+          trackProperties.languageCode = captionsTrack.lang;
+        }
+        trackProperties.media = captionsTrack;
+      });
     }
-
-    this.logger.log(1, () => this.getDisplayText());
-    const topRowIndex = this.currRow + 1 - this.nrRollUpRows;
-    const topRow = this.rows.splice(topRowIndex, 1)[0];
-    topRow.clear();
-    this.rows.splice(this.currRow, 0, topRow);
-    this.logger.log(2, 'Rolling up');
-    // this.logger.log(VerboseLevel.TEXT, this.get_display_text())
   }
-
-  /**
-   * Get all non-empty rows with as unicode text.
-   */
-  getDisplayText(asOneRow) {
-    asOneRow = asOneRow || false;
-    const displayText = [];
-    let text = '';
-    let rowNr = -1;
-    for (let i = 0; i < NR_ROWS; i++) {
-      const rowText = this.rows[i].getTextString();
-      if (rowText) {
-        rowNr = i + 1;
-        if (asOneRow) {
-          displayText.push('Row ' + rowNr + ": '" + rowText + "'");
-        } else {
-          displayText.push(rowText.trim());
-        }
+  closedCaptionsForLevel(frag) {
+    const level = this.hls.levels[frag.level];
+    return level == null ? void 0 : level.attrs['CLOSED-CAPTIONS'];
+  }
+  onFragLoading(event, data) {
+    this.initCea608Parsers();
+    const {
+      cea608Parser1,
+      cea608Parser2,
+      lastCc,
+      lastSn,
+      lastPartIndex
+    } = this;
+    if (!this.enabled || !cea608Parser1 || !cea608Parser2) {
+      return;
+    }
+    // if this frag isn't contiguous, clear the parser so cues with bad start/end times aren't added to the textTrack
+    if (data.frag.type === PlaylistLevelType.MAIN) {
+      var _data$part$index, _data$part;
+      const {
+        cc,
+        sn
+      } = data.frag;
+      const partIndex = (_data$part$index = data == null ? void 0 : (_data$part = data.part) == null ? void 0 : _data$part.index) != null ? _data$part$index : -1;
+      if (!(sn === lastSn + 1 || sn === lastSn && partIndex === lastPartIndex + 1 || cc === lastCc)) {
+        cea608Parser1.reset();
+        cea608Parser2.reset();
       }
+      this.lastCc = cc;
+      this.lastSn = sn;
+      this.lastPartIndex = partIndex;
     }
-    if (displayText.length > 0) {
-      if (asOneRow) {
-        text = '[' + displayText.join(' | ') + ']';
+  }
+  onFragLoaded(event, data) {
+    const {
+      frag,
+      payload
+    } = data;
+    if (frag.type === PlaylistLevelType.SUBTITLE) {
+      // If fragment is subtitle type, parse as WebVTT.
+      if (payload.byteLength) {
+        const decryptData = frag.decryptdata;
+        // fragment after decryption has a stats object
+        const decrypted = ('stats' in data);
+        // If the subtitles are not encrypted, parse VTTs now. Otherwise, we need to wait.
+        if (decryptData == null || !decryptData.encrypted || decrypted) {
+          const trackPlaylistMedia = this.tracks[frag.level];
+          const vttCCs = this.vttCCs;
+          if (!vttCCs[frag.cc]) {
+            vttCCs[frag.cc] = {
+              start: frag.start,
+              prevCC: this.prevCC,
+              new: true
+            };
+            this.prevCC = frag.cc;
+          }
+          if (trackPlaylistMedia && trackPlaylistMedia.textCodec === IMSC1_CODEC) {
+            this._parseIMSC1(frag, payload);
+          } else {
+            this._parseVTTs(data);
+          }
+        }
       } else {
-        text = displayText.join('\n');
+        // In case there is no payload, finish unsuccessfully.
+        this.hls.trigger(Events.SUBTITLE_FRAG_PROCESSED, {
+          success: false,
+          frag,
+          error: new Error('Empty subtitle payload')
+        });
       }
     }
-    return text;
   }
-  getTextAndFormat() {
-    return this.rows;
+  _parseIMSC1(frag, payload) {
+    const hls = this.hls;
+    parseIMSC1(payload, this.initPTS[frag.cc], cues => {
+      this._appendCues(cues, frag.level);
+      hls.trigger(Events.SUBTITLE_FRAG_PROCESSED, {
+        success: true,
+        frag: frag
+      });
+    }, error => {
+      logger.log(`Failed to parse IMSC1: ${error}`);
+      hls.trigger(Events.SUBTITLE_FRAG_PROCESSED, {
+        success: false,
+        frag: frag,
+        error
+      });
+    });
   }
-}
-
-// var modes = ['MODE_ROLL-UP', 'MODE_POP-ON', 'MODE_PAINT-ON', 'MODE_TEXT'];
-
-class Cea608Channel {
-  constructor(channelNumber, outputFilter, logger) {
-    this.chNr = void 0;
-    this.outputFilter = void 0;
-    this.mode = void 0;
-    this.verbose = void 0;
-    this.displayedMemory = void 0;
-    this.nonDisplayedMemory = void 0;
-    this.lastOutputScreen = void 0;
-    this.currRollUpRow = void 0;
-    this.writeScreen = void 0;
-    this.cueStartTime = void 0;
-    this.logger = void 0;
-    this.chNr = channelNumber;
-    this.outputFilter = outputFilter;
-    this.mode = null;
-    this.verbose = 0;
-    this.displayedMemory = new CaptionScreen(logger);
-    this.nonDisplayedMemory = new CaptionScreen(logger);
-    this.lastOutputScreen = new CaptionScreen(logger);
-    this.currRollUpRow = this.displayedMemory.rows[NR_ROWS - 1];
-    this.writeScreen = this.displayedMemory;
-    this.mode = null;
-    this.cueStartTime = null; // Keeps track of where a cue started.
-    this.logger = logger;
+  _parseVTTs(data) {
+    var _frag$initSegment;
+    const {
+      frag,
+      payload
+    } = data;
+    // We need an initial synchronisation PTS. Store fragments as long as none has arrived
+    const {
+      initPTS,
+      unparsedVttFrags
+    } = this;
+    const maxAvCC = initPTS.length - 1;
+    if (!initPTS[frag.cc] && maxAvCC === -1) {
+      unparsedVttFrags.push(data);
+      return;
+    }
+    const hls = this.hls;
+    // Parse the WebVTT file contents.
+    const payloadWebVTT = (_frag$initSegment = frag.initSegment) != null && _frag$initSegment.data ? appendUint8Array(frag.initSegment.data, new Uint8Array(payload)) : payload;
+    parseWebVTT(payloadWebVTT, this.initPTS[frag.cc], this.vttCCs, frag.cc, frag.start, cues => {
+      this._appendCues(cues, frag.level);
+      hls.trigger(Events.SUBTITLE_FRAG_PROCESSED, {
+        success: true,
+        frag: frag
+      });
+    }, error => {
+      const missingInitPTS = error.message === 'Missing initPTS for VTT MPEGTS';
+      if (missingInitPTS) {
+        unparsedVttFrags.push(data);
+      } else {
+        this._fallbackToIMSC1(frag, payload);
+      }
+      // Something went wrong while parsing. Trigger event with success false.
+      logger.log(`Failed to parse VTT cue: ${error}`);
+      if (missingInitPTS && maxAvCC > frag.cc) {
+        return;
+      }
+      hls.trigger(Events.SUBTITLE_FRAG_PROCESSED, {
+        success: false,
+        frag: frag,
+        error
+      });
+    });
   }
-  reset() {
-    this.mode = null;
-    this.displayedMemory.reset();
-    this.nonDisplayedMemory.reset();
-    this.lastOutputScreen.reset();
-    this.outputFilter.reset();
-    this.currRollUpRow = this.displayedMemory.rows[NR_ROWS - 1];
-    this.writeScreen = this.displayedMemory;
-    this.mode = null;
-    this.cueStartTime = null;
+  _fallbackToIMSC1(frag, payload) {
+    // If textCodec is unknown, try parsing as IMSC1. Set textCodec based on the result
+    const trackPlaylistMedia = this.tracks[frag.level];
+    if (!trackPlaylistMedia.textCodec) {
+      parseIMSC1(payload, this.initPTS[frag.cc], () => {
+        trackPlaylistMedia.textCodec = IMSC1_CODEC;
+        this._parseIMSC1(frag, payload);
+      }, () => {
+        trackPlaylistMedia.textCodec = 'wvtt';
+      });
+    }
   }
-  getHandler() {
-    return this.outputFilter;
+  _appendCues(cues, fragLevel) {
+    const hls = this.hls;
+    if (this.config.renderTextTracksNatively) {
+      const textTrack = this.textTracks[fragLevel];
+      // WebVTTParser.parse is an async method and if the currently selected text track mode is set to "disabled"
+      // before parsing is done then don't try to access currentTrack.cues.getCueById as cues will be null
+      // and trying to access getCueById method of cues will throw an exception
+      // Because we check if the mode is disabled, we can force check `cues` below. They can't be null.
+      if (!textTrack || textTrack.mode === 'disabled') {
+        return;
+      }
+      cues.forEach(cue => addCueToTrack(textTrack, cue));
+    } else {
+      const currentTrack = this.tracks[fragLevel];
+      if (!currentTrack) {
+        return;
+      }
+      const track = currentTrack.default ? 'default' : 'subtitles' + fragLevel;
+      hls.trigger(Events.CUES_PARSED, {
+        type: 'subtitles',
+        cues,
+        track
+      });
+    }
   }
-  setHandler(newHandler) {
-    this.outputFilter = newHandler;
+  onFragDecrypted(event, data) {
+    const {
+      frag
+    } = data;
+    if (frag.type === PlaylistLevelType.SUBTITLE) {
+      this.onFragLoaded(Events.FRAG_LOADED, data);
+    }
   }
-  setPAC(pacData) {
-    this.writeScreen.setPAC(pacData);
+  onSubtitleTracksCleared() {
+    this.tracks = [];
+    this.captionsTracks = {};
   }
-  setBkgData(bkgData) {
-    this.writeScreen.setBkgData(bkgData);
+  onFragParsingUserdata(event, data) {
+    this.initCea608Parsers();
+    const {
+      cea608Parser1,
+      cea608Parser2
+    } = this;
+    if (!this.enabled || !cea608Parser1 || !cea608Parser2) {
+      return;
+    }
+    const {
+      frag,
+      samples
+    } = data;
+    if (frag.type === PlaylistLevelType.MAIN && this.closedCaptionsForLevel(frag) === 'NONE') {
+      return;
+    }
+    // If the event contains captions (found in the bytes property), push all bytes into the parser immediately
+    // It will create the proper timestamps based on the PTS value
+    for (let i = 0; i < samples.length; i++) {
+      const ccBytes = samples[i].bytes;
+      if (ccBytes) {
+        const ccdatas = this.extractCea608Data(ccBytes);
+        cea608Parser1.addData(samples[i].pts, ccdatas[0]);
+        cea608Parser2.addData(samples[i].pts, ccdatas[1]);
+      }
+    }
   }
-  setMode(newMode) {
-    if (newMode === this.mode) {
+  onBufferFlushing(event, {
+    startOffset,
+    endOffset,
+    endOffsetSubtitles,
+    type
+  }) {
+    const {
+      media
+    } = this;
+    if (!media || media.currentTime < endOffset) {
       return;
     }
-    this.mode = newMode;
-    this.logger.log(2, () => 'MODE=' + newMode);
-    if (this.mode === 'MODE_POP-ON') {
-      this.writeScreen = this.nonDisplayedMemory;
-    } else {
-      this.writeScreen = this.displayedMemory;
-      this.writeScreen.reset();
+    // Clear 608 caption cues from the captions TextTracks when the video back buffer is flushed
+    // Forward cues are never removed because we can loose streamed 608 content from recent fragments
+    if (!type || type === 'video') {
+      const {
+        captionsTracks
+      } = this;
+      Object.keys(captionsTracks).forEach(trackName => removeCuesInRange(captionsTracks[trackName], startOffset, endOffset));
     }
-    if (this.mode !== 'MODE_ROLL-UP') {
-      this.displayedMemory.nrRollUpRows = null;
-      this.nonDisplayedMemory.nrRollUpRows = null;
+    if (this.config.renderTextTracksNatively) {
+      // Clear VTT/IMSC1 subtitle cues from the subtitle TextTracks when the back buffer is flushed
+      if (startOffset === 0 && endOffsetSubtitles !== undefined) {
+        const {
+          textTracks
+        } = this;
+        Object.keys(textTracks).forEach(trackName => removeCuesInRange(textTracks[trackName], startOffset, endOffsetSubtitles));
+      }
     }
-    this.mode = newMode;
   }
-  insertChars(chars) {
-    for (let i = 0; i < chars.length; i++) {
-      this.writeScreen.insertChar(chars[i]);
+  extractCea608Data(byteArray) {
+    const actualCCBytes = [[], []];
+    const count = byteArray[0] & 0x1f;
+    let position = 2;
+    for (let j = 0; j < count; j++) {
+      const tmpByte = byteArray[position++];
+      const ccbyte1 = 0x7f & byteArray[position++];
+      const ccbyte2 = 0x7f & byteArray[position++];
+      if (ccbyte1 === 0 && ccbyte2 === 0) {
+        continue;
+      }
+      const ccValid = (0x04 & tmpByte) !== 0; // Support all four channels
+      if (ccValid) {
+        const ccType = 0x03 & tmpByte;
+        if (0x00 /* CEA608 field1*/ === ccType || 0x01 /* CEA608 field2*/ === ccType) {
+          // Exclude CEA708 CC data.
+          actualCCBytes[ccType].push(ccbyte1);
+          actualCCBytes[ccType].push(ccbyte2);
+        }
+      }
     }
-    const screen = this.writeScreen === this.displayedMemory ? 'DISP' : 'NON_DISP';
-    this.logger.log(2, () => screen + ': ' + this.writeScreen.getDisplayText(true));
-    if (this.mode === 'MODE_PAINT-ON' || this.mode === 'MODE_ROLL-UP') {
-      this.logger.log(1, () => 'DISPLAYED: ' + this.displayedMemory.getDisplayText(true));
-      this.outputDataUpdate();
+    return actualCCBytes;
+  }
+}
+function captionsOrSubtitlesFromCharacteristics(track) {
+  if (track.characteristics) {
+    if (/transcribes-spoken-dialog/gi.test(track.characteristics) && /describes-music-and-sound/gi.test(track.characteristics)) {
+      return 'captions';
     }
   }
-  ccRCL() {
-    // Resume Caption Loading (switch mode to Pop On)
-    this.logger.log(2, 'RCL - Resume Caption Loading');
-    this.setMode('MODE_POP-ON');
+  return 'subtitles';
+}
+function canReuseVttTextTrack(inUseTrack, manifestTrack) {
+  return !!inUseTrack && inUseTrack.kind === captionsOrSubtitlesFromCharacteristics(manifestTrack) && subtitleTrackMatchesTextTrack(manifestTrack, inUseTrack);
+}
+function intersection(x1, x2, y1, y2) {
+  return Math.min(x2, y2) - Math.max(x1, y1);
+}
+function newVTTCCs() {
+  return {
+    ccOffset: 0,
+    presentationOffset: 0,
+    0: {
+      start: 0,
+      prevCC: -1,
+      new: true
+    }
+  };
+}
+
+class CapLevelController {
+  constructor(hls) {
+    this.hls = void 0;
+    this.autoLevelCapping = void 0;
+    this.firstLevel = void 0;
+    this.media = void 0;
+    this.restrictedLevels = void 0;
+    this.timer = void 0;
+    this.clientRect = void 0;
+    this.streamController = void 0;
+    this.hls = hls;
+    this.autoLevelCapping = Number.POSITIVE_INFINITY;
+    this.firstLevel = -1;
+    this.media = null;
+    this.restrictedLevels = [];
+    this.timer = undefined;
+    this.clientRect = null;
+    this.registerListeners();
   }
-  ccBS() {
-    // BackSpace
-    this.logger.log(2, 'BS - BackSpace');
-    if (this.mode === 'MODE_TEXT') {
-      return;
+  setStreamController(streamController) {
+    this.streamController = streamController;
+  }
+  destroy() {
+    if (this.hls) {
+      this.unregisterListener();
     }
-    this.writeScreen.backSpace();
-    if (this.writeScreen === this.displayedMemory) {
-      this.outputDataUpdate();
+    if (this.timer) {
+      this.stopCapping();
     }
+    this.media = null;
+    this.clientRect = null;
+    // @ts-ignore
+    this.hls = this.streamController = null;
   }
-  ccAOF() {
-    // Reserved (formerly Alarm Off)
+  registerListeners() {
+    const {
+      hls
+    } = this;
+    hls.on(Events.FPS_DROP_LEVEL_CAPPING, this.onFpsDropLevelCapping, this);
+    hls.on(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
+    hls.on(Events.MANIFEST_PARSED, this.onManifestParsed, this);
+    hls.on(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
+    hls.on(Events.BUFFER_CODECS, this.onBufferCodecs, this);
+    hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
   }
-  ccAON() {
-    // Reserved (formerly Alarm On)
+  unregisterListener() {
+    const {
+      hls
+    } = this;
+    hls.off(Events.FPS_DROP_LEVEL_CAPPING, this.onFpsDropLevelCapping, this);
+    hls.off(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
+    hls.off(Events.MANIFEST_PARSED, this.onManifestParsed, this);
+    hls.off(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
+    hls.off(Events.BUFFER_CODECS, this.onBufferCodecs, this);
+    hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
   }
-  ccDER() {
-    // Delete to End of Row
-    this.logger.log(2, 'DER- Delete to End of Row');
-    this.writeScreen.clearToEndOfRow();
-    this.outputDataUpdate();
+  onFpsDropLevelCapping(event, data) {
+    // Don't add a restricted level more than once
+    const level = this.hls.levels[data.droppedLevel];
+    if (this.isLevelAllowed(level)) {
+      this.restrictedLevels.push({
+        bitrate: level.bitrate,
+        height: level.height,
+        width: level.width
+      });
+    }
   }
-  ccRU(nrRows) {
-    // Roll-Up Captions-2,3,or 4 Rows
-    this.logger.log(2, 'RU(' + nrRows + ') - Roll Up');
-    this.writeScreen = this.displayedMemory;
-    this.setMode('MODE_ROLL-UP');
-    this.writeScreen.setRollUpRows(nrRows);
+  onMediaAttaching(event, data) {
+    this.media = data.media instanceof HTMLVideoElement ? data.media : null;
+    this.clientRect = null;
+    if (this.timer && this.hls.levels.length) {
+      this.detectPlayerSize();
+    }
   }
-  ccFON() {
-    // Flash On
-    this.logger.log(2, 'FON - Flash On');
-    this.writeScreen.setPen({
-      flash: true
-    });
+  onManifestParsed(event, data) {
+    const hls = this.hls;
+    this.restrictedLevels = [];
+    this.firstLevel = data.firstLevel;
+    if (hls.config.capLevelToPlayerSize && data.video) {
+      // Start capping immediately if the manifest has signaled video codecs
+      this.startCapping();
+    }
   }
-  ccRDC() {
-    // Resume Direct Captioning (switch mode to PaintOn)
-    this.logger.log(2, 'RDC - Resume Direct Captioning');
-    this.setMode('MODE_PAINT-ON');
+  onLevelsUpdated(event, data) {
+    if (this.timer && isFiniteNumber(this.autoLevelCapping)) {
+      this.detectPlayerSize();
+    }
   }
-  ccTR() {
-    // Text Restart in text mode (not supported, however)
-    this.logger.log(2, 'TR');
-    this.setMode('MODE_TEXT');
+
+  // Only activate capping when playing a video stream; otherwise, multi-bitrate audio-only streams will be restricted
+  // to the first level
+  onBufferCodecs(event, data) {
+    const hls = this.hls;
+    if (hls.config.capLevelToPlayerSize && data.video) {
+      // If the manifest did not signal a video codec capping has been deferred until we're certain video is present
+      this.startCapping();
+    }
   }
-  ccRTD() {
-    // Resume Text Display in Text mode (not supported, however)
-    this.logger.log(2, 'RTD');
-    this.setMode('MODE_TEXT');
+  onMediaDetaching() {
+    this.stopCapping();
   }
-  ccEDM() {
-    // Erase Displayed Memory
-    this.logger.log(2, 'EDM - Erase Displayed Memory');
-    this.displayedMemory.reset();
-    this.outputDataUpdate(true);
+  detectPlayerSize() {
+    if (this.media) {
+      if (this.mediaHeight <= 0 || this.mediaWidth <= 0) {
+        this.clientRect = null;
+        return;
+      }
+      const levels = this.hls.levels;
+      if (levels.length) {
+        const hls = this.hls;
+        const maxLevel = this.getMaxLevel(levels.length - 1);
+        if (maxLevel !== this.autoLevelCapping) {
+          logger.log(`Setting autoLevelCapping to ${maxLevel}: ${levels[maxLevel].height}p@${levels[maxLevel].bitrate} for media ${this.mediaWidth}x${this.mediaHeight}`);
+        }
+        hls.autoLevelCapping = maxLevel;
+        if (hls.autoLevelCapping > this.autoLevelCapping && this.streamController) {
+          // if auto level capping has a higher value for the previous one, flush the buffer using nextLevelSwitch
+          // usually happen when the user go to the fullscreen mode.
+          this.streamController.nextLevelSwitch();
+        }
+        this.autoLevelCapping = hls.autoLevelCapping;
+      }
+    }
   }
-  ccCR() {
-    // Carriage Return
-    this.logger.log(2, 'CR - Carriage Return');
-    this.writeScreen.rollUp();
-    this.outputDataUpdate(true);
+
+  /*
+   * returns level should be the one with the dimensions equal or greater than the media (player) dimensions (so the video will be downscaled)
+   */
+  getMaxLevel(capLevelIndex) {
+    const levels = this.hls.levels;
+    if (!levels.length) {
+      return -1;
+    }
+    const validLevels = levels.filter((level, index) => this.isLevelAllowed(level) && index <= capLevelIndex);
+    this.clientRect = null;
+    return CapLevelController.getMaxLevelByMediaSize(validLevels, this.mediaWidth, this.mediaHeight);
   }
-  ccENM() {
-    // Erase Non-Displayed Memory
-    this.logger.log(2, 'ENM - Erase Non-displayed Memory');
-    this.nonDisplayedMemory.reset();
+  startCapping() {
+    if (this.timer) {
+      // Don't reset capping if started twice; this can happen if the manifest signals a video codec
+      return;
+    }
+    this.autoLevelCapping = Number.POSITIVE_INFINITY;
+    self.clearInterval(this.timer);
+    this.timer = self.setInterval(this.detectPlayerSize.bind(this), 1000);
+    this.detectPlayerSize();
   }
-  ccEOC() {
-    // End of Caption (Flip Memories)
-    this.logger.log(2, 'EOC - End Of Caption');
-    if (this.mode === 'MODE_POP-ON') {
-      const tmp = this.displayedMemory;
-      this.displayedMemory = this.nonDisplayedMemory;
-      this.nonDisplayedMemory = tmp;
-      this.writeScreen = this.nonDisplayedMemory;
-      this.logger.log(1, () => 'DISP: ' + this.displayedMemory.getDisplayText());
+  stopCapping() {
+    this.restrictedLevels = [];
+    this.firstLevel = -1;
+    this.autoLevelCapping = Number.POSITIVE_INFINITY;
+    if (this.timer) {
+      self.clearInterval(this.timer);
+      this.timer = undefined;
     }
-    this.outputDataUpdate(true);
-  }
-  ccTO(nrCols) {
-    // Tab Offset 1,2, or 3 columns
-    this.logger.log(2, 'TO(' + nrCols + ') - Tab Offset');
-    this.writeScreen.moveCursor(nrCols);
   }
-  ccMIDROW(secondByte) {
-    // Parse MIDROW command
-    const styles = {
-      flash: false
+  getDimensions() {
+    if (this.clientRect) {
+      return this.clientRect;
+    }
+    const media = this.media;
+    const boundsRect = {
+      width: 0,
+      height: 0
     };
-    styles.underline = secondByte % 2 === 1;
-    styles.italics = secondByte >= 0x2e;
-    if (!styles.italics) {
-      const colorIndex = Math.floor(secondByte / 2) - 0x10;
-      const colors = ['white', 'green', 'blue', 'cyan', 'red', 'yellow', 'magenta'];
-      styles.foreground = colors[colorIndex];
-    } else {
-      styles.foreground = 'white';
+    if (media) {
+      const clientRect = media.getBoundingClientRect();
+      boundsRect.width = clientRect.width;
+      boundsRect.height = clientRect.height;
+      if (!boundsRect.width && !boundsRect.height) {
+        // When the media element has no width or height (equivalent to not being in the DOM),
+        // then use its width and height attributes (media.width, media.height)
+        boundsRect.width = clientRect.right - clientRect.left || media.width || 0;
+        boundsRect.height = clientRect.bottom - clientRect.top || media.height || 0;
+      }
     }
-    this.logger.log(2, 'MIDROW: ' + JSON.stringify(styles));
-    this.writeScreen.setPen(styles);
+    this.clientRect = boundsRect;
+    return boundsRect;
   }
-  outputDataUpdate(dispatch = false) {
-    const time = this.logger.time;
-    if (time === null) {
-      return;
-    }
-    if (this.outputFilter) {
-      if (this.cueStartTime === null && !this.displayedMemory.isEmpty()) {
-        // Start of a new cue
-        this.cueStartTime = time;
-      } else {
-        if (!this.displayedMemory.equals(this.lastOutputScreen)) {
-          this.outputFilter.newCue(this.cueStartTime, time, this.lastOutputScreen);
-          if (dispatch && this.outputFilter.dispatchCue) {
-            this.outputFilter.dispatchCue();
-          }
-          this.cueStartTime = this.displayedMemory.isEmpty() ? null : time;
-        }
+  get mediaWidth() {
+    return this.getDimensions().width * this.contentScaleFactor;
+  }
+  get mediaHeight() {
+    return this.getDimensions().height * this.contentScaleFactor;
+  }
+  get contentScaleFactor() {
+    let pixelRatio = 1;
+    if (!this.hls.config.ignoreDevicePixelRatio) {
+      try {
+        pixelRatio = self.devicePixelRatio;
+      } catch (e) {
+        /* no-op */
       }
-      this.lastOutputScreen.copy(this.displayedMemory);
     }
+    return pixelRatio;
   }
-  cueSplitAtTime(t) {
-    if (this.outputFilter) {
-      if (!this.displayedMemory.isEmpty()) {
-        if (this.outputFilter.newCue) {
-          this.outputFilter.newCue(this.cueStartTime, t, this.displayedMemory);
-        }
-        this.cueStartTime = t;
+  isLevelAllowed(level) {
+    const restrictedLevels = this.restrictedLevels;
+    return !restrictedLevels.some(restrictedLevel => {
+      return level.bitrate === restrictedLevel.bitrate && level.width === restrictedLevel.width && level.height === restrictedLevel.height;
+    });
+  }
+  static getMaxLevelByMediaSize(levels, width, height) {
+    if (!(levels != null && levels.length)) {
+      return -1;
+    }
+
+    // Levels can have the same dimensions but differing bandwidths - since levels are ordered, we can look to the next
+    // to determine whether we've chosen the greatest bandwidth for the media's dimensions
+    const atGreatestBandwidth = (curLevel, nextLevel) => {
+      if (!nextLevel) {
+        return true;
+      }
+      return curLevel.width !== nextLevel.width || curLevel.height !== nextLevel.height;
+    };
+
+    // If we run through the loop without breaking, the media's dimensions are greater than every level, so default to
+    // the max level
+    let maxLevelIndex = levels.length - 1;
+    // Prevent changes in aspect-ratio from causing capping to toggle back and forth
+    const squareSize = Math.max(width, height);
+    for (let i = 0; i < levels.length; i += 1) {
+      const level = levels[i];
+      if ((level.width >= squareSize || level.height >= squareSize) && atGreatestBandwidth(level, levels[i + 1])) {
+        maxLevelIndex = i;
+        break;
       }
     }
+    return maxLevelIndex;
   }
 }
 
-// Will be 1 or 2 when parsing captions
-
-class Cea608Parser {
-  constructor(field, out1, out2) {
-    this.channels = void 0;
-    this.currentChannel = 0;
-    this.cmdHistory = void 0;
-    this.logger = void 0;
-    const logger = new CaptionsLogger();
-    this.channels = [null, new Cea608Channel(field, out1, logger), new Cea608Channel(field + 1, out2, logger)];
-    this.cmdHistory = createCmdHistory();
-    this.logger = logger;
+class FPSController {
+  constructor(hls) {
+    this.hls = void 0;
+    this.isVideoPlaybackQualityAvailable = false;
+    this.timer = void 0;
+    this.media = null;
+    this.lastTime = void 0;
+    this.lastDroppedFrames = 0;
+    this.lastDecodedFrames = 0;
+    // stream controller must be provided as a dependency!
+    this.streamController = void 0;
+    this.hls = hls;
+    this.registerListeners();
   }
-  getHandler(channel) {
-    return this.channels[channel].getHandler();
+  setStreamController(streamController) {
+    this.streamController = streamController;
   }
-  setHandler(channel, newHandler) {
-    this.channels[channel].setHandler(newHandler);
+  registerListeners() {
+    this.hls.on(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
   }
-
-  /**
-   * Add data for time t in forms of list of bytes (unsigned ints). The bytes are treated as pairs.
-   */
-  addData(time, byteList) {
-    let cmdFound;
-    let a;
-    let b;
-    let charsFound = false;
-    this.logger.time = time;
-    for (let i = 0; i < byteList.length; i += 2) {
-      a = byteList[i] & 0x7f;
-      b = byteList[i + 1] & 0x7f;
-      if (a === 0 && b === 0) {
-        continue;
-      } else {
-        this.logger.log(3, '[' + numArrayToHexArray([byteList[i], byteList[i + 1]]) + '] -> (' + numArrayToHexArray([a, b]) + ')');
-      }
-      cmdFound = this.parseCmd(a, b);
-      if (!cmdFound) {
-        cmdFound = this.parseMidrow(a, b);
-      }
-      if (!cmdFound) {
-        cmdFound = this.parsePAC(a, b);
-      }
-      if (!cmdFound) {
-        cmdFound = this.parseBackgroundAttributes(a, b);
+  unregisterListeners() {
+    this.hls.off(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
+  }
+  destroy() {
+    if (this.timer) {
+      clearInterval(this.timer);
+    }
+    this.unregisterListeners();
+    this.isVideoPlaybackQualityAvailable = false;
+    this.media = null;
+  }
+  onMediaAttaching(event, data) {
+    const config = this.hls.config;
+    if (config.capLevelOnFPSDrop) {
+      const media = data.media instanceof self.HTMLVideoElement ? data.media : null;
+      this.media = media;
+      if (media && typeof media.getVideoPlaybackQuality === 'function') {
+        this.isVideoPlaybackQualityAvailable = true;
       }
-      if (!cmdFound) {
-        charsFound = this.parseChars(a, b);
-        if (charsFound) {
-          const currChNr = this.currentChannel;
-          if (currChNr && currChNr > 0) {
-            const channel = this.channels[currChNr];
-            channel.insertChars(charsFound);
-          } else {
-            this.logger.log(2, 'No channel found yet. TEXT-MODE?');
+      self.clearInterval(this.timer);
+      this.timer = self.setInterval(this.checkFPSInterval.bind(this), config.fpsDroppedMonitoringPeriod);
+    }
+  }
+  checkFPS(video, decodedFrames, droppedFrames) {
+    const currentTime = performance.now();
+    if (decodedFrames) {
+      if (this.lastTime) {
+        const currentPeriod = currentTime - this.lastTime;
+        const currentDropped = droppedFrames - this.lastDroppedFrames;
+        const currentDecoded = decodedFrames - this.lastDecodedFrames;
+        const droppedFPS = 1000 * currentDropped / currentPeriod;
+        const hls = this.hls;
+        hls.trigger(Events.FPS_DROP, {
+          currentDropped: currentDropped,
+          currentDecoded: currentDecoded,
+          totalDroppedFrames: droppedFrames
+        });
+        if (droppedFPS > 0) {
+          // logger.log('checkFPS : droppedFPS/decodedFPS:' + droppedFPS/(1000 * currentDecoded / currentPeriod));
+          if (currentDropped > hls.config.fpsDroppedMonitoringThreshold * currentDecoded) {
+            let currentLevel = hls.currentLevel;
+            logger.warn('drop FPS ratio greater than max allowed value for currentLevel: ' + currentLevel);
+            if (currentLevel > 0 && (hls.autoLevelCapping === -1 || hls.autoLevelCapping >= currentLevel)) {
+              currentLevel = currentLevel - 1;
+              hls.trigger(Events.FPS_DROP_LEVEL_CAPPING, {
+                level: currentLevel,
+                droppedLevel: hls.currentLevel
+              });
+              hls.autoLevelCapping = currentLevel;
+              this.streamController.nextLevelSwitch();
+            }
           }
         }
       }
-      if (!cmdFound && !charsFound) {
-        this.logger.log(2, "Couldn't parse cleaned data " + numArrayToHexArray([a, b]) + ' orig: ' + numArrayToHexArray([byteList[i], byteList[i + 1]]));
+      this.lastTime = currentTime;
+      this.lastDroppedFrames = droppedFrames;
+      this.lastDecodedFrames = decodedFrames;
+    }
+  }
+  checkFPSInterval() {
+    const video = this.media;
+    if (video) {
+      if (this.isVideoPlaybackQualityAvailable) {
+        const videoPlaybackQuality = video.getVideoPlaybackQuality();
+        this.checkFPS(video, videoPlaybackQuality.totalVideoFrames, videoPlaybackQuality.droppedVideoFrames);
+      } else {
+        // HTMLVideoElement doesn't include the webkit types
+        this.checkFPS(video, video.webkitDecodedFrameCount, video.webkitDroppedFrameCount);
       }
     }
   }
-
-  /**
-   * Parse Command.
-   * @returns True if a command was found
-   */
-  parseCmd(a, b) {
+}
+
+const LOGGER_PREFIX = '[eme]';
+/**
+ * Controller to deal with encrypted media extensions (EME)
+ * @see https://developer.mozilla.org/en-US/docs/Web/API/Encrypted_Media_Extensions_API
+ *
+ * @class
+ * @constructor
+ */
+class EMEController {
+  constructor(hls) {
+    this.hls = void 0;
+    this.config = void 0;
+    this.media = null;
+    this.keyFormatPromise = null;
+    this.keySystemAccessPromises = {};
+    this._requestLicenseFailureCount = 0;
+    this.mediaKeySessions = [];
+    this.keyIdToKeySessionPromise = {};
+    this.setMediaKeysQueue = EMEController.CDMCleanupPromise ? [EMEController.CDMCleanupPromise] : [];
+    this.onMediaEncrypted = this._onMediaEncrypted.bind(this);
+    this.onWaitingForKey = this._onWaitingForKey.bind(this);
+    this.debug = logger.debug.bind(logger, LOGGER_PREFIX);
+    this.log = logger.log.bind(logger, LOGGER_PREFIX);
+    this.warn = logger.warn.bind(logger, LOGGER_PREFIX);
+    this.error = logger.error.bind(logger, LOGGER_PREFIX);
+    this.hls = hls;
+    this.config = hls.config;
+    this.registerListeners();
+  }
+  destroy() {
+    this.unregisterListeners();
+    this.onMediaDetached();
+    // Remove any references that could be held in config options or callbacks
+    const config = this.config;
+    config.requestMediaKeySystemAccessFunc = null;
+    config.licenseXhrSetup = config.licenseResponseCallback = undefined;
+    config.drmSystems = config.drmSystemOptions = {};
+    // @ts-ignore
+    this.hls = this.onMediaEncrypted = this.onWaitingForKey = this.keyIdToKeySessionPromise = null;
+    // @ts-ignore
+    this.config = null;
+  }
+  registerListeners() {
+    this.hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
+    this.hls.on(Events.MEDIA_DETACHED, this.onMediaDetached, this);
+    this.hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
+    this.hls.on(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
+  }
+  unregisterListeners() {
+    this.hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
+    this.hls.off(Events.MEDIA_DETACHED, this.onMediaDetached, this);
+    this.hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
+    this.hls.off(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
+  }
+  getLicenseServerUrl(keySystem) {
     const {
-      cmdHistory
-    } = this;
-    const cond1 = (a === 0x14 || a === 0x1c || a === 0x15 || a === 0x1d) && b >= 0x20 && b <= 0x2f;
-    const cond2 = (a === 0x17 || a === 0x1f) && b >= 0x21 && b <= 0x23;
-    if (!(cond1 || cond2)) {
-      return false;
+      drmSystems,
+      widevineLicenseUrl
+    } = this.config;
+    const keySystemConfiguration = drmSystems[keySystem];
+    if (keySystemConfiguration) {
+      return keySystemConfiguration.licenseUrl;
     }
-    if (hasCmdRepeated(a, b, cmdHistory)) {
-      setLastCmd(null, null, cmdHistory);
-      this.logger.log(3, 'Repeated command (' + numArrayToHexArray([a, b]) + ') is dropped');
-      return true;
+
+    // For backward compatibility
+    if (keySystem === KeySystems.WIDEVINE && widevineLicenseUrl) {
+      return widevineLicenseUrl;
     }
-    const chNr = a === 0x14 || a === 0x15 || a === 0x17 ? 1 : 2;
-    const channel = this.channels[chNr];
-    if (a === 0x14 || a === 0x15 || a === 0x1c || a === 0x1d) {
-      if (b === 0x20) {
-        channel.ccRCL();
-      } else if (b === 0x21) {
-        channel.ccBS();
-      } else if (b === 0x22) {
-        channel.ccAOF();
-      } else if (b === 0x23) {
-        channel.ccAON();
-      } else if (b === 0x24) {
-        channel.ccDER();
-      } else if (b === 0x25) {
-        channel.ccRU(2);
-      } else if (b === 0x26) {
-        channel.ccRU(3);
-      } else if (b === 0x27) {
-        channel.ccRU(4);
-      } else if (b === 0x28) {
-        channel.ccFON();
-      } else if (b === 0x29) {
-        channel.ccRDC();
-      } else if (b === 0x2a) {
-        channel.ccTR();
-      } else if (b === 0x2b) {
-        channel.ccRTD();
-      } else if (b === 0x2c) {
-        channel.ccEDM();
-      } else if (b === 0x2d) {
-        channel.ccCR();
-      } else if (b === 0x2e) {
-        channel.ccENM();
-      } else if (b === 0x2f) {
-        channel.ccEOC();
-      }
+    throw new Error(`no license server URL configured for key-system "${keySystem}"`);
+  }
+  getServerCertificateUrl(keySystem) {
+    const {
+      drmSystems
+    } = this.config;
+    const keySystemConfiguration = drmSystems[keySystem];
+    if (keySystemConfiguration) {
+      return keySystemConfiguration.serverCertificateUrl;
     } else {
-      // a == 0x17 || a == 0x1F
-      channel.ccTO(b - 0x20);
+      this.log(`No Server Certificate in config.drmSystems["${keySystem}"]`);
     }
-    setLastCmd(a, b, cmdHistory);
-    this.currentChannel = chNr;
-    return true;
   }
-
-  /**
-   * Parse midrow styling command
-   */
-  parseMidrow(a, b) {
-    let chNr = 0;
-    if ((a === 0x11 || a === 0x19) && b >= 0x20 && b <= 0x2f) {
-      if (a === 0x11) {
-        chNr = 1;
-      } else {
-        chNr = 2;
-      }
-      if (chNr !== this.currentChannel) {
-        this.logger.log(0, 'Mismatch channel in midrow parsing');
-        return false;
-      }
-      const channel = this.channels[chNr];
-      if (!channel) {
-        return false;
-      }
-      channel.ccMIDROW(b);
-      this.logger.log(3, 'MIDROW (' + numArrayToHexArray([a, b]) + ')');
-      return true;
+  attemptKeySystemAccess(keySystemsToAttempt) {
+    const levels = this.hls.levels;
+    const uniqueCodec = (value, i, a) => !!value && a.indexOf(value) === i;
+    const audioCodecs = levels.map(level => level.audioCodec).filter(uniqueCodec);
+    const videoCodecs = levels.map(level => level.videoCodec).filter(uniqueCodec);
+    if (audioCodecs.length + videoCodecs.length === 0) {
+      videoCodecs.push('avc1.42e01e');
     }
-    return false;
+    return new Promise((resolve, reject) => {
+      const attempt = keySystems => {
+        const keySystem = keySystems.shift();
+        this.getMediaKeysPromise(keySystem, audioCodecs, videoCodecs).then(mediaKeys => resolve({
+          keySystem,
+          mediaKeys
+        })).catch(error => {
+          if (keySystems.length) {
+            attempt(keySystems);
+          } else if (error instanceof EMEKeyError) {
+            reject(error);
+          } else {
+            reject(new EMEKeyError({
+              type: ErrorTypes.KEY_SYSTEM_ERROR,
+              details: ErrorDetails.KEY_SYSTEM_NO_ACCESS,
+              error,
+              fatal: true
+            }, error.message));
+          }
+        });
+      };
+      attempt(keySystemsToAttempt);
+    });
   }
-
-  /**
-   * Parse Preable Access Codes (Table 53).
-   * @returns {Boolean} Tells if PAC found
-   */
-  parsePAC(a, b) {
-    let row;
-    const cmdHistory = this.cmdHistory;
-    const case1 = (a >= 0x11 && a <= 0x17 || a >= 0x19 && a <= 0x1f) && b >= 0x40 && b <= 0x7f;
-    const case2 = (a === 0x10 || a === 0x18) && b >= 0x40 && b <= 0x5f;
-    if (!(case1 || case2)) {
-      return false;
+  requestMediaKeySystemAccess(keySystem, supportedConfigurations) {
+    const {
+      requestMediaKeySystemAccessFunc
+    } = this.config;
+    if (!(typeof requestMediaKeySystemAccessFunc === 'function')) {
+      let errMessage = `Configured requestMediaKeySystemAccess is not a function ${requestMediaKeySystemAccessFunc}`;
+      if (requestMediaKeySystemAccess === null && self.location.protocol === 'http:') {
+        errMessage = `navigator.requestMediaKeySystemAccess is not available over insecure protocol ${location.protocol}`;
+      }
+      return Promise.reject(new Error(errMessage));
     }
-    if (hasCmdRepeated(a, b, cmdHistory)) {
-      setLastCmd(null, null, cmdHistory);
-      return true; // Repeated commands are dropped (once)
+    return requestMediaKeySystemAccessFunc(keySystem, supportedConfigurations);
+  }
+  getMediaKeysPromise(keySystem, audioCodecs, videoCodecs) {
+    // This can throw, but is caught in event handler callpath
+    const mediaKeySystemConfigs = getSupportedMediaKeySystemConfigurations(keySystem, audioCodecs, videoCodecs, this.config.drmSystemOptions);
+    const keySystemAccessPromises = this.keySystemAccessPromises[keySystem];
+    let keySystemAccess = keySystemAccessPromises == null ? void 0 : keySystemAccessPromises.keySystemAccess;
+    if (!keySystemAccess) {
+      this.log(`Requesting encrypted media "${keySystem}" key-system access with config: ${JSON.stringify(mediaKeySystemConfigs)}`);
+      keySystemAccess = this.requestMediaKeySystemAccess(keySystem, mediaKeySystemConfigs);
+      const _keySystemAccessPromises = this.keySystemAccessPromises[keySystem] = {
+        keySystemAccess
+      };
+      keySystemAccess.catch(error => {
+        this.log(`Failed to obtain access to key-system "${keySystem}": ${error}`);
+      });
+      return keySystemAccess.then(mediaKeySystemAccess => {
+        this.log(`Access for key-system "${mediaKeySystemAccess.keySystem}" obtained`);
+        const certificateRequest = this.fetchServerCertificate(keySystem);
+        this.log(`Create media-keys for "${keySystem}"`);
+        _keySystemAccessPromises.mediaKeys = mediaKeySystemAccess.createMediaKeys().then(mediaKeys => {
+          this.log(`Media-keys created for "${keySystem}"`);
+          return certificateRequest.then(certificate => {
+            if (certificate) {
+              return this.setMediaKeysServerCertificate(mediaKeys, keySystem, certificate);
+            }
+            return mediaKeys;
+          });
+        });
+        _keySystemAccessPromises.mediaKeys.catch(error => {
+          this.error(`Failed to create media-keys for "${keySystem}"}: ${error}`);
+        });
+        return _keySystemAccessPromises.mediaKeys;
+      });
     }
-
-    const chNr = a <= 0x17 ? 1 : 2;
-    if (b >= 0x40 && b <= 0x5f) {
-      row = chNr === 1 ? rowsLowCh1[a] : rowsLowCh2[a];
+    return keySystemAccess.then(() => keySystemAccessPromises.mediaKeys);
+  }
+  createMediaKeySessionContext({
+    decryptdata,
+    keySystem,
+    mediaKeys
+  }) {
+    this.log(`Creating key-system session "${keySystem}" keyId: ${Hex.hexDump(decryptdata.keyId || [])}`);
+    const mediaKeysSession = mediaKeys.createSession();
+    const mediaKeySessionContext = {
+      decryptdata,
+      keySystem,
+      mediaKeys,
+      mediaKeysSession,
+      keyStatus: 'status-pending'
+    };
+    this.mediaKeySessions.push(mediaKeySessionContext);
+    return mediaKeySessionContext;
+  }
+  renewKeySession(mediaKeySessionContext) {
+    const decryptdata = mediaKeySessionContext.decryptdata;
+    if (decryptdata.pssh) {
+      const keySessionContext = this.createMediaKeySessionContext(mediaKeySessionContext);
+      const keyId = this.getKeyIdString(decryptdata);
+      const scheme = 'cenc';
+      this.keyIdToKeySessionPromise[keyId] = this.generateRequestWithPreferredKeySession(keySessionContext, scheme, decryptdata.pssh, 'expired');
     } else {
-      // 0x60 <= b <= 0x7F
-      row = chNr === 1 ? rowsHighCh1[a] : rowsHighCh2[a];
-    }
-    const channel = this.channels[chNr];
-    if (!channel) {
-      return false;
+      this.warn(`Could not renew expired session. Missing pssh initData.`);
     }
-    channel.setPAC(this.interpretPAC(row, b));
-    setLastCmd(a, b, cmdHistory);
-    this.currentChannel = chNr;
-    return true;
+    this.removeSession(mediaKeySessionContext);
   }
-
-  /**
-   * Interpret the second byte of the pac, and return the information.
-   * @returns pacData with style parameters
-   */
-  interpretPAC(row, byte) {
-    let pacIndex;
-    const pacData = {
-      color: null,
-      italics: false,
-      indent: null,
-      underline: false,
-      row: row
-    };
-    if (byte > 0x5f) {
-      pacIndex = byte - 0x60;
-    } else {
-      pacIndex = byte - 0x40;
+  getKeyIdString(decryptdata) {
+    if (!decryptdata) {
+      throw new Error('Could not read keyId of undefined decryptdata');
     }
-    pacData.underline = (pacIndex & 1) === 1;
-    if (pacIndex <= 0xd) {
-      pacData.color = ['white', 'green', 'blue', 'cyan', 'red', 'yellow', 'magenta', 'white'][Math.floor(pacIndex / 2)];
-    } else if (pacIndex <= 0xf) {
-      pacData.italics = true;
-      pacData.color = 'white';
-    } else {
-      pacData.indent = Math.floor((pacIndex - 0x10) / 2) * 4;
+    if (decryptdata.keyId === null) {
+      throw new Error('keyId is null');
     }
-    return pacData; // Note that row has zero offset. The spec uses 1.
+    return Hex.hexDump(decryptdata.keyId);
   }
-
-  /**
-   * Parse characters.
-   * @returns An array with 1 to 2 codes corresponding to chars, if found. null otherwise.
-   */
-  parseChars(a, b) {
-    let channelNr;
-    let charCodes = null;
-    let charCode1 = null;
-    if (a >= 0x19) {
-      channelNr = 2;
-      charCode1 = a - 8;
-    } else {
-      channelNr = 1;
-      charCode1 = a;
+  updateKeySession(mediaKeySessionContext, data) {
+    var _mediaKeySessionConte;
+    const keySession = mediaKeySessionContext.mediaKeysSession;
+    this.log(`Updating key-session "${keySession.sessionId}" for keyID ${Hex.hexDump(((_mediaKeySessionConte = mediaKeySessionContext.decryptdata) == null ? void 0 : _mediaKeySessionConte.keyId) || [])}
+      } (data length: ${data ? data.byteLength : data})`);
+    return keySession.update(data);
+  }
+  selectKeySystemFormat(frag) {
+    const keyFormats = Object.keys(frag.levelkeys || {});
+    if (!this.keyFormatPromise) {
+      this.log(`Selecting key-system from fragment (sn: ${frag.sn} ${frag.type}: ${frag.level}) key formats ${keyFormats.join(', ')}`);
+      this.keyFormatPromise = this.getKeyFormatPromise(keyFormats);
     }
-    if (charCode1 >= 0x11 && charCode1 <= 0x13) {
-      // Special character
-      let oneCode;
-      if (charCode1 === 0x11) {
-        oneCode = b + 0x50;
-      } else if (charCode1 === 0x12) {
-        oneCode = b + 0x70;
-      } else {
-        oneCode = b + 0x90;
-      }
-      this.logger.log(2, "Special char '" + getCharForByte(oneCode) + "' in channel " + channelNr);
-      charCodes = [oneCode];
-    } else if (a >= 0x20 && a <= 0x7f) {
-      charCodes = b === 0 ? [a] : [a, b];
+    return this.keyFormatPromise;
+  }
+  getKeyFormatPromise(keyFormats) {
+    return new Promise((resolve, reject) => {
+      const keySystemsInConfig = getKeySystemsForConfig(this.config);
+      const keySystemsToAttempt = keyFormats.map(keySystemFormatToKeySystemDomain).filter(value => !!value && keySystemsInConfig.indexOf(value) !== -1);
+      return this.getKeySystemSelectionPromise(keySystemsToAttempt).then(({
+        keySystem
+      }) => {
+        const keySystemFormat = keySystemDomainToKeySystemFormat(keySystem);
+        if (keySystemFormat) {
+          resolve(keySystemFormat);
+        } else {
+          reject(new Error(`Unable to find format for key-system "${keySystem}"`));
+        }
+      }).catch(reject);
+    });
+  }
+  loadKey(data) {
+    const decryptdata = data.keyInfo.decryptdata;
+    const keyId = this.getKeyIdString(decryptdata);
+    const keyDetails = `(keyId: ${keyId} format: "${decryptdata.keyFormat}" method: ${decryptdata.method} uri: ${decryptdata.uri})`;
+    this.log(`Starting session for key ${keyDetails}`);
+    let keySessionContextPromise = this.keyIdToKeySessionPromise[keyId];
+    if (!keySessionContextPromise) {
+      keySessionContextPromise = this.keyIdToKeySessionPromise[keyId] = this.getKeySystemForKeyPromise(decryptdata).then(({
+        keySystem,
+        mediaKeys
+      }) => {
+        this.throwIfDestroyed();
+        this.log(`Handle encrypted media sn: ${data.frag.sn} ${data.frag.type}: ${data.frag.level} using key ${keyDetails}`);
+        return this.attemptSetMediaKeys(keySystem, mediaKeys).then(() => {
+          this.throwIfDestroyed();
+          const keySessionContext = this.createMediaKeySessionContext({
+            keySystem,
+            mediaKeys,
+            decryptdata
+          });
+          const scheme = 'cenc';
+          return this.generateRequestWithPreferredKeySession(keySessionContext, scheme, decryptdata.pssh, 'playlist-key');
+        });
+      });
+      keySessionContextPromise.catch(error => this.handleError(error));
     }
-    if (charCodes) {
-      const hexCodes = numArrayToHexArray(charCodes);
-      this.logger.log(3, 'Char codes =  ' + hexCodes.join(','));
-      setLastCmd(a, b, this.cmdHistory);
+    return keySessionContextPromise;
+  }
+  throwIfDestroyed(message = 'Invalid state') {
+    if (!this.hls) {
+      throw new Error('invalid state');
     }
-    return charCodes;
   }
-
-  /**
-   * Parse extended background attributes as well as new foreground color black.
-   * @returns True if background attributes are found
-   */
-  parseBackgroundAttributes(a, b) {
-    const case1 = (a === 0x10 || a === 0x18) && b >= 0x20 && b <= 0x2f;
-    const case2 = (a === 0x17 || a === 0x1f) && b >= 0x2d && b <= 0x2f;
-    if (!(case1 || case2)) {
-      return false;
+  handleError(error) {
+    if (!this.hls) {
+      return;
     }
-    let index;
-    const bkgData = {};
-    if (a === 0x10 || a === 0x18) {
-      index = Math.floor((b - 0x20) / 2);
-      bkgData.background = backgroundColors[index];
-      if (b % 2 === 1) {
-        bkgData.background = bkgData.background + '_semi';
-      }
-    } else if (b === 0x2d) {
-      bkgData.background = 'transparent';
+    this.error(error.message);
+    if (error instanceof EMEKeyError) {
+      this.hls.trigger(Events.ERROR, error.data);
     } else {
-      bkgData.foreground = 'black';
-      if (b === 0x2f) {
-        bkgData.underline = true;
-      }
+      this.hls.trigger(Events.ERROR, {
+        type: ErrorTypes.KEY_SYSTEM_ERROR,
+        details: ErrorDetails.KEY_SYSTEM_NO_KEYS,
+        error,
+        fatal: true
+      });
     }
-    const chNr = a <= 0x17 ? 1 : 2;
-    const channel = this.channels[chNr];
-    channel.setBkgData(bkgData);
-    setLastCmd(a, b, this.cmdHistory);
-    return true;
   }
-
-  /**
-   * Reset state of parser and its channels.
-   */
-  reset() {
-    for (let i = 0; i < Object.keys(this.channels).length; i++) {
-      const channel = this.channels[i];
-      if (channel) {
-        channel.reset();
-      }
+  getKeySystemForKeyPromise(decryptdata) {
+    const keyId = this.getKeyIdString(decryptdata);
+    const mediaKeySessionContext = this.keyIdToKeySessionPromise[keyId];
+    if (!mediaKeySessionContext) {
+      const keySystem = keySystemFormatToKeySystemDomain(decryptdata.keyFormat);
+      const keySystemsToAttempt = keySystem ? [keySystem] : getKeySystemsForConfig(this.config);
+      return this.attemptKeySystemAccess(keySystemsToAttempt);
     }
-    this.cmdHistory = createCmdHistory();
+    return mediaKeySessionContext;
+  }
+  getKeySystemSelectionPromise(keySystemsToAttempt) {
+    if (!keySystemsToAttempt.length) {
+      keySystemsToAttempt = getKeySystemsForConfig(this.config);
+    }
+    if (keySystemsToAttempt.length === 0) {
+      throw new EMEKeyError({
+        type: ErrorTypes.KEY_SYSTEM_ERROR,
+        details: ErrorDetails.KEY_SYSTEM_NO_CONFIGURED_LICENSE,
+        fatal: true
+      }, `Missing key-system license configuration options ${JSON.stringify({
+        drmSystems: this.config.drmSystems
+      })}`);
+    }
+    return this.attemptKeySystemAccess(keySystemsToAttempt);
   }
+  _onMediaEncrypted(event) {
+    const {
+      initDataType,
+      initData
+    } = event;
+    this.debug(`"${event.type}" event: init data type: "${initDataType}"`);
 
-  /**
-   * Trigger the generation of a cue, and the start of a new one if displayScreens are not empty.
-   */
-  cueSplitAtTime(t) {
-    for (let i = 0; i < this.channels.length; i++) {
-      const channel = this.channels[i];
-      if (channel) {
-        channel.cueSplitAtTime(t);
+    // Ignore event when initData is null
+    if (initData === null) {
+      return;
+    }
+    let keyId;
+    let keySystemDomain;
+    if (initDataType === 'sinf' && this.config.drmSystems[KeySystems.FAIRPLAY]) {
+      // Match sinf keyId to playlist skd://keyId=
+      const json = bin2str(new Uint8Array(initData));
+      try {
+        const sinf = base64Decode(JSON.parse(json).sinf);
+        const tenc = parseSinf(new Uint8Array(sinf));
+        if (!tenc) {
+          return;
+        }
+        keyId = tenc.subarray(8, 24);
+        keySystemDomain = KeySystems.FAIRPLAY;
+      } catch (error) {
+        this.warn('Failed to parse sinf "encrypted" event message initData');
+        return;
+      }
+    } else {
+      // Support clear-lead key-session creation (otherwise depend on playlist keys)
+      const psshInfo = parsePssh(initData);
+      if (psshInfo === null) {
+        return;
+      }
+      if (psshInfo.version === 0 && psshInfo.systemId === KeySystemIds.WIDEVINE && psshInfo.data) {
+        keyId = psshInfo.data.subarray(8, 24);
       }
+      keySystemDomain = keySystemIdToKeySystemDomain(psshInfo.systemId);
     }
-  }
-}
-function setLastCmd(a, b, cmdHistory) {
-  cmdHistory.a = a;
-  cmdHistory.b = b;
-}
-function hasCmdRepeated(a, b, cmdHistory) {
-  return cmdHistory.a === a && cmdHistory.b === b;
-}
-function createCmdHistory() {
-  return {
-    a: null,
-    b: null
-  };
-}
-
-class OutputFilter {
-  constructor(timelineController, trackName) {
-    this.timelineController = void 0;
-    this.cueRanges = [];
-    this.trackName = void 0;
-    this.startTime = null;
-    this.endTime = null;
-    this.screen = null;
-    this.timelineController = timelineController;
-    this.trackName = trackName;
-  }
-  dispatchCue() {
-    if (this.startTime === null) {
+    if (!keySystemDomain || !keyId) {
       return;
     }
-    this.timelineController.addCues(this.trackName, this.startTime, this.endTime, this.screen, this.cueRanges);
-    this.startTime = null;
-  }
-  newCue(startTime, endTime, screen) {
-    if (this.startTime === null || this.startTime > startTime) {
-      this.startTime = startTime;
+    const keyIdHex = Hex.hexDump(keyId);
+    const {
+      keyIdToKeySessionPromise,
+      mediaKeySessions
+    } = this;
+    let keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex];
+    for (let i = 0; i < mediaKeySessions.length; i++) {
+      // Match playlist key
+      const keyContext = mediaKeySessions[i];
+      const decryptdata = keyContext.decryptdata;
+      if (decryptdata.pssh || !decryptdata.keyId) {
+        continue;
+      }
+      const oldKeyIdHex = Hex.hexDump(decryptdata.keyId);
+      if (keyIdHex === oldKeyIdHex || decryptdata.uri.replace(/-/g, '').indexOf(keyIdHex) !== -1) {
+        keySessionContextPromise = keyIdToKeySessionPromise[oldKeyIdHex];
+        delete keyIdToKeySessionPromise[oldKeyIdHex];
+        decryptdata.pssh = new Uint8Array(initData);
+        decryptdata.keyId = keyId;
+        keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = keySessionContextPromise.then(() => {
+          return this.generateRequestWithPreferredKeySession(keyContext, initDataType, initData, 'encrypted-event-key-match');
+        });
+        break;
+      }
     }
-    this.endTime = endTime;
-    this.screen = screen;
-    this.timelineController.createCaptionsTrack(this.trackName);
+    if (!keySessionContextPromise) {
+      // Clear-lead key (not encountered in playlist)
+      keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = this.getKeySystemSelectionPromise([keySystemDomain]).then(({
+        keySystem,
+        mediaKeys
+      }) => {
+        var _keySystemToKeySystem;
+        this.throwIfDestroyed();
+        const decryptdata = new LevelKey('ISO-23001-7', keyIdHex, (_keySystemToKeySystem = keySystemDomainToKeySystemFormat(keySystem)) != null ? _keySystemToKeySystem : '');
+        decryptdata.pssh = new Uint8Array(initData);
+        decryptdata.keyId = keyId;
+        return this.attemptSetMediaKeys(keySystem, mediaKeys).then(() => {
+          this.throwIfDestroyed();
+          const keySessionContext = this.createMediaKeySessionContext({
+            decryptdata,
+            keySystem,
+            mediaKeys
+          });
+          return this.generateRequestWithPreferredKeySession(keySessionContext, initDataType, initData, 'encrypted-event-no-match');
+        });
+      });
+    }
+    keySessionContextPromise.catch(error => this.handleError(error));
   }
-  reset() {
-    this.cueRanges = [];
-    this.startTime = null;
+  _onWaitingForKey(event) {
+    this.log(`"${event.type}" event`);
   }
-}
-
-/**
- * Copyright 2013 vtt.js Contributors
- *
- * Licensed under the Apache License, Version 2.0 (the 'License');
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
- *
- *   http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an 'AS IS' BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-var VTTCue = (function () {
-  if (typeof self !== 'undefined' && self.VTTCue) {
-    return self.VTTCue;
+  attemptSetMediaKeys(keySystem, mediaKeys) {
+    const queue = this.setMediaKeysQueue.slice();
+    this.log(`Setting media-keys for "${keySystem}"`);
+    // Only one setMediaKeys() can run at one time, and multiple setMediaKeys() operations
+    // can be queued for execution for multiple key sessions.
+    const setMediaKeysPromise = Promise.all(queue).then(() => {
+      if (!this.media) {
+        throw new Error('Attempted to set mediaKeys without media element attached');
+      }
+      return this.media.setMediaKeys(mediaKeys);
+    });
+    this.setMediaKeysQueue.push(setMediaKeysPromise);
+    return setMediaKeysPromise.then(() => {
+      this.log(`Media-keys set for "${keySystem}"`);
+      queue.push(setMediaKeysPromise);
+      this.setMediaKeysQueue = this.setMediaKeysQueue.filter(p => queue.indexOf(p) === -1);
+    });
   }
-  const AllowedDirections = ['', 'lr', 'rl'];
-  const AllowedAlignments = ['start', 'middle', 'end', 'left', 'right'];
-  function isAllowedValue(allowed, value) {
-    if (typeof value !== 'string') {
-      return false;
+  generateRequestWithPreferredKeySession(context, initDataType, initData, reason) {
+    var _this$config$drmSyste, _this$config$drmSyste2;
+    const generateRequestFilter = (_this$config$drmSyste = this.config.drmSystems) == null ? void 0 : (_this$config$drmSyste2 = _this$config$drmSyste[context.keySystem]) == null ? void 0 : _this$config$drmSyste2.generateRequest;
+    if (generateRequestFilter) {
+      try {
+        const mappedInitData = generateRequestFilter.call(this.hls, initDataType, initData, context);
+        if (!mappedInitData) {
+          throw new Error('Invalid response from configured generateRequest filter');
+        }
+        initDataType = mappedInitData.initDataType;
+        initData = context.decryptdata.pssh = mappedInitData.initData ? new Uint8Array(mappedInitData.initData) : null;
+      } catch (error) {
+        var _this$hls;
+        this.warn(error.message);
+        if ((_this$hls = this.hls) != null && _this$hls.config.debug) {
+          throw error;
+        }
+      }
     }
-    // necessary for assuring the generic conforms to the Array interface
-    if (!Array.isArray(allowed)) {
-      return false;
+    if (initData === null) {
+      this.log(`Skipping key-session request for "${reason}" (no initData)`);
+      return Promise.resolve(context);
     }
-    // reset the type so that the next narrowing works well
-    const lcValue = value.toLowerCase();
-    // use the allow list to narrow the type to a specific subset of strings
-    if (~allowed.indexOf(lcValue)) {
-      return lcValue;
+    const keyId = this.getKeyIdString(context.decryptdata);
+    this.log(`Generating key-session request for "${reason}": ${keyId} (init data type: ${initDataType} length: ${initData ? initData.byteLength : null})`);
+    const licenseStatus = new EventEmitter();
+    const onmessage = context._onmessage = event => {
+      const keySession = context.mediaKeysSession;
+      if (!keySession) {
+        licenseStatus.emit('error', new Error('invalid state'));
+        return;
+      }
+      const {
+        messageType,
+        message
+      } = event;
+      this.log(`"${messageType}" message event for session "${keySession.sessionId}" message size: ${message.byteLength}`);
+      if (messageType === 'license-request' || messageType === 'license-renewal') {
+        this.renewLicense(context, message).catch(error => {
+          this.handleError(error);
+          licenseStatus.emit('error', error);
+        });
+      } else if (messageType === 'license-release') {
+        if (context.keySystem === KeySystems.FAIRPLAY) {
+          this.updateKeySession(context, strToUtf8array('acknowledged'));
+          this.removeSession(context);
+        }
+      } else {
+        this.warn(`unhandled media key message type "${messageType}"`);
+      }
+    };
+    const onkeystatuseschange = context._onkeystatuseschange = event => {
+      const keySession = context.mediaKeysSession;
+      if (!keySession) {
+        licenseStatus.emit('error', new Error('invalid state'));
+        return;
+      }
+      this.onKeyStatusChange(context);
+      const keyStatus = context.keyStatus;
+      licenseStatus.emit('keyStatus', keyStatus);
+      if (keyStatus === 'expired') {
+        this.warn(`${context.keySystem} expired for key ${keyId}`);
+        this.renewKeySession(context);
+      }
+    };
+    context.mediaKeysSession.addEventListener('message', onmessage);
+    context.mediaKeysSession.addEventListener('keystatuseschange', onkeystatuseschange);
+    const keyUsablePromise = new Promise((resolve, reject) => {
+      licenseStatus.on('error', reject);
+      licenseStatus.on('keyStatus', keyStatus => {
+        if (keyStatus.startsWith('usable')) {
+          resolve();
+        } else if (keyStatus === 'output-restricted') {
+          reject(new EMEKeyError({
+            type: ErrorTypes.KEY_SYSTEM_ERROR,
+            details: ErrorDetails.KEY_SYSTEM_STATUS_OUTPUT_RESTRICTED,
+            fatal: false
+          }, 'HDCP level output restricted'));
+        } else if (keyStatus === 'internal-error') {
+          reject(new EMEKeyError({
+            type: ErrorTypes.KEY_SYSTEM_ERROR,
+            details: ErrorDetails.KEY_SYSTEM_STATUS_INTERNAL_ERROR,
+            fatal: true
+          }, `key status changed to "${keyStatus}"`));
+        } else if (keyStatus === 'expired') {
+          reject(new Error('key expired while generating request'));
+        } else {
+          this.warn(`unhandled key status change "${keyStatus}"`);
+        }
+      });
+    });
+    return context.mediaKeysSession.generateRequest(initDataType, initData).then(() => {
+      var _context$mediaKeysSes;
+      this.log(`Request generated for key-session "${(_context$mediaKeysSes = context.mediaKeysSession) == null ? void 0 : _context$mediaKeysSes.sessionId}" keyId: ${keyId}`);
+    }).catch(error => {
+      throw new EMEKeyError({
+        type: ErrorTypes.KEY_SYSTEM_ERROR,
+        details: ErrorDetails.KEY_SYSTEM_NO_SESSION,
+        error,
+        fatal: false
+      }, `Error generating key-session request: ${error}`);
+    }).then(() => keyUsablePromise).catch(error => {
+      licenseStatus.removeAllListeners();
+      this.removeSession(context);
+      throw error;
+    }).then(() => {
+      licenseStatus.removeAllListeners();
+      return context;
+    });
+  }
+  onKeyStatusChange(mediaKeySessionContext) {
+    mediaKeySessionContext.mediaKeysSession.keyStatuses.forEach((status, keyId) => {
+      this.log(`key status change "${status}" for keyStatuses keyId: ${Hex.hexDump('buffer' in keyId ? new Uint8Array(keyId.buffer, keyId.byteOffset, keyId.byteLength) : new Uint8Array(keyId))} session keyId: ${Hex.hexDump(new Uint8Array(mediaKeySessionContext.decryptdata.keyId || []))} uri: ${mediaKeySessionContext.decryptdata.uri}`);
+      mediaKeySessionContext.keyStatus = status;
+    });
+  }
+  fetchServerCertificate(keySystem) {
+    const config = this.config;
+    const Loader = config.loader;
+    const certLoader = new Loader(config);
+    const url = this.getServerCertificateUrl(keySystem);
+    if (!url) {
+      return Promise.resolve();
     }
-    return false;
+    this.log(`Fetching server certificate for "${keySystem}"`);
+    return new Promise((resolve, reject) => {
+      const loaderContext = {
+        responseType: 'arraybuffer',
+        url
+      };
+      const loadPolicy = config.certLoadPolicy.default;
+      const loaderConfig = {
+        loadPolicy,
+        timeout: loadPolicy.maxLoadTimeMs,
+        maxRetry: 0,
+        retryDelay: 0,
+        maxRetryDelay: 0
+      };
+      const loaderCallbacks = {
+        onSuccess: (response, stats, context, networkDetails) => {
+          resolve(response.data);
+        },
+        onError: (response, contex, networkDetails, stats) => {
+          reject(new EMEKeyError({
+            type: ErrorTypes.KEY_SYSTEM_ERROR,
+            details: ErrorDetails.KEY_SYSTEM_SERVER_CERTIFICATE_REQUEST_FAILED,
+            fatal: true,
+            networkDetails,
+            response: _objectSpread2({
+              url: loaderContext.url,
+              data: undefined
+            }, response)
+          }, `"${keySystem}" certificate request failed (${url}). Status: ${response.code} (${response.text})`));
+        },
+        onTimeout: (stats, context, networkDetails) => {
+          reject(new EMEKeyError({
+            type: ErrorTypes.KEY_SYSTEM_ERROR,
+            details: ErrorDetails.KEY_SYSTEM_SERVER_CERTIFICATE_REQUEST_FAILED,
+            fatal: true,
+            networkDetails,
+            response: {
+              url: loaderContext.url,
+              data: undefined
+            }
+          }, `"${keySystem}" certificate request timed out (${url})`));
+        },
+        onAbort: (stats, context, networkDetails) => {
+          reject(new Error('aborted'));
+        }
+      };
+      certLoader.load(loaderContext, loaderConfig, loaderCallbacks);
+    });
   }
-  function findDirectionSetting(value) {
-    return isAllowedValue(AllowedDirections, value);
+  setMediaKeysServerCertificate(mediaKeys, keySystem, cert) {
+    return new Promise((resolve, reject) => {
+      mediaKeys.setServerCertificate(cert).then(success => {
+        this.log(`setServerCertificate ${success ? 'success' : 'not supported by CDM'} (${cert == null ? void 0 : cert.byteLength}) on "${keySystem}"`);
+        resolve(mediaKeys);
+      }).catch(error => {
+        reject(new EMEKeyError({
+          type: ErrorTypes.KEY_SYSTEM_ERROR,
+          details: ErrorDetails.KEY_SYSTEM_SERVER_CERTIFICATE_UPDATE_FAILED,
+          error,
+          fatal: true
+        }, error.message));
+      });
+    });
   }
-  function findAlignSetting(value) {
-    return isAllowedValue(AllowedAlignments, value);
+  renewLicense(context, keyMessage) {
+    return this.requestLicense(context, new Uint8Array(keyMessage)).then(data => {
+      return this.updateKeySession(context, new Uint8Array(data)).catch(error => {
+        throw new EMEKeyError({
+          type: ErrorTypes.KEY_SYSTEM_ERROR,
+          details: ErrorDetails.KEY_SYSTEM_SESSION_UPDATE_FAILED,
+          error,
+          fatal: true
+        }, error.message);
+      });
+    });
   }
-  function extend(obj, ...rest) {
-    let i = 1;
-    for (; i < arguments.length; i++) {
-      const cobj = arguments[i];
-      for (const p in cobj) {
-        obj[p] = cobj[p];
-      }
-    }
-    return obj;
+  unpackPlayReadyKeyMessage(xhr, licenseChallenge) {
+    // On Edge, the raw license message is UTF-16-encoded XML.  We need
+    // to unpack the Challenge element (base64-encoded string containing the
+    // actual license request) and any HttpHeader elements (sent as request
+    // headers).
+    // For PlayReady CDMs, we need to dig the Challenge out of the XML.
+    const xmlString = String.fromCharCode.apply(null, new Uint16Array(licenseChallenge.buffer));
+    if (!xmlString.includes('PlayReadyKeyMessage')) {
+      // This does not appear to be a wrapped message as on Edge.  Some
+      // clients do not need this unwrapping, so we will assume this is one of
+      // them.  Note that "xml" at this point probably looks like random
+      // garbage, since we interpreted UTF-8 as UTF-16.
+      xhr.setRequestHeader('Content-Type', 'text/xml; charset=utf-8');
+      return licenseChallenge;
+    }
+    const keyMessageXml = new DOMParser().parseFromString(xmlString, 'application/xml');
+    // Set request headers.
+    const headers = keyMessageXml.querySelectorAll('HttpHeader');
+    if (headers.length > 0) {
+      let header;
+      for (let i = 0, len = headers.length; i < len; i++) {
+        var _header$querySelector, _header$querySelector2;
+        header = headers[i];
+        const name = (_header$querySelector = header.querySelector('name')) == null ? void 0 : _header$querySelector.textContent;
+        const value = (_header$querySelector2 = header.querySelector('value')) == null ? void 0 : _header$querySelector2.textContent;
+        if (name && value) {
+          xhr.setRequestHeader(name, value);
+        }
+      }
+    }
+    const challengeElement = keyMessageXml.querySelector('Challenge');
+    const challengeText = challengeElement == null ? void 0 : challengeElement.textContent;
+    if (!challengeText) {
+      throw new Error(`Cannot find <Challenge> in key message`);
+    }
+    return strToUtf8array(atob(challengeText));
   }
-  function VTTCue(startTime, endTime, text) {
-    const cue = this;
-    const baseObj = {
-      enumerable: true
-    };
-    /**
-     * Shim implementation specific properties. These properties are not in
-     * the spec.
-     */
-
-    // Lets us know when the VTTCue's data has changed in such a way that we need
-    // to recompute its display state. This lets us compute its display state
-    // lazily.
-    cue.hasBeenReset = false;
-
-    /**
-     * VTTCue and TextTrackCue properties
-     * http://dev.w3.org/html5/webvtt/#vttcue-interface
-     */
-
-    let _id = '';
-    let _pauseOnExit = false;
-    let _startTime = startTime;
-    let _endTime = endTime;
-    let _text = text;
-    let _region = null;
-    let _vertical = '';
-    let _snapToLines = true;
-    let _line = 'auto';
-    let _lineAlign = 'start';
-    let _position = 50;
-    let _positionAlign = 'middle';
-    let _size = 50;
-    let _align = 'middle';
-    Object.defineProperty(cue, 'id', extend({}, baseObj, {
-      get: function () {
-        return _id;
-      },
-      set: function (value) {
-        _id = '' + value;
-      }
-    }));
-    Object.defineProperty(cue, 'pauseOnExit', extend({}, baseObj, {
-      get: function () {
-        return _pauseOnExit;
-      },
-      set: function (value) {
-        _pauseOnExit = !!value;
-      }
-    }));
-    Object.defineProperty(cue, 'startTime', extend({}, baseObj, {
-      get: function () {
-        return _startTime;
-      },
-      set: function (value) {
-        if (typeof value !== 'number') {
-          throw new TypeError('Start time must be set to a number.');
-        }
-        _startTime = value;
-        this.hasBeenReset = true;
-      }
-    }));
-    Object.defineProperty(cue, 'endTime', extend({}, baseObj, {
-      get: function () {
-        return _endTime;
-      },
-      set: function (value) {
-        if (typeof value !== 'number') {
-          throw new TypeError('End time must be set to a number.');
-        }
-        _endTime = value;
-        this.hasBeenReset = true;
+  setupLicenseXHR(xhr, url, keysListItem, licenseChallenge) {
+    const licenseXhrSetup = this.config.licenseXhrSetup;
+    if (!licenseXhrSetup) {
+      xhr.open('POST', url, true);
+      return Promise.resolve({
+        xhr,
+        licenseChallenge
+      });
+    }
+    return Promise.resolve().then(() => {
+      if (!keysListItem.decryptdata) {
+        throw new Error('Key removed');
       }
-    }));
-    Object.defineProperty(cue, 'text', extend({}, baseObj, {
-      get: function () {
-        return _text;
-      },
-      set: function (value) {
-        _text = '' + value;
-        this.hasBeenReset = true;
+      return licenseXhrSetup.call(this.hls, xhr, url, keysListItem, licenseChallenge);
+    }).catch(error => {
+      if (!keysListItem.decryptdata) {
+        // Key session removed. Cancel license request.
+        throw error;
       }
-    }));
-
-    // todo: implement VTTRegion polyfill?
-    Object.defineProperty(cue, 'region', extend({}, baseObj, {
-      get: function () {
-        return _region;
-      },
-      set: function (value) {
-        _region = value;
-        this.hasBeenReset = true;
+      // let's try to open before running setup
+      xhr.open('POST', url, true);
+      return licenseXhrSetup.call(this.hls, xhr, url, keysListItem, licenseChallenge);
+    }).then(licenseXhrSetupResult => {
+      // if licenseXhrSetup did not yet call open, let's do it now
+      if (!xhr.readyState) {
+        xhr.open('POST', url, true);
       }
-    }));
-    Object.defineProperty(cue, 'vertical', extend({}, baseObj, {
-      get: function () {
-        return _vertical;
-      },
-      set: function (value) {
-        const setting = findDirectionSetting(value);
-        // Have to check for false because the setting an be an empty string.
-        if (setting === false) {
-          throw new SyntaxError('An invalid or illegal string was specified.');
+      const finalLicenseChallenge = licenseXhrSetupResult ? licenseXhrSetupResult : licenseChallenge;
+      return {
+        xhr,
+        licenseChallenge: finalLicenseChallenge
+      };
+    });
+  }
+  requestLicense(keySessionContext, licenseChallenge) {
+    const keyLoadPolicy = this.config.keyLoadPolicy.default;
+    return new Promise((resolve, reject) => {
+      const url = this.getLicenseServerUrl(keySessionContext.keySystem);
+      this.log(`Sending license request to URL: ${url}`);
+      const xhr = new XMLHttpRequest();
+      xhr.responseType = 'arraybuffer';
+      xhr.onreadystatechange = () => {
+        if (!this.hls || !keySessionContext.mediaKeysSession) {
+          return reject(new Error('invalid state'));
         }
-        _vertical = setting;
-        this.hasBeenReset = true;
-      }
-    }));
-    Object.defineProperty(cue, 'snapToLines', extend({}, baseObj, {
-      get: function () {
-        return _snapToLines;
-      },
-      set: function (value) {
-        _snapToLines = !!value;
-        this.hasBeenReset = true;
-      }
-    }));
-    Object.defineProperty(cue, 'line', extend({}, baseObj, {
-      get: function () {
-        return _line;
-      },
-      set: function (value) {
-        if (typeof value !== 'number' && value !== 'auto') {
-          throw new SyntaxError('An invalid number or illegal string was specified.');
+        if (xhr.readyState === 4) {
+          if (xhr.status === 200) {
+            this._requestLicenseFailureCount = 0;
+            let data = xhr.response;
+            this.log(`License received ${data instanceof ArrayBuffer ? data.byteLength : data}`);
+            const licenseResponseCallback = this.config.licenseResponseCallback;
+            if (licenseResponseCallback) {
+              try {
+                data = licenseResponseCallback.call(this.hls, xhr, url, keySessionContext);
+              } catch (error) {
+                this.error(error);
+              }
+            }
+            resolve(data);
+          } else {
+            const retryConfig = keyLoadPolicy.errorRetry;
+            const maxNumRetry = retryConfig ? retryConfig.maxNumRetry : 0;
+            this._requestLicenseFailureCount++;
+            if (this._requestLicenseFailureCount > maxNumRetry || xhr.status >= 400 && xhr.status < 500) {
+              reject(new EMEKeyError({
+                type: ErrorTypes.KEY_SYSTEM_ERROR,
+                details: ErrorDetails.KEY_SYSTEM_LICENSE_REQUEST_FAILED,
+                fatal: true,
+                networkDetails: xhr,
+                response: {
+                  url,
+                  data: undefined,
+                  code: xhr.status,
+                  text: xhr.statusText
+                }
+              }, `License Request XHR failed (${url}). Status: ${xhr.status} (${xhr.statusText})`));
+            } else {
+              const attemptsLeft = maxNumRetry - this._requestLicenseFailureCount + 1;
+              this.warn(`Retrying license request, ${attemptsLeft} attempts left`);
+              this.requestLicense(keySessionContext, licenseChallenge).then(resolve, reject);
+            }
+          }
         }
-        _line = value;
-        this.hasBeenReset = true;
+      };
+      if (keySessionContext.licenseXhr && keySessionContext.licenseXhr.readyState !== XMLHttpRequest.DONE) {
+        keySessionContext.licenseXhr.abort();
       }
-    }));
-    Object.defineProperty(cue, 'lineAlign', extend({}, baseObj, {
-      get: function () {
-        return _lineAlign;
-      },
-      set: function (value) {
-        const setting = findAlignSetting(value);
-        if (!setting) {
-          throw new SyntaxError('An invalid or illegal string was specified.');
+      keySessionContext.licenseXhr = xhr;
+      this.setupLicenseXHR(xhr, url, keySessionContext, licenseChallenge).then(({
+        xhr,
+        licenseChallenge
+      }) => {
+        if (keySessionContext.keySystem == KeySystems.PLAYREADY) {
+          licenseChallenge = this.unpackPlayReadyKeyMessage(xhr, licenseChallenge);
         }
-        _lineAlign = setting;
-        this.hasBeenReset = true;
+        xhr.send(licenseChallenge);
+      });
+    });
+  }
+  onMediaAttached(event, data) {
+    if (!this.config.emeEnabled) {
+      return;
+    }
+    const media = data.media;
+
+    // keep reference of media
+    this.media = media;
+    media.addEventListener('encrypted', this.onMediaEncrypted);
+    media.addEventListener('waitingforkey', this.onWaitingForKey);
+  }
+  onMediaDetached() {
+    const media = this.media;
+    const mediaKeysList = this.mediaKeySessions;
+    if (media) {
+      media.removeEventListener('encrypted', this.onMediaEncrypted);
+      media.removeEventListener('waitingforkey', this.onWaitingForKey);
+      this.media = null;
+    }
+    this._requestLicenseFailureCount = 0;
+    this.setMediaKeysQueue = [];
+    this.mediaKeySessions = [];
+    this.keyIdToKeySessionPromise = {};
+    LevelKey.clearKeyUriToKeyIdMap();
+
+    // Close all sessions and remove media keys from the video element.
+    const keySessionCount = mediaKeysList.length;
+    EMEController.CDMCleanupPromise = Promise.all(mediaKeysList.map(mediaKeySessionContext => this.removeSession(mediaKeySessionContext)).concat(media == null ? void 0 : media.setMediaKeys(null).catch(error => {
+      this.log(`Could not clear media keys: ${error}`);
+    }))).then(() => {
+      if (keySessionCount) {
+        this.log('finished closing key sessions and clearing media keys');
+        mediaKeysList.length = 0;
       }
-    }));
-    Object.defineProperty(cue, 'position', extend({}, baseObj, {
-      get: function () {
-        return _position;
-      },
-      set: function (value) {
-        if (value < 0 || value > 100) {
-          throw new Error('Position must be between 0 and 100.');
+    }).catch(error => {
+      this.log(`Could not close sessions and clear media keys: ${error}`);
+    });
+  }
+  onManifestLoading() {
+    this.keyFormatPromise = null;
+  }
+  onManifestLoaded(event, {
+    sessionKeys
+  }) {
+    if (!sessionKeys || !this.config.emeEnabled) {
+      return;
+    }
+    if (!this.keyFormatPromise) {
+      const keyFormats = sessionKeys.reduce((formats, sessionKey) => {
+        if (formats.indexOf(sessionKey.keyFormat) === -1) {
+          formats.push(sessionKey.keyFormat);
         }
-        _position = value;
-        this.hasBeenReset = true;
+        return formats;
+      }, []);
+      this.log(`Selecting key-system from session-keys ${keyFormats.join(', ')}`);
+      this.keyFormatPromise = this.getKeyFormatPromise(keyFormats);
+    }
+  }
+  removeSession(mediaKeySessionContext) {
+    const {
+      mediaKeysSession,
+      licenseXhr
+    } = mediaKeySessionContext;
+    if (mediaKeysSession) {
+      this.log(`Remove licenses and keys and close session ${mediaKeysSession.sessionId}`);
+      if (mediaKeySessionContext._onmessage) {
+        mediaKeysSession.removeEventListener('message', mediaKeySessionContext._onmessage);
+        mediaKeySessionContext._onmessage = undefined;
       }
-    }));
-    Object.defineProperty(cue, 'positionAlign', extend({}, baseObj, {
-      get: function () {
-        return _positionAlign;
-      },
-      set: function (value) {
-        const setting = findAlignSetting(value);
-        if (!setting) {
-          throw new SyntaxError('An invalid or illegal string was specified.');
-        }
-        _positionAlign = setting;
-        this.hasBeenReset = true;
+      if (mediaKeySessionContext._onkeystatuseschange) {
+        mediaKeysSession.removeEventListener('keystatuseschange', mediaKeySessionContext._onkeystatuseschange);
+        mediaKeySessionContext._onkeystatuseschange = undefined;
       }
-    }));
-    Object.defineProperty(cue, 'size', extend({}, baseObj, {
-      get: function () {
-        return _size;
-      },
-      set: function (value) {
-        if (value < 0 || value > 100) {
-          throw new Error('Size must be between 0 and 100.');
-        }
-        _size = value;
-        this.hasBeenReset = true;
+      if (licenseXhr && licenseXhr.readyState !== XMLHttpRequest.DONE) {
+        licenseXhr.abort();
       }
-    }));
-    Object.defineProperty(cue, 'align', extend({}, baseObj, {
-      get: function () {
-        return _align;
-      },
-      set: function (value) {
-        const setting = findAlignSetting(value);
-        if (!setting) {
-          throw new SyntaxError('An invalid or illegal string was specified.');
-        }
-        _align = setting;
-        this.hasBeenReset = true;
+      mediaKeySessionContext.mediaKeysSession = mediaKeySessionContext.decryptdata = mediaKeySessionContext.licenseXhr = undefined;
+      const index = this.mediaKeySessions.indexOf(mediaKeySessionContext);
+      if (index > -1) {
+        this.mediaKeySessions.splice(index, 1);
       }
-    }));
-
-    /**
-     * Other <track> spec defined properties
-     */
-
-    // http://www.whatwg.org/specs/web-apps/current-work/multipage/the-video-element.html#text-track-cue-display-state
-    cue.displayState = undefined;
+      return mediaKeysSession.remove().catch(error => {
+        this.log(`Could not remove session: ${error}`);
+      }).then(() => {
+        return mediaKeysSession.close();
+      }).catch(error => {
+        this.log(`Could not close session: ${error}`);
+      });
+    }
+  }
+}
+EMEController.CDMCleanupPromise = void 0;
+class EMEKeyError extends Error {
+  constructor(data, message) {
+    super(message);
+    this.data = void 0;
+    data.error || (data.error = new Error(message));
+    this.data = data;
+    data.err = data.error;
   }
+}
 
+/**
+ * Common Media Object Type
+ *
+ * @group CMCD
+ * @group CMSD
+ *
+ * @beta
+ */
+var CmObjectType;
+(function (CmObjectType) {
   /**
-   * VTTCue methods
+   * text file, such as a manifest or playlist
+   */
+  CmObjectType["MANIFEST"] = "m";
+  /**
+   * audio only
+   */
+  CmObjectType["AUDIO"] = "a";
+  /**
+   * video only
+   */
+  CmObjectType["VIDEO"] = "v";
+  /**
+   * muxed audio and video
+   */
+  CmObjectType["MUXED"] = "av";
+  /**
+   * init segment
+   */
+  CmObjectType["INIT"] = "i";
+  /**
+   * caption or subtitle
+   */
+  CmObjectType["CAPTION"] = "c";
+  /**
+   * ISOBMFF timed text track
+   */
+  CmObjectType["TIMED_TEXT"] = "tt";
+  /**
+   * cryptographic key, license or certificate.
+   */
+  CmObjectType["KEY"] = "k";
+  /**
+   * other
    */
+  CmObjectType["OTHER"] = "o";
+})(CmObjectType || (CmObjectType = {}));
 
-  VTTCue.prototype.getCueAsHTML = function () {
-    // Assume WebVTT.convertCueToDOMTree is on the global.
-    const WebVTT = self.WebVTT;
-    return WebVTT.convertCueToDOMTree(self, this.text);
-  };
-  // this is a polyfill hack
-  return VTTCue;
-})();
+/**
+ * Common Media Streaming Format
+ *
+ * @group CMCD
+ * @group CMSD
+ *
+ * @beta
+ */
+var CmStreamingFormat;
+(function (CmStreamingFormat) {
+  /**
+   * MPEG DASH
+   */
+  CmStreamingFormat["DASH"] = "d";
+  /**
+   * HTTP Live Streaming (HLS)
+   */
+  CmStreamingFormat["HLS"] = "h";
+  /**
+   * Smooth Streaming
+   */
+  CmStreamingFormat["SMOOTH"] = "s";
+  /**
+   * Other
+   */
+  CmStreamingFormat["OTHER"] = "o";
+})(CmStreamingFormat || (CmStreamingFormat = {}));
 
-/*
- * Source: https://github.com/mozilla/vtt.js/blob/master/dist/vtt.js
+/**
+ * CMCD header fields.
+ *
+ * @group CMCD
+ *
+ * @beta
+ */
+var CmcdHeaderField;
+(function (CmcdHeaderField) {
+  /**
+   * keys whose values vary with the object being requested.
+   */
+  CmcdHeaderField["OBJECT"] = "CMCD-Object";
+  /**
+   * keys whose values vary with each request.
+   */
+  CmcdHeaderField["REQUEST"] = "CMCD-Request";
+  /**
+   * keys whose values are expected to be invariant over the life of the session.
+   */
+  CmcdHeaderField["SESSION"] = "CMCD-Session";
+  /**
+   * keys whose values do not vary with every request or object.
+   */
+  CmcdHeaderField["STATUS"] = "CMCD-Status";
+})(CmcdHeaderField || (CmcdHeaderField = {}));
+
+/**
+ * The map of CMCD header fields to official CMCD keys.
+ *
+ * @internal
+ *
+ * @group CMCD
  */
+const CmcdHeaderMap = {
+  [CmcdHeaderField.OBJECT]: ['br', 'd', 'ot', 'tb'],
+  [CmcdHeaderField.REQUEST]: ['bl', 'dl', 'mtp', 'nor', 'nrr', 'su'],
+  [CmcdHeaderField.SESSION]: ['cid', 'pr', 'sf', 'sid', 'st', 'v'],
+  [CmcdHeaderField.STATUS]: ['bs', 'rtp']
+};
 
-class StringDecoder {
-  // eslint-disable-next-line @typescript-eslint/no-unused-vars
-  decode(data, options) {
-    if (!data) {
-      return '';
-    }
-    if (typeof data !== 'string') {
-      throw new Error('Error - expected string data.');
+/**
+ * Structured Field Item
+ *
+ * @group Structured Field
+ *
+ * @beta
+ */
+class SfItem {
+  constructor(value, params) {
+    this.value = void 0;
+    this.params = void 0;
+    if (Array.isArray(value)) {
+      value = value.map(v => v instanceof SfItem ? v : new SfItem(v));
     }
-    return decodeURIComponent(encodeURIComponent(data));
+    this.value = value;
+    this.params = params;
   }
 }
 
-// Try to parse input as a time stamp.
-function parseTimeStamp(input) {
-  function computeSeconds(h, m, s, f) {
-    return (h | 0) * 3600 + (m | 0) * 60 + (s | 0) + parseFloat(f || 0);
-  }
-  const m = input.match(/^(?:(\d+):)?(\d{2}):(\d{2})(\.\d+)?/);
-  if (!m) {
-    return null;
-  }
-  if (parseFloat(m[2]) > 59) {
-    // Timestamp takes the form of [hours]:[minutes].[milliseconds]
-    // First position is hours as it's over 59.
-    return computeSeconds(m[2], m[3], 0, m[4]);
+/**
+ * A class to represent structured field tokens when `Symbol` is not available.
+ *
+ * @group Structured Field
+ *
+ * @beta
+ */
+class SfToken {
+  constructor(description) {
+    this.description = void 0;
+    this.description = description;
   }
-  // Timestamp takes the form of [hours (optional)]:[minutes]:[seconds].[milliseconds]
-  return computeSeconds(m[1], m[2], m[3], m[4]);
 }
 
-// A settings object holds key/value pairs and will ignore anything but the first
-// assignment to a specific key.
-class Settings {
-  constructor() {
-    this.values = Object.create(null);
+const DICT = 'Dict';
+
+function format(value) {
+  if (Array.isArray(value)) {
+    return JSON.stringify(value);
   }
-  // Only accept the first assignment to any key.
-  set(k, v) {
-    if (!this.get(k) && v !== '') {
-      this.values[k] = v;
-    }
+  if (value instanceof Map) {
+    return 'Map{}';
   }
-  // Return the value for a key, or a default value.
-  // If 'defaultKey' is passed then 'dflt' is assumed to be an object with
-  // a number of possible default values as properties where 'defaultKey' is
-  // the key of the property that will be chosen; otherwise it's assumed to be
-  // a single value.
-  get(k, dflt, defaultKey) {
-    if (defaultKey) {
-      return this.has(k) ? this.values[k] : dflt[defaultKey];
-    }
-    return this.has(k) ? this.values[k] : dflt;
+  if (value instanceof Set) {
+    return 'Set{}';
   }
-  // Check whether we have a value for a key.
-  has(k) {
-    return k in this.values;
+  if (typeof value === 'object') {
+    return JSON.stringify(value);
   }
-  // Accept a setting if its one of the given alternatives.
-  alt(k, v, a) {
-    for (let n = 0; n < a.length; ++n) {
-      if (v === a[n]) {
-        this.set(k, v);
-        break;
-      }
-    }
+  return String(value);
+}
+function throwError(action, src, type, cause) {
+  return new Error(`failed to ${action} "${format(src)}" as ${type}`, {
+    cause
+  });
+}
+
+const BARE_ITEM = 'Bare Item';
+
+const BOOLEAN = 'Boolean';
+
+const BYTES = 'Byte Sequence';
+
+const DECIMAL = 'Decimal';
+
+const INTEGER = 'Integer';
+
+function isInvalidInt(value) {
+  return value < -999999999999999 || 999999999999999 < value;
+}
+
+const STRING_REGEX = /[\x00-\x1f\x7f]+/; // eslint-disable-line no-control-regex
+
+const TOKEN = 'Token';
+
+const KEY = 'Key';
+
+function serializeError(src, type, cause) {
+  return throwError('serialize', src, type, cause);
+}
+
+// 4.1.9.  Serializing a Boolean
+//
+// Given a Boolean as input_boolean, return an ASCII string suitable for
+// use in a HTTP field value.
+//
+// 1.  If input_boolean is not a boolean, fail serialization.
+//
+// 2.  Let output be an empty string.
+//
+// 3.  Append "?" to output.
+//
+// 4.  If input_boolean is true, append "1" to output.
+//
+// 5.  If input_boolean is false, append "0" to output.
+//
+// 6.  Return output.
+function serializeBoolean(value) {
+  if (typeof value !== 'boolean') {
+    throw serializeError(value, BOOLEAN);
   }
-  // Accept a setting if its a valid (signed) integer.
-  integer(k, v) {
-    if (/^-?\d+$/.test(v)) {
-      // integer
-      this.set(k, parseInt(v, 10));
-    }
+  return value ? '?1' : '?0';
+}
+
+/**
+ * Encodes binary data to base64
+ *
+ * @param binary - The binary data to encode
+ * @returns The base64 encoded string
+ *
+ * @group Utils
+ *
+ * @beta
+ */
+function base64encode(binary) {
+  return btoa(String.fromCharCode(...binary));
+}
+
+// 4.1.8.  Serializing a Byte Sequence
+//
+// Given a Byte Sequence as input_bytes, return an ASCII string suitable
+// for use in a HTTP field value.
+//
+// 1.  If input_bytes is not a sequence of bytes, fail serialization.
+//
+// 2.  Let output be an empty string.
+//
+// 3.  Append ":" to output.
+//
+// 4.  Append the result of base64-encoding input_bytes as per
+//     [RFC4648], Section 4, taking account of the requirements below.
+//
+// 5.  Append ":" to output.
+//
+// 6.  Return output.
+//
+// The encoded data is required to be padded with "=", as per [RFC4648],
+// Section 3.2.
+//
+// Likewise, encoded data SHOULD have pad bits set to zero, as per
+// [RFC4648], Section 3.5, unless it is not possible to do so due to
+// implementation constraints.
+function serializeByteSequence(value) {
+  if (ArrayBuffer.isView(value) === false) {
+    throw serializeError(value, BYTES);
+  }
+  return `:${base64encode(value)}:`;
+}
+
+// 4.1.4.  Serializing an Integer
+//
+// Given an Integer as input_integer, return an ASCII string suitable
+// for use in a HTTP field value.
+//
+// 1.  If input_integer is not an integer in the range of
+//     -999,999,999,999,999 to 999,999,999,999,999 inclusive, fail
+//     serialization.
+//
+// 2.  Let output be an empty string.
+//
+// 3.  If input_integer is less than (but not equal to) 0, append "-" to
+//     output.
+//
+// 4.  Append input_integer's numeric value represented in base 10 using
+//     only decimal digits to output.
+//
+// 5.  Return output.
+function serializeInteger(value) {
+  if (isInvalidInt(value)) {
+    throw serializeError(value, INTEGER);
+  }
+  return value.toString();
+}
+
+// 4.1.10.  Serializing a Date
+//
+// Given a Date as input_integer, return an ASCII string suitable for
+// use in an HTTP field value.
+// 1.  Let output be "@".
+// 2.  Append to output the result of running Serializing an Integer
+//     with input_date (Section 4.1.4).
+// 3.  Return output.
+function serializeDate(value) {
+  return `@${serializeInteger(value.getTime() / 1000)}`;
+}
+
+/**
+ * This implements the rounding procedure described in step 2 of the "Serializing a Decimal" specification.
+ * This rounding style is known as "even rounding", "banker's rounding", or "commercial rounding".
+ *
+ * @param value - The value to round
+ * @param precision - The number of decimal places to round to
+ * @returns The rounded value
+ *
+ * @group Utils
+ *
+ * @beta
+ */
+function roundToEven(value, precision) {
+  if (value < 0) {
+    return -roundToEven(-value, precision);
+  }
+  const decimalShift = Math.pow(10, precision);
+  const isEquidistant = Math.abs(value * decimalShift % 1 - 0.5) < Number.EPSILON;
+  if (isEquidistant) {
+    // If the tail of the decimal place is 'equidistant' we round to the nearest even value
+    const flooredValue = Math.floor(value * decimalShift);
+    return (flooredValue % 2 === 0 ? flooredValue : flooredValue + 1) / decimalShift;
+  } else {
+    // Otherwise, proceed as normal
+    return Math.round(value * decimalShift) / decimalShift;
+  }
+}
+
+// 4.1.5.  Serializing a Decimal
+//
+// Given a decimal number as input_decimal, return an ASCII string
+// suitable for use in a HTTP field value.
+//
+// 1.   If input_decimal is not a decimal number, fail serialization.
+//
+// 2.   If input_decimal has more than three significant digits to the
+//      right of the decimal point, round it to three decimal places,
+//      rounding the final digit to the nearest value, or to the even
+//      value if it is equidistant.
+//
+// 3.   If input_decimal has more than 12 significant digits to the left
+//      of the decimal point after rounding, fail serialization.
+//
+// 4.   Let output be an empty string.
+//
+// 5.   If input_decimal is less than (but not equal to) 0, append "-"
+//      to output.
+//
+// 6.   Append input_decimal's integer component represented in base 10
+//      (using only decimal digits) to output; if it is zero, append
+//      "0".
+//
+// 7.   Append "." to output.
+//
+// 8.   If input_decimal's fractional component is zero, append "0" to
+//      output.
+//
+// 9.   Otherwise, append the significant digits of input_decimal's
+//      fractional component represented in base 10 (using only decimal
+//      digits) to output.
+//
+// 10.  Return output.
+function serializeDecimal(value) {
+  const roundedValue = roundToEven(value, 3); // round to 3 decimal places
+  if (Math.floor(Math.abs(roundedValue)).toString().length > 12) {
+    throw serializeError(value, DECIMAL);
+  }
+  const stringValue = roundedValue.toString();
+  return stringValue.includes('.') ? stringValue : `${stringValue}.0`;
+}
+
+const STRING = 'String';
+
+// 4.1.6.  Serializing a String
+//
+// Given a String as input_string, return an ASCII string suitable for
+// use in a HTTP field value.
+//
+// 1.  Convert input_string into a sequence of ASCII characters; if
+//     conversion fails, fail serialization.
+//
+// 2.  If input_string contains characters in the range %x00-1f or %x7f
+//     (i.e., not in VCHAR or SP), fail serialization.
+//
+// 3.  Let output be the string DQUOTE.
+//
+// 4.  For each character char in input_string:
+//
+//     1.  If char is "\" or DQUOTE:
+//
+//         1.  Append "\" to output.
+//
+//     2.  Append char to output.
+//
+// 5.  Append DQUOTE to output.
+//
+// 6.  Return output.
+function serializeString(value) {
+  if (STRING_REGEX.test(value)) {
+    throw serializeError(value, STRING);
+  }
+  return `"${value.replace(/\\/g, `\\\\`).replace(/"/g, `\\"`)}"`;
+}
+
+function symbolToStr(symbol) {
+  return symbol.description || symbol.toString().slice(7, -1);
+}
+
+function serializeToken(token) {
+  const value = symbolToStr(token);
+  if (/^([a-zA-Z*])([!#$%&'*+\-.^_`|~\w:/]*)$/.test(value) === false) {
+    throw serializeError(value, TOKEN);
   }
-  // Accept a setting if its a valid percentage.
-  percent(k, v) {
-    if (/^([\d]{1,3})(\.[\d]*)?%$/.test(v)) {
-      const percent = parseFloat(v);
-      if (percent >= 0 && percent <= 100) {
-        this.set(k, percent);
-        return true;
+  return value;
+}
+
+// 4.1.3.1.  Serializing a Bare Item
+//
+// Given an Item as input_item, return an ASCII string suitable for use
+// in a HTTP field value.
+//
+// 1.  If input_item is an Integer, return the result of running
+//     Serializing an Integer (Section 4.1.4) with input_item.
+//
+// 2.  If input_item is a Decimal, return the result of running
+//     Serializing a Decimal (Section 4.1.5) with input_item.
+//
+// 3.  If input_item is a String, return the result of running
+//     Serializing a String (Section 4.1.6) with input_item.
+//
+// 4.  If input_item is a Token, return the result of running
+//     Serializing a Token (Section 4.1.7) with input_item.
+//
+// 5.  If input_item is a Boolean, return the result of running
+//     Serializing a Boolean (Section 4.1.9) with input_item.
+//
+// 6.  If input_item is a Byte Sequence, return the result of running
+//     Serializing a Byte Sequence (Section 4.1.8) with input_item.
+//
+// 7.  If input_item is a Date, return the result of running Serializing
+//     a Date (Section 4.1.10) with input_item.
+//
+// 8.  Otherwise, fail serialization.
+function serializeBareItem(value) {
+  switch (typeof value) {
+    case 'number':
+      if (!isFiniteNumber(value)) {
+        throw serializeError(value, BARE_ITEM);
+      }
+      if (Number.isInteger(value)) {
+        return serializeInteger(value);
+      }
+      return serializeDecimal(value);
+    case 'string':
+      return serializeString(value);
+    case 'symbol':
+      return serializeToken(value);
+    case 'boolean':
+      return serializeBoolean(value);
+    case 'object':
+      if (value instanceof Date) {
+        return serializeDate(value);
+      }
+      if (value instanceof Uint8Array) {
+        return serializeByteSequence(value);
+      }
+      if (value instanceof SfToken) {
+        return serializeToken(value);
       }
-    }
-    return false;
+    default:
+      // fail
+      throw serializeError(value, BARE_ITEM);
+  }
+}
+
+// 4.1.1.3.  Serializing a Key
+//
+// Given a key as input_key, return an ASCII string suitable for use in
+// a HTTP field value.
+//
+// 1.  Convert input_key into a sequence of ASCII characters; if
+//     conversion fails, fail serialization.
+//
+// 2.  If input_key contains characters not in lcalpha, DIGIT, "_", "-",
+//     ".", or "*" fail serialization.
+//
+// 3.  If the first character of input_key is not lcalpha or "*", fail
+//     serialization.
+//
+// 4.  Let output be an empty string.
+//
+// 5.  Append input_key to output.
+//
+// 6.  Return output.
+function serializeKey(value) {
+  if (/^[a-z*][a-z0-9\-_.*]*$/.test(value) === false) {
+    throw serializeError(value, KEY);
   }
+  return value;
 }
 
-// Helper function to parse input into groups separated by 'groupDelim', and
-// interpret each group as a key/value pair separated by 'keyValueDelim'.
-function parseOptions(input, callback, keyValueDelim, groupDelim) {
-  const groups = groupDelim ? input.split(groupDelim) : [input];
-  for (const i in groups) {
-    if (typeof groups[i] !== 'string') {
-      continue;
-    }
-    const kv = groups[i].split(keyValueDelim);
-    if (kv.length !== 2) {
-      continue;
+// 4.1.1.2.  Serializing Parameters
+//
+// Given an ordered Dictionary as input_parameters (each member having a
+// param_name and a param_value), return an ASCII string suitable for
+// use in a HTTP field value.
+//
+// 1.  Let output be an empty string.
+//
+// 2.  For each param_name with a value of param_value in
+//     input_parameters:
+//
+//     1.  Append ";" to output.
+//
+//     2.  Append the result of running Serializing a Key
+//         (Section 4.1.1.3) with param_name to output.
+//
+//     3.  If param_value is not Boolean true:
+//
+//         1.  Append "=" to output.
+//
+//         2.  Append the result of running Serializing a bare Item
+//             (Section 4.1.3.1) with param_value to output.
+//
+// 3.  Return output.
+function serializeParams(params) {
+  if (params == null) {
+    return '';
+  }
+  return Object.entries(params).map(([key, value]) => {
+    if (value === true) {
+      return `;${serializeKey(key)}`; // omit true
+    }
+    return `;${serializeKey(key)}=${serializeBareItem(value)}`;
+  }).join('');
+}
+
+// 4.1.3.  Serializing an Item
+//
+// Given an Item as bare_item and Parameters as item_parameters, return
+// an ASCII string suitable for use in a HTTP field value.
+//
+// 1.  Let output be an empty string.
+//
+// 2.  Append the result of running Serializing a Bare Item
+//     Section 4.1.3.1 with bare_item to output.
+//
+// 3.  Append the result of running Serializing Parameters
+//     Section 4.1.1.2 with item_parameters to output.
+//
+// 4.  Return output.
+function serializeItem(value) {
+  if (value instanceof SfItem) {
+    return `${serializeBareItem(value.value)}${serializeParams(value.params)}`;
+  } else {
+    return serializeBareItem(value);
+  }
+}
+
+// 4.1.1.1.  Serializing an Inner List
+//
+// Given an array of (member_value, parameters) tuples as inner_list,
+// and parameters as list_parameters, return an ASCII string suitable
+// for use in a HTTP field value.
+//
+// 1.  Let output be the string "(".
+//
+// 2.  For each (member_value, parameters) of inner_list:
+//
+//     1.  Append the result of running Serializing an Item
+//         (Section 4.1.3) with (member_value, parameters) to output.
+//
+//     2.  If more values remain in inner_list, append a single SP to
+//         output.
+//
+// 3.  Append ")" to output.
+//
+// 4.  Append the result of running Serializing Parameters
+//     (Section 4.1.1.2) with list_parameters to output.
+//
+// 5.  Return output.
+function serializeInnerList(value) {
+  return `(${value.value.map(serializeItem).join(' ')})${serializeParams(value.params)}`;
+}
+
+// 4.1.2.  Serializing a Dictionary
+//
+// Given an ordered Dictionary as input_dictionary (each member having a
+// member_name and a tuple value of (member_value, parameters)), return
+// an ASCII string suitable for use in a HTTP field value.
+//
+// 1.  Let output be an empty string.
+//
+// 2.  For each member_name with a value of (member_value, parameters)
+//     in input_dictionary:
+//
+//     1.  Append the result of running Serializing a Key
+//         (Section 4.1.1.3) with member's member_name to output.
+//
+//     2.  If member_value is Boolean true:
+//
+//         1.  Append the result of running Serializing Parameters
+//             (Section 4.1.1.2) with parameters to output.
+//
+//     3.  Otherwise:
+//
+//         1.  Append "=" to output.
+//
+//         2.  If member_value is an array, append the result of running
+//             Serializing an Inner List (Section 4.1.1.1) with
+//             (member_value, parameters) to output.
+//
+//         3.  Otherwise, append the result of running Serializing an
+//             Item (Section 4.1.3) with (member_value, parameters) to
+//             output.
+//
+//     4.  If more members remain in input_dictionary:
+//
+//         1.  Append "," to output.
+//
+//         2.  Append a single SP to output.
+//
+// 3.  Return output.
+function serializeDict(dict, options = {
+  whitespace: true
+}) {
+  if (typeof dict !== 'object') {
+    throw serializeError(dict, DICT);
+  }
+  const entries = dict instanceof Map ? dict.entries() : Object.entries(dict);
+  const optionalWhiteSpace = options != null && options.whitespace ? ' ' : '';
+  return Array.from(entries).map(([key, item]) => {
+    if (item instanceof SfItem === false) {
+      item = new SfItem(item);
+    }
+    let output = serializeKey(key);
+    if (item.value === true) {
+      output += serializeParams(item.params);
+    } else {
+      output += '=';
+      if (Array.isArray(item.value)) {
+        output += serializeInnerList(item);
+      } else {
+        output += serializeItem(item);
+      }
     }
-    const k = kv[0];
-    const v = kv[1];
-    callback(k, v);
-  }
+    return output;
+  }).join(`,${optionalWhiteSpace}`);
 }
-const defaults = new VTTCue(0, 0, '');
-// 'middle' was changed to 'center' in the spec: https://github.com/w3c/webvtt/pull/244
-//  Safari doesn't yet support this change, but FF and Chrome do.
-const center = defaults.align === 'middle' ? 'middle' : 'center';
-function parseCue(input, cue, regionList) {
-  // Remember the original input if we need to throw an error.
-  const oInput = input;
-  // 4.1 WebVTT timestamp
-  function consumeTimeStamp() {
-    const ts = parseTimeStamp(input);
-    if (ts === null) {
-      throw new Error('Malformed timestamp: ' + oInput);
-    }
 
-    // Remove time stamp from input.
-    input = input.replace(/^[^\sa-zA-Z-]+/, '');
-    return ts;
-  }
+/**
+ * Encode an object into a structured field dictionary
+ *
+ * @param input - The structured field dictionary to encode
+ * @returns The structured field string
+ *
+ * @group Structured Field
+ *
+ * @beta
+ */
+function encodeSfDict(value, options) {
+  return serializeDict(value, options);
+}
 
-  // 4.4.2 WebVTT cue settings
-  function consumeCueSettings(input, cue) {
-    const settings = new Settings();
-    parseOptions(input, function (k, v) {
-      let vals;
-      switch (k) {
-        case 'region':
-          // Find the last region we parsed with the same region id.
-          for (let i = regionList.length - 1; i >= 0; i--) {
-            if (regionList[i].id === v) {
-              settings.set(k, regionList[i].region);
-              break;
-            }
-          }
-          break;
-        case 'vertical':
-          settings.alt(k, v, ['rl', 'lr']);
-          break;
-        case 'line':
-          vals = v.split(',');
-          settings.integer(k, vals[0]);
-          if (settings.percent(k, vals[0])) {
-            settings.set('snapToLines', false);
-          }
-          settings.alt(k, vals[0], ['auto']);
-          if (vals.length === 2) {
-            settings.alt('lineAlign', vals[1], ['start', center, 'end']);
-          }
-          break;
-        case 'position':
-          vals = v.split(',');
-          settings.percent(k, vals[0]);
-          if (vals.length === 2) {
-            settings.alt('positionAlign', vals[1], ['start', center, 'end', 'line-left', 'line-right', 'auto']);
-          }
-          break;
-        case 'size':
-          settings.percent(k, v);
-          break;
-        case 'align':
-          settings.alt(k, v, ['start', center, 'end', 'left', 'right']);
-          break;
-      }
-    }, /:/, /\s/);
+/**
+ * Checks if the given key is a token field.
+ *
+ * @param key - The key to check.
+ *
+ * @returns `true` if the key is a token field.
+ *
+ * @internal
+ *
+ * @group CMCD
+ */
+const isTokenField = key => key === 'ot' || key === 'sf' || key === 'st';
 
-    // Apply default values for any missing fields.
-    cue.region = settings.get('region', null);
-    cue.vertical = settings.get('vertical', '');
-    let line = settings.get('line', 'auto');
-    if (line === 'auto' && defaults.line === -1) {
-      // set numeric line number for Safari
-      line = -1;
-    }
-    cue.line = line;
-    cue.lineAlign = settings.get('lineAlign', 'start');
-    cue.snapToLines = settings.get('snapToLines', true);
-    cue.size = settings.get('size', 100);
-    cue.align = settings.get('align', center);
-    let position = settings.get('position', 'auto');
-    if (position === 'auto' && defaults.position === 50) {
-      // set numeric position for Safari
-      position = cue.align === 'start' || cue.align === 'left' ? 0 : cue.align === 'end' || cue.align === 'right' ? 100 : 50;
-    }
-    cue.position = position;
+const isValid = value => {
+  if (typeof value === 'number') {
+    return isFiniteNumber(value);
   }
-  function skipWhitespace() {
-    input = input.replace(/^\s+/, '');
+  return value != null && value !== '' && value !== false;
+};
+
+/**
+ * Constructs a relative path from a URL.
+ *
+ * @param url - The destination URL
+ * @param base - The base URL
+ * @returns The relative path
+ *
+ * @group Utils
+ *
+ * @beta
+ */
+function urlToRelativePath(url, base) {
+  const to = new URL(url);
+  const from = new URL(base);
+  if (to.origin !== from.origin) {
+    return url;
+  }
+  const toPath = to.pathname.split('/').slice(1);
+  const fromPath = from.pathname.split('/').slice(1, -1);
+  // remove common parents
+  while (toPath[0] === fromPath[0]) {
+    toPath.shift();
+    fromPath.shift();
   }
+  // add back paths
+  while (fromPath.length) {
+    fromPath.shift();
+    toPath.unshift('..');
+  }
+  return toPath.join('/');
+}
 
-  // 4.1 WebVTT cue timings.
-  skipWhitespace();
-  cue.startTime = consumeTimeStamp(); // (1) collect cue start time
-  skipWhitespace();
-  if (input.slice(0, 3) !== '-->') {
-    // (3) next characters must match '-->'
-    throw new Error("Malformed time stamp (time stamps must be separated by '-->'): " + oInput);
+/**
+ * Generate a random v4 UUID
+ *
+ * @returns A random v4 UUID
+ *
+ * @group Utils
+ *
+ * @beta
+ */
+function uuid() {
+  try {
+    return crypto.randomUUID();
+  } catch (error) {
+    try {
+      const url = URL.createObjectURL(new Blob());
+      const uuid = url.toString();
+      URL.revokeObjectURL(url);
+      return uuid.slice(uuid.lastIndexOf('/') + 1);
+    } catch (error) {
+      let dt = new Date().getTime();
+      const uuid = 'xxxxxxxx-xxxx-4xxx-yxxx-xxxxxxxxxxxx'.replace(/[xy]/g, c => {
+        const r = (dt + Math.random() * 16) % 16 | 0;
+        dt = Math.floor(dt / 16);
+        return (c == 'x' ? r : r & 0x3 | 0x8).toString(16);
+      });
+      return uuid;
+    }
   }
-  input = input.slice(3);
-  skipWhitespace();
-  cue.endTime = consumeTimeStamp(); // (5) collect cue end time
-
-  // 4.1 WebVTT cue settings list.
-  skipWhitespace();
-  consumeCueSettings(input, cue);
-}
-function fixLineBreaks(input) {
-  return input.replace(/<br(?: \/)?>/gi, '\n');
 }
-class VTTParser {
-  constructor() {
-    this.state = 'INITIAL';
-    this.buffer = '';
-    this.decoder = new StringDecoder();
-    this.regionList = [];
-    this.cue = null;
-    this.oncue = void 0;
-    this.onparsingerror = void 0;
-    this.onflush = void 0;
+
+const toRounded = value => Math.round(value);
+const toUrlSafe = (value, options) => {
+  if (options != null && options.baseUrl) {
+    value = urlToRelativePath(value, options.baseUrl);
   }
-  parse(data) {
-    const _this = this;
+  return encodeURIComponent(value);
+};
+const toHundred = value => toRounded(value / 100) * 100;
+/**
+ * The default formatters for CMCD values.
+ *
+ * @group CMCD
+ *
+ * @beta
+ */
+const CmcdFormatters = {
+  /**
+   * Bitrate (kbps) rounded integer
+   */
+  br: toRounded,
+  /**
+   * Duration (milliseconds) rounded integer
+   */
+  d: toRounded,
+  /**
+   * Buffer Length (milliseconds) rounded nearest 100ms
+   */
+  bl: toHundred,
+  /**
+   * Deadline (milliseconds) rounded nearest 100ms
+   */
+  dl: toHundred,
+  /**
+   * Measured Throughput (kbps) rounded nearest 100kbps
+   */
+  mtp: toHundred,
+  /**
+   * Next Object Request URL encoded
+   */
+  nor: toUrlSafe,
+  /**
+   * Requested maximum throughput (kbps) rounded nearest 100kbps
+   */
+  rtp: toHundred,
+  /**
+   * Top Bitrate (kbps) rounded integer
+   */
+  tb: toRounded
+};
 
-    // If there is no data then we won't decode it, but will just try to parse
-    // whatever is in buffer already. This may occur in circumstances, for
-    // example when flush() is called.
-    if (data) {
-      // Try to decode the data that we received.
-      _this.buffer += _this.decoder.decode(data, {
-        stream: true
-      });
+/**
+ * Internal CMCD processing function.
+ *
+ * @param obj - The CMCD object to process.
+ * @param map - The mapping function to use.
+ * @param options - Options for encoding.
+ *
+ * @internal
+ *
+ * @group CMCD
+ */
+function processCmcd(obj, options) {
+  const results = {};
+  if (obj == null || typeof obj !== 'object') {
+    return results;
+  }
+  const keys = Object.keys(obj).sort();
+  const formatters = _extends({}, CmcdFormatters, options == null ? void 0 : options.formatters);
+  const filter = options == null ? void 0 : options.filter;
+  keys.forEach(key => {
+    if (filter != null && filter(key)) {
+      return;
     }
-    function collectNextLine() {
-      let buffer = _this.buffer;
-      let pos = 0;
-      buffer = fixLineBreaks(buffer);
-      while (pos < buffer.length && buffer[pos] !== '\r' && buffer[pos] !== '\n') {
-        ++pos;
-      }
-      const line = buffer.slice(0, pos);
-      // Advance the buffer early in case we fail below.
-      if (buffer[pos] === '\r') {
-        ++pos;
-      }
-      if (buffer[pos] === '\n') {
-        ++pos;
-      }
-      _this.buffer = buffer.slice(pos);
-      return line;
+    let value = obj[key];
+    const formatter = formatters[key];
+    if (formatter) {
+      value = formatter(value, options);
     }
-
-    // 3.2 WebVTT metadata header syntax
-    function parseHeader(input) {
-      parseOptions(input, function (k, v) {
-        // switch (k) {
-        // case 'region':
-        // 3.3 WebVTT region metadata header syntax
-        // console.log('parse region', v);
-        // parseRegion(v);
-        // break;
-        // }
-      }, /:/);
+    // Version should only be reported if not equal to 1.
+    if (key === 'v' && value === 1) {
+      return;
     }
-
-    // 5.1 WebVTT file parsing.
-    try {
-      let line = '';
-      if (_this.state === 'INITIAL') {
-        // We can't start parsing until we have the first line.
-        if (!/\r\n|\n/.test(_this.buffer)) {
-          return this;
-        }
-        line = collectNextLine();
-        // strip of UTF-8 BOM if any
-        // https://en.wikipedia.org/wiki/Byte_order_mark#UTF-8
-        const m = line.match(/^()?WEBVTT([ \t].*)?$/);
-        if (!(m != null && m[0])) {
-          throw new Error('Malformed WebVTT signature.');
-        }
-        _this.state = 'HEADER';
-      }
-      let alreadyCollectedLine = false;
-      while (_this.buffer) {
-        // We can't parse a line until we have the full line.
-        if (!/\r\n|\n/.test(_this.buffer)) {
-          return this;
-        }
-        if (!alreadyCollectedLine) {
-          line = collectNextLine();
-        } else {
-          alreadyCollectedLine = false;
-        }
-        switch (_this.state) {
-          case 'HEADER':
-            // 13-18 - Allow a header (metadata) under the WEBVTT line.
-            if (/:/.test(line)) {
-              parseHeader(line);
-            } else if (!line) {
-              // An empty line terminates the header and starts the body (cues).
-              _this.state = 'ID';
-            }
-            continue;
-          case 'NOTE':
-            // Ignore NOTE blocks.
-            if (!line) {
-              _this.state = 'ID';
-            }
-            continue;
-          case 'ID':
-            // Check for the start of NOTE blocks.
-            if (/^NOTE($|[ \t])/.test(line)) {
-              _this.state = 'NOTE';
-              break;
-            }
-            // 19-29 - Allow any number of line terminators, then initialize new cue values.
-            if (!line) {
-              continue;
-            }
-            _this.cue = new VTTCue(0, 0, '');
-            _this.state = 'CUE';
-            // 30-39 - Check if self line contains an optional identifier or timing data.
-            if (line.indexOf('-->') === -1) {
-              _this.cue.id = line;
-              continue;
-            }
-          // Process line as start of a cue.
-          /* falls through */
-          case 'CUE':
-            // 40 - Collect cue timings and settings.
-            if (!_this.cue) {
-              _this.state = 'BADCUE';
-              continue;
-            }
-            try {
-              parseCue(line, _this.cue, _this.regionList);
-            } catch (e) {
-              // In case of an error ignore rest of the cue.
-              _this.cue = null;
-              _this.state = 'BADCUE';
-              continue;
-            }
-            _this.state = 'CUETEXT';
-            continue;
-          case 'CUETEXT':
-            {
-              const hasSubstring = line.indexOf('-->') !== -1;
-              // 34 - If we have an empty line then report the cue.
-              // 35 - If we have the special substring '-->' then report the cue,
-              // but do not collect the line as we need to process the current
-              // one as a new cue.
-              if (!line || hasSubstring && (alreadyCollectedLine = true)) {
-                // We are done parsing self cue.
-                if (_this.oncue && _this.cue) {
-                  _this.oncue(_this.cue);
-                }
-                _this.cue = null;
-                _this.state = 'ID';
-                continue;
-              }
-              if (_this.cue === null) {
-                continue;
-              }
-              if (_this.cue.text) {
-                _this.cue.text += '\n';
-              }
-              _this.cue.text += line;
-            }
-            continue;
-          case 'BADCUE':
-            // 54-62 - Collect and discard the remaining cue.
-            if (!line) {
-              _this.state = 'ID';
-            }
-        }
-      }
-    } catch (e) {
-      // If we are currently parsing a cue, report what we have.
-      if (_this.state === 'CUETEXT' && _this.cue && _this.oncue) {
-        _this.oncue(_this.cue);
-      }
-      _this.cue = null;
-      // Enter BADWEBVTT state if header was not parsed correctly otherwise
-      // another exception occurred so enter BADCUE state.
-      _this.state = _this.state === 'INITIAL' ? 'BADWEBVTT' : 'BADCUE';
+    // Playback rate should only be sent if not equal to 1.
+    if (key == 'pr' && value === 1) {
+      return;
     }
-    return this;
-  }
-  flush() {
-    const _this = this;
-    try {
-      // Finish decoding the stream.
-      // _this.buffer += _this.decoder.decode();
-      // Synthesize the end of the current cue or region.
-      if (_this.cue || _this.state === 'HEADER') {
-        _this.buffer += '\n\n';
-        _this.parse();
-      }
-      // If we've flushed, parsed, and we're still on the INITIAL state then
-      // that means we don't have enough of the stream to parse the first
-      // line.
-      if (_this.state === 'INITIAL' || _this.state === 'BADWEBVTT') {
-        throw new Error('Malformed WebVTT signature.');
-      }
-    } catch (e) {
-      if (_this.onparsingerror) {
-        _this.onparsingerror(e);
-      }
+    // ignore invalid values
+    if (!isValid(value)) {
+      return;
     }
-    if (_this.onflush) {
-      _this.onflush();
+    if (isTokenField(key) && typeof value === 'string') {
+      value = new SfToken(value);
     }
-    return this;
+    results[key] = value;
+  });
+  return results;
+}
+
+/**
+ * Encode a CMCD object to a string.
+ *
+ * @param cmcd - The CMCD object to encode.
+ * @param options - Options for encoding.
+ *
+ * @returns The encoded CMCD string.
+ *
+ * @group CMCD
+ *
+ * @beta
+ */
+function encodeCmcd(cmcd, options = {}) {
+  if (!cmcd) {
+    return '';
   }
+  return encodeSfDict(processCmcd(cmcd, options), _extends({
+    whitespace: false
+  }, options));
+}
+
+/**
+ * Convert a CMCD data object to request headers
+ *
+ * @param cmcd - The CMCD data object to convert.
+ * @param options - Options for encoding the CMCD object.
+ *
+ * @returns The CMCD header shards.
+ *
+ * @group CMCD
+ *
+ * @beta
+ */
+function toCmcdHeaders(cmcd, options = {}) {
+  if (!cmcd) {
+    return {};
+  }
+  const entries = Object.entries(cmcd);
+  const headerMap = Object.entries(CmcdHeaderMap).concat(Object.entries((options == null ? void 0 : options.customHeaderMap) || {}));
+  const shards = entries.reduce((acc, entry) => {
+    var _headerMap$find, _acc$field;
+    const [key, value] = entry;
+    const field = ((_headerMap$find = headerMap.find(entry => entry[1].includes(key))) == null ? void 0 : _headerMap$find[0]) || CmcdHeaderField.REQUEST;
+    (_acc$field = acc[field]) != null ? _acc$field : acc[field] = {};
+    acc[field][key] = value;
+    return acc;
+  }, {});
+  return Object.entries(shards).reduce((acc, [field, value]) => {
+    acc[field] = encodeCmcd(value, options);
+    return acc;
+  }, {});
 }
 
-const LINEBREAKS = /\r\n|\n\r|\n|\r/g;
+/**
+ * Append CMCD query args to a header object.
+ *
+ * @param headers - The headers to append to.
+ * @param cmcd - The CMCD object to append.
+ * @param customHeaderMap - A map of custom CMCD keys to header fields.
+ *
+ * @returns The headers with the CMCD header shards appended.
+ *
+ * @group CMCD
+ *
+ * @beta
+ */
+function appendCmcdHeaders(headers, cmcd, options) {
+  return _extends(headers, toCmcdHeaders(cmcd, options));
+}
 
-// String.prototype.startsWith is not supported in IE11
-const startsWith = function startsWith(inputString, searchString, position = 0) {
-  return inputString.slice(position, position + searchString.length) === searchString;
-};
-const cueString2millis = function cueString2millis(timeString) {
-  let ts = parseInt(timeString.slice(-3));
-  const secs = parseInt(timeString.slice(-6, -4));
-  const mins = parseInt(timeString.slice(-9, -7));
-  const hours = timeString.length > 9 ? parseInt(timeString.substring(0, timeString.indexOf(':'))) : 0;
-  if (!isFiniteNumber(ts) || !isFiniteNumber(secs) || !isFiniteNumber(mins) || !isFiniteNumber(hours)) {
-    throw Error(`Malformed X-TIMESTAMP-MAP: Local:${timeString}`);
-  }
-  ts += 1000 * secs;
-  ts += 60 * 1000 * mins;
-  ts += 60 * 60 * 1000 * hours;
-  return ts;
-};
+/**
+ * CMCD parameter name.
+ *
+ * @group CMCD
+ *
+ * @beta
+ */
+const CMCD_PARAM = 'CMCD';
 
-// From https://github.com/darkskyapp/string-hash
-const hash = function hash(text) {
-  let _hash = 5381;
-  let i = text.length;
-  while (i) {
-    _hash = _hash * 33 ^ text.charCodeAt(--i);
+/**
+ * Convert a CMCD data object to a query arg.
+ *
+ * @param cmcd - The CMCD object to convert.
+ * @param options - Options for encoding the CMCD object.
+ *
+ * @returns The CMCD query arg.
+ *
+ * @group CMCD
+ *
+ * @beta
+ */
+function toCmcdQuery(cmcd, options = {}) {
+  if (!cmcd) {
+    return '';
   }
-  return (_hash >>> 0).toString();
-};
-
-// Create a unique hash id for a cue based on start/end times and text.
-// This helps timeline-controller to avoid showing repeated captions.
-function generateCueId(startTime, endTime, text) {
-  return hash(startTime.toString()) + hash(endTime.toString()) + hash(text);
+  const params = encodeCmcd(cmcd, options);
+  return `${CMCD_PARAM}=${encodeURIComponent(params)}`;
 }
-const calculateOffset = function calculateOffset(vttCCs, cc, presentationTime) {
-  let currCC = vttCCs[cc];
-  let prevCC = vttCCs[currCC.prevCC];
 
-  // This is the first discontinuity or cues have been processed since the last discontinuity
-  // Offset = current discontinuity time
-  if (!prevCC || !prevCC.new && currCC.new) {
-    vttCCs.ccOffset = vttCCs.presentationOffset = currCC.start;
-    currCC.new = false;
-    return;
+const REGEX = /CMCD=[^&#]+/;
+/**
+ * Append CMCD query args to a URL.
+ *
+ * @param url - The URL to append to.
+ * @param cmcd - The CMCD object to append.
+ * @param options - Options for encoding the CMCD object.
+ *
+ * @returns The URL with the CMCD query args appended.
+ *
+ * @group CMCD
+ *
+ * @beta
+ */
+function appendCmcdQuery(url, cmcd, options) {
+  // TODO: Replace with URLSearchParams once we drop Safari < 10.1 & Chrome < 49 support.
+  // https://developer.mozilla.org/en-US/docs/Web/API/URLSearchParams
+  const query = toCmcdQuery(cmcd, options);
+  if (!query) {
+    return url;
   }
-
-  // There have been discontinuities since cues were last parsed.
-  // Offset = time elapsed
-  while ((_prevCC = prevCC) != null && _prevCC.new) {
-    var _prevCC;
-    vttCCs.ccOffset += currCC.start - prevCC.start;
-    currCC.new = false;
-    currCC = prevCC;
-    prevCC = vttCCs[currCC.prevCC];
+  if (REGEX.test(url)) {
+    return url.replace(REGEX, query);
   }
-  vttCCs.presentationOffset = presentationTime;
-};
-function parseWebVTT(vttByteArray, initPTS, vttCCs, cc, timeOffset, callBack, errorCallBack) {
-  const parser = new VTTParser();
-  // Convert byteArray into string, replacing any somewhat exotic linefeeds with "\n", then split on that character.
-  // Uint8Array.prototype.reduce is not implemented in IE11
-  const vttLines = utf8ArrayToStr(new Uint8Array(vttByteArray)).trim().replace(LINEBREAKS, '\n').split('\n');
-  const cues = [];
-  const init90kHz = initPTS ? toMpegTsClockFromTimescale(initPTS.baseTime, initPTS.timescale) : 0;
-  let cueTime = '00:00.000';
-  let timestampMapMPEGTS = 0;
-  let timestampMapLOCAL = 0;
-  let parsingError;
-  let inHeader = true;
-  parser.oncue = function (cue) {
-    // Adjust cue timing; clamp cues to start no earlier than - and drop cues that don't end after - 0 on timeline.
-    const currCC = vttCCs[cc];
-    let cueOffset = vttCCs.ccOffset;
+  const separator = url.includes('?') ? '&' : '?';
+  return `${url}${separator}${query}`;
+}
 
-    // Calculate subtitle PTS offset
-    const webVttMpegTsMapOffset = (timestampMapMPEGTS - init90kHz) / 90000;
+/**
+ * Controller to deal with Common Media Client Data (CMCD)
+ * @see https://cdn.cta.tech/cta/media/media/resources/standards/pdfs/cta-5004-final.pdf
+ */
+class CMCDController {
+  // eslint-disable-line no-restricted-globals
 
-    // Update offsets for new discontinuities
-    if (currCC != null && currCC.new) {
-      if (timestampMapLOCAL !== undefined) {
-        // When local time is provided, offset = discontinuity start time - local time
-        cueOffset = vttCCs.ccOffset = currCC.start;
-      } else {
-        calculateOffset(vttCCs, cc, webVttMpegTsMapOffset);
+  constructor(hls) {
+    this.hls = void 0;
+    this.config = void 0;
+    this.media = void 0;
+    this.sid = void 0;
+    this.cid = void 0;
+    this.useHeaders = false;
+    this.includeKeys = void 0;
+    this.initialized = false;
+    this.starved = false;
+    this.buffering = true;
+    this.audioBuffer = void 0;
+    // eslint-disable-line no-restricted-globals
+    this.videoBuffer = void 0;
+    this.onWaiting = () => {
+      if (this.initialized) {
+        this.starved = true;
       }
-    }
-    if (webVttMpegTsMapOffset) {
-      if (!initPTS) {
-        parsingError = new Error('Missing initPTS for VTT MPEGTS');
-        return;
+      this.buffering = true;
+    };
+    this.onPlaying = () => {
+      if (!this.initialized) {
+        this.initialized = true;
       }
-      // If we have MPEGTS, offset = presentation time + discontinuity offset
-      cueOffset = webVttMpegTsMapOffset - vttCCs.presentationOffset;
-    }
-    const duration = cue.endTime - cue.startTime;
-    const startTime = normalizePts((cue.startTime + cueOffset - timestampMapLOCAL) * 90000, timeOffset * 90000) / 90000;
-    cue.startTime = Math.max(startTime, 0);
-    cue.endTime = Math.max(startTime + duration, 0);
-
-    //trim trailing webvtt block whitespaces
-    const text = cue.text.trim();
-
-    // Fix encoding of special characters
-    cue.text = decodeURIComponent(encodeURIComponent(text));
-
-    // If the cue was not assigned an id from the VTT file (line above the content), create one.
-    if (!cue.id) {
-      cue.id = generateCueId(cue.startTime, cue.endTime, text);
-    }
-    if (cue.endTime > 0) {
-      cues.push(cue);
-    }
-  };
-  parser.onparsingerror = function (error) {
-    parsingError = error;
-  };
-  parser.onflush = function () {
-    if (parsingError) {
-      errorCallBack(parsingError);
-      return;
-    }
-    callBack(cues);
-  };
-
-  // Go through contents line by line.
-  vttLines.forEach(line => {
-    if (inHeader) {
-      // Look for X-TIMESTAMP-MAP in header.
-      if (startsWith(line, 'X-TIMESTAMP-MAP=')) {
-        // Once found, no more are allowed anyway, so stop searching.
-        inHeader = false;
-        // Extract LOCAL and MPEGTS.
-        line.slice(16).split(',').forEach(timestamp => {
-          if (startsWith(timestamp, 'LOCAL:')) {
-            cueTime = timestamp.slice(6);
-          } else if (startsWith(timestamp, 'MPEGTS:')) {
-            timestampMapMPEGTS = parseInt(timestamp.slice(7));
-          }
+      this.buffering = false;
+    };
+    /**
+     * Apply CMCD data to a manifest request.
+     */
+    this.applyPlaylistData = context => {
+      try {
+        this.apply(context, {
+          ot: CmObjectType.MANIFEST,
+          su: !this.initialized
         });
-        try {
-          // Convert cue time to seconds
-          timestampMapLOCAL = cueString2millis(cueTime) / 1000;
-        } catch (error) {
-          parsingError = error;
+      } catch (error) {
+        logger.warn('Could not generate manifest CMCD data.', error);
+      }
+    };
+    /**
+     * Apply CMCD data to a segment request
+     */
+    this.applyFragmentData = context => {
+      try {
+        const fragment = context.frag;
+        const level = this.hls.levels[fragment.level];
+        const ot = this.getObjectType(fragment);
+        const data = {
+          d: fragment.duration * 1000,
+          ot
+        };
+        if (ot === CmObjectType.VIDEO || ot === CmObjectType.AUDIO || ot == CmObjectType.MUXED) {
+          data.br = level.bitrate / 1000;
+          data.tb = this.getTopBandwidth(ot) / 1000;
+          data.bl = this.getBufferLength(ot);
         }
-        // Return without parsing X-TIMESTAMP-MAP line.
-        return;
-      } else if (line === '') {
-        inHeader = false;
+        this.apply(context, data);
+      } catch (error) {
+        logger.warn('Could not generate segment CMCD data.', error);
       }
+    };
+    this.hls = hls;
+    const config = this.config = hls.config;
+    const {
+      cmcd
+    } = config;
+    if (cmcd != null) {
+      config.pLoader = this.createPlaylistLoader();
+      config.fLoader = this.createFragmentLoader();
+      this.sid = cmcd.sessionId || uuid();
+      this.cid = cmcd.contentId;
+      this.useHeaders = cmcd.useHeaders === true;
+      this.includeKeys = cmcd.includeKeys;
+      this.registerListeners();
     }
-    // Parse line by default.
-    parser.parse(line + '\n');
-  });
-  parser.flush();
-}
-
-const IMSC1_CODEC = 'stpp.ttml.im1t';
+  }
+  registerListeners() {
+    const hls = this.hls;
+    hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
+    hls.on(Events.MEDIA_DETACHED, this.onMediaDetached, this);
+    hls.on(Events.BUFFER_CREATED, this.onBufferCreated, this);
+  }
+  unregisterListeners() {
+    const hls = this.hls;
+    hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
+    hls.off(Events.MEDIA_DETACHED, this.onMediaDetached, this);
+    hls.off(Events.BUFFER_CREATED, this.onBufferCreated, this);
+  }
+  destroy() {
+    this.unregisterListeners();
+    this.onMediaDetached();
 
-// Time format: h:m:s:frames(.subframes)
-const HMSF_REGEX = /^(\d{2,}):(\d{2}):(\d{2}):(\d{2})\.?(\d+)?$/;
+    // @ts-ignore
+    this.hls = this.config = this.audioBuffer = this.videoBuffer = null;
+    // @ts-ignore
+    this.onWaiting = this.onPlaying = null;
+  }
+  onMediaAttached(event, data) {
+    this.media = data.media;
+    this.media.addEventListener('waiting', this.onWaiting);
+    this.media.addEventListener('playing', this.onPlaying);
+  }
+  onMediaDetached() {
+    if (!this.media) {
+      return;
+    }
+    this.media.removeEventListener('waiting', this.onWaiting);
+    this.media.removeEventListener('playing', this.onPlaying);
 
-// Time format: hours, minutes, seconds, milliseconds, frames, ticks
-const TIME_UNIT_REGEX = /^(\d*(?:\.\d*)?)(h|m|s|ms|f|t)$/;
-const textAlignToLineAlign = {
-  left: 'start',
-  center: 'center',
-  right: 'end',
-  start: 'start',
-  end: 'end'
-};
-function parseIMSC1(payload, initPTS, callBack, errorCallBack) {
-  const results = findBox(new Uint8Array(payload), ['mdat']);
-  if (results.length === 0) {
-    errorCallBack(new Error('Could not parse IMSC1 mdat'));
-    return;
+    // @ts-ignore
+    this.media = null;
   }
-  const ttmlList = results.map(mdat => utf8ArrayToStr(mdat));
-  const syncTime = toTimescaleFromScale(initPTS.baseTime, 1, initPTS.timescale);
-  try {
-    ttmlList.forEach(ttml => callBack(parseTTML(ttml, syncTime)));
-  } catch (error) {
-    errorCallBack(error);
+  onBufferCreated(event, data) {
+    var _data$tracks$audio, _data$tracks$video;
+    this.audioBuffer = (_data$tracks$audio = data.tracks.audio) == null ? void 0 : _data$tracks$audio.buffer;
+    this.videoBuffer = (_data$tracks$video = data.tracks.video) == null ? void 0 : _data$tracks$video.buffer;
   }
-}
-function parseTTML(ttml, syncTime) {
-  const parser = new DOMParser();
-  const xmlDoc = parser.parseFromString(ttml, 'text/xml');
-  const tt = xmlDoc.getElementsByTagName('tt')[0];
-  if (!tt) {
-    throw new Error('Invalid ttml');
+  /**
+   * Create baseline CMCD data
+   */
+  createData() {
+    var _this$media;
+    return {
+      v: 1,
+      sf: CmStreamingFormat.HLS,
+      sid: this.sid,
+      cid: this.cid,
+      pr: (_this$media = this.media) == null ? void 0 : _this$media.playbackRate,
+      mtp: this.hls.bandwidthEstimate / 1000
+    };
   }
-  const defaultRateInfo = {
-    frameRate: 30,
-    subFrameRate: 1,
-    frameRateMultiplier: 0,
-    tickRate: 0
-  };
-  const rateInfo = Object.keys(defaultRateInfo).reduce((result, key) => {
-    result[key] = tt.getAttribute(`ttp:${key}`) || defaultRateInfo[key];
-    return result;
-  }, {});
-  const trim = tt.getAttribute('xml:space') !== 'preserve';
-  const styleElements = collectionToDictionary(getElementCollection(tt, 'styling', 'style'));
-  const regionElements = collectionToDictionary(getElementCollection(tt, 'layout', 'region'));
-  const cueElements = getElementCollection(tt, 'body', '[begin]');
-  return [].map.call(cueElements, cueElement => {
-    const cueText = getTextContent(cueElement, trim);
-    if (!cueText || !cueElement.hasAttribute('begin')) {
-      return null;
-    }
-    const startTime = parseTtmlTime(cueElement.getAttribute('begin'), rateInfo);
-    const duration = parseTtmlTime(cueElement.getAttribute('dur'), rateInfo);
-    let endTime = parseTtmlTime(cueElement.getAttribute('end'), rateInfo);
-    if (startTime === null) {
-      throw timestampParsingError(cueElement);
+
+  /**
+   * Apply CMCD data to a request.
+   */
+  apply(context, data = {}) {
+    // apply baseline data
+    _extends(data, this.createData());
+    const isVideo = data.ot === CmObjectType.INIT || data.ot === CmObjectType.VIDEO || data.ot === CmObjectType.MUXED;
+    if (this.starved && isVideo) {
+      data.bs = true;
+      data.su = true;
+      this.starved = false;
     }
-    if (endTime === null) {
-      if (duration === null) {
-        throw timestampParsingError(cueElement);
-      }
-      endTime = startTime + duration;
+    if (data.su == null) {
+      data.su = this.buffering;
     }
-    const cue = new VTTCue(startTime - syncTime, endTime - syncTime, cueText);
-    cue.id = generateCueId(cue.startTime, cue.endTime, cue.text);
-    const region = regionElements[cueElement.getAttribute('region')];
-    const style = styleElements[cueElement.getAttribute('style')];
 
-    // Apply styles to cue
-    const styles = getTtmlStyles(region, style, styleElements);
+    // TODO: Implement rtp, nrr, nor, dl
+
     const {
-      textAlign
-    } = styles;
-    if (textAlign) {
-      // cue.positionAlign not settable in FF~2016
-      const lineAlign = textAlignToLineAlign[textAlign];
-      if (lineAlign) {
-        cue.lineAlign = lineAlign;
+      includeKeys
+    } = this;
+    if (includeKeys) {
+      data = Object.keys(data).reduce((acc, key) => {
+        includeKeys.includes(key) && (acc[key] = data[key]);
+        return acc;
+      }, {});
+    }
+    if (this.useHeaders) {
+      if (!context.headers) {
+        context.headers = {};
       }
-      cue.align = textAlign;
+      appendCmcdHeaders(context.headers, data);
+    } else {
+      context.url = appendCmcdQuery(context.url, data);
     }
-    _extends(cue, styles);
-    return cue;
-  }).filter(cue => cue !== null);
-}
-function getElementCollection(fromElement, parentName, childName) {
-  const parent = fromElement.getElementsByTagName(parentName)[0];
-  if (parent) {
-    return [].slice.call(parent.querySelectorAll(childName));
   }
-  return [];
-}
-function collectionToDictionary(elementsWithId) {
-  return elementsWithId.reduce((dict, element) => {
-    const id = element.getAttribute('xml:id');
-    if (id) {
-      dict[id] = element;
+  /**
+   * The CMCD object type.
+   */
+  getObjectType(fragment) {
+    const {
+      type
+    } = fragment;
+    if (type === 'subtitle') {
+      return CmObjectType.TIMED_TEXT;
     }
-    return dict;
-  }, {});
-}
-function getTextContent(element, trim) {
-  return [].slice.call(element.childNodes).reduce((str, node, i) => {
-    var _node$childNodes;
-    if (node.nodeName === 'br' && i) {
-      return str + '\n';
+    if (fragment.sn === 'initSegment') {
+      return CmObjectType.INIT;
     }
-    if ((_node$childNodes = node.childNodes) != null && _node$childNodes.length) {
-      return getTextContent(node, trim);
-    } else if (trim) {
-      return str + node.textContent.trim().replace(/\s+/g, ' ');
+    if (type === 'audio') {
+      return CmObjectType.AUDIO;
     }
-    return str + node.textContent;
-  }, '');
-}
-function getTtmlStyles(region, style, styleElements) {
-  const ttsNs = 'http://www.w3.org/ns/ttml#styling';
-  let regionStyle = null;
-  const styleAttributes = ['displayAlign', 'textAlign', 'color', 'backgroundColor', 'fontSize', 'fontFamily'
-  // 'fontWeight',
-  // 'lineHeight',
-  // 'wrapOption',
-  // 'fontStyle',
-  // 'direction',
-  // 'writingMode'
-  ];
-
-  const regionStyleName = region != null && region.hasAttribute('style') ? region.getAttribute('style') : null;
-  if (regionStyleName && styleElements.hasOwnProperty(regionStyleName)) {
-    regionStyle = styleElements[regionStyleName];
-  }
-  return styleAttributes.reduce((styles, name) => {
-    const value = getAttributeNS(style, ttsNs, name) || getAttributeNS(region, ttsNs, name) || getAttributeNS(regionStyle, ttsNs, name);
-    if (value) {
-      styles[name] = value;
+    if (type === 'main') {
+      if (!this.hls.audioTracks.length) {
+        return CmObjectType.MUXED;
+      }
+      return CmObjectType.VIDEO;
     }
-    return styles;
-  }, {});
-}
-function getAttributeNS(element, ns, name) {
-  if (!element) {
-    return null;
+    return undefined;
   }
-  return element.hasAttributeNS(ns, name) ? element.getAttributeNS(ns, name) : null;
-}
-function timestampParsingError(node) {
-  return new Error(`Could not parse ttml timestamp ${node}`);
-}
-function parseTtmlTime(timeAttributeValue, rateInfo) {
-  if (!timeAttributeValue) {
-    return null;
+
+  /**
+   * Get the highest bitrate.
+   */
+  getTopBandwidth(type) {
+    let bitrate = 0;
+    let levels;
+    const hls = this.hls;
+    if (type === CmObjectType.AUDIO) {
+      levels = hls.audioTracks;
+    } else {
+      const max = hls.maxAutoLevel;
+      const len = max > -1 ? max + 1 : hls.levels.length;
+      levels = hls.levels.slice(0, len);
+    }
+    for (const level of levels) {
+      if (level.bitrate > bitrate) {
+        bitrate = level.bitrate;
+      }
+    }
+    return bitrate > 0 ? bitrate : NaN;
   }
-  let seconds = parseTimeStamp(timeAttributeValue);
-  if (seconds === null) {
-    if (HMSF_REGEX.test(timeAttributeValue)) {
-      seconds = parseHoursMinutesSecondsFrames(timeAttributeValue, rateInfo);
-    } else if (TIME_UNIT_REGEX.test(timeAttributeValue)) {
-      seconds = parseTimeUnits(timeAttributeValue, rateInfo);
+
+  /**
+   * Get the buffer length for a media type in milliseconds
+   */
+  getBufferLength(type) {
+    const media = this.hls.media;
+    const buffer = type === CmObjectType.AUDIO ? this.audioBuffer : this.videoBuffer;
+    if (!buffer || !media) {
+      return NaN;
     }
+    const info = BufferHelper.bufferInfo(buffer, media.currentTime, this.config.maxBufferHole);
+    return info.len * 1000;
+  }
+
+  /**
+   * Create a playlist loader
+   */
+  createPlaylistLoader() {
+    const {
+      pLoader
+    } = this.config;
+    const apply = this.applyPlaylistData;
+    const Ctor = pLoader || this.config.loader;
+    return class CmcdPlaylistLoader {
+      constructor(config) {
+        this.loader = void 0;
+        this.loader = new Ctor(config);
+      }
+      get stats() {
+        return this.loader.stats;
+      }
+      get context() {
+        return this.loader.context;
+      }
+      destroy() {
+        this.loader.destroy();
+      }
+      abort() {
+        this.loader.abort();
+      }
+      load(context, config, callbacks) {
+        apply(context);
+        this.loader.load(context, config, callbacks);
+      }
+    };
   }
-  return seconds;
-}
-function parseHoursMinutesSecondsFrames(timeAttributeValue, rateInfo) {
-  const m = HMSF_REGEX.exec(timeAttributeValue);
-  const frames = (m[4] | 0) + (m[5] | 0) / rateInfo.subFrameRate;
-  return (m[1] | 0) * 3600 + (m[2] | 0) * 60 + (m[3] | 0) + frames / rateInfo.frameRate;
-}
-function parseTimeUnits(timeAttributeValue, rateInfo) {
-  const m = TIME_UNIT_REGEX.exec(timeAttributeValue);
-  const value = Number(m[1]);
-  const unit = m[2];
-  switch (unit) {
-    case 'h':
-      return value * 3600;
-    case 'm':
-      return value * 60;
-    case 'ms':
-      return value * 1000;
-    case 'f':
-      return value / rateInfo.frameRate;
-    case 't':
-      return value / rateInfo.tickRate;
+
+  /**
+   * Create a playlist loader
+   */
+  createFragmentLoader() {
+    const {
+      fLoader
+    } = this.config;
+    const apply = this.applyFragmentData;
+    const Ctor = fLoader || this.config.loader;
+    return class CmcdFragmentLoader {
+      constructor(config) {
+        this.loader = void 0;
+        this.loader = new Ctor(config);
+      }
+      get stats() {
+        return this.loader.stats;
+      }
+      get context() {
+        return this.loader.context;
+      }
+      destroy() {
+        this.loader.destroy();
+      }
+      abort() {
+        this.loader.abort();
+      }
+      load(context, config, callbacks) {
+        apply(context);
+        this.loader.load(context, config, callbacks);
+      }
+    };
   }
-  return value;
 }
 
-class TimelineController {
+const PATHWAY_PENALTY_DURATION_MS = 300000;
+class ContentSteeringController {
   constructor(hls) {
     this.hls = void 0;
-    this.media = null;
-    this.config = void 0;
+    this.log = void 0;
+    this.loader = null;
+    this.uri = null;
+    this.pathwayId = '.';
+    this.pathwayPriority = null;
+    this.timeToLoad = 300;
+    this.reloadTimer = -1;
+    this.updated = 0;
+    this.started = false;
     this.enabled = true;
-    this.Cues = void 0;
-    this.textTracks = [];
-    this.tracks = [];
-    this.initPTS = [];
-    this.unparsedVttFrags = [];
-    this.captionsTracks = {};
-    this.nonNativeCaptionsTracks = {};
-    this.cea608Parser1 = void 0;
-    this.cea608Parser2 = void 0;
-    this.lastSn = -1;
-    this.lastPartIndex = -1;
-    this.prevCC = -1;
-    this.vttCCs = newVTTCCs();
-    this.captionsProperties = void 0;
+    this.levels = null;
+    this.audioTracks = null;
+    this.subtitleTracks = null;
+    this.penalizedPathways = {};
     this.hls = hls;
-    this.config = hls.config;
-    this.Cues = hls.config.cueHandler;
-    this.captionsProperties = {
-      textTrack1: {
-        label: this.config.captionsTextTrack1Label,
-        languageCode: this.config.captionsTextTrack1LanguageCode
-      },
-      textTrack2: {
-        label: this.config.captionsTextTrack2Label,
-        languageCode: this.config.captionsTextTrack2LanguageCode
-      },
-      textTrack3: {
-        label: this.config.captionsTextTrack3Label,
-        languageCode: this.config.captionsTextTrack3LanguageCode
-      },
-      textTrack4: {
-        label: this.config.captionsTextTrack4Label,
-        languageCode: this.config.captionsTextTrack4LanguageCode
-      }
-    };
-    if (this.config.enableCEA708Captions) {
-      const channel1 = new OutputFilter(this, 'textTrack1');
-      const channel2 = new OutputFilter(this, 'textTrack2');
-      const channel3 = new OutputFilter(this, 'textTrack3');
-      const channel4 = new OutputFilter(this, 'textTrack4');
-      this.cea608Parser1 = new Cea608Parser(1, channel1, channel2);
-      this.cea608Parser2 = new Cea608Parser(3, channel3, channel4);
-    }
-    hls.on(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
-    hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
+    this.log = logger.log.bind(logger, `[content-steering]:`);
+    this.registerListeners();
+  }
+  registerListeners() {
+    const hls = this.hls;
     hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
     hls.on(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
-    hls.on(Events.SUBTITLE_TRACKS_UPDATED, this.onSubtitleTracksUpdated, this);
-    hls.on(Events.FRAG_LOADING, this.onFragLoading, this);
-    hls.on(Events.FRAG_LOADED, this.onFragLoaded, this);
-    hls.on(Events.FRAG_PARSING_USERDATA, this.onFragParsingUserdata, this);
-    hls.on(Events.FRAG_DECRYPTED, this.onFragDecrypted, this);
-    hls.on(Events.INIT_PTS_FOUND, this.onInitPtsFound, this);
-    hls.on(Events.SUBTITLE_TRACKS_CLEARED, this.onSubtitleTracksCleared, this);
-    hls.on(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
+    hls.on(Events.MANIFEST_PARSED, this.onManifestParsed, this);
+    hls.on(Events.ERROR, this.onError, this);
   }
-  destroy() {
-    const {
-      hls
-    } = this;
-    hls.off(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
-    hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
+  unregisterListeners() {
+    const hls = this.hls;
+    if (!hls) {
+      return;
+    }
     hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
     hls.off(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
-    hls.off(Events.SUBTITLE_TRACKS_UPDATED, this.onSubtitleTracksUpdated, this);
-    hls.off(Events.FRAG_LOADING, this.onFragLoading, this);
-    hls.off(Events.FRAG_LOADED, this.onFragLoaded, this);
-    hls.off(Events.FRAG_PARSING_USERDATA, this.onFragParsingUserdata, this);
-    hls.off(Events.FRAG_DECRYPTED, this.onFragDecrypted, this);
-    hls.off(Events.INIT_PTS_FOUND, this.onInitPtsFound, this);
-    hls.off(Events.SUBTITLE_TRACKS_CLEARED, this.onSubtitleTracksCleared, this);
-    hls.off(Events.BUFFER_FLUSHING, this.onBufferFlushing, this);
-    // @ts-ignore
-    this.hls = this.config = this.cea608Parser1 = this.cea608Parser2 = null;
+    hls.off(Events.MANIFEST_PARSED, this.onManifestParsed, this);
+    hls.off(Events.ERROR, this.onError, this);
   }
-  addCues(trackName, startTime, endTime, screen, cueRanges) {
-    // skip cues which overlap more than 50% with previously parsed time ranges
-    let merged = false;
-    for (let i = cueRanges.length; i--;) {
-      const cueRange = cueRanges[i];
-      const overlap = intersection(cueRange[0], cueRange[1], startTime, endTime);
-      if (overlap >= 0) {
-        cueRange[0] = Math.min(cueRange[0], startTime);
-        cueRange[1] = Math.max(cueRange[1], endTime);
-        merged = true;
-        if (overlap / (endTime - startTime) > 0.5) {
+  startLoad() {
+    this.started = true;
+    this.clearTimeout();
+    if (this.enabled && this.uri) {
+      if (this.updated) {
+        const ttl = this.timeToLoad * 1000 - (performance.now() - this.updated);
+        if (ttl > 0) {
+          this.scheduleRefresh(this.uri, ttl);
           return;
         }
       }
-    }
-    if (!merged) {
-      cueRanges.push([startTime, endTime]);
-    }
-    if (this.config.renderTextTracksNatively) {
-      const track = this.captionsTracks[trackName];
-      this.Cues.newCue(track, startTime, endTime, screen);
-    } else {
-      const cues = this.Cues.newCue(null, startTime, endTime, screen);
-      this.hls.trigger(Events.CUES_PARSED, {
-        type: 'captions',
-        cues,
-        track: trackName
-      });
+      this.loadSteeringManifest(this.uri);
     }
   }
-
-  // Triggered when an initial PTS is found; used for synchronisation of WebVTT.
-  onInitPtsFound(event, {
-    frag,
-    id,
-    initPTS,
-    timescale
-  }) {
-    const {
-      unparsedVttFrags
-    } = this;
-    if (id === 'main') {
-      this.initPTS[frag.cc] = {
-        baseTime: initPTS,
-        timescale
-      };
-    }
-
-    // Due to asynchronous processing, initial PTS may arrive later than the first VTT fragments are loaded.
-    // Parse any unparsed fragments upon receiving the initial PTS.
-    if (unparsedVttFrags.length) {
-      this.unparsedVttFrags = [];
-      unparsedVttFrags.forEach(frag => {
-        this.onFragLoaded(Events.FRAG_LOADED, frag);
-      });
+  stopLoad() {
+    this.started = false;
+    if (this.loader) {
+      this.loader.destroy();
+      this.loader = null;
     }
+    this.clearTimeout();
   }
-  getExistingTrack(trackName) {
-    const {
-      media
-    } = this;
-    if (media) {
-      for (let i = 0; i < media.textTracks.length; i++) {
-        const textTrack = media.textTracks[i];
-        if (textTrack[trackName]) {
-          return textTrack;
-        }
-      }
+  clearTimeout() {
+    if (this.reloadTimer !== -1) {
+      self.clearTimeout(this.reloadTimer);
+      this.reloadTimer = -1;
     }
-    return null;
   }
-  createCaptionsTrack(trackName) {
-    if (this.config.renderTextTracksNatively) {
-      this.createNativeTrack(trackName);
-    } else {
-      this.createNonNativeTrack(trackName);
+  destroy() {
+    this.unregisterListeners();
+    this.stopLoad();
+    // @ts-ignore
+    this.hls = null;
+    this.levels = this.audioTracks = this.subtitleTracks = null;
+  }
+  removeLevel(levelToRemove) {
+    const levels = this.levels;
+    if (levels) {
+      this.levels = levels.filter(level => level !== levelToRemove);
     }
   }
-  createNativeTrack(trackName) {
-    if (this.captionsTracks[trackName]) {
+  onManifestLoading() {
+    this.stopLoad();
+    this.enabled = true;
+    this.timeToLoad = 300;
+    this.updated = 0;
+    this.uri = null;
+    this.pathwayId = '.';
+    this.levels = this.audioTracks = this.subtitleTracks = null;
+  }
+  onManifestLoaded(event, data) {
+    const {
+      contentSteering
+    } = data;
+    if (contentSteering === null) {
       return;
     }
+    this.pathwayId = contentSteering.pathwayId;
+    this.uri = contentSteering.uri;
+    if (this.started) {
+      this.startLoad();
+    }
+  }
+  onManifestParsed(event, data) {
+    this.audioTracks = data.audioTracks;
+    this.subtitleTracks = data.subtitleTracks;
+  }
+  onError(event, data) {
     const {
-      captionsProperties,
-      captionsTracks,
-      media
-    } = this;
-    const {
-      label,
-      languageCode
-    } = captionsProperties[trackName];
-    // Enable reuse of existing text track.
-    const existingTrack = this.getExistingTrack(trackName);
-    if (!existingTrack) {
-      const textTrack = this.createTextTrack('captions', label, languageCode);
-      if (textTrack) {
-        // Set a special property on the track so we know it's managed by Hls.js
-        textTrack[trackName] = true;
-        captionsTracks[trackName] = textTrack;
+      errorAction
+    } = data;
+    if ((errorAction == null ? void 0 : errorAction.action) === NetworkErrorAction.SendAlternateToPenaltyBox && errorAction.flags === ErrorActionFlags.MoveAllAlternatesMatchingHost) {
+      const levels = this.levels;
+      let pathwayPriority = this.pathwayPriority;
+      let errorPathway = this.pathwayId;
+      if (data.context) {
+        const {
+          groupId,
+          pathwayId,
+          type
+        } = data.context;
+        if (groupId && levels) {
+          errorPathway = this.getPathwayForGroupId(groupId, type, errorPathway);
+        } else if (pathwayId) {
+          errorPathway = pathwayId;
+        }
+      }
+      if (!(errorPathway in this.penalizedPathways)) {
+        this.penalizedPathways[errorPathway] = performance.now();
+      }
+      if (!pathwayPriority && levels) {
+        // If PATHWAY-PRIORITY was not provided, list pathways for error handling
+        pathwayPriority = levels.reduce((pathways, level) => {
+          if (pathways.indexOf(level.pathwayId) === -1) {
+            pathways.push(level.pathwayId);
+          }
+          return pathways;
+        }, []);
+      }
+      if (pathwayPriority && pathwayPriority.length > 1) {
+        this.updatePathwayPriority(pathwayPriority);
+        errorAction.resolved = this.pathwayId !== errorPathway;
+      }
+      if (!errorAction.resolved) {
+        logger.warn(`Could not resolve ${data.details} ("${data.error.message}") with content-steering for Pathway: ${errorPathway} levels: ${levels ? levels.length : levels} priorities: ${JSON.stringify(pathwayPriority)} penalized: ${JSON.stringify(this.penalizedPathways)}`);
       }
-    } else {
-      captionsTracks[trackName] = existingTrack;
-      clearCurrentCues(captionsTracks[trackName]);
-      sendAddTrackEvent(captionsTracks[trackName], media);
     }
   }
-  createNonNativeTrack(trackName) {
-    if (this.nonNativeCaptionsTracks[trackName]) {
-      return;
+  filterParsedLevels(levels) {
+    // Filter levels to only include those that are in the initial pathway
+    this.levels = levels;
+    let pathwayLevels = this.getLevelsForPathway(this.pathwayId);
+    if (pathwayLevels.length === 0) {
+      const pathwayId = levels[0].pathwayId;
+      this.log(`No levels found in Pathway ${this.pathwayId}. Setting initial Pathway to "${pathwayId}"`);
+      pathwayLevels = this.getLevelsForPathway(pathwayId);
+      this.pathwayId = pathwayId;
     }
-    // Create a list of a single track for the provider to consume
-    const trackProperties = this.captionsProperties[trackName];
-    if (!trackProperties) {
-      return;
+    if (pathwayLevels.length !== levels.length) {
+      this.log(`Found ${pathwayLevels.length}/${levels.length} levels in Pathway "${this.pathwayId}"`);
+      return pathwayLevels;
     }
-    const label = trackProperties.label;
-    const track = {
-      _id: trackName,
-      label,
-      kind: 'captions',
-      default: trackProperties.media ? !!trackProperties.media.default : false,
-      closedCaptions: trackProperties.media
-    };
-    this.nonNativeCaptionsTracks[trackName] = track;
-    this.hls.trigger(Events.NON_NATIVE_TEXT_TRACKS_FOUND, {
-      tracks: [track]
-    });
+    return levels;
   }
-  createTextTrack(kind, label, lang) {
-    const media = this.media;
-    if (!media) {
-      return;
+  getLevelsForPathway(pathwayId) {
+    if (this.levels === null) {
+      return [];
     }
-    return media.addTextTrack(kind, label, lang);
-  }
-  onMediaAttaching(event, data) {
-    this.media = data.media;
-    this._cleanTracks();
+    return this.levels.filter(level => pathwayId === level.pathwayId);
   }
-  onMediaDetaching() {
-    const {
-      captionsTracks
-    } = this;
-    Object.keys(captionsTracks).forEach(trackName => {
-      clearCurrentCues(captionsTracks[trackName]);
-      delete captionsTracks[trackName];
+  updatePathwayPriority(pathwayPriority) {
+    this.pathwayPriority = pathwayPriority;
+    let levels;
+
+    // Evaluate if we should remove the pathway from the penalized list
+    const penalizedPathways = this.penalizedPathways;
+    const now = performance.now();
+    Object.keys(penalizedPathways).forEach(pathwayId => {
+      if (now - penalizedPathways[pathwayId] > PATHWAY_PENALTY_DURATION_MS) {
+        delete penalizedPathways[pathwayId];
+      }
     });
-    this.nonNativeCaptionsTracks = {};
-  }
-  onManifestLoading() {
-    this.lastSn = -1; // Detect discontinuity in fragment parsing
-    this.lastPartIndex = -1;
-    this.prevCC = -1;
-    this.vttCCs = newVTTCCs(); // Detect discontinuity in subtitle manifests
-    this._cleanTracks();
-    this.tracks = [];
-    this.captionsTracks = {};
-    this.nonNativeCaptionsTracks = {};
-    this.textTracks = [];
-    this.unparsedVttFrags = [];
-    this.initPTS = [];
-    if (this.cea608Parser1 && this.cea608Parser2) {
-      this.cea608Parser1.reset();
-      this.cea608Parser2.reset();
+    for (let i = 0; i < pathwayPriority.length; i++) {
+      const pathwayId = pathwayPriority[i];
+      if (pathwayId in penalizedPathways) {
+        continue;
+      }
+      if (pathwayId === this.pathwayId) {
+        return;
+      }
+      const selectedIndex = this.hls.nextLoadLevel;
+      const selectedLevel = this.hls.levels[selectedIndex];
+      levels = this.getLevelsForPathway(pathwayId);
+      if (levels.length > 0) {
+        this.log(`Setting Pathway to "${pathwayId}"`);
+        this.pathwayId = pathwayId;
+        reassignFragmentLevelIndexes(levels);
+        this.hls.trigger(Events.LEVELS_UPDATED, {
+          levels
+        });
+        // Set LevelController's level to trigger LEVEL_SWITCHING which loads playlist if needed
+        const levelAfterChange = this.hls.levels[selectedIndex];
+        if (selectedLevel && levelAfterChange && this.levels) {
+          if (levelAfterChange.attrs['STABLE-VARIANT-ID'] !== selectedLevel.attrs['STABLE-VARIANT-ID'] && levelAfterChange.bitrate !== selectedLevel.bitrate) {
+            this.log(`Unstable Pathways change from bitrate ${selectedLevel.bitrate} to ${levelAfterChange.bitrate}`);
+          }
+          this.hls.nextLoadLevel = selectedIndex;
+        }
+        break;
+      }
     }
   }
-  _cleanTracks() {
-    // clear outdated subtitles
-    const {
-      media
-    } = this;
-    if (!media) {
-      return;
-    }
-    const textTracks = media.textTracks;
-    if (textTracks) {
-      for (let i = 0; i < textTracks.length; i++) {
-        clearCurrentCues(textTracks[i]);
+  getPathwayForGroupId(groupId, type, defaultPathway) {
+    const levels = this.getLevelsForPathway(defaultPathway).concat(this.levels || []);
+    for (let i = 0; i < levels.length; i++) {
+      if (type === PlaylistContextType.AUDIO_TRACK && levels[i].hasAudioGroup(groupId) || type === PlaylistContextType.SUBTITLE_TRACK && levels[i].hasSubtitleGroup(groupId)) {
+        return levels[i].pathwayId;
       }
     }
+    return defaultPathway;
   }
-  onSubtitleTracksUpdated(event, data) {
-    const tracks = data.subtitleTracks || [];
-    const hasIMSC1 = tracks.some(track => track.textCodec === IMSC1_CODEC);
-    if (this.config.enableWebVTT || hasIMSC1 && this.config.enableIMSC1) {
-      const listIsIdentical = subtitleOptionsIdentical(this.tracks, tracks);
-      if (listIsIdentical) {
-        this.tracks = tracks;
+  clonePathways(pathwayClones) {
+    const levels = this.levels;
+    if (!levels) {
+      return;
+    }
+    const audioGroupCloneMap = {};
+    const subtitleGroupCloneMap = {};
+    pathwayClones.forEach(pathwayClone => {
+      const {
+        ID: cloneId,
+        'BASE-ID': baseId,
+        'URI-REPLACEMENT': uriReplacement
+      } = pathwayClone;
+      if (levels.some(level => level.pathwayId === cloneId)) {
         return;
       }
-      this.textTracks = [];
-      this.tracks = tracks;
-      if (this.config.renderTextTracksNatively) {
-        const inUseTracks = this.media ? this.media.textTracks : null;
-        this.tracks.forEach((track, index) => {
-          let textTrack;
-          if (inUseTracks && index < inUseTracks.length) {
-            let inUseTrack = null;
-            for (let i = 0; i < inUseTracks.length; i++) {
-              if (canReuseVttTextTrack(inUseTracks[i], track)) {
-                inUseTrack = inUseTracks[i];
-                break;
-              }
-            }
-
-            // Reuse tracks with the same label, but do not reuse 608/708 tracks
-            if (inUseTrack) {
-              textTrack = inUseTrack;
-            }
-          }
-          if (textTrack) {
-            clearCurrentCues(textTrack);
-          } else {
-            const textTrackKind = this._captionsOrSubtitlesFromCharacteristics(track);
-            textTrack = this.createTextTrack(textTrackKind, track.name, track.lang);
-            if (textTrack) {
-              textTrack.mode = 'disabled';
-            }
-          }
-          if (textTrack) {
-            textTrack.groupId = track.groupId;
-            this.textTracks.push(textTrack);
-          }
-        });
-      } else if (this.tracks.length) {
-        // Create a list of tracks for the provider to consume
-        const tracksList = this.tracks.map(track => {
-          return {
-            label: track.name,
-            kind: track.type.toLowerCase(),
-            default: track.default,
-            subtitleTrack: track
-          };
-        });
-        this.hls.trigger(Events.NON_NATIVE_TEXT_TRACKS_FOUND, {
-          tracks: tracksList
+      const clonedVariants = this.getLevelsForPathway(baseId).map(baseLevel => {
+        const attributes = new AttrList(baseLevel.attrs);
+        attributes['PATHWAY-ID'] = cloneId;
+        const clonedAudioGroupId = attributes.AUDIO && `${attributes.AUDIO}_clone_${cloneId}`;
+        const clonedSubtitleGroupId = attributes.SUBTITLES && `${attributes.SUBTITLES}_clone_${cloneId}`;
+        if (clonedAudioGroupId) {
+          audioGroupCloneMap[attributes.AUDIO] = clonedAudioGroupId;
+          attributes.AUDIO = clonedAudioGroupId;
+        }
+        if (clonedSubtitleGroupId) {
+          subtitleGroupCloneMap[attributes.SUBTITLES] = clonedSubtitleGroupId;
+          attributes.SUBTITLES = clonedSubtitleGroupId;
+        }
+        const url = performUriReplacement(baseLevel.uri, attributes['STABLE-VARIANT-ID'], 'PER-VARIANT-URIS', uriReplacement);
+        const clonedLevel = new Level({
+          attrs: attributes,
+          audioCodec: baseLevel.audioCodec,
+          bitrate: baseLevel.bitrate,
+          height: baseLevel.height,
+          name: baseLevel.name,
+          url,
+          videoCodec: baseLevel.videoCodec,
+          width: baseLevel.width
         });
-      }
-    }
+        if (baseLevel.audioGroups) {
+          for (let i = 1; i < baseLevel.audioGroups.length; i++) {
+            clonedLevel.addGroupId('audio', `${baseLevel.audioGroups[i]}_clone_${cloneId}`);
+          }
+        }
+        if (baseLevel.subtitleGroups) {
+          for (let i = 1; i < baseLevel.subtitleGroups.length; i++) {
+            clonedLevel.addGroupId('text', `${baseLevel.subtitleGroups[i]}_clone_${cloneId}`);
+          }
+        }
+        return clonedLevel;
+      });
+      levels.push(...clonedVariants);
+      cloneRenditionGroups(this.audioTracks, audioGroupCloneMap, uriReplacement, cloneId);
+      cloneRenditionGroups(this.subtitleTracks, subtitleGroupCloneMap, uriReplacement, cloneId);
+    });
   }
-  _captionsOrSubtitlesFromCharacteristics(track) {
-    if (track.attrs.CHARACTERISTICS) {
-      const transcribesSpokenDialog = /transcribes-spoken-dialog/gi.test(track.attrs.CHARACTERISTICS);
-      const describesMusicAndSound = /describes-music-and-sound/gi.test(track.attrs.CHARACTERISTICS);
-      if (transcribesSpokenDialog && describesMusicAndSound) {
-        return 'captions';
-      }
+  loadSteeringManifest(uri) {
+    const config = this.hls.config;
+    const Loader = config.loader;
+    if (this.loader) {
+      this.loader.destroy();
     }
-    return 'subtitles';
-  }
-  onManifestLoaded(event, data) {
-    if (this.config.enableCEA708Captions && data.captions) {
-      data.captions.forEach(captionsTrack => {
-        const instreamIdMatch = /(?:CC|SERVICE)([1-4])/.exec(captionsTrack.instreamId);
-        if (!instreamIdMatch) {
+    this.loader = new Loader(config);
+    let url;
+    try {
+      url = new self.URL(uri);
+    } catch (error) {
+      this.enabled = false;
+      this.log(`Failed to parse Steering Manifest URI: ${uri}`);
+      return;
+    }
+    if (url.protocol !== 'data:') {
+      const throughput = (this.hls.bandwidthEstimate || config.abrEwmaDefaultEstimate) | 0;
+      url.searchParams.set('_HLS_pathway', this.pathwayId);
+      url.searchParams.set('_HLS_throughput', '' + throughput);
+    }
+    const context = {
+      responseType: 'json',
+      url: url.href
+    };
+    const loadPolicy = config.steeringManifestLoadPolicy.default;
+    const legacyRetryCompatibility = loadPolicy.errorRetry || loadPolicy.timeoutRetry || {};
+    const loaderConfig = {
+      loadPolicy,
+      timeout: loadPolicy.maxLoadTimeMs,
+      maxRetry: legacyRetryCompatibility.maxNumRetry || 0,
+      retryDelay: legacyRetryCompatibility.retryDelayMs || 0,
+      maxRetryDelay: legacyRetryCompatibility.maxRetryDelayMs || 0
+    };
+    const callbacks = {
+      onSuccess: (response, stats, context, networkDetails) => {
+        this.log(`Loaded steering manifest: "${url}"`);
+        const steeringData = response.data;
+        if (steeringData.VERSION !== 1) {
+          this.log(`Steering VERSION ${steeringData.VERSION} not supported!`);
           return;
         }
-        const trackName = `textTrack${instreamIdMatch[1]}`;
-        const trackProperties = this.captionsProperties[trackName];
-        if (!trackProperties) {
+        this.updated = performance.now();
+        this.timeToLoad = steeringData.TTL;
+        const {
+          'RELOAD-URI': reloadUri,
+          'PATHWAY-CLONES': pathwayClones,
+          'PATHWAY-PRIORITY': pathwayPriority
+        } = steeringData;
+        if (reloadUri) {
+          try {
+            this.uri = new self.URL(reloadUri, url).href;
+          } catch (error) {
+            this.enabled = false;
+            this.log(`Failed to parse Steering Manifest RELOAD-URI: ${reloadUri}`);
+            return;
+          }
+        }
+        this.scheduleRefresh(this.uri || context.url);
+        if (pathwayClones) {
+          this.clonePathways(pathwayClones);
+        }
+        const loadedSteeringData = {
+          steeringManifest: steeringData,
+          url: url.toString()
+        };
+        this.hls.trigger(Events.STEERING_MANIFEST_LOADED, loadedSteeringData);
+        if (pathwayPriority) {
+          this.updatePathwayPriority(pathwayPriority);
+        }
+      },
+      onError: (error, context, networkDetails, stats) => {
+        this.log(`Error loading steering manifest: ${error.code} ${error.text} (${context.url})`);
+        this.stopLoad();
+        if (error.code === 410) {
+          this.enabled = false;
+          this.log(`Steering manifest ${context.url} no longer available`);
           return;
         }
-        trackProperties.label = captionsTrack.name;
-        if (captionsTrack.lang) {
-          // optional attribute
-          trackProperties.languageCode = captionsTrack.lang;
+        let ttl = this.timeToLoad * 1000;
+        if (error.code === 429) {
+          const loader = this.loader;
+          if (typeof (loader == null ? void 0 : loader.getResponseHeader) === 'function') {
+            const retryAfter = loader.getResponseHeader('Retry-After');
+            if (retryAfter) {
+              ttl = parseFloat(retryAfter) * 1000;
+            }
+          }
+          this.log(`Steering manifest ${context.url} rate limited`);
+          return;
         }
-        trackProperties.media = captionsTrack;
-      });
-    }
+        this.scheduleRefresh(this.uri || context.url, ttl);
+      },
+      onTimeout: (stats, context, networkDetails) => {
+        this.log(`Timeout loading steering manifest (${context.url})`);
+        this.scheduleRefresh(this.uri || context.url);
+      }
+    };
+    this.log(`Requesting steering manifest: ${url}`);
+    this.loader.load(context, loaderConfig, callbacks);
   }
-  closedCaptionsForLevel(frag) {
-    const level = this.hls.levels[frag.level];
-    return level == null ? void 0 : level.attrs['CLOSED-CAPTIONS'];
+  scheduleRefresh(uri, ttlMs = this.timeToLoad * 1000) {
+    this.clearTimeout();
+    this.reloadTimer = self.setTimeout(() => {
+      var _this$hls;
+      const media = (_this$hls = this.hls) == null ? void 0 : _this$hls.media;
+      if (media && !media.ended) {
+        this.loadSteeringManifest(uri);
+        return;
+      }
+      this.scheduleRefresh(uri, this.timeToLoad * 1000);
+    }, ttlMs);
   }
-  onFragLoading(event, data) {
-    const {
-      cea608Parser1,
-      cea608Parser2,
-      lastSn,
-      lastPartIndex
-    } = this;
-    if (!this.enabled || !(cea608Parser1 && cea608Parser2)) {
-      return;
+}
+function cloneRenditionGroups(tracks, groupCloneMap, uriReplacement, cloneId) {
+  if (!tracks) {
+    return;
+  }
+  Object.keys(groupCloneMap).forEach(audioGroupId => {
+    const clonedTracks = tracks.filter(track => track.groupId === audioGroupId).map(track => {
+      const clonedTrack = _extends({}, track);
+      clonedTrack.details = undefined;
+      clonedTrack.attrs = new AttrList(clonedTrack.attrs);
+      clonedTrack.url = clonedTrack.attrs.URI = performUriReplacement(track.url, track.attrs['STABLE-RENDITION-ID'], 'PER-RENDITION-URIS', uriReplacement);
+      clonedTrack.groupId = clonedTrack.attrs['GROUP-ID'] = groupCloneMap[audioGroupId];
+      clonedTrack.attrs['PATHWAY-ID'] = cloneId;
+      return clonedTrack;
+    });
+    tracks.push(...clonedTracks);
+  });
+}
+function performUriReplacement(uri, stableId, perOptionKey, uriReplacement) {
+  const {
+    HOST: host,
+    PARAMS: params,
+    [perOptionKey]: perOptionUris
+  } = uriReplacement;
+  let perVariantUri;
+  if (stableId) {
+    perVariantUri = perOptionUris == null ? void 0 : perOptionUris[stableId];
+    if (perVariantUri) {
+      uri = perVariantUri;
     }
-    // if this frag isn't contiguous, clear the parser so cues with bad start/end times aren't added to the textTrack
-    if (data.frag.type === PlaylistLevelType.MAIN) {
-      var _data$part$index, _data$part;
-      const sn = data.frag.sn;
-      const partIndex = (_data$part$index = data == null ? void 0 : (_data$part = data.part) == null ? void 0 : _data$part.index) != null ? _data$part$index : -1;
-      if (!(sn === lastSn + 1 || sn === lastSn && partIndex === lastPartIndex + 1)) {
-        cea608Parser1.reset();
-        cea608Parser2.reset();
+  }
+  const url = new self.URL(uri);
+  if (host && !perVariantUri) {
+    url.host = host;
+  }
+  if (params) {
+    Object.keys(params).sort().forEach(key => {
+      if (key) {
+        url.searchParams.set(key, params[key]);
       }
-      this.lastSn = sn;
-      this.lastPartIndex = partIndex;
-    }
+    });
   }
-  onFragLoaded(event, data) {
-    const {
-      frag,
-      payload
-    } = data;
-    if (frag.type === PlaylistLevelType.SUBTITLE) {
-      // If fragment is subtitle type, parse as WebVTT.
-      if (payload.byteLength) {
-        const decryptData = frag.decryptdata;
-        // fragment after decryption has a stats object
-        const decrypted = ('stats' in data);
-        // If the subtitles are not encrypted, parse VTTs now. Otherwise, we need to wait.
-        if (decryptData == null || !decryptData.encrypted || decrypted) {
-          const trackPlaylistMedia = this.tracks[frag.level];
-          const vttCCs = this.vttCCs;
-          if (!vttCCs[frag.cc]) {
-            vttCCs[frag.cc] = {
-              start: frag.start,
-              prevCC: this.prevCC,
-              new: true
-            };
-            this.prevCC = frag.cc;
-          }
-          if (trackPlaylistMedia && trackPlaylistMedia.textCodec === IMSC1_CODEC) {
-            this._parseIMSC1(frag, payload);
-          } else {
-            this._parseVTTs(data);
-          }
-        }
-      } else {
-        // In case there is no payload, finish unsuccessfully.
-        this.hls.trigger(Events.SUBTITLE_FRAG_PROCESSED, {
-          success: false,
-          frag,
-          error: new Error('Empty subtitle payload')
-        });
+  return url.href;
+}
+
+const AGE_HEADER_LINE_REGEX = /^age:\s*[\d.]+\s*$/im;
+class XhrLoader {
+  constructor(config) {
+    this.xhrSetup = void 0;
+    this.requestTimeout = void 0;
+    this.retryTimeout = void 0;
+    this.retryDelay = void 0;
+    this.config = null;
+    this.callbacks = null;
+    this.context = null;
+    this.loader = null;
+    this.stats = void 0;
+    this.xhrSetup = config ? config.xhrSetup || null : null;
+    this.stats = new LoadStats();
+    this.retryDelay = 0;
+  }
+  destroy() {
+    this.callbacks = null;
+    this.abortInternal();
+    this.loader = null;
+    this.config = null;
+    this.context = null;
+    this.xhrSetup = null;
+    // @ts-ignore
+    this.stats = null;
+  }
+  abortInternal() {
+    const loader = this.loader;
+    self.clearTimeout(this.requestTimeout);
+    self.clearTimeout(this.retryTimeout);
+    if (loader) {
+      loader.onreadystatechange = null;
+      loader.onprogress = null;
+      if (loader.readyState !== 4) {
+        this.stats.aborted = true;
+        loader.abort();
       }
     }
   }
-  _parseIMSC1(frag, payload) {
-    const hls = this.hls;
-    parseIMSC1(payload, this.initPTS[frag.cc], cues => {
-      this._appendCues(cues, frag.level);
-      hls.trigger(Events.SUBTITLE_FRAG_PROCESSED, {
-        success: true,
-        frag: frag
-      });
-    }, error => {
-      logger.log(`Failed to parse IMSC1: ${error}`);
-      hls.trigger(Events.SUBTITLE_FRAG_PROCESSED, {
-        success: false,
-        frag: frag,
-        error
-      });
-    });
+  abort() {
+    var _this$callbacks;
+    this.abortInternal();
+    if ((_this$callbacks = this.callbacks) != null && _this$callbacks.onAbort) {
+      this.callbacks.onAbort(this.stats, this.context, this.loader);
+    }
+  }
+  load(context, config, callbacks) {
+    if (this.stats.loading.start) {
+      throw new Error('Loader can only be used once.');
+    }
+    this.stats.loading.start = self.performance.now();
+    this.context = context;
+    this.config = config;
+    this.callbacks = callbacks;
+    this.loadInternal();
   }
-  _parseVTTs(data) {
-    var _frag$initSegment;
-    const {
-      frag,
-      payload
-    } = data;
-    // We need an initial synchronisation PTS. Store fragments as long as none has arrived
+  loadInternal() {
     const {
-      initPTS,
-      unparsedVttFrags
+      config,
+      context
     } = this;
-    const maxAvCC = initPTS.length - 1;
-    if (!initPTS[frag.cc] && maxAvCC === -1) {
-      unparsedVttFrags.push(data);
+    if (!config || !context) {
       return;
     }
-    const hls = this.hls;
-    // Parse the WebVTT file contents.
-    const payloadWebVTT = (_frag$initSegment = frag.initSegment) != null && _frag$initSegment.data ? appendUint8Array(frag.initSegment.data, new Uint8Array(payload)) : payload;
-    parseWebVTT(payloadWebVTT, this.initPTS[frag.cc], this.vttCCs, frag.cc, frag.start, cues => {
-      this._appendCues(cues, frag.level);
-      hls.trigger(Events.SUBTITLE_FRAG_PROCESSED, {
-        success: true,
-        frag: frag
-      });
-    }, error => {
-      const missingInitPTS = error.message === 'Missing initPTS for VTT MPEGTS';
-      if (missingInitPTS) {
-        unparsedVttFrags.push(data);
-      } else {
-        this._fallbackToIMSC1(frag, payload);
-      }
-      // Something went wrong while parsing. Trigger event with success false.
-      logger.log(`Failed to parse VTT cue: ${error}`);
-      if (missingInitPTS && maxAvCC > frag.cc) {
+    const xhr = this.loader = new self.XMLHttpRequest();
+    const stats = this.stats;
+    stats.loading.first = 0;
+    stats.loaded = 0;
+    stats.aborted = false;
+    const xhrSetup = this.xhrSetup;
+    if (xhrSetup) {
+      Promise.resolve().then(() => {
+        if (this.stats.aborted) return;
+        return xhrSetup(xhr, context.url);
+      }).catch(error => {
+        xhr.open('GET', context.url, true);
+        return xhrSetup(xhr, context.url);
+      }).then(() => {
+        if (this.stats.aborted) return;
+        this.openAndSendXhr(xhr, context, config);
+      }).catch(error => {
+        // IE11 throws an exception on xhr.open if attempting to access an HTTP resource over HTTPS
+        this.callbacks.onError({
+          code: xhr.status,
+          text: error.message
+        }, context, xhr, stats);
         return;
-      }
-      hls.trigger(Events.SUBTITLE_FRAG_PROCESSED, {
-        success: false,
-        frag: frag,
-        error
-      });
-    });
-  }
-  _fallbackToIMSC1(frag, payload) {
-    // If textCodec is unknown, try parsing as IMSC1. Set textCodec based on the result
-    const trackPlaylistMedia = this.tracks[frag.level];
-    if (!trackPlaylistMedia.textCodec) {
-      parseIMSC1(payload, this.initPTS[frag.cc], () => {
-        trackPlaylistMedia.textCodec = IMSC1_CODEC;
-        this._parseIMSC1(frag, payload);
-      }, () => {
-        trackPlaylistMedia.textCodec = 'wvtt';
       });
-    }
-  }
-  _appendCues(cues, fragLevel) {
-    const hls = this.hls;
-    if (this.config.renderTextTracksNatively) {
-      const textTrack = this.textTracks[fragLevel];
-      // WebVTTParser.parse is an async method and if the currently selected text track mode is set to "disabled"
-      // before parsing is done then don't try to access currentTrack.cues.getCueById as cues will be null
-      // and trying to access getCueById method of cues will throw an exception
-      // Because we check if the mode is disabled, we can force check `cues` below. They can't be null.
-      if (!textTrack || textTrack.mode === 'disabled') {
-        return;
-      }
-      cues.forEach(cue => addCueToTrack(textTrack, cue));
     } else {
-      const currentTrack = this.tracks[fragLevel];
-      if (!currentTrack) {
-        return;
-      }
-      const track = currentTrack.default ? 'default' : 'subtitles' + fragLevel;
-      hls.trigger(Events.CUES_PARSED, {
-        type: 'subtitles',
-        cues,
-        track
-      });
+      this.openAndSendXhr(xhr, context, config);
     }
   }
-  onFragDecrypted(event, data) {
+  openAndSendXhr(xhr, context, config) {
+    if (!xhr.readyState) {
+      xhr.open('GET', context.url, true);
+    }
+    const headers = context.headers;
     const {
-      frag
-    } = data;
-    if (frag.type === PlaylistLevelType.SUBTITLE) {
-      this.onFragLoaded(Events.FRAG_LOADED, data);
+      maxTimeToFirstByteMs,
+      maxLoadTimeMs
+    } = config.loadPolicy;
+    if (headers) {
+      for (const header in headers) {
+        xhr.setRequestHeader(header, headers[header]);
+      }
     }
+    if (context.rangeEnd) {
+      xhr.setRequestHeader('Range', 'bytes=' + context.rangeStart + '-' + (context.rangeEnd - 1));
+    }
+    xhr.onreadystatechange = this.readystatechange.bind(this);
+    xhr.onprogress = this.loadprogress.bind(this);
+    xhr.responseType = context.responseType;
+    // setup timeout before we perform request
+    self.clearTimeout(this.requestTimeout);
+    config.timeout = maxTimeToFirstByteMs && isFiniteNumber(maxTimeToFirstByteMs) ? maxTimeToFirstByteMs : maxLoadTimeMs;
+    this.requestTimeout = self.setTimeout(this.loadtimeout.bind(this), config.timeout);
+    xhr.send();
   }
-  onSubtitleTracksCleared() {
-    this.tracks = [];
-    this.captionsTracks = {};
-  }
-  onFragParsingUserdata(event, data) {
+  readystatechange() {
     const {
-      cea608Parser1,
-      cea608Parser2
+      context,
+      loader: xhr,
+      stats
     } = this;
-    if (!this.enabled || !(cea608Parser1 && cea608Parser2)) {
+    if (!context || !xhr) {
       return;
     }
-    const {
-      frag,
-      samples
-    } = data;
-    if (frag.type === PlaylistLevelType.MAIN && this.closedCaptionsForLevel(frag) === 'NONE') {
+    const readyState = xhr.readyState;
+    const config = this.config;
+
+    // don't proceed if xhr has been aborted
+    if (stats.aborted) {
       return;
     }
-    // If the event contains captions (found in the bytes property), push all bytes into the parser immediately
-    // It will create the proper timestamps based on the PTS value
-    for (let i = 0; i < samples.length; i++) {
-      const ccBytes = samples[i].bytes;
-      if (ccBytes) {
-        const ccdatas = this.extractCea608Data(ccBytes);
-        cea608Parser1.addData(samples[i].pts, ccdatas[0]);
-        cea608Parser2.addData(samples[i].pts, ccdatas[1]);
+
+    // >= HEADERS_RECEIVED
+    if (readyState >= 2) {
+      if (stats.loading.first === 0) {
+        stats.loading.first = Math.max(self.performance.now(), stats.loading.start);
+        // readyState >= 2 AND readyState !==4 (readyState = HEADERS_RECEIVED || LOADING) rearm timeout as xhr not finished yet
+        if (config.timeout !== config.loadPolicy.maxLoadTimeMs) {
+          self.clearTimeout(this.requestTimeout);
+          config.timeout = config.loadPolicy.maxLoadTimeMs;
+          this.requestTimeout = self.setTimeout(this.loadtimeout.bind(this), config.loadPolicy.maxLoadTimeMs - (stats.loading.first - stats.loading.start));
+        }
+      }
+      if (readyState === 4) {
+        self.clearTimeout(this.requestTimeout);
+        xhr.onreadystatechange = null;
+        xhr.onprogress = null;
+        const status = xhr.status;
+        // http status between 200 to 299 are all successful
+        const useResponse = xhr.responseType !== 'text';
+        if (status >= 200 && status < 300 && (useResponse && xhr.response || xhr.responseText !== null)) {
+          stats.loading.end = Math.max(self.performance.now(), stats.loading.first);
+          const data = useResponse ? xhr.response : xhr.responseText;
+          const len = xhr.responseType === 'arraybuffer' ? data.byteLength : data.length;
+          stats.loaded = stats.total = len;
+          stats.bwEstimate = stats.total * 8000 / (stats.loading.end - stats.loading.first);
+          if (!this.callbacks) {
+            return;
+          }
+          const onProgress = this.callbacks.onProgress;
+          if (onProgress) {
+            onProgress(stats, context, data, xhr);
+          }
+          if (!this.callbacks) {
+            return;
+          }
+          const response = {
+            url: xhr.responseURL,
+            data: data,
+            code: status
+          };
+          this.callbacks.onSuccess(response, stats, context, xhr);
+        } else {
+          const retryConfig = config.loadPolicy.errorRetry;
+          const retryCount = stats.retry;
+          // if max nb of retries reached or if http status between 400 and 499 (such error cannot be recovered, retrying is useless), return error
+          const response = {
+            url: context.url,
+            data: undefined,
+            code: status
+          };
+          if (shouldRetry(retryConfig, retryCount, false, response)) {
+            this.retry(retryConfig);
+          } else {
+            logger.error(`${status} while loading ${context.url}`);
+            this.callbacks.onError({
+              code: status,
+              text: xhr.statusText
+            }, context, xhr, stats);
+          }
+        }
+      }
+    }
+  }
+  loadtimeout() {
+    var _this$config;
+    const retryConfig = (_this$config = this.config) == null ? void 0 : _this$config.loadPolicy.timeoutRetry;
+    const retryCount = this.stats.retry;
+    if (shouldRetry(retryConfig, retryCount, true)) {
+      this.retry(retryConfig);
+    } else {
+      var _this$context;
+      logger.warn(`timeout while loading ${(_this$context = this.context) == null ? void 0 : _this$context.url}`);
+      const callbacks = this.callbacks;
+      if (callbacks) {
+        this.abortInternal();
+        callbacks.onTimeout(this.stats, this.context, this.loader);
       }
     }
   }
-  onBufferFlushing(event, {
-    startOffset,
-    endOffset,
-    endOffsetSubtitles,
-    type
-  }) {
+  retry(retryConfig) {
     const {
-      media
+      context,
+      stats
     } = this;
-    if (!media || media.currentTime < endOffset) {
-      return;
-    }
-    // Clear 608 caption cues from the captions TextTracks when the video back buffer is flushed
-    // Forward cues are never removed because we can loose streamed 608 content from recent fragments
-    if (!type || type === 'video') {
-      const {
-        captionsTracks
-      } = this;
-      Object.keys(captionsTracks).forEach(trackName => removeCuesInRange(captionsTracks[trackName], startOffset, endOffset));
-    }
-    if (this.config.renderTextTracksNatively) {
-      // Clear VTT/IMSC1 subtitle cues from the subtitle TextTracks when the back buffer is flushed
-      if (startOffset === 0 && endOffsetSubtitles !== undefined) {
-        const {
-          textTracks
-        } = this;
-        Object.keys(textTracks).forEach(trackName => removeCuesInRange(textTracks[trackName], startOffset, endOffsetSubtitles));
-      }
+    this.retryDelay = getRetryDelay(retryConfig, stats.retry);
+    stats.retry++;
+    logger.warn(`${status ? 'HTTP Status ' + status : 'Timeout'} while loading ${context == null ? void 0 : context.url}, retrying ${stats.retry}/${retryConfig.maxNumRetry} in ${this.retryDelay}ms`);
+    // abort and reset internal state
+    this.abortInternal();
+    this.loader = null;
+    // schedule retry
+    self.clearTimeout(this.retryTimeout);
+    this.retryTimeout = self.setTimeout(this.loadInternal.bind(this), this.retryDelay);
+  }
+  loadprogress(event) {
+    const stats = this.stats;
+    stats.loaded = event.loaded;
+    if (event.lengthComputable) {
+      stats.total = event.total;
     }
   }
-  extractCea608Data(byteArray) {
-    const actualCCBytes = [[], []];
-    const count = byteArray[0] & 0x1f;
-    let position = 2;
-    for (let j = 0; j < count; j++) {
-      const tmpByte = byteArray[position++];
-      const ccbyte1 = 0x7f & byteArray[position++];
-      const ccbyte2 = 0x7f & byteArray[position++];
-      if (ccbyte1 === 0 && ccbyte2 === 0) {
-        continue;
-      }
-      const ccValid = (0x04 & tmpByte) !== 0; // Support all four channels
-      if (ccValid) {
-        const ccType = 0x03 & tmpByte;
-        if (0x00 /* CEA608 field1*/ === ccType || 0x01 /* CEA608 field2*/ === ccType) {
-          // Exclude CEA708 CC data.
-          actualCCBytes[ccType].push(ccbyte1);
-          actualCCBytes[ccType].push(ccbyte2);
-        }
-      }
+  getCacheAge() {
+    let result = null;
+    if (this.loader && AGE_HEADER_LINE_REGEX.test(this.loader.getAllResponseHeaders())) {
+      const ageHeader = this.loader.getResponseHeader('age');
+      result = ageHeader ? parseFloat(ageHeader) : null;
     }
-    return actualCCBytes;
+    return result;
   }
-}
-function canReuseVttTextTrack(inUseTrack, manifestTrack) {
-  return !!inUseTrack && inUseTrack.label === manifestTrack.name && !(inUseTrack.textTrack1 || inUseTrack.textTrack2);
-}
-function intersection(x1, x2, y1, y2) {
-  return Math.min(x2, y2) - Math.max(x1, y1);
-}
-function newVTTCCs() {
-  return {
-    ccOffset: 0,
-    presentationOffset: 0,
-    0: {
-      start: 0,
-      prevCC: -1,
-      new: true
+  getResponseHeader(name) {
+    if (this.loader && new RegExp(`^${name}:\\s*[\\d.]+\\s*$`, 'im').test(this.loader.getAllResponseHeaders())) {
+      return this.loader.getResponseHeader(name);
     }
-  };
+    return null;
+  }
 }
 
-/*
- * cap stream level to media size dimension controller
- */
-
-class CapLevelController {
-  constructor(hls) {
-    this.hls = void 0;
-    this.autoLevelCapping = void 0;
-    this.firstLevel = void 0;
-    this.media = void 0;
-    this.restrictedLevels = void 0;
-    this.timer = void 0;
-    this.clientRect = void 0;
-    this.streamController = void 0;
-    this.hls = hls;
-    this.autoLevelCapping = Number.POSITIVE_INFINITY;
-    this.firstLevel = -1;
-    this.media = null;
-    this.restrictedLevels = [];
-    this.timer = undefined;
-    this.clientRect = null;
-    this.registerListeners();
+function fetchSupported() {
+  if (
+  // @ts-ignore
+  self.fetch && self.AbortController && self.ReadableStream && self.Request) {
+    try {
+      new self.ReadableStream({}); // eslint-disable-line no-new
+      return true;
+    } catch (e) {
+      /* noop */
+    }
   }
-  setStreamController(streamController) {
-    this.streamController = streamController;
+  return false;
+}
+const BYTERANGE = /(\d+)-(\d+)\/(\d+)/;
+class FetchLoader {
+  constructor(config /* HlsConfig */) {
+    this.fetchSetup = void 0;
+    this.requestTimeout = void 0;
+    this.request = null;
+    this.response = null;
+    this.controller = void 0;
+    this.context = null;
+    this.config = null;
+    this.callbacks = null;
+    this.stats = void 0;
+    this.loader = null;
+    this.fetchSetup = config.fetchSetup || getRequest;
+    this.controller = new self.AbortController();
+    this.stats = new LoadStats();
   }
   destroy() {
-    this.unregisterListener();
-    if (this.hls.config.capLevelToPlayerSize) {
-      this.stopCapping();
-    }
-    this.media = null;
-    this.clientRect = null;
+    this.loader = this.callbacks = this.context = this.config = this.request = null;
+    this.abortInternal();
+    this.response = null;
     // @ts-ignore
-    this.hls = this.streamController = null;
-  }
-  registerListeners() {
-    const {
-      hls
-    } = this;
-    hls.on(Events.FPS_DROP_LEVEL_CAPPING, this.onFpsDropLevelCapping, this);
-    hls.on(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
-    hls.on(Events.MANIFEST_PARSED, this.onManifestParsed, this);
-    hls.on(Events.BUFFER_CODECS, this.onBufferCodecs, this);
-    hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
-  }
-  unregisterListener() {
-    const {
-      hls
-    } = this;
-    hls.off(Events.FPS_DROP_LEVEL_CAPPING, this.onFpsDropLevelCapping, this);
-    hls.off(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
-    hls.off(Events.MANIFEST_PARSED, this.onManifestParsed, this);
-    hls.off(Events.BUFFER_CODECS, this.onBufferCodecs, this);
-    hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
+    this.fetchSetup = this.controller = this.stats = null;
   }
-  onFpsDropLevelCapping(event, data) {
-    // Don't add a restricted level more than once
-    const level = this.hls.levels[data.droppedLevel];
-    if (this.isLevelAllowed(level)) {
-      this.restrictedLevels.push({
-        bitrate: level.bitrate,
-        height: level.height,
-        width: level.width
-      });
+  abortInternal() {
+    if (this.controller && !this.stats.loading.end) {
+      this.stats.aborted = true;
+      this.controller.abort();
     }
   }
-  onMediaAttaching(event, data) {
-    this.media = data.media instanceof HTMLVideoElement ? data.media : null;
-    this.clientRect = null;
-  }
-  onManifestParsed(event, data) {
-    const hls = this.hls;
-    this.restrictedLevels = [];
-    this.firstLevel = data.firstLevel;
-    if (hls.config.capLevelToPlayerSize && data.video) {
-      // Start capping immediately if the manifest has signaled video codecs
-      this.startCapping();
+  abort() {
+    var _this$callbacks;
+    this.abortInternal();
+    if ((_this$callbacks = this.callbacks) != null && _this$callbacks.onAbort) {
+      this.callbacks.onAbort(this.stats, this.context, this.response);
     }
   }
-
-  // Only activate capping when playing a video stream; otherwise, multi-bitrate audio-only streams will be restricted
-  // to the first level
-  onBufferCodecs(event, data) {
-    const hls = this.hls;
-    if (hls.config.capLevelToPlayerSize && data.video) {
-      // If the manifest did not signal a video codec capping has been deferred until we're certain video is present
-      this.startCapping();
+  load(context, config, callbacks) {
+    const stats = this.stats;
+    if (stats.loading.start) {
+      throw new Error('Loader can only be used once.');
     }
-  }
-  onMediaDetaching() {
-    this.stopCapping();
-  }
-  detectPlayerSize() {
-    if (this.media && this.mediaHeight > 0 && this.mediaWidth > 0) {
-      const levels = this.hls.levels;
-      if (levels.length) {
-        const hls = this.hls;
-        hls.autoLevelCapping = this.getMaxLevel(levels.length - 1);
-        if (hls.autoLevelCapping > this.autoLevelCapping && this.streamController) {
-          // if auto level capping has a higher value for the previous one, flush the buffer using nextLevelSwitch
-          // usually happen when the user go to the fullscreen mode.
-          this.streamController.nextLevelSwitch();
-        }
-        this.autoLevelCapping = hls.autoLevelCapping;
+    stats.loading.start = self.performance.now();
+    const initParams = getRequestParameters(context, this.controller.signal);
+    const onProgress = callbacks.onProgress;
+    const isArrayBuffer = context.responseType === 'arraybuffer';
+    const LENGTH = isArrayBuffer ? 'byteLength' : 'length';
+    const {
+      maxTimeToFirstByteMs,
+      maxLoadTimeMs
+    } = config.loadPolicy;
+    this.context = context;
+    this.config = config;
+    this.callbacks = callbacks;
+    this.request = this.fetchSetup(context, initParams);
+    self.clearTimeout(this.requestTimeout);
+    config.timeout = maxTimeToFirstByteMs && isFiniteNumber(maxTimeToFirstByteMs) ? maxTimeToFirstByteMs : maxLoadTimeMs;
+    this.requestTimeout = self.setTimeout(() => {
+      this.abortInternal();
+      callbacks.onTimeout(stats, context, this.response);
+    }, config.timeout);
+    self.fetch(this.request).then(response => {
+      this.response = this.loader = response;
+      const first = Math.max(self.performance.now(), stats.loading.start);
+      self.clearTimeout(this.requestTimeout);
+      config.timeout = maxLoadTimeMs;
+      this.requestTimeout = self.setTimeout(() => {
+        this.abortInternal();
+        callbacks.onTimeout(stats, context, this.response);
+      }, maxLoadTimeMs - (first - stats.loading.start));
+      if (!response.ok) {
+        const {
+          status,
+          statusText
+        } = response;
+        throw new FetchError(statusText || 'fetch, bad network response', status, response);
+      }
+      stats.loading.first = first;
+      stats.total = getContentLength(response.headers) || stats.total;
+      if (onProgress && isFiniteNumber(config.highWaterMark)) {
+        return this.loadProgressively(response, stats, context, config.highWaterMark, onProgress);
       }
-    }
-  }
-
-  /*
-   * returns level should be the one with the dimensions equal or greater than the media (player) dimensions (so the video will be downscaled)
-   */
-  getMaxLevel(capLevelIndex) {
-    const levels = this.hls.levels;
-    if (!levels.length) {
-      return -1;
-    }
-    const validLevels = levels.filter((level, index) => this.isLevelAllowed(level) && index <= capLevelIndex);
-    this.clientRect = null;
-    return CapLevelController.getMaxLevelByMediaSize(validLevels, this.mediaWidth, this.mediaHeight);
+      if (isArrayBuffer) {
+        return response.arrayBuffer();
+      }
+      if (context.responseType === 'json') {
+        return response.json();
+      }
+      return response.text();
+    }).then(responseData => {
+      const response = this.response;
+      if (!response) {
+        throw new Error('loader destroyed');
+      }
+      self.clearTimeout(this.requestTimeout);
+      stats.loading.end = Math.max(self.performance.now(), stats.loading.first);
+      const total = responseData[LENGTH];
+      if (total) {
+        stats.loaded = stats.total = total;
+      }
+      const loaderResponse = {
+        url: response.url,
+        data: responseData,
+        code: response.status
+      };
+      if (onProgress && !isFiniteNumber(config.highWaterMark)) {
+        onProgress(stats, context, responseData, response);
+      }
+      callbacks.onSuccess(loaderResponse, stats, context, response);
+    }).catch(error => {
+      self.clearTimeout(this.requestTimeout);
+      if (stats.aborted) {
+        return;
+      }
+      // CORS errors result in an undefined code. Set it to 0 here to align with XHR's behavior
+      // when destroying, 'error' itself can be undefined
+      const code = !error ? 0 : error.code || 0;
+      const text = !error ? null : error.message;
+      callbacks.onError({
+        code,
+        text
+      }, context, error ? error.details : null, stats);
+    });
   }
-  startCapping() {
-    if (this.timer) {
-      // Don't reset capping if started twice; this can happen if the manifest signals a video codec
-      return;
+  getCacheAge() {
+    let result = null;
+    if (this.response) {
+      const ageHeader = this.response.headers.get('age');
+      result = ageHeader ? parseFloat(ageHeader) : null;
     }
-    this.autoLevelCapping = Number.POSITIVE_INFINITY;
-    this.hls.firstLevel = this.getMaxLevel(this.firstLevel);
-    self.clearInterval(this.timer);
-    this.timer = self.setInterval(this.detectPlayerSize.bind(this), 1000);
-    this.detectPlayerSize();
+    return result;
   }
-  stopCapping() {
-    this.restrictedLevels = [];
-    this.firstLevel = -1;
-    this.autoLevelCapping = Number.POSITIVE_INFINITY;
-    if (this.timer) {
-      self.clearInterval(this.timer);
-      this.timer = undefined;
-    }
+  getResponseHeader(name) {
+    return this.response ? this.response.headers.get(name) : null;
   }
-  getDimensions() {
-    if (this.clientRect) {
-      return this.clientRect;
-    }
-    const media = this.media;
-    const boundsRect = {
-      width: 0,
-      height: 0
+  loadProgressively(response, stats, context, highWaterMark = 0, onProgress) {
+    const chunkCache = new ChunkCache();
+    const reader = response.body.getReader();
+    const pump = () => {
+      return reader.read().then(data => {
+        if (data.done) {
+          if (chunkCache.dataLength) {
+            onProgress(stats, context, chunkCache.flush(), response);
+          }
+          return Promise.resolve(new ArrayBuffer(0));
+        }
+        const chunk = data.value;
+        const len = chunk.length;
+        stats.loaded += len;
+        if (len < highWaterMark || chunkCache.dataLength) {
+          // The current chunk is too small to to be emitted or the cache already has data
+          // Push it to the cache
+          chunkCache.push(chunk);
+          if (chunkCache.dataLength >= highWaterMark) {
+            // flush in order to join the typed arrays
+            onProgress(stats, context, chunkCache.flush(), response);
+          }
+        } else {
+          // If there's nothing cached already, and the chache is large enough
+          // just emit the progress event
+          onProgress(stats, context, chunk, response);
+        }
+        return pump();
+      }).catch(() => {
+        /* aborted */
+        return Promise.reject();
+      });
     };
-    if (media) {
-      const clientRect = media.getBoundingClientRect();
-      boundsRect.width = clientRect.width;
-      boundsRect.height = clientRect.height;
-      if (!boundsRect.width && !boundsRect.height) {
-        // When the media element has no width or height (equivalent to not being in the DOM),
-        // then use its width and height attributes (media.width, media.height)
-        boundsRect.width = clientRect.right - clientRect.left || media.width || 0;
-        boundsRect.height = clientRect.bottom - clientRect.top || media.height || 0;
-      }
-    }
-    this.clientRect = boundsRect;
-    return boundsRect;
+    return pump();
   }
-  get mediaWidth() {
-    return this.getDimensions().width * this.contentScaleFactor;
+}
+function getRequestParameters(context, signal) {
+  const initParams = {
+    method: 'GET',
+    mode: 'cors',
+    credentials: 'same-origin',
+    signal,
+    headers: new self.Headers(_extends({}, context.headers))
+  };
+  if (context.rangeEnd) {
+    initParams.headers.set('Range', 'bytes=' + context.rangeStart + '-' + String(context.rangeEnd - 1));
   }
-  get mediaHeight() {
-    return this.getDimensions().height * this.contentScaleFactor;
+  return initParams;
+}
+function getByteRangeLength(byteRangeHeader) {
+  const result = BYTERANGE.exec(byteRangeHeader);
+  if (result) {
+    return parseInt(result[2]) - parseInt(result[1]) + 1;
   }
-  get contentScaleFactor() {
-    let pixelRatio = 1;
-    if (!this.hls.config.ignoreDevicePixelRatio) {
-      try {
-        pixelRatio = self.devicePixelRatio;
-      } catch (e) {
-        /* no-op */
-      }
+}
+function getContentLength(headers) {
+  const contentRange = headers.get('Content-Range');
+  if (contentRange) {
+    const byteRangeLength = getByteRangeLength(contentRange);
+    if (isFiniteNumber(byteRangeLength)) {
+      return byteRangeLength;
     }
-    return pixelRatio;
   }
-  isLevelAllowed(level) {
-    const restrictedLevels = this.restrictedLevels;
-    return !restrictedLevels.some(restrictedLevel => {
-      return level.bitrate === restrictedLevel.bitrate && level.width === restrictedLevel.width && level.height === restrictedLevel.height;
-    });
+  const contentLength = headers.get('Content-Length');
+  if (contentLength) {
+    return parseInt(contentLength);
   }
-  static getMaxLevelByMediaSize(levels, width, height) {
-    if (!(levels != null && levels.length)) {
-      return -1;
-    }
+}
+function getRequest(context, initParams) {
+  return new self.Request(context.url, initParams);
+}
+class FetchError extends Error {
+  constructor(message, code, details) {
+    super(message);
+    this.code = void 0;
+    this.details = void 0;
+    this.code = code;
+    this.details = details;
+  }
+}
 
-    // Levels can have the same dimensions but differing bandwidths - since levels are ordered, we can look to the next
-    // to determine whether we've chosen the greatest bandwidth for the media's dimensions
-    const atGreatestBandwidth = (curLevel, nextLevel) => {
-      if (!nextLevel) {
-        return true;
-      }
-      return curLevel.width !== nextLevel.width || curLevel.height !== nextLevel.height;
-    };
+const WHITESPACE_CHAR = /\s/;
+const Cues = {
+  newCue(track, startTime, endTime, captionScreen) {
+    const result = [];
+    let row;
+    // the type data states this is VTTCue, but it can potentially be a TextTrackCue on old browsers
+    let cue;
+    let indenting;
+    let indent;
+    let text;
+    const Cue = self.VTTCue || self.TextTrackCue;
+    for (let r = 0; r < captionScreen.rows.length; r++) {
+      row = captionScreen.rows[r];
+      indenting = true;
+      indent = 0;
+      text = '';
+      if (!row.isEmpty()) {
+        var _track$cues;
+        for (let c = 0; c < row.chars.length; c++) {
+          if (WHITESPACE_CHAR.test(row.chars[c].uchar) && indenting) {
+            indent++;
+          } else {
+            text += row.chars[c].uchar;
+            indenting = false;
+          }
+        }
+        // To be used for cleaning-up orphaned roll-up captions
+        row.cueStartTime = startTime;
 
-    // If we run through the loop without breaking, the media's dimensions are greater than every level, so default to
-    // the max level
-    let maxLevelIndex = levels.length - 1;
-    for (let i = 0; i < levels.length; i += 1) {
-      const level = levels[i];
-      if ((level.width >= width || level.height >= height) && atGreatestBandwidth(level, levels[i + 1])) {
-        maxLevelIndex = i;
-        break;
+        // Give a slight bump to the endTime if it's equal to startTime to avoid a SyntaxError in IE
+        if (startTime === endTime) {
+          endTime += 0.0001;
+        }
+        if (indent >= 16) {
+          indent--;
+        } else {
+          indent++;
+        }
+        const cueText = fixLineBreaks(text.trim());
+        const id = generateCueId(startTime, endTime, cueText);
+
+        // If this cue already exists in the track do not push it
+        if (!(track != null && (_track$cues = track.cues) != null && _track$cues.getCueById(id))) {
+          cue = new Cue(startTime, endTime, cueText);
+          cue.id = id;
+          cue.line = r + 1;
+          cue.align = 'left';
+          // Clamp the position between 10 and 80 percent (CEA-608 PAC indent code)
+          // https://dvcs.w3.org/hg/text-tracks/raw-file/default/608toVTT/608toVTT.html#positioning-in-cea-608
+          // Firefox throws an exception and captions break with out of bounds 0-100 values
+          cue.position = 10 + Math.min(80, Math.floor(indent * 8 / 32) * 10);
+          result.push(cue);
+        }
       }
     }
-    return maxLevelIndex;
+    if (track && result.length) {
+      // Sort bottom cues in reverse order so that they render in line order when overlapping in Chrome
+      result.sort((cueA, cueB) => {
+        if (cueA.line === 'auto' || cueB.line === 'auto') {
+          return 0;
+        }
+        if (cueA.line > 8 && cueB.line > 8) {
+          return cueB.line - cueA.line;
+        }
+        return cueA.line - cueB.line;
+      });
+      result.forEach(cue => addCueToTrack(track, cue));
+    }
+    return result;
   }
-}
+};
 
-class FPSController {
-  // stream controller must be provided as a dependency!
+/**
+ * @deprecated use fragLoadPolicy.default
+ */
 
-  constructor(hls) {
-    this.hls = void 0;
-    this.isVideoPlaybackQualityAvailable = false;
-    this.timer = void 0;
-    this.media = null;
-    this.lastTime = void 0;
-    this.lastDroppedFrames = 0;
-    this.lastDecodedFrames = 0;
-    this.streamController = void 0;
-    this.hls = hls;
-    this.registerListeners();
-  }
-  setStreamController(streamController) {
-    this.streamController = streamController;
-  }
-  registerListeners() {
-    this.hls.on(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
-  }
-  unregisterListeners() {
-    this.hls.off(Events.MEDIA_ATTACHING, this.onMediaAttaching, this);
-  }
-  destroy() {
-    if (this.timer) {
-      clearInterval(this.timer);
-    }
-    this.unregisterListeners();
-    this.isVideoPlaybackQualityAvailable = false;
-    this.media = null;
-  }
-  onMediaAttaching(event, data) {
-    const config = this.hls.config;
-    if (config.capLevelOnFPSDrop) {
-      const media = data.media instanceof self.HTMLVideoElement ? data.media : null;
-      this.media = media;
-      if (media && typeof media.getVideoPlaybackQuality === 'function') {
-        this.isVideoPlaybackQualityAvailable = true;
-      }
-      self.clearInterval(this.timer);
-      this.timer = self.setInterval(this.checkFPSInterval.bind(this), config.fpsDroppedMonitoringPeriod);
-    }
-  }
-  checkFPS(video, decodedFrames, droppedFrames) {
-    const currentTime = performance.now();
-    if (decodedFrames) {
-      if (this.lastTime) {
-        const currentPeriod = currentTime - this.lastTime;
-        const currentDropped = droppedFrames - this.lastDroppedFrames;
-        const currentDecoded = decodedFrames - this.lastDecodedFrames;
-        const droppedFPS = 1000 * currentDropped / currentPeriod;
-        const hls = this.hls;
-        hls.trigger(Events.FPS_DROP, {
-          currentDropped: currentDropped,
-          currentDecoded: currentDecoded,
-          totalDroppedFrames: droppedFrames
-        });
-        if (droppedFPS > 0) {
-          // logger.log('checkFPS : droppedFPS/decodedFPS:' + droppedFPS/(1000 * currentDecoded / currentPeriod));
-          if (currentDropped > hls.config.fpsDroppedMonitoringThreshold * currentDecoded) {
-            let currentLevel = hls.currentLevel;
-            logger.warn('drop FPS ratio greater than max allowed value for currentLevel: ' + currentLevel);
-            if (currentLevel > 0 && (hls.autoLevelCapping === -1 || hls.autoLevelCapping >= currentLevel)) {
-              currentLevel = currentLevel - 1;
-              hls.trigger(Events.FPS_DROP_LEVEL_CAPPING, {
-                level: currentLevel,
-                droppedLevel: hls.currentLevel
-              });
-              hls.autoLevelCapping = currentLevel;
-              this.streamController.nextLevelSwitch();
-            }
-          }
-        }
+/**
+ * @deprecated use manifestLoadPolicy.default and playlistLoadPolicy.default
+ */
+
+const defaultLoadPolicy = {
+  maxTimeToFirstByteMs: 8000,
+  maxLoadTimeMs: 20000,
+  timeoutRetry: null,
+  errorRetry: null
+};
+
+/**
+ * @ignore
+ * If possible, keep hlsDefaultConfig shallow
+ * It is cloned whenever a new Hls instance is created, by keeping the config
+ * shallow the properties are cloned, and we don't end up manipulating the default
+ */
+const hlsDefaultConfig = _objectSpread2(_objectSpread2({
+  autoStartLoad: true,
+  // used by stream-controller
+  startPosition: -1,
+  // used by stream-controller
+  defaultAudioCodec: undefined,
+  // used by stream-controller
+  debug: false,
+  // used by logger
+  capLevelOnFPSDrop: false,
+  // used by fps-controller
+  capLevelToPlayerSize: false,
+  // used by cap-level-controller
+  ignoreDevicePixelRatio: false,
+  // used by cap-level-controller
+  preferManagedMediaSource: true,
+  initialLiveManifestSize: 1,
+  // used by stream-controller
+  maxBufferLength: 30,
+  // used by stream-controller
+  backBufferLength: Infinity,
+  // used by buffer-controller
+  frontBufferFlushThreshold: Infinity,
+  maxBufferSize: 60 * 1000 * 1000,
+  // used by stream-controller
+  maxBufferHole: 0.1,
+  // used by stream-controller
+  highBufferWatchdogPeriod: 2,
+  // used by stream-controller
+  nudgeOffset: 0.1,
+  // used by stream-controller
+  nudgeMaxRetry: 3,
+  // used by stream-controller
+  maxFragLookUpTolerance: 0.25,
+  // used by stream-controller
+  liveSyncDurationCount: 3,
+  // used by latency-controller
+  liveMaxLatencyDurationCount: Infinity,
+  // used by latency-controller
+  liveSyncDuration: undefined,
+  // used by latency-controller
+  liveMaxLatencyDuration: undefined,
+  // used by latency-controller
+  maxLiveSyncPlaybackRate: 1,
+  // used by latency-controller
+  liveDurationInfinity: false,
+  // used by buffer-controller
+  /**
+   * @deprecated use backBufferLength
+   */
+  liveBackBufferLength: null,
+  // used by buffer-controller
+  maxMaxBufferLength: 600,
+  // used by stream-controller
+  enableWorker: true,
+  // used by transmuxer
+  workerPath: null,
+  // used by transmuxer
+  enableSoftwareAES: true,
+  // used by decrypter
+  startLevel: undefined,
+  // used by level-controller
+  startFragPrefetch: false,
+  // used by stream-controller
+  fpsDroppedMonitoringPeriod: 5000,
+  // used by fps-controller
+  fpsDroppedMonitoringThreshold: 0.2,
+  // used by fps-controller
+  appendErrorMaxRetry: 3,
+  // used by buffer-controller
+  loader: XhrLoader,
+  // loader: FetchLoader,
+  fLoader: undefined,
+  // used by fragment-loader
+  pLoader: undefined,
+  // used by playlist-loader
+  xhrSetup: undefined,
+  // used by xhr-loader
+  licenseXhrSetup: undefined,
+  // used by eme-controller
+  licenseResponseCallback: undefined,
+  // used by eme-controller
+  abrController: AbrController,
+  bufferController: BufferController,
+  capLevelController: CapLevelController,
+  errorController: ErrorController,
+  fpsController: FPSController,
+  stretchShortVideoTrack: false,
+  // used by mp4-remuxer
+  maxAudioFramesDrift: 1,
+  // used by mp4-remuxer
+  forceKeyFrameOnDiscontinuity: true,
+  // used by ts-demuxer
+  abrEwmaFastLive: 3,
+  // used by abr-controller
+  abrEwmaSlowLive: 9,
+  // used by abr-controller
+  abrEwmaFastVoD: 3,
+  // used by abr-controller
+  abrEwmaSlowVoD: 9,
+  // used by abr-controller
+  abrEwmaDefaultEstimate: 5e5,
+  // 500 kbps  // used by abr-controller
+  abrEwmaDefaultEstimateMax: 5e6,
+  // 5 mbps
+  abrBandWidthFactor: 0.95,
+  // used by abr-controller
+  abrBandWidthUpFactor: 0.7,
+  // used by abr-controller
+  abrMaxWithRealBitrate: false,
+  // used by abr-controller
+  maxStarvationDelay: 4,
+  // used by abr-controller
+  maxLoadingDelay: 4,
+  // used by abr-controller
+  minAutoBitrate: 0,
+  // used by hls
+  emeEnabled: false,
+  // used by eme-controller
+  widevineLicenseUrl: undefined,
+  // used by eme-controller
+  drmSystems: {},
+  // used by eme-controller
+  drmSystemOptions: {},
+  // used by eme-controller
+  requestMediaKeySystemAccessFunc: requestMediaKeySystemAccess ,
+  // used by eme-controller
+  testBandwidth: true,
+  progressive: false,
+  lowLatencyMode: true,
+  cmcd: undefined,
+  enableDateRangeMetadataCues: true,
+  enableEmsgMetadataCues: true,
+  enableID3MetadataCues: true,
+  useMediaCapabilities: true,
+  certLoadPolicy: {
+    default: defaultLoadPolicy
+  },
+  keyLoadPolicy: {
+    default: {
+      maxTimeToFirstByteMs: 8000,
+      maxLoadTimeMs: 20000,
+      timeoutRetry: {
+        maxNumRetry: 1,
+        retryDelayMs: 1000,
+        maxRetryDelayMs: 20000,
+        backoff: 'linear'
+      },
+      errorRetry: {
+        maxNumRetry: 8,
+        retryDelayMs: 1000,
+        maxRetryDelayMs: 20000,
+        backoff: 'linear'
       }
-      this.lastTime = currentTime;
-      this.lastDroppedFrames = droppedFrames;
-      this.lastDecodedFrames = decodedFrames;
     }
-  }
-  checkFPSInterval() {
-    const video = this.media;
-    if (video) {
-      if (this.isVideoPlaybackQualityAvailable) {
-        const videoPlaybackQuality = video.getVideoPlaybackQuality();
-        this.checkFPS(video, videoPlaybackQuality.totalVideoFrames, videoPlaybackQuality.droppedVideoFrames);
-      } else {
-        // HTMLVideoElement doesn't include the webkit types
-        this.checkFPS(video, video.webkitDecodedFrameCount, video.webkitDroppedFrameCount);
+  },
+  manifestLoadPolicy: {
+    default: {
+      maxTimeToFirstByteMs: Infinity,
+      maxLoadTimeMs: 20000,
+      timeoutRetry: {
+        maxNumRetry: 2,
+        retryDelayMs: 0,
+        maxRetryDelayMs: 0
+      },
+      errorRetry: {
+        maxNumRetry: 1,
+        retryDelayMs: 1000,
+        maxRetryDelayMs: 8000
       }
     }
-  }
-}
-
-const LOGGER_PREFIX = '[eme]';
-/**
- * Controller to deal with encrypted media extensions (EME)
- * @see https://developer.mozilla.org/en-US/docs/Web/API/Encrypted_Media_Extensions_API
- *
- * @class
- * @constructor
- */
-class EMEController {
-  constructor(hls) {
-    this.hls = void 0;
-    this.config = void 0;
-    this.media = null;
-    this.keyFormatPromise = null;
-    this.keySystemAccessPromises = {};
-    this._requestLicenseFailureCount = 0;
-    this.mediaKeySessions = [];
-    this.keyIdToKeySessionPromise = {};
-    this.setMediaKeysQueue = EMEController.CDMCleanupPromise ? [EMEController.CDMCleanupPromise] : [];
-    this.onMediaEncrypted = this._onMediaEncrypted.bind(this);
-    this.onWaitingForKey = this._onWaitingForKey.bind(this);
-    this.debug = logger.debug.bind(logger, LOGGER_PREFIX);
-    this.log = logger.log.bind(logger, LOGGER_PREFIX);
-    this.warn = logger.warn.bind(logger, LOGGER_PREFIX);
-    this.error = logger.error.bind(logger, LOGGER_PREFIX);
-    this.hls = hls;
-    this.config = hls.config;
-    this.registerListeners();
-  }
-  destroy() {
-    this.unregisterListeners();
-    this.onMediaDetached();
-    // Remove any references that could be held in config options or callbacks
-    const config = this.config;
-    config.requestMediaKeySystemAccessFunc = null;
-    config.licenseXhrSetup = config.licenseResponseCallback = undefined;
-    config.drmSystems = config.drmSystemOptions = {};
-    // @ts-ignore
-    this.hls = this.onMediaEncrypted = this.onWaitingForKey = this.keyIdToKeySessionPromise = null;
-    // @ts-ignore
-    this.config = null;
-  }
-  registerListeners() {
-    this.hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-    this.hls.on(Events.MEDIA_DETACHED, this.onMediaDetached, this);
-    this.hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
-    this.hls.on(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
-  }
-  unregisterListeners() {
-    this.hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-    this.hls.off(Events.MEDIA_DETACHED, this.onMediaDetached, this);
-    this.hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
-    this.hls.off(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
-  }
-  getLicenseServerUrl(keySystem) {
-    const {
-      drmSystems,
-      widevineLicenseUrl
-    } = this.config;
-    const keySystemConfiguration = drmSystems[keySystem];
-    if (keySystemConfiguration) {
-      return keySystemConfiguration.licenseUrl;
-    }
-
-    // For backward compatibility
-    if (keySystem === KeySystems.WIDEVINE && widevineLicenseUrl) {
-      return widevineLicenseUrl;
-    }
-    throw new Error(`no license server URL configured for key-system "${keySystem}"`);
-  }
-  getServerCertificateUrl(keySystem) {
-    const {
-      drmSystems
-    } = this.config;
-    const keySystemConfiguration = drmSystems[keySystem];
-    if (keySystemConfiguration) {
-      return keySystemConfiguration.serverCertificateUrl;
-    } else {
-      this.log(`No Server Certificate in config.drmSystems["${keySystem}"]`);
-    }
-  }
-  attemptKeySystemAccess(keySystemsToAttempt) {
-    const levels = this.hls.levels;
-    const uniqueCodec = (value, i, a) => !!value && a.indexOf(value) === i;
-    const audioCodecs = levels.map(level => level.audioCodec).filter(uniqueCodec);
-    const videoCodecs = levels.map(level => level.videoCodec).filter(uniqueCodec);
-    if (audioCodecs.length + videoCodecs.length === 0) {
-      videoCodecs.push('avc1.42e01e');
-    }
-    return new Promise((resolve, reject) => {
-      const attempt = keySystems => {
-        const keySystem = keySystems.shift();
-        this.getMediaKeysPromise(keySystem, audioCodecs, videoCodecs).then(mediaKeys => resolve({
-          keySystem,
-          mediaKeys
-        })).catch(error => {
-          if (keySystems.length) {
-            attempt(keySystems);
-          } else if (error instanceof EMEKeyError) {
-            reject(error);
-          } else {
-            reject(new EMEKeyError({
-              type: ErrorTypes.KEY_SYSTEM_ERROR,
-              details: ErrorDetails.KEY_SYSTEM_NO_ACCESS,
-              error,
-              fatal: true
-            }, error.message));
-          }
-        });
-      };
-      attempt(keySystemsToAttempt);
-    });
-  }
-  requestMediaKeySystemAccess(keySystem, supportedConfigurations) {
-    const {
-      requestMediaKeySystemAccessFunc
-    } = this.config;
-    if (!(typeof requestMediaKeySystemAccessFunc === 'function')) {
-      let errMessage = `Configured requestMediaKeySystemAccess is not a function ${requestMediaKeySystemAccessFunc}`;
-      if (requestMediaKeySystemAccess === null && self.location.protocol === 'http:') {
-        errMessage = `navigator.requestMediaKeySystemAccess is not available over insecure protocol ${location.protocol}`;
+  },
+  playlistLoadPolicy: {
+    default: {
+      maxTimeToFirstByteMs: 10000,
+      maxLoadTimeMs: 20000,
+      timeoutRetry: {
+        maxNumRetry: 2,
+        retryDelayMs: 0,
+        maxRetryDelayMs: 0
+      },
+      errorRetry: {
+        maxNumRetry: 2,
+        retryDelayMs: 1000,
+        maxRetryDelayMs: 8000
       }
-      return Promise.reject(new Error(errMessage));
-    }
-    return requestMediaKeySystemAccessFunc(keySystem, supportedConfigurations);
-  }
-  getMediaKeysPromise(keySystem, audioCodecs, videoCodecs) {
-    // This can throw, but is caught in event handler callpath
-    const mediaKeySystemConfigs = getSupportedMediaKeySystemConfigurations(keySystem, audioCodecs, videoCodecs, this.config.drmSystemOptions);
-    const keySystemAccessPromises = this.keySystemAccessPromises[keySystem];
-    let keySystemAccess = keySystemAccessPromises == null ? void 0 : keySystemAccessPromises.keySystemAccess;
-    if (!keySystemAccess) {
-      this.log(`Requesting encrypted media "${keySystem}" key-system access with config: ${JSON.stringify(mediaKeySystemConfigs)}`);
-      keySystemAccess = this.requestMediaKeySystemAccess(keySystem, mediaKeySystemConfigs);
-      const _keySystemAccessPromises = this.keySystemAccessPromises[keySystem] = {
-        keySystemAccess
-      };
-      keySystemAccess.catch(error => {
-        this.log(`Failed to obtain access to key-system "${keySystem}": ${error}`);
-      });
-      return keySystemAccess.then(mediaKeySystemAccess => {
-        this.log(`Access for key-system "${mediaKeySystemAccess.keySystem}" obtained`);
-        const certificateRequest = this.fetchServerCertificate(keySystem);
-        this.log(`Create media-keys for "${keySystem}"`);
-        _keySystemAccessPromises.mediaKeys = mediaKeySystemAccess.createMediaKeys().then(mediaKeys => {
-          this.log(`Media-keys created for "${keySystem}"`);
-          return certificateRequest.then(certificate => {
-            if (certificate) {
-              return this.setMediaKeysServerCertificate(mediaKeys, keySystem, certificate);
-            }
-            return mediaKeys;
-          });
-        });
-        _keySystemAccessPromises.mediaKeys.catch(error => {
-          this.error(`Failed to create media-keys for "${keySystem}"}: ${error}`);
-        });
-        return _keySystemAccessPromises.mediaKeys;
-      });
-    }
-    return keySystemAccess.then(() => keySystemAccessPromises.mediaKeys);
-  }
-  createMediaKeySessionContext({
-    decryptdata,
-    keySystem,
-    mediaKeys
-  }) {
-    this.log(`Creating key-system session "${keySystem}" keyId: ${Hex.hexDump(decryptdata.keyId || [])}`);
-    const mediaKeysSession = mediaKeys.createSession();
-    const mediaKeySessionContext = {
-      decryptdata,
-      keySystem,
-      mediaKeys,
-      mediaKeysSession,
-      keyStatus: 'status-pending'
-    };
-    this.mediaKeySessions.push(mediaKeySessionContext);
-    return mediaKeySessionContext;
-  }
-  renewKeySession(mediaKeySessionContext) {
-    const decryptdata = mediaKeySessionContext.decryptdata;
-    if (decryptdata.pssh) {
-      const keySessionContext = this.createMediaKeySessionContext(mediaKeySessionContext);
-      const keyId = this.getKeyIdString(decryptdata);
-      const scheme = 'cenc';
-      this.keyIdToKeySessionPromise[keyId] = this.generateRequestWithPreferredKeySession(keySessionContext, scheme, decryptdata.pssh, 'expired');
-    } else {
-      this.warn(`Could not renew expired session. Missing pssh initData.`);
-    }
-    this.removeSession(mediaKeySessionContext);
-  }
-  getKeyIdString(decryptdata) {
-    if (!decryptdata) {
-      throw new Error('Could not read keyId of undefined decryptdata');
     }
-    if (decryptdata.keyId === null) {
-      throw new Error('keyId is null');
+  },
+  fragLoadPolicy: {
+    default: {
+      maxTimeToFirstByteMs: 10000,
+      maxLoadTimeMs: 120000,
+      timeoutRetry: {
+        maxNumRetry: 4,
+        retryDelayMs: 0,
+        maxRetryDelayMs: 0
+      },
+      errorRetry: {
+        maxNumRetry: 6,
+        retryDelayMs: 1000,
+        maxRetryDelayMs: 8000
+      }
     }
-    return Hex.hexDump(decryptdata.keyId);
+  },
+  steeringManifestLoadPolicy: {
+    default: {
+      maxTimeToFirstByteMs: 10000,
+      maxLoadTimeMs: 20000,
+      timeoutRetry: {
+        maxNumRetry: 2,
+        retryDelayMs: 0,
+        maxRetryDelayMs: 0
+      },
+      errorRetry: {
+        maxNumRetry: 1,
+        retryDelayMs: 1000,
+        maxRetryDelayMs: 8000
+      }
+    } 
+  },
+  // These default settings are deprecated in favor of the above policies
+  // and are maintained for backwards compatibility
+  manifestLoadingTimeOut: 10000,
+  manifestLoadingMaxRetry: 1,
+  manifestLoadingRetryDelay: 1000,
+  manifestLoadingMaxRetryTimeout: 64000,
+  levelLoadingTimeOut: 10000,
+  levelLoadingMaxRetry: 4,
+  levelLoadingRetryDelay: 1000,
+  levelLoadingMaxRetryTimeout: 64000,
+  fragLoadingTimeOut: 20000,
+  fragLoadingMaxRetry: 6,
+  fragLoadingRetryDelay: 1000,
+  fragLoadingMaxRetryTimeout: 64000
+}, timelineConfig()), {}, {
+  subtitleStreamController: SubtitleStreamController ,
+  subtitleTrackController: SubtitleTrackController ,
+  timelineController: TimelineController ,
+  audioStreamController: AudioStreamController ,
+  audioTrackController: AudioTrackController ,
+  emeController: EMEController ,
+  cmcdController: CMCDController ,
+  contentSteeringController: ContentSteeringController 
+});
+function timelineConfig() {
+  return {
+    cueHandler: Cues,
+    // used by timeline-controller
+    enableWebVTT: true,
+    // used by timeline-controller
+    enableIMSC1: true,
+    // used by timeline-controller
+    enableCEA708Captions: true,
+    // used by timeline-controller
+    captionsTextTrack1Label: 'English',
+    // used by timeline-controller
+    captionsTextTrack1LanguageCode: 'en',
+    // used by timeline-controller
+    captionsTextTrack2Label: 'Spanish',
+    // used by timeline-controller
+    captionsTextTrack2LanguageCode: 'es',
+    // used by timeline-controller
+    captionsTextTrack3Label: 'Unknown CC',
+    // used by timeline-controller
+    captionsTextTrack3LanguageCode: '',
+    // used by timeline-controller
+    captionsTextTrack4Label: 'Unknown CC',
+    // used by timeline-controller
+    captionsTextTrack4LanguageCode: '',
+    // used by timeline-controller
+    renderTextTracksNatively: true
+  };
+}
+
+/**
+ * @ignore
+ */
+function mergeConfig(defaultConfig, userConfig) {
+  if ((userConfig.liveSyncDurationCount || userConfig.liveMaxLatencyDurationCount) && (userConfig.liveSyncDuration || userConfig.liveMaxLatencyDuration)) {
+    throw new Error("Illegal hls.js config: don't mix up liveSyncDurationCount/liveMaxLatencyDurationCount and liveSyncDuration/liveMaxLatencyDuration");
   }
-  updateKeySession(mediaKeySessionContext, data) {
-    var _mediaKeySessionConte;
-    const keySession = mediaKeySessionContext.mediaKeysSession;
-    this.log(`Updating key-session "${keySession.sessionId}" for keyID ${Hex.hexDump(((_mediaKeySessionConte = mediaKeySessionContext.decryptdata) == null ? void 0 : _mediaKeySessionConte.keyId) || [])}
-      } (data length: ${data ? data.byteLength : data})`);
-    return keySession.update(data);
+  if (userConfig.liveMaxLatencyDurationCount !== undefined && (userConfig.liveSyncDurationCount === undefined || userConfig.liveMaxLatencyDurationCount <= userConfig.liveSyncDurationCount)) {
+    throw new Error('Illegal hls.js config: "liveMaxLatencyDurationCount" must be greater than "liveSyncDurationCount"');
   }
-  selectKeySystemFormat(frag) {
-    const keyFormats = Object.keys(frag.levelkeys || {});
-    if (!this.keyFormatPromise) {
-      this.log(`Selecting key-system from fragment (sn: ${frag.sn} ${frag.type}: ${frag.level}) key formats ${keyFormats.join(', ')}`);
-      this.keyFormatPromise = this.getKeyFormatPromise(keyFormats);
-    }
-    return this.keyFormatPromise;
+  if (userConfig.liveMaxLatencyDuration !== undefined && (userConfig.liveSyncDuration === undefined || userConfig.liveMaxLatencyDuration <= userConfig.liveSyncDuration)) {
+    throw new Error('Illegal hls.js config: "liveMaxLatencyDuration" must be greater than "liveSyncDuration"');
   }
-  getKeyFormatPromise(keyFormats) {
-    return new Promise((resolve, reject) => {
-      const keySystemsInConfig = getKeySystemsForConfig(this.config);
-      const keySystemsToAttempt = keyFormats.map(keySystemFormatToKeySystemDomain).filter(value => !!value && keySystemsInConfig.indexOf(value) !== -1);
-      return this.getKeySystemSelectionPromise(keySystemsToAttempt).then(({
-        keySystem
-      }) => {
-        const keySystemFormat = keySystemDomainToKeySystemFormat(keySystem);
-        if (keySystemFormat) {
-          resolve(keySystemFormat);
-        } else {
-          reject(new Error(`Unable to find format for key-system "${keySystem}"`));
+  const defaultsCopy = deepCpy(defaultConfig);
+
+  // Backwards compatibility with deprecated config values
+  const deprecatedSettingTypes = ['manifest', 'level', 'frag'];
+  const deprecatedSettings = ['TimeOut', 'MaxRetry', 'RetryDelay', 'MaxRetryTimeout'];
+  deprecatedSettingTypes.forEach(type => {
+    const policyName = `${type === 'level' ? 'playlist' : type}LoadPolicy`;
+    const policyNotSet = userConfig[policyName] === undefined;
+    const report = [];
+    deprecatedSettings.forEach(setting => {
+      const deprecatedSetting = `${type}Loading${setting}`;
+      const value = userConfig[deprecatedSetting];
+      if (value !== undefined && policyNotSet) {
+        report.push(deprecatedSetting);
+        const settings = defaultsCopy[policyName].default;
+        userConfig[policyName] = {
+          default: settings
+        };
+        switch (setting) {
+          case 'TimeOut':
+            settings.maxLoadTimeMs = value;
+            settings.maxTimeToFirstByteMs = value;
+            break;
+          case 'MaxRetry':
+            settings.errorRetry.maxNumRetry = value;
+            settings.timeoutRetry.maxNumRetry = value;
+            break;
+          case 'RetryDelay':
+            settings.errorRetry.retryDelayMs = value;
+            settings.timeoutRetry.retryDelayMs = value;
+            break;
+          case 'MaxRetryTimeout':
+            settings.errorRetry.maxRetryDelayMs = value;
+            settings.timeoutRetry.maxRetryDelayMs = value;
+            break;
         }
-      }).catch(reject);
+      }
     });
-  }
-  loadKey(data) {
-    const decryptdata = data.keyInfo.decryptdata;
-    const keyId = this.getKeyIdString(decryptdata);
-    const keyDetails = `(keyId: ${keyId} format: "${decryptdata.keyFormat}" method: ${decryptdata.method} uri: ${decryptdata.uri})`;
-    this.log(`Starting session for key ${keyDetails}`);
-    let keySessionContextPromise = this.keyIdToKeySessionPromise[keyId];
-    if (!keySessionContextPromise) {
-      keySessionContextPromise = this.keyIdToKeySessionPromise[keyId] = this.getKeySystemForKeyPromise(decryptdata).then(({
-        keySystem,
-        mediaKeys
-      }) => {
-        this.throwIfDestroyed();
-        this.log(`Handle encrypted media sn: ${data.frag.sn} ${data.frag.type}: ${data.frag.level} using key ${keyDetails}`);
-        return this.attemptSetMediaKeys(keySystem, mediaKeys).then(() => {
-          this.throwIfDestroyed();
-          const keySessionContext = this.createMediaKeySessionContext({
-            keySystem,
-            mediaKeys,
-            decryptdata
-          });
-          const scheme = 'cenc';
-          return this.generateRequestWithPreferredKeySession(keySessionContext, scheme, decryptdata.pssh, 'playlist-key');
-        });
-      });
-      keySessionContextPromise.catch(error => this.handleError(error));
+    if (report.length) {
+      logger.warn(`hls.js config: "${report.join('", "')}" setting(s) are deprecated, use "${policyName}": ${JSON.stringify(userConfig[policyName])}`);
     }
-    return keySessionContextPromise;
-  }
-  throwIfDestroyed(message = 'Invalid state') {
-    if (!this.hls) {
-      throw new Error('invalid state');
+  });
+  return _objectSpread2(_objectSpread2({}, defaultsCopy), userConfig);
+}
+function deepCpy(obj) {
+  if (obj && typeof obj === 'object') {
+    if (Array.isArray(obj)) {
+      return obj.map(deepCpy);
     }
+    return Object.keys(obj).reduce((result, key) => {
+      result[key] = deepCpy(obj[key]);
+      return result;
+    }, {});
   }
-  handleError(error) {
-    if (!this.hls) {
-      return;
-    }
-    this.error(error.message);
-    if (error instanceof EMEKeyError) {
-      this.hls.trigger(Events.ERROR, error.data);
-    } else {
-      this.hls.trigger(Events.ERROR, {
-        type: ErrorTypes.KEY_SYSTEM_ERROR,
-        details: ErrorDetails.KEY_SYSTEM_NO_KEYS,
-        error,
-        fatal: true
-      });
+  return obj;
+}
+
+/**
+ * @ignore
+ */
+function enableStreamingMode(config) {
+  const currentLoader = config.loader;
+  if (currentLoader !== FetchLoader && currentLoader !== XhrLoader) {
+    // If a developer has configured their own loader, respect that choice
+    logger.log('[config]: Custom loader detected, cannot enable progressive streaming');
+    config.progressive = false;
+  } else {
+    const canStreamProgressively = fetchSupported();
+    if (canStreamProgressively) {
+      config.loader = FetchLoader;
+      config.progressive = true;
+      config.enableSoftwareAES = true;
+      logger.log('[config]: Progressive streaming enabled, using FetchLoader');
     }
   }
-  getKeySystemForKeyPromise(decryptdata) {
-    const keyId = this.getKeyIdString(decryptdata);
-    const mediaKeySessionContext = this.keyIdToKeySessionPromise[keyId];
-    if (!mediaKeySessionContext) {
-      const keySystem = keySystemFormatToKeySystemDomain(decryptdata.keyFormat);
-      const keySystemsToAttempt = keySystem ? [keySystem] : getKeySystemsForConfig(this.config);
-      return this.attemptKeySystemAccess(keySystemsToAttempt);
-    }
-    return mediaKeySessionContext;
+}
+
+let chromeOrFirefox;
+class LevelController extends BasePlaylistController {
+  constructor(hls, contentSteeringController) {
+    super(hls, '[level-controller]');
+    this._levels = [];
+    this._firstLevel = -1;
+    this._maxAutoLevel = -1;
+    this._startLevel = void 0;
+    this.currentLevel = null;
+    this.currentLevelIndex = -1;
+    this.manualLevelIndex = -1;
+    this.steering = void 0;
+    this.onParsedComplete = void 0;
+    this.steering = contentSteeringController;
+    this._registerListeners();
+  }
+  _registerListeners() {
+    const {
+      hls
+    } = this;
+    hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
+    hls.on(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
+    hls.on(Events.LEVEL_LOADED, this.onLevelLoaded, this);
+    hls.on(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
+    hls.on(Events.FRAG_BUFFERED, this.onFragBuffered, this);
+    hls.on(Events.ERROR, this.onError, this);
+  }
+  _unregisterListeners() {
+    const {
+      hls
+    } = this;
+    hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
+    hls.off(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
+    hls.off(Events.LEVEL_LOADED, this.onLevelLoaded, this);
+    hls.off(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
+    hls.off(Events.FRAG_BUFFERED, this.onFragBuffered, this);
+    hls.off(Events.ERROR, this.onError, this);
+  }
+  destroy() {
+    this._unregisterListeners();
+    this.steering = null;
+    this.resetLevels();
+    super.destroy();
   }
-  getKeySystemSelectionPromise(keySystemsToAttempt) {
-    if (!keySystemsToAttempt.length) {
-      keySystemsToAttempt = getKeySystemsForConfig(this.config);
-    }
-    if (keySystemsToAttempt.length === 0) {
-      throw new EMEKeyError({
-        type: ErrorTypes.KEY_SYSTEM_ERROR,
-        details: ErrorDetails.KEY_SYSTEM_NO_CONFIGURED_LICENSE,
-        fatal: true
-      }, `Missing key-system license configuration options ${JSON.stringify({
-        drmSystems: this.config.drmSystems
-      })}`);
-    }
-    return this.attemptKeySystemAccess(keySystemsToAttempt);
+  stopLoad() {
+    const levels = this._levels;
+
+    // clean up live level details to force reload them, and reset load errors
+    levels.forEach(level => {
+      level.loadError = 0;
+      level.fragmentError = 0;
+    });
+    super.stopLoad();
   }
-  _onMediaEncrypted(event) {
-    const {
-      initDataType,
-      initData
-    } = event;
-    this.debug(`"${event.type}" event: init data type: "${initDataType}"`);
+  resetLevels() {
+    this._startLevel = undefined;
+    this.manualLevelIndex = -1;
+    this.currentLevelIndex = -1;
+    this.currentLevel = null;
+    this._levels = [];
+    this._maxAutoLevel = -1;
+  }
+  onManifestLoading(event, data) {
+    this.resetLevels();
+  }
+  onManifestLoaded(event, data) {
+    const preferManagedMediaSource = this.hls.config.preferManagedMediaSource;
+    const levels = [];
+    const redundantSet = {};
+    const generatePathwaySet = {};
+    let resolutionFound = false;
+    let videoCodecFound = false;
+    let audioCodecFound = false;
+    data.levels.forEach(levelParsed => {
+      var _audioCodec, _videoCodec;
+      const attributes = levelParsed.attrs;
 
-    // Ignore event when initData is null
-    if (initData === null) {
-      return;
-    }
-    let keyId;
-    let keySystemDomain;
-    if (initDataType === 'sinf' && this.config.drmSystems[KeySystems.FAIRPLAY]) {
-      // Match sinf keyId to playlist skd://keyId=
-      const json = bin2str(new Uint8Array(initData));
-      try {
-        const sinf = base64Decode(JSON.parse(json).sinf);
-        const tenc = parseSinf(new Uint8Array(sinf));
-        if (!tenc) {
-          return;
+      // erase audio codec info if browser does not support mp4a.40.34.
+      // demuxer will autodetect codec and fallback to mpeg/audio
+      let {
+        audioCodec,
+        videoCodec
+      } = levelParsed;
+      if (((_audioCodec = audioCodec) == null ? void 0 : _audioCodec.indexOf('mp4a.40.34')) !== -1) {
+        chromeOrFirefox || (chromeOrFirefox = /chrome|firefox/i.test(navigator.userAgent));
+        if (chromeOrFirefox) {
+          levelParsed.audioCodec = audioCodec = undefined;
         }
-        keyId = tenc.subarray(8, 24);
-        keySystemDomain = KeySystems.FAIRPLAY;
-      } catch (error) {
-        this.warn('Failed to parse sinf "encrypted" event message initData');
-        return;
       }
-    } else {
-      // Support clear-lead key-session creation (otherwise depend on playlist keys)
-      const psshInfo = parsePssh(initData);
-      if (psshInfo === null) {
-        return;
+      if (audioCodec) {
+        levelParsed.audioCodec = audioCodec = getCodecCompatibleName(audioCodec, preferManagedMediaSource);
       }
-      if (psshInfo.version === 0 && psshInfo.systemId === KeySystemIds.WIDEVINE && psshInfo.data) {
-        keyId = psshInfo.data.subarray(8, 24);
+      if (((_videoCodec = videoCodec) == null ? void 0 : _videoCodec.indexOf('avc1')) === 0) {
+        videoCodec = levelParsed.videoCodec = convertAVC1ToAVCOTI(videoCodec);
       }
-      keySystemDomain = keySystemIdToKeySystemDomain(psshInfo.systemId);
-    }
-    if (!keySystemDomain || !keyId) {
-      return;
-    }
-    const keyIdHex = Hex.hexDump(keyId);
-    const {
-      keyIdToKeySessionPromise,
-      mediaKeySessions
-    } = this;
-    let keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex];
-    for (let i = 0; i < mediaKeySessions.length; i++) {
-      // Match playlist key
-      const keyContext = mediaKeySessions[i];
-      const decryptdata = keyContext.decryptdata;
-      if (decryptdata.pssh || !decryptdata.keyId) {
-        continue;
+
+      // only keep levels with supported audio/video codecs
+      const {
+        width,
+        height,
+        unknownCodecs
+      } = levelParsed;
+      resolutionFound || (resolutionFound = !!(width && height));
+      videoCodecFound || (videoCodecFound = !!videoCodec);
+      audioCodecFound || (audioCodecFound = !!audioCodec);
+      if (unknownCodecs != null && unknownCodecs.length || audioCodec && !areCodecsMediaSourceSupported(audioCodec, 'audio', preferManagedMediaSource) || videoCodec && !areCodecsMediaSourceSupported(videoCodec, 'video', preferManagedMediaSource)) {
+        return;
       }
-      const oldKeyIdHex = Hex.hexDump(decryptdata.keyId);
-      if (keyIdHex === oldKeyIdHex || decryptdata.uri.replace(/-/g, '').indexOf(keyIdHex) !== -1) {
-        keySessionContextPromise = keyIdToKeySessionPromise[oldKeyIdHex];
-        delete keyIdToKeySessionPromise[oldKeyIdHex];
-        decryptdata.pssh = new Uint8Array(initData);
-        decryptdata.keyId = keyId;
-        keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = keySessionContextPromise.then(() => {
-          return this.generateRequestWithPreferredKeySession(keyContext, initDataType, initData, 'encrypted-event-key-match');
-        });
-        break;
+      const {
+        CODECS,
+        'FRAME-RATE': FRAMERATE,
+        'HDCP-LEVEL': HDCP,
+        'PATHWAY-ID': PATHWAY,
+        RESOLUTION,
+        'VIDEO-RANGE': VIDEO_RANGE
+      } = attributes;
+      const contentSteeringPrefix = `${PATHWAY || '.'}-`;
+      const levelKey = `${contentSteeringPrefix}${levelParsed.bitrate}-${RESOLUTION}-${FRAMERATE}-${CODECS}-${VIDEO_RANGE}-${HDCP}`;
+      if (!redundantSet[levelKey]) {
+        const level = new Level(levelParsed);
+        redundantSet[levelKey] = level;
+        generatePathwaySet[levelKey] = 1;
+        levels.push(level);
+      } else if (redundantSet[levelKey].uri !== levelParsed.url && !levelParsed.attrs['PATHWAY-ID']) {
+        // Assign Pathway IDs to Redundant Streams (default Pathways is ".". Redundant Streams "..", "...", and so on.)
+        // Content Steering controller to handles Pathway fallback on error
+        const pathwayCount = generatePathwaySet[levelKey] += 1;
+        levelParsed.attrs['PATHWAY-ID'] = new Array(pathwayCount + 1).join('.');
+        const level = new Level(levelParsed);
+        redundantSet[levelKey] = level;
+        levels.push(level);
+      } else {
+        redundantSet[levelKey].addGroupId('audio', attributes.AUDIO);
+        redundantSet[levelKey].addGroupId('text', attributes.SUBTITLES);
       }
+    });
+    this.filterAndSortMediaOptions(levels, data, resolutionFound, videoCodecFound, audioCodecFound);
+  }
+  filterAndSortMediaOptions(filteredLevels, data, resolutionFound, videoCodecFound, audioCodecFound) {
+    let audioTracks = [];
+    let subtitleTracks = [];
+    let levels = filteredLevels;
+
+    // remove audio-only and invalid video-range levels if we also have levels with video codecs or RESOLUTION signalled
+    if ((resolutionFound || videoCodecFound) && audioCodecFound) {
+      levels = levels.filter(({
+        videoCodec,
+        videoRange,
+        width,
+        height
+      }) => (!!videoCodec || !!(width && height)) && isVideoRange(videoRange));
     }
-    if (!keySessionContextPromise) {
-      // Clear-lead key (not encountered in playlist)
-      keySessionContextPromise = keyIdToKeySessionPromise[keyIdHex] = this.getKeySystemSelectionPromise([keySystemDomain]).then(({
-        keySystem,
-        mediaKeys
-      }) => {
-        var _keySystemToKeySystem;
-        this.throwIfDestroyed();
-        const decryptdata = new LevelKey('ISO-23001-7', keyIdHex, (_keySystemToKeySystem = keySystemDomainToKeySystemFormat(keySystem)) != null ? _keySystemToKeySystem : '');
-        decryptdata.pssh = new Uint8Array(initData);
-        decryptdata.keyId = keyId;
-        return this.attemptSetMediaKeys(keySystem, mediaKeys).then(() => {
-          this.throwIfDestroyed();
-          const keySessionContext = this.createMediaKeySessionContext({
-            decryptdata,
-            keySystem,
-            mediaKeys
+    if (levels.length === 0) {
+      // Dispatch error after MANIFEST_LOADED is done propagating
+      Promise.resolve().then(() => {
+        if (this.hls) {
+          if (data.levels.length) {
+            this.warn(`One or more CODECS in variant not supported: ${JSON.stringify(data.levels[0].attrs)}`);
+          }
+          const error = new Error('no level with compatible codecs found in manifest');
+          this.hls.trigger(Events.ERROR, {
+            type: ErrorTypes.MEDIA_ERROR,
+            details: ErrorDetails.MANIFEST_INCOMPATIBLE_CODECS_ERROR,
+            fatal: true,
+            url: data.url,
+            error,
+            reason: error.message
           });
-          return this.generateRequestWithPreferredKeySession(keySessionContext, initDataType, initData, 'encrypted-event-no-match');
-        });
+        }
       });
+      return;
     }
-    keySessionContextPromise.catch(error => this.handleError(error));
-  }
-  _onWaitingForKey(event) {
-    this.log(`"${event.type}" event`);
-  }
-  attemptSetMediaKeys(keySystem, mediaKeys) {
-    const queue = this.setMediaKeysQueue.slice();
-    this.log(`Setting media-keys for "${keySystem}"`);
-    // Only one setMediaKeys() can run at one time, and multiple setMediaKeys() operations
-    // can be queued for execution for multiple key sessions.
-    const setMediaKeysPromise = Promise.all(queue).then(() => {
-      if (!this.media) {
-        throw new Error('Attempted to set mediaKeys without media element attached');
+    if (data.audioTracks) {
+      const {
+        preferManagedMediaSource
+      } = this.hls.config;
+      audioTracks = data.audioTracks.filter(track => !track.audioCodec || areCodecsMediaSourceSupported(track.audioCodec, 'audio', preferManagedMediaSource));
+      // Assign ids after filtering as array indices by group-id
+      assignTrackIdsByGroup(audioTracks);
+    }
+    if (data.subtitles) {
+      subtitleTracks = data.subtitles;
+      assignTrackIdsByGroup(subtitleTracks);
+    }
+    // start bitrate is the first bitrate of the manifest
+    const unsortedLevels = levels.slice(0);
+    // sort levels from lowest to highest
+    levels.sort((a, b) => {
+      if (a.attrs['HDCP-LEVEL'] !== b.attrs['HDCP-LEVEL']) {
+        return (a.attrs['HDCP-LEVEL'] || '') > (b.attrs['HDCP-LEVEL'] || '') ? 1 : -1;
       }
-      return this.media.setMediaKeys(mediaKeys);
-    });
-    this.setMediaKeysQueue.push(setMediaKeysPromise);
-    return setMediaKeysPromise.then(() => {
-      this.log(`Media-keys set for "${keySystem}"`);
-      queue.push(setMediaKeysPromise);
-      this.setMediaKeysQueue = this.setMediaKeysQueue.filter(p => queue.indexOf(p) === -1);
-    });
-  }
-  generateRequestWithPreferredKeySession(context, initDataType, initData, reason) {
-    var _this$config$drmSyste, _this$config$drmSyste2;
-    const generateRequestFilter = (_this$config$drmSyste = this.config.drmSystems) == null ? void 0 : (_this$config$drmSyste2 = _this$config$drmSyste[context.keySystem]) == null ? void 0 : _this$config$drmSyste2.generateRequest;
-    if (generateRequestFilter) {
-      try {
-        const mappedInitData = generateRequestFilter.call(this.hls, initDataType, initData, context);
-        if (!mappedInitData) {
-          throw new Error('Invalid response from configured generateRequest filter');
+      // sort on height before bitrate for cap-level-controller
+      if (resolutionFound && a.height !== b.height) {
+        return a.height - b.height;
+      }
+      if (a.frameRate !== b.frameRate) {
+        return a.frameRate - b.frameRate;
+      }
+      if (a.videoRange !== b.videoRange) {
+        return VideoRangeValues.indexOf(a.videoRange) - VideoRangeValues.indexOf(b.videoRange);
+      }
+      if (a.videoCodec !== b.videoCodec) {
+        const valueA = videoCodecPreferenceValue(a.videoCodec);
+        const valueB = videoCodecPreferenceValue(b.videoCodec);
+        if (valueA !== valueB) {
+          return valueB - valueA;
         }
-        initDataType = mappedInitData.initDataType;
-        initData = context.decryptdata.pssh = mappedInitData.initData ? new Uint8Array(mappedInitData.initData) : null;
-      } catch (error) {
-        var _this$hls;
-        this.warn(error.message);
-        if ((_this$hls = this.hls) != null && _this$hls.config.debug) {
-          throw error;
+      }
+      if (a.uri === b.uri && a.codecSet !== b.codecSet) {
+        const valueA = codecsSetSelectionPreferenceValue(a.codecSet);
+        const valueB = codecsSetSelectionPreferenceValue(b.codecSet);
+        if (valueA !== valueB) {
+          return valueB - valueA;
+        }
+      }
+      if (a.bitrate !== b.bitrate) {
+        return a.bitrate - b.bitrate;
+      }
+      return 0;
+    });
+    let firstLevelInPlaylist = unsortedLevels[0];
+    if (this.steering) {
+      levels = this.steering.filterParsedLevels(levels);
+      if (levels.length !== unsortedLevels.length) {
+        for (let i = 0; i < unsortedLevels.length; i++) {
+          if (unsortedLevels[i].pathwayId === levels[0].pathwayId) {
+            firstLevelInPlaylist = unsortedLevels[i];
+            break;
+          }
         }
       }
     }
-    if (initData === null) {
-      this.log(`Skipping key-session request for "${reason}" (no initData)`);
-      return Promise.resolve(context);
-    }
-    const keyId = this.getKeyIdString(context.decryptdata);
-    this.log(`Generating key-session request for "${reason}": ${keyId} (init data type: ${initDataType} length: ${initData ? initData.byteLength : null})`);
-    const licenseStatus = new EventEmitter();
-    context.mediaKeysSession.onmessage = event => {
-      const keySession = context.mediaKeysSession;
-      if (!keySession) {
-        licenseStatus.emit('error', new Error('invalid state'));
-        return;
-      }
-      const {
-        messageType,
-        message
-      } = event;
-      this.log(`"${messageType}" message event for session "${keySession.sessionId}" message size: ${message.byteLength}`);
-      if (messageType === 'license-request' || messageType === 'license-renewal') {
-        this.renewLicense(context, message).catch(error => {
-          this.handleError(error);
-          licenseStatus.emit('error', error);
-        });
-      } else if (messageType === 'license-release') {
-        if (context.keySystem === KeySystems.FAIRPLAY) {
-          this.updateKeySession(context, strToUtf8array('acknowledged'));
-          this.removeSession(context);
+    this._levels = levels;
+
+    // find index of first level in sorted levels
+    for (let i = 0; i < levels.length; i++) {
+      if (levels[i] === firstLevelInPlaylist) {
+        var _this$hls$userConfig;
+        this._firstLevel = i;
+        const firstLevelBitrate = firstLevelInPlaylist.bitrate;
+        const bandwidthEstimate = this.hls.bandwidthEstimate;
+        this.log(`manifest loaded, ${levels.length} level(s) found, first bitrate: ${firstLevelBitrate}`);
+        // Update default bwe to first variant bitrate as long it has not been configured or set
+        if (((_this$hls$userConfig = this.hls.userConfig) == null ? void 0 : _this$hls$userConfig.abrEwmaDefaultEstimate) === undefined) {
+          const startingBwEstimate = Math.min(firstLevelBitrate, this.hls.config.abrEwmaDefaultEstimateMax);
+          if (startingBwEstimate > bandwidthEstimate && bandwidthEstimate === hlsDefaultConfig.abrEwmaDefaultEstimate) {
+            this.hls.bandwidthEstimate = startingBwEstimate;
+          }
         }
-      } else {
-        this.warn(`unhandled media key message type "${messageType}"`);
+        break;
       }
+    }
+
+    // Audio is only alternate if manifest include a URI along with the audio group tag,
+    // and this is not an audio-only stream where levels contain audio-only
+    const audioOnly = audioCodecFound && !videoCodecFound;
+    const edata = {
+      levels,
+      audioTracks,
+      subtitleTracks,
+      sessionData: data.sessionData,
+      sessionKeys: data.sessionKeys,
+      firstLevel: this._firstLevel,
+      stats: data.stats,
+      audio: audioCodecFound,
+      video: videoCodecFound,
+      altAudio: !audioOnly && audioTracks.some(t => !!t.url)
     };
-    context.mediaKeysSession.onkeystatuseschange = event => {
-      const keySession = context.mediaKeysSession;
-      if (!keySession) {
-        licenseStatus.emit('error', new Error('invalid state'));
+    this.hls.trigger(Events.MANIFEST_PARSED, edata);
+
+    // Initiate loading after all controllers have received MANIFEST_PARSED
+    if (this.hls.config.autoStartLoad || this.hls.forceStartLoad) {
+      this.hls.startLoad(this.hls.config.startPosition);
+    }
+  }
+  get levels() {
+    if (this._levels.length === 0) {
+      return null;
+    }
+    return this._levels;
+  }
+  get level() {
+    return this.currentLevelIndex;
+  }
+  set level(newLevel) {
+    const levels = this._levels;
+    if (levels.length === 0) {
+      return;
+    }
+    // check if level idx is valid
+    if (newLevel < 0 || newLevel >= levels.length) {
+      // invalid level id given, trigger error
+      const error = new Error('invalid level idx');
+      const fatal = newLevel < 0;
+      this.hls.trigger(Events.ERROR, {
+        type: ErrorTypes.OTHER_ERROR,
+        details: ErrorDetails.LEVEL_SWITCH_ERROR,
+        level: newLevel,
+        fatal,
+        error,
+        reason: error.message
+      });
+      if (fatal) {
         return;
       }
-      this.onKeyStatusChange(context);
-      const keyStatus = context.keyStatus;
-      licenseStatus.emit('keyStatus', keyStatus);
-      if (keyStatus === 'expired') {
-        this.warn(`${context.keySystem} expired for key ${keyId}`);
-        this.renewKeySession(context);
-      }
+      newLevel = Math.min(newLevel, levels.length - 1);
+    }
+    const lastLevelIndex = this.currentLevelIndex;
+    const lastLevel = this.currentLevel;
+    const lastPathwayId = lastLevel ? lastLevel.attrs['PATHWAY-ID'] : undefined;
+    const level = levels[newLevel];
+    const pathwayId = level.attrs['PATHWAY-ID'];
+    this.currentLevelIndex = newLevel;
+    this.currentLevel = level;
+    if (lastLevelIndex === newLevel && level.details && lastLevel && lastPathwayId === pathwayId) {
+      return;
+    }
+    this.log(`Switching to level ${newLevel} (${level.height ? level.height + 'p ' : ''}${level.videoRange ? level.videoRange + ' ' : ''}${level.codecSet ? level.codecSet + ' ' : ''}@${level.bitrate})${pathwayId ? ' with Pathway ' + pathwayId : ''} from level ${lastLevelIndex}${lastPathwayId ? ' with Pathway ' + lastPathwayId : ''}`);
+    const levelSwitchingData = {
+      level: newLevel,
+      attrs: level.attrs,
+      details: level.details,
+      bitrate: level.bitrate,
+      averageBitrate: level.averageBitrate,
+      maxBitrate: level.maxBitrate,
+      realBitrate: level.realBitrate,
+      width: level.width,
+      height: level.height,
+      codecSet: level.codecSet,
+      audioCodec: level.audioCodec,
+      videoCodec: level.videoCodec,
+      audioGroups: level.audioGroups,
+      subtitleGroups: level.subtitleGroups,
+      loaded: level.loaded,
+      loadError: level.loadError,
+      fragmentError: level.fragmentError,
+      name: level.name,
+      id: level.id,
+      uri: level.uri,
+      url: level.url,
+      urlId: 0,
+      audioGroupIds: level.audioGroupIds,
+      textGroupIds: level.textGroupIds
     };
-    const keyUsablePromise = new Promise((resolve, reject) => {
-      licenseStatus.on('error', reject);
-      licenseStatus.on('keyStatus', keyStatus => {
-        if (keyStatus.startsWith('usable')) {
-          resolve();
-        } else if (keyStatus === 'output-restricted') {
-          reject(new EMEKeyError({
-            type: ErrorTypes.KEY_SYSTEM_ERROR,
-            details: ErrorDetails.KEY_SYSTEM_STATUS_OUTPUT_RESTRICTED,
-            fatal: false
-          }, 'HDCP level output restricted'));
-        } else if (keyStatus === 'internal-error') {
-          reject(new EMEKeyError({
-            type: ErrorTypes.KEY_SYSTEM_ERROR,
-            details: ErrorDetails.KEY_SYSTEM_STATUS_INTERNAL_ERROR,
-            fatal: true
-          }, `key status changed to "${keyStatus}"`));
-        } else if (keyStatus === 'expired') {
-          reject(new Error('key expired while generating request'));
-        } else {
-          this.warn(`unhandled key status change "${keyStatus}"`);
-        }
-      });
-    });
-    return context.mediaKeysSession.generateRequest(initDataType, initData).then(() => {
-      var _context$mediaKeysSes;
-      this.log(`Request generated for key-session "${(_context$mediaKeysSes = context.mediaKeysSession) == null ? void 0 : _context$mediaKeysSes.sessionId}" keyId: ${keyId}`);
-    }).catch(error => {
-      throw new EMEKeyError({
-        type: ErrorTypes.KEY_SYSTEM_ERROR,
-        details: ErrorDetails.KEY_SYSTEM_NO_SESSION,
-        error,
-        fatal: false
-      }, `Error generating key-session request: ${error}`);
-    }).then(() => keyUsablePromise).catch(error => {
-      licenseStatus.removeAllListeners();
-      this.removeSession(context);
-      throw error;
-    }).then(() => {
-      licenseStatus.removeAllListeners();
-      return context;
-    });
+    this.hls.trigger(Events.LEVEL_SWITCHING, levelSwitchingData);
+    // check if we need to load playlist for this level
+    const levelDetails = level.details;
+    if (!levelDetails || levelDetails.live) {
+      // level not retrieved yet, or live playlist we need to (re)load it
+      const hlsUrlParameters = this.switchParams(level.uri, lastLevel == null ? void 0 : lastLevel.details);
+      this.loadPlaylist(hlsUrlParameters);
+    }
   }
-  onKeyStatusChange(mediaKeySessionContext) {
-    mediaKeySessionContext.mediaKeysSession.keyStatuses.forEach((status, keyId) => {
-      this.log(`key status change "${status}" for keyStatuses keyId: ${Hex.hexDump('buffer' in keyId ? new Uint8Array(keyId.buffer, keyId.byteOffset, keyId.byteLength) : new Uint8Array(keyId))} session keyId: ${Hex.hexDump(new Uint8Array(mediaKeySessionContext.decryptdata.keyId || []))} uri: ${mediaKeySessionContext.decryptdata.uri}`);
-      mediaKeySessionContext.keyStatus = status;
-    });
+  get manualLevel() {
+    return this.manualLevelIndex;
   }
-  fetchServerCertificate(keySystem) {
-    const config = this.config;
-    const Loader = config.loader;
-    const certLoader = new Loader(config);
-    const url = this.getServerCertificateUrl(keySystem);
-    if (!url) {
-      return Promise.resolve();
+  set manualLevel(newLevel) {
+    this.manualLevelIndex = newLevel;
+    if (this._startLevel === undefined) {
+      this._startLevel = newLevel;
+    }
+    if (newLevel !== -1) {
+      this.level = newLevel;
     }
-    this.log(`Fetching serverCertificate for "${keySystem}"`);
-    return new Promise((resolve, reject) => {
-      const loaderContext = {
-        responseType: 'arraybuffer',
-        url
-      };
-      const loadPolicy = config.certLoadPolicy.default;
-      const loaderConfig = {
-        loadPolicy,
-        timeout: loadPolicy.maxLoadTimeMs,
-        maxRetry: 0,
-        retryDelay: 0,
-        maxRetryDelay: 0
-      };
-      const loaderCallbacks = {
-        onSuccess: (response, stats, context, networkDetails) => {
-          resolve(response.data);
-        },
-        onError: (response, contex, networkDetails, stats) => {
-          reject(new EMEKeyError({
-            type: ErrorTypes.KEY_SYSTEM_ERROR,
-            details: ErrorDetails.KEY_SYSTEM_SERVER_CERTIFICATE_REQUEST_FAILED,
-            fatal: true,
-            networkDetails,
-            response: _objectSpread2({
-              url: loaderContext.url,
-              data: undefined
-            }, response)
-          }, `"${keySystem}" certificate request failed (${url}). Status: ${response.code} (${response.text})`));
-        },
-        onTimeout: (stats, context, networkDetails) => {
-          reject(new EMEKeyError({
-            type: ErrorTypes.KEY_SYSTEM_ERROR,
-            details: ErrorDetails.KEY_SYSTEM_SERVER_CERTIFICATE_REQUEST_FAILED,
-            fatal: true,
-            networkDetails,
-            response: {
-              url: loaderContext.url,
-              data: undefined
-            }
-          }, `"${keySystem}" certificate request timed out (${url})`));
-        },
-        onAbort: (stats, context, networkDetails) => {
-          reject(new Error('aborted'));
-        }
-      };
-      certLoader.load(loaderContext, loaderConfig, loaderCallbacks);
-    });
   }
-  setMediaKeysServerCertificate(mediaKeys, keySystem, cert) {
-    return new Promise((resolve, reject) => {
-      mediaKeys.setServerCertificate(cert).then(success => {
-        this.log(`setServerCertificate ${success ? 'success' : 'not supported by CDM'} (${cert == null ? void 0 : cert.byteLength}) on "${keySystem}"`);
-        resolve(mediaKeys);
-      }).catch(error => {
-        reject(new EMEKeyError({
-          type: ErrorTypes.KEY_SYSTEM_ERROR,
-          details: ErrorDetails.KEY_SYSTEM_SERVER_CERTIFICATE_UPDATE_FAILED,
-          error,
-          fatal: true
-        }, error.message));
-      });
-    });
+  get firstLevel() {
+    return this._firstLevel;
+  }
+  set firstLevel(newLevel) {
+    this._firstLevel = newLevel;
+  }
+  get startLevel() {
+    // Setting hls.startLevel (this._startLevel) overrides config.startLevel
+    if (this._startLevel === undefined) {
+      const configStartLevel = this.hls.config.startLevel;
+      if (configStartLevel !== undefined) {
+        return configStartLevel;
+      }
+      return this.hls.firstAutoLevel;
+    }
+    return this._startLevel;
   }
-  renewLicense(context, keyMessage) {
-    return this.requestLicense(context, new Uint8Array(keyMessage)).then(data => {
-      return this.updateKeySession(context, new Uint8Array(data)).catch(error => {
-        throw new EMEKeyError({
-          type: ErrorTypes.KEY_SYSTEM_ERROR,
-          details: ErrorDetails.KEY_SYSTEM_SESSION_UPDATE_FAILED,
-          error,
-          fatal: true
-        }, error.message);
-      });
-    });
+  set startLevel(newLevel) {
+    this._startLevel = newLevel;
   }
-  setupLicenseXHR(xhr, url, keysListItem, licenseChallenge) {
-    const licenseXhrSetup = this.config.licenseXhrSetup;
-    if (!licenseXhrSetup) {
-      xhr.open('POST', url, true);
-      return Promise.resolve({
-        xhr,
-        licenseChallenge
-      });
+  onError(event, data) {
+    if (data.fatal || !data.context) {
+      return;
     }
-    return Promise.resolve().then(() => {
-      if (!keysListItem.decryptdata) {
-        throw new Error('Key removed');
+    if (data.context.type === PlaylistContextType.LEVEL && data.context.level === this.level) {
+      this.checkRetry(data);
+    }
+  }
+
+  // reset errors on the successful load of a fragment
+  onFragBuffered(event, {
+    frag
+  }) {
+    if (frag !== undefined && frag.type === PlaylistLevelType.MAIN) {
+      const el = frag.elementaryStreams;
+      if (!Object.keys(el).some(type => !!el[type])) {
+        return;
       }
-      return licenseXhrSetup.call(this.hls, xhr, url, keysListItem, licenseChallenge);
-    }).catch(error => {
-      if (!keysListItem.decryptdata) {
-        // Key session removed. Cancel license request.
-        throw error;
+      const level = this._levels[frag.level];
+      if (level != null && level.loadError) {
+        this.log(`Resetting level error count of ${level.loadError} on frag buffered`);
+        level.loadError = 0;
       }
-      // let's try to open before running setup
-      xhr.open('POST', url, true);
-      return licenseXhrSetup.call(this.hls, xhr, url, keysListItem, licenseChallenge);
-    }).then(licenseXhrSetupResult => {
-      // if licenseXhrSetup did not yet call open, let's do it now
-      if (!xhr.readyState) {
-        xhr.open('POST', url, true);
+    }
+  }
+  onLevelLoaded(event, data) {
+    var _data$deliveryDirecti2;
+    const {
+      level,
+      details
+    } = data;
+    const curLevel = this._levels[level];
+    if (!curLevel) {
+      var _data$deliveryDirecti;
+      this.warn(`Invalid level index ${level}`);
+      if ((_data$deliveryDirecti = data.deliveryDirectives) != null && _data$deliveryDirecti.skip) {
+        details.deltaUpdateFailed = true;
       }
-      const finalLicenseChallenge = licenseXhrSetupResult ? licenseXhrSetupResult : licenseChallenge;
-      return {
-        xhr,
-        licenseChallenge: finalLicenseChallenge
-      };
-    });
+      return;
+    }
+
+    // only process level loaded events matching with expected level
+    if (level === this.currentLevelIndex) {
+      // reset level load error counter on successful level loaded only if there is no issues with fragments
+      if (curLevel.fragmentError === 0) {
+        curLevel.loadError = 0;
+      }
+      this.playlistLoaded(level, data, curLevel.details);
+    } else if ((_data$deliveryDirecti2 = data.deliveryDirectives) != null && _data$deliveryDirecti2.skip) {
+      // received a delta playlist update that cannot be merged
+      details.deltaUpdateFailed = true;
+    }
   }
-  requestLicense(keySessionContext, licenseChallenge) {
-    const keyLoadPolicy = this.config.keyLoadPolicy.default;
-    return new Promise((resolve, reject) => {
-      const url = this.getLicenseServerUrl(keySessionContext.keySystem);
-      this.log(`Sending license request to URL: ${url}`);
-      const xhr = new XMLHttpRequest();
-      xhr.responseType = 'arraybuffer';
-      xhr.onreadystatechange = () => {
-        if (!this.hls || !keySessionContext.mediaKeysSession) {
-          return reject(new Error('invalid state'));
-        }
-        if (xhr.readyState === 4) {
-          if (xhr.status === 200) {
-            this._requestLicenseFailureCount = 0;
-            let data = xhr.response;
-            this.log(`License received ${data instanceof ArrayBuffer ? data.byteLength : data}`);
-            const licenseResponseCallback = this.config.licenseResponseCallback;
-            if (licenseResponseCallback) {
-              try {
-                data = licenseResponseCallback.call(this.hls, xhr, url, keySessionContext);
-              } catch (error) {
-                this.error(error);
-              }
-            }
-            resolve(data);
-          } else {
-            const retryConfig = keyLoadPolicy.errorRetry;
-            const maxNumRetry = retryConfig ? retryConfig.maxNumRetry : 0;
-            this._requestLicenseFailureCount++;
-            if (this._requestLicenseFailureCount > maxNumRetry || xhr.status >= 400 && xhr.status < 500) {
-              reject(new EMEKeyError({
-                type: ErrorTypes.KEY_SYSTEM_ERROR,
-                details: ErrorDetails.KEY_SYSTEM_LICENSE_REQUEST_FAILED,
-                fatal: true,
-                networkDetails: xhr,
-                response: {
-                  url,
-                  data: undefined,
-                  code: xhr.status,
-                  text: xhr.statusText
-                }
-              }, `License Request XHR failed (${url}). Status: ${xhr.status} (${xhr.statusText})`));
-            } else {
-              const attemptsLeft = maxNumRetry - this._requestLicenseFailureCount + 1;
-              this.warn(`Retrying license request, ${attemptsLeft} attempts left`);
-              this.requestLicense(keySessionContext, licenseChallenge).then(resolve, reject);
-            }
-          }
+  loadPlaylist(hlsUrlParameters) {
+    super.loadPlaylist();
+    const currentLevelIndex = this.currentLevelIndex;
+    const currentLevel = this.currentLevel;
+    if (currentLevel && this.shouldLoadPlaylist(currentLevel)) {
+      let url = currentLevel.uri;
+      if (hlsUrlParameters) {
+        try {
+          url = hlsUrlParameters.addDirectives(url);
+        } catch (error) {
+          this.warn(`Could not construct new URL with HLS Delivery Directives: ${error}`);
         }
-      };
-      if (keySessionContext.licenseXhr && keySessionContext.licenseXhr.readyState !== XMLHttpRequest.DONE) {
-        keySessionContext.licenseXhr.abort();
       }
-      keySessionContext.licenseXhr = xhr;
-      this.setupLicenseXHR(xhr, url, keySessionContext, licenseChallenge).then(({
-        xhr,
-        licenseChallenge
-      }) => {
-        xhr.send(licenseChallenge);
+      const pathwayId = currentLevel.attrs['PATHWAY-ID'];
+      this.log(`Loading level index ${currentLevelIndex}${(hlsUrlParameters == null ? void 0 : hlsUrlParameters.msn) !== undefined ? ' at sn ' + hlsUrlParameters.msn + ' part ' + hlsUrlParameters.part : ''} with${pathwayId ? ' Pathway ' + pathwayId : ''} ${url}`);
+
+      // console.log('Current audio track group ID:', this.hls.audioTracks[this.hls.audioTrack].groupId);
+      // console.log('New video quality level audio group id:', levelObject.attrs.AUDIO, level);
+      this.clearTimer();
+      this.hls.trigger(Events.LEVEL_LOADING, {
+        url,
+        level: currentLevelIndex,
+        pathwayId: currentLevel.attrs['PATHWAY-ID'],
+        id: 0,
+        // Deprecated Level urlId
+        deliveryDirectives: hlsUrlParameters || null
       });
-    });
+    }
   }
-  onMediaAttached(event, data) {
-    if (!this.config.emeEnabled) {
-      return;
+  get nextLoadLevel() {
+    if (this.manualLevelIndex !== -1) {
+      return this.manualLevelIndex;
+    } else {
+      return this.hls.nextAutoLevel;
     }
-    const media = data.media;
-
-    // keep reference of media
-    this.media = media;
-    media.addEventListener('encrypted', this.onMediaEncrypted);
-    media.addEventListener('waitingforkey', this.onWaitingForKey);
   }
-  onMediaDetached() {
-    const media = this.media;
-    const mediaKeysList = this.mediaKeySessions;
-    if (media) {
-      media.removeEventListener('encrypted', this.onMediaEncrypted);
-      media.removeEventListener('waitingforkey', this.onWaitingForKey);
-      this.media = null;
+  set nextLoadLevel(nextLevel) {
+    this.level = nextLevel;
+    if (this.manualLevelIndex === -1) {
+      this.hls.nextAutoLevel = nextLevel;
     }
-    this._requestLicenseFailureCount = 0;
-    this.setMediaKeysQueue = [];
-    this.mediaKeySessions = [];
-    this.keyIdToKeySessionPromise = {};
-    LevelKey.clearKeyUriToKeyIdMap();
+  }
+  removeLevel(levelIndex) {
+    var _this$currentLevel;
+    const levels = this._levels.filter((level, index) => {
+      if (index !== levelIndex) {
+        return true;
+      }
+      if (this.steering) {
+        this.steering.removeLevel(level);
+      }
+      if (level === this.currentLevel) {
+        this.currentLevel = null;
+        this.currentLevelIndex = -1;
+        if (level.details) {
+          level.details.fragments.forEach(f => f.level = -1);
+        }
+      }
+      return false;
+    });
+    reassignFragmentLevelIndexes(levels);
+    this._levels = levels;
+    if (this.currentLevelIndex > -1 && (_this$currentLevel = this.currentLevel) != null && _this$currentLevel.details) {
+      this.currentLevelIndex = this.currentLevel.details.fragments[0].level;
+    }
+    this.hls.trigger(Events.LEVELS_UPDATED, {
+      levels
+    });
+  }
+  onLevelsUpdated(event, {
+    levels
+  }) {
+    this._levels = levels;
+  }
+  checkMaxAutoUpdated() {
+    const {
+      autoLevelCapping,
+      maxAutoLevel,
+      maxHdcpLevel
+    } = this.hls;
+    if (this._maxAutoLevel !== maxAutoLevel) {
+      this._maxAutoLevel = maxAutoLevel;
+      this.hls.trigger(Events.MAX_AUTO_LEVEL_UPDATED, {
+        autoLevelCapping,
+        levels: this.levels,
+        maxAutoLevel,
+        minAutoLevel: this.hls.minAutoLevel,
+        maxHdcpLevel
+      });
+    }
+  }
+}
+function assignTrackIdsByGroup(tracks) {
+  const groups = {};
+  tracks.forEach(track => {
+    const groupId = track.groupId || '';
+    track.id = groups[groupId] = groups[groupId] || 0;
+    groups[groupId]++;
+  });
+}
 
-    // Close all sessions and remove media keys from the video element.
-    const keySessionCount = mediaKeysList.length;
-    EMEController.CDMCleanupPromise = Promise.all(mediaKeysList.map(mediaKeySessionContext => this.removeSession(mediaKeySessionContext)).concat(media == null ? void 0 : media.setMediaKeys(null).catch(error => {
-      this.log(`Could not clear media keys: ${error}. media.src: ${media == null ? void 0 : media.src}`);
-    }))).then(() => {
-      if (keySessionCount) {
-        this.log('finished closing key sessions and clearing media keys');
-        mediaKeysList.length = 0;
+class KeyLoader {
+  constructor(config) {
+    this.config = void 0;
+    this.keyUriToKeyInfo = {};
+    this.emeController = null;
+    this.config = config;
+  }
+  abort(type) {
+    for (const uri in this.keyUriToKeyInfo) {
+      const loader = this.keyUriToKeyInfo[uri].loader;
+      if (loader) {
+        var _loader$context;
+        if (type && type !== ((_loader$context = loader.context) == null ? void 0 : _loader$context.frag.type)) {
+          return;
+        }
+        loader.abort();
       }
-    }).catch(error => {
-      this.log(`Could not close sessions and clear media keys: ${error}. media.src: ${media == null ? void 0 : media.src}`);
-    });
+    }
   }
-  onManifestLoading() {
-    this.keyFormatPromise = null;
+  detach() {
+    for (const uri in this.keyUriToKeyInfo) {
+      const keyInfo = this.keyUriToKeyInfo[uri];
+      // Remove cached EME keys on detach
+      if (keyInfo.mediaKeySessionContext || keyInfo.decryptdata.isCommonEncryption) {
+        delete this.keyUriToKeyInfo[uri];
+      }
+    }
   }
-  onManifestLoaded(event, {
-    sessionKeys
-  }) {
-    if (!sessionKeys || !this.config.emeEnabled) {
-      return;
+  destroy() {
+    this.detach();
+    for (const uri in this.keyUriToKeyInfo) {
+      const loader = this.keyUriToKeyInfo[uri].loader;
+      if (loader) {
+        loader.destroy();
+      }
     }
-    if (!this.keyFormatPromise) {
-      const keyFormats = sessionKeys.reduce((formats, sessionKey) => {
-        if (formats.indexOf(sessionKey.keyFormat) === -1) {
-          formats.push(sessionKey.keyFormat);
+    this.keyUriToKeyInfo = {};
+  }
+  createKeyLoadError(frag, details = ErrorDetails.KEY_LOAD_ERROR, error, networkDetails, response) {
+    return new LoadError({
+      type: ErrorTypes.NETWORK_ERROR,
+      details,
+      fatal: false,
+      frag,
+      response,
+      error,
+      networkDetails
+    });
+  }
+  loadClear(loadingFrag, encryptedFragments) {
+    if (this.emeController && this.config.emeEnabled) {
+      // access key-system with nearest key on start (loaidng frag is unencrypted)
+      const {
+        sn,
+        cc
+      } = loadingFrag;
+      for (let i = 0; i < encryptedFragments.length; i++) {
+        const frag = encryptedFragments[i];
+        if (cc <= frag.cc && (sn === 'initSegment' || frag.sn === 'initSegment' || sn < frag.sn)) {
+          this.emeController.selectKeySystemFormat(frag).then(keySystemFormat => {
+            frag.setKeyFormat(keySystemFormat);
+          });
+          break;
         }
-        return formats;
-      }, []);
-      this.log(`Selecting key-system from session-keys ${keyFormats.join(', ')}`);
-      this.keyFormatPromise = this.getKeyFormatPromise(keyFormats);
+      }
     }
   }
-  removeSession(mediaKeySessionContext) {
-    const {
-      mediaKeysSession,
-      licenseXhr
-    } = mediaKeySessionContext;
-    if (mediaKeysSession) {
-      this.log(`Remove licenses and keys and close session ${mediaKeysSession.sessionId}`);
-      mediaKeysSession.onmessage = null;
-      mediaKeysSession.onkeystatuseschange = null;
-      if (licenseXhr && licenseXhr.readyState !== XMLHttpRequest.DONE) {
-        licenseXhr.abort();
-      }
-      mediaKeySessionContext.mediaKeysSession = mediaKeySessionContext.decryptdata = mediaKeySessionContext.licenseXhr = undefined;
-      const index = this.mediaKeySessions.indexOf(mediaKeySessionContext);
-      if (index > -1) {
-        this.mediaKeySessions.splice(index, 1);
-      }
-      return mediaKeysSession.remove().catch(error => {
-        this.log(`Could not remove session: ${error}`);
-      }).then(() => {
-        return mediaKeysSession.close();
-      }).catch(error => {
-        this.log(`Could not close session: ${error}`);
+  load(frag) {
+    if (!frag.decryptdata && frag.encrypted && this.emeController) {
+      // Multiple keys, but none selected, resolve in eme-controller
+      return this.emeController.selectKeySystemFormat(frag).then(keySystemFormat => {
+        return this.loadInternal(frag, keySystemFormat);
       });
     }
+    return this.loadInternal(frag);
   }
-}
-EMEController.CDMCleanupPromise = void 0;
-class EMEKeyError extends Error {
-  constructor(data, message) {
-    super(message);
-    this.data = void 0;
-    data.error || (data.error = new Error(message));
-    this.data = data;
-    data.err = data.error;
-  }
-}
-
-/**
- * CMCD spec version
- */
-const CMCDVersion = 1;
-
-/**
- * CMCD Object Type
- */
-var CMCDObjectType = {
-  MANIFEST: "m",
-  AUDIO: "a",
-  VIDEO: "v",
-  MUXED: "av",
-  INIT: "i",
-  CAPTION: "c",
-  TIMED_TEXT: "tt",
-  KEY: "k",
-  OTHER: "o"
-};
-
-/**
- * CMCD Streaming Format
- */
-const CMCDStreamingFormatHLS = 'h';
-
-/**
- * CMCD Streaming Type
- */
-
-/**
- * CMCD Headers
- */
-
-/**
- * CMCD
- */
-
-/**
- * Controller to deal with Common Media Client Data (CMCD)
- * @see https://cdn.cta.tech/cta/media/media/resources/standards/pdfs/cta-5004-final.pdf
- */
-class CMCDController {
-  // eslint-disable-line no-restricted-globals
-  // eslint-disable-line no-restricted-globals
-
-  constructor(hls) {
-    this.hls = void 0;
-    this.config = void 0;
-    this.media = void 0;
-    this.sid = void 0;
-    this.cid = void 0;
-    this.useHeaders = false;
-    this.initialized = false;
-    this.starved = false;
-    this.buffering = true;
-    this.audioBuffer = void 0;
-    this.videoBuffer = void 0;
-    this.onWaiting = () => {
-      if (this.initialized) {
-        this.starved = true;
-      }
-      this.buffering = true;
-    };
-    this.onPlaying = () => {
-      if (!this.initialized) {
-        this.initialized = true;
-      }
-      this.buffering = false;
-    };
-    /**
-     * Apply CMCD data to a manifest request.
-     */
-    this.applyPlaylistData = context => {
-      try {
-        this.apply(context, {
-          ot: CMCDObjectType.MANIFEST,
-          su: !this.initialized
-        });
-      } catch (error) {
-        logger.warn('Could not generate manifest CMCD data.', error);
+  loadInternal(frag, keySystemFormat) {
+    var _keyInfo, _keyInfo2;
+    if (keySystemFormat) {
+      frag.setKeyFormat(keySystemFormat);
+    }
+    const decryptdata = frag.decryptdata;
+    if (!decryptdata) {
+      const error = new Error(keySystemFormat ? `Expected frag.decryptdata to be defined after setting format ${keySystemFormat}` : 'Missing decryption data on fragment in onKeyLoading');
+      return Promise.reject(this.createKeyLoadError(frag, ErrorDetails.KEY_LOAD_ERROR, error));
+    }
+    const uri = decryptdata.uri;
+    if (!uri) {
+      return Promise.reject(this.createKeyLoadError(frag, ErrorDetails.KEY_LOAD_ERROR, new Error(`Invalid key URI: "${uri}"`)));
+    }
+    let keyInfo = this.keyUriToKeyInfo[uri];
+    if ((_keyInfo = keyInfo) != null && _keyInfo.decryptdata.key) {
+      decryptdata.key = keyInfo.decryptdata.key;
+      return Promise.resolve({
+        frag,
+        keyInfo
+      });
+    }
+    // Return key load promise as long as it does not have a mediakey session with an unusable key status
+    if ((_keyInfo2 = keyInfo) != null && _keyInfo2.keyLoadPromise) {
+      var _keyInfo$mediaKeySess;
+      switch ((_keyInfo$mediaKeySess = keyInfo.mediaKeySessionContext) == null ? void 0 : _keyInfo$mediaKeySess.keyStatus) {
+        case undefined:
+        case 'status-pending':
+        case 'usable':
+        case 'usable-in-future':
+          return keyInfo.keyLoadPromise.then(keyLoadedData => {
+            // Return the correct fragment with updated decryptdata key and loaded keyInfo
+            decryptdata.key = keyLoadedData.keyInfo.decryptdata.key;
+            return {
+              frag,
+              keyInfo
+            };
+          });
       }
+      // If we have a key session and status and it is not pending or usable, continue
+      // This will go back to the eme-controller for expired keys to get a new keyLoadPromise
+    }
+
+    // Load the key or return the loading promise
+    keyInfo = this.keyUriToKeyInfo[uri] = {
+      decryptdata,
+      keyLoadPromise: null,
+      loader: null,
+      mediaKeySessionContext: null
     };
-    /**
-     * Apply CMCD data to a segment request
-     */
-    this.applyFragmentData = context => {
-      try {
-        const fragment = context.frag;
-        const level = this.hls.levels[fragment.level];
-        const ot = this.getObjectType(fragment);
-        const data = {
-          d: fragment.duration * 1000,
-          ot
-        };
-        if (ot === CMCDObjectType.VIDEO || ot === CMCDObjectType.AUDIO || ot == CMCDObjectType.MUXED) {
-          data.br = level.bitrate / 1000;
-          data.tb = this.getTopBandwidth(ot) / 1000;
-          data.bl = this.getBufferLength(ot);
+    switch (decryptdata.method) {
+      case 'ISO-23001-7':
+      case 'SAMPLE-AES':
+      case 'SAMPLE-AES-CENC':
+      case 'SAMPLE-AES-CTR':
+        if (decryptdata.keyFormat === 'identity') {
+          // loadKeyHTTP handles http(s) and data URLs
+          return this.loadKeyHTTP(keyInfo, frag);
         }
-        this.apply(context, data);
-      } catch (error) {
-        logger.warn('Could not generate segment CMCD data.', error);
+        return this.loadKeyEME(keyInfo, frag);
+      case 'AES-128':
+        return this.loadKeyHTTP(keyInfo, frag);
+      default:
+        return Promise.reject(this.createKeyLoadError(frag, ErrorDetails.KEY_LOAD_ERROR, new Error(`Key supplied with unsupported METHOD: "${decryptdata.method}"`)));
+    }
+  }
+  loadKeyEME(keyInfo, frag) {
+    const keyLoadedData = {
+      frag,
+      keyInfo
+    };
+    if (this.emeController && this.config.emeEnabled) {
+      const keySessionContextPromise = this.emeController.loadKey(keyLoadedData);
+      if (keySessionContextPromise) {
+        return (keyInfo.keyLoadPromise = keySessionContextPromise.then(keySessionContext => {
+          keyInfo.mediaKeySessionContext = keySessionContext;
+          return keyLoadedData;
+        })).catch(error => {
+          // Remove promise for license renewal or retry
+          keyInfo.keyLoadPromise = null;
+          throw error;
+        });
       }
-    };
-    this.hls = hls;
-    const config = this.config = hls.config;
-    const {
-      cmcd
-    } = config;
-    if (cmcd != null) {
-      config.pLoader = this.createPlaylistLoader();
-      config.fLoader = this.createFragmentLoader();
-      this.sid = cmcd.sessionId || CMCDController.uuid();
-      this.cid = cmcd.contentId;
-      this.useHeaders = cmcd.useHeaders === true;
-      this.registerListeners();
     }
+    return Promise.resolve(keyLoadedData);
   }
-  registerListeners() {
-    const hls = this.hls;
-    hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-    hls.on(Events.MEDIA_DETACHED, this.onMediaDetached, this);
-    hls.on(Events.BUFFER_CREATED, this.onBufferCreated, this);
+  loadKeyHTTP(keyInfo, frag) {
+    const config = this.config;
+    const Loader = config.loader;
+    const keyLoader = new Loader(config);
+    frag.keyLoader = keyInfo.loader = keyLoader;
+    return keyInfo.keyLoadPromise = new Promise((resolve, reject) => {
+      const loaderContext = {
+        keyInfo,
+        frag,
+        responseType: 'arraybuffer',
+        url: keyInfo.decryptdata.uri
+      };
+
+      // maxRetry is 0 so that instead of retrying the same key on the same variant multiple times,
+      // key-loader will trigger an error and rely on stream-controller to handle retry logic.
+      // this will also align retry logic with fragment-loader
+      const loadPolicy = config.keyLoadPolicy.default;
+      const loaderConfig = {
+        loadPolicy,
+        timeout: loadPolicy.maxLoadTimeMs,
+        maxRetry: 0,
+        retryDelay: 0,
+        maxRetryDelay: 0
+      };
+      const loaderCallbacks = {
+        onSuccess: (response, stats, context, networkDetails) => {
+          const {
+            frag,
+            keyInfo,
+            url: uri
+          } = context;
+          if (!frag.decryptdata || keyInfo !== this.keyUriToKeyInfo[uri]) {
+            return reject(this.createKeyLoadError(frag, ErrorDetails.KEY_LOAD_ERROR, new Error('after key load, decryptdata unset or changed'), networkDetails));
+          }
+          keyInfo.decryptdata.key = frag.decryptdata.key = new Uint8Array(response.data);
+
+          // detach fragment key loader on load success
+          frag.keyLoader = null;
+          keyInfo.loader = null;
+          resolve({
+            frag,
+            keyInfo
+          });
+        },
+        onError: (response, context, networkDetails, stats) => {
+          this.resetLoader(context);
+          reject(this.createKeyLoadError(frag, ErrorDetails.KEY_LOAD_ERROR, new Error(`HTTP Error ${response.code} loading key ${response.text}`), networkDetails, _objectSpread2({
+            url: loaderContext.url,
+            data: undefined
+          }, response)));
+        },
+        onTimeout: (stats, context, networkDetails) => {
+          this.resetLoader(context);
+          reject(this.createKeyLoadError(frag, ErrorDetails.KEY_LOAD_TIMEOUT, new Error('key loading timed out'), networkDetails));
+        },
+        onAbort: (stats, context, networkDetails) => {
+          this.resetLoader(context);
+          reject(this.createKeyLoadError(frag, ErrorDetails.INTERNAL_ABORTED, new Error('key loading aborted'), networkDetails));
+        }
+      };
+      keyLoader.load(loaderContext, loaderConfig, loaderCallbacks);
+    });
   }
-  unregisterListeners() {
-    const hls = this.hls;
-    hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
-    hls.off(Events.MEDIA_DETACHED, this.onMediaDetached, this);
-    hls.off(Events.BUFFER_CREATED, this.onBufferCreated, this);
+  resetLoader(context) {
+    const {
+      frag,
+      keyInfo,
+      url: uri
+    } = context;
+    const loader = keyInfo.loader;
+    if (frag.keyLoader === loader) {
+      frag.keyLoader = null;
+      keyInfo.loader = null;
+    }
+    delete this.keyUriToKeyInfo[uri];
+    if (loader) {
+      loader.destroy();
+    }
   }
-  destroy() {
-    this.unregisterListeners();
-    this.onMediaDetached();
+}
 
-    // @ts-ignore
-    this.hls = this.config = this.audioBuffer = this.videoBuffer = null;
+function getSourceBuffer() {
+  return self.SourceBuffer || self.WebKitSourceBuffer;
+}
+function isMSESupported() {
+  const mediaSource = getMediaSource();
+  if (!mediaSource) {
+    return false;
   }
-  onMediaAttached(event, data) {
-    this.media = data.media;
-    this.media.addEventListener('waiting', this.onWaiting);
-    this.media.addEventListener('playing', this.onPlaying);
+
+  // if SourceBuffer is exposed ensure its API is valid
+  // Older browsers do not expose SourceBuffer globally so checking SourceBuffer.prototype is impossible
+  const sourceBuffer = getSourceBuffer();
+  return !sourceBuffer || sourceBuffer.prototype && typeof sourceBuffer.prototype.appendBuffer === 'function' && typeof sourceBuffer.prototype.remove === 'function';
+}
+function isSupported() {
+  if (!isMSESupported()) {
+    return false;
   }
-  onMediaDetached() {
-    if (!this.media) {
-      return;
-    }
-    this.media.removeEventListener('waiting', this.onWaiting);
-    this.media.removeEventListener('playing', this.onPlaying);
+  const mediaSource = getMediaSource();
+  return typeof (mediaSource == null ? void 0 : mediaSource.isTypeSupported) === 'function' && (['avc1.42E01E,mp4a.40.2', 'av01.0.01M.08', 'vp09.00.50.08'].some(codecsForVideoContainer => mediaSource.isTypeSupported(mimeTypeForCodec(codecsForVideoContainer, 'video'))) || ['mp4a.40.2', 'fLaC'].some(codecForAudioContainer => mediaSource.isTypeSupported(mimeTypeForCodec(codecForAudioContainer, 'audio'))));
+}
+function changeTypeSupported() {
+  var _sourceBuffer$prototy;
+  const sourceBuffer = getSourceBuffer();
+  return typeof (sourceBuffer == null ? void 0 : (_sourceBuffer$prototy = sourceBuffer.prototype) == null ? void 0 : _sourceBuffer$prototy.changeType) === 'function';
+}
 
-    // @ts-ignore
+const STALL_MINIMUM_DURATION_MS = 250;
+const MAX_START_GAP_JUMP = 2.0;
+const SKIP_BUFFER_HOLE_STEP_SECONDS = 0.1;
+const SKIP_BUFFER_RANGE_START = 0.05;
+class GapController {
+  constructor(config, media, fragmentTracker, hls) {
+    this.config = void 0;
     this.media = null;
+    this.fragmentTracker = void 0;
+    this.hls = void 0;
+    this.nudgeRetry = 0;
+    this.stallReported = false;
+    this.stalled = null;
+    this.moved = false;
+    this.seeking = false;
+    this.config = config;
+    this.media = media;
+    this.fragmentTracker = fragmentTracker;
+    this.hls = hls;
   }
-  onBufferCreated(event, data) {
-    var _data$tracks$audio, _data$tracks$video;
-    this.audioBuffer = (_data$tracks$audio = data.tracks.audio) == null ? void 0 : _data$tracks$audio.buffer;
-    this.videoBuffer = (_data$tracks$video = data.tracks.video) == null ? void 0 : _data$tracks$video.buffer;
-  }
-  /**
-   * Create baseline CMCD data
-   */
-  createData() {
-    var _this$media;
-    return {
-      v: CMCDVersion,
-      sf: CMCDStreamingFormatHLS,
-      sid: this.sid,
-      cid: this.cid,
-      pr: (_this$media = this.media) == null ? void 0 : _this$media.playbackRate,
-      mtp: this.hls.bandwidthEstimate / 1000
-    };
+  destroy() {
+    this.media = null;
+    // @ts-ignore
+    this.hls = this.fragmentTracker = null;
   }
 
   /**
-   * Apply CMCD data to a request.
+   * Checks if the playhead is stuck within a gap, and if so, attempts to free it.
+   * A gap is an unbuffered range between two buffered ranges (or the start and the first buffered range).
+   *
+   * @param lastCurrentTime - Previously read playhead position
    */
-  apply(context, data = {}) {
-    // apply baseline data
-    _extends(data, this.createData());
-    const isVideo = data.ot === CMCDObjectType.INIT || data.ot === CMCDObjectType.VIDEO || data.ot === CMCDObjectType.MUXED;
-    if (this.starved && isVideo) {
-      data.bs = true;
-      data.su = true;
-      this.starved = false;
+  poll(lastCurrentTime, activeFrag) {
+    const {
+      config,
+      media,
+      stalled
+    } = this;
+    if (media === null) {
+      return;
     }
-    if (data.su == null) {
-      data.su = this.buffering;
+    const {
+      currentTime,
+      seeking
+    } = media;
+    const seeked = this.seeking && !seeking;
+    const beginSeek = !this.seeking && seeking;
+    this.seeking = seeking;
+
+    // The playhead is moving, no-op
+    if (currentTime !== lastCurrentTime) {
+      this.moved = true;
+      if (!seeking) {
+        this.nudgeRetry = 0;
+      }
+      if (stalled !== null) {
+        // The playhead is now moving, but was previously stalled
+        if (this.stallReported) {
+          const _stalledDuration = self.performance.now() - stalled;
+          logger.warn(`playback not stuck anymore @${currentTime}, after ${Math.round(_stalledDuration)}ms`);
+          this.stallReported = false;
+        }
+        this.stalled = null;
+      }
+      return;
     }
 
-    // TODO: Implement rtp, nrr, nor, dl
+    // Clear stalled state when beginning or finishing seeking so that we don't report stalls coming out of a seek
+    if (beginSeek || seeked) {
+      this.stalled = null;
+      return;
+    }
 
-    if (this.useHeaders) {
-      const headers = CMCDController.toHeaders(data);
-      if (!Object.keys(headers).length) {
+    // The playhead should not be moving
+    if (media.paused && !seeking || media.ended || media.playbackRate === 0 || !BufferHelper.getBuffered(media).length) {
+      this.nudgeRetry = 0;
+      return;
+    }
+    const bufferInfo = BufferHelper.bufferInfo(media, currentTime, 0);
+    const nextStart = bufferInfo.nextStart || 0;
+    if (seeking) {
+      // Waiting for seeking in a buffered range to complete
+      const hasEnoughBuffer = bufferInfo.len > MAX_START_GAP_JUMP;
+      // Next buffered range is too far ahead to jump to while still seeking
+      const noBufferGap = !nextStart || activeFrag && activeFrag.start <= currentTime || nextStart - currentTime > MAX_START_GAP_JUMP && !this.fragmentTracker.getPartialFragment(currentTime);
+      if (hasEnoughBuffer || noBufferGap) {
         return;
       }
-      if (!context.headers) {
-        context.headers = {};
+      // Reset moved state when seeking to a point in or before a gap
+      this.moved = false;
+    }
+
+    // Skip start gaps if we haven't played, but the last poll detected the start of a stall
+    // The addition poll gives the browser a chance to jump the gap for us
+    if (!this.moved && this.stalled !== null) {
+      var _level$details;
+      // There is no playable buffer (seeked, waiting for buffer)
+      const isBuffered = bufferInfo.len > 0;
+      if (!isBuffered && !nextStart) {
+        return;
       }
-      _extends(context.headers, headers);
-    } else {
-      const query = CMCDController.toQuery(data);
-      if (!query) {
+      // Jump start gaps within jump threshold
+      const startJump = Math.max(nextStart, bufferInfo.start || 0) - currentTime;
+
+      // When joining a live stream with audio tracks, account for live playlist window sliding by allowing
+      // a larger jump over start gaps caused by the audio-stream-controller buffering a start fragment
+      // that begins over 1 target duration after the video start position.
+      const level = this.hls.levels ? this.hls.levels[this.hls.currentLevel] : null;
+      const isLive = level == null ? void 0 : (_level$details = level.details) == null ? void 0 : _level$details.live;
+      const maxStartGapJump = isLive ? level.details.targetduration * 2 : MAX_START_GAP_JUMP;
+      const partialOrGap = this.fragmentTracker.getPartialFragment(currentTime);
+      if (startJump > 0 && (startJump <= maxStartGapJump || partialOrGap)) {
+        if (!media.paused) {
+          this._trySkipBufferHole(partialOrGap);
+        }
         return;
       }
-      context.url = CMCDController.appendQueryToUri(context.url, query);
-    }
-  }
-  /**
-   * The CMCD object type.
-   */
-  getObjectType(fragment) {
-    const {
-      type
-    } = fragment;
-    if (type === 'subtitle') {
-      return CMCDObjectType.TIMED_TEXT;
     }
-    if (fragment.sn === 'initSegment') {
-      return CMCDObjectType.INIT;
-    }
-    if (type === 'audio') {
-      return CMCDObjectType.AUDIO;
+
+    // Start tracking stall time
+    const tnow = self.performance.now();
+    if (stalled === null) {
+      this.stalled = tnow;
+      return;
     }
-    if (type === 'main') {
-      if (!this.hls.audioTracks.length) {
-        return CMCDObjectType.MUXED;
+    const stalledDuration = tnow - stalled;
+    if (!seeking && stalledDuration >= STALL_MINIMUM_DURATION_MS) {
+      // Report stalling after trying to fix
+      this._reportStall(bufferInfo);
+      if (!this.media) {
+        return;
       }
-      return CMCDObjectType.VIDEO;
     }
-    return undefined;
+    const bufferedWithHoles = BufferHelper.bufferInfo(media, currentTime, config.maxBufferHole);
+    this._tryFixBufferStall(bufferedWithHoles, stalledDuration);
   }
 
   /**
-   * Get the highest bitrate.
+   * Detects and attempts to fix known buffer stalling issues.
+   * @param bufferInfo - The properties of the current buffer.
+   * @param stalledDurationMs - The amount of time Hls.js has been stalling for.
+   * @private
    */
-  getTopBandwidth(type) {
-    let bitrate = 0;
-    let levels;
-    const hls = this.hls;
-    if (type === CMCDObjectType.AUDIO) {
-      levels = hls.audioTracks;
-    } else {
-      const max = hls.maxAutoLevel;
-      const len = max > -1 ? max + 1 : hls.levels.length;
-      levels = hls.levels.slice(0, len);
+  _tryFixBufferStall(bufferInfo, stalledDurationMs) {
+    const {
+      config,
+      fragmentTracker,
+      media
+    } = this;
+    if (media === null) {
+      return;
     }
-    for (const level of levels) {
-      if (level.bitrate > bitrate) {
-        bitrate = level.bitrate;
+    const currentTime = media.currentTime;
+    const partial = fragmentTracker.getPartialFragment(currentTime);
+    if (partial) {
+      // Try to skip over the buffer hole caused by a partial fragment
+      // This method isn't limited by the size of the gap between buffered ranges
+      const targetTime = this._trySkipBufferHole(partial);
+      // we return here in this case, meaning
+      // the branch below only executes when we haven't seeked to a new position
+      if (targetTime || !this.media) {
+        return;
       }
     }
-    return bitrate > 0 ? bitrate : NaN;
-  }
 
-  /**
-   * Get the buffer length for a media type in milliseconds
-   */
-  getBufferLength(type) {
-    const media = this.hls.media;
-    const buffer = type === CMCDObjectType.AUDIO ? this.audioBuffer : this.videoBuffer;
-    if (!buffer || !media) {
-      return NaN;
+    // if we haven't had to skip over a buffer hole of a partial fragment
+    // we may just have to "nudge" the playlist as the browser decoding/rendering engine
+    // needs to cross some sort of threshold covering all source-buffers content
+    // to start playing properly.
+    if ((bufferInfo.len > config.maxBufferHole || bufferInfo.nextStart && bufferInfo.nextStart - currentTime < config.maxBufferHole) && stalledDurationMs > config.highBufferWatchdogPeriod * 1000) {
+      logger.warn('Trying to nudge playhead over buffer-hole');
+      // Try to nudge currentTime over a buffer hole if we've been stalling for the configured amount of seconds
+      // We only try to jump the hole if it's under the configured size
+      // Reset stalled so to rearm watchdog timer
+      this.stalled = null;
+      this._tryNudgeBuffer();
     }
-    const info = BufferHelper.bufferInfo(buffer, media.currentTime, this.config.maxBufferHole);
-    return info.len * 1000;
   }
 
   /**
-   * Create a playlist loader
+   * Triggers a BUFFER_STALLED_ERROR event, but only once per stall period.
+   * @param bufferLen - The playhead distance from the end of the current buffer segment.
+   * @private
    */
-  createPlaylistLoader() {
+  _reportStall(bufferInfo) {
     const {
-      pLoader
-    } = this.config;
-    const apply = this.applyPlaylistData;
-    const Ctor = pLoader || this.config.loader;
-    return class CmcdPlaylistLoader {
-      constructor(config) {
-        this.loader = void 0;
-        this.loader = new Ctor(config);
-      }
-      get stats() {
-        return this.loader.stats;
-      }
-      get context() {
-        return this.loader.context;
-      }
-      destroy() {
-        this.loader.destroy();
-      }
-      abort() {
-        this.loader.abort();
-      }
-      load(context, config, callbacks) {
-        apply(context);
-        this.loader.load(context, config, callbacks);
-      }
-    };
+      hls,
+      media,
+      stallReported
+    } = this;
+    if (!stallReported && media) {
+      // Report stalled error once
+      this.stallReported = true;
+      const error = new Error(`Playback stalling at @${media.currentTime} due to low buffer (${JSON.stringify(bufferInfo)})`);
+      logger.warn(error.message);
+      hls.trigger(Events.ERROR, {
+        type: ErrorTypes.MEDIA_ERROR,
+        details: ErrorDetails.BUFFER_STALLED_ERROR,
+        fatal: false,
+        error,
+        buffer: bufferInfo.len
+      });
+    }
   }
 
   /**
-   * Create a playlist loader
+   * Attempts to fix buffer stalls by jumping over known gaps caused by partial fragments
+   * @param partial - The partial fragment found at the current time (where playback is stalling).
+   * @private
    */
-  createFragmentLoader() {
+  _trySkipBufferHole(partial) {
     const {
-      fLoader
-    } = this.config;
-    const apply = this.applyFragmentData;
-    const Ctor = fLoader || this.config.loader;
-    return class CmcdFragmentLoader {
-      constructor(config) {
-        this.loader = void 0;
-        this.loader = new Ctor(config);
-      }
-      get stats() {
-        return this.loader.stats;
-      }
-      get context() {
-        return this.loader.context;
-      }
-      destroy() {
-        this.loader.destroy();
-      }
-      abort() {
-        this.loader.abort();
-      }
-      load(context, config, callbacks) {
-        apply(context);
-        this.loader.load(context, config, callbacks);
-      }
-    };
-  }
-
-  /**
-   * Generate a random v4 UUI
-   *
-   * @returns {string}
-   */
-  static uuid() {
-    const url = URL.createObjectURL(new Blob());
-    const uuid = url.toString();
-    URL.revokeObjectURL(url);
-    return uuid.slice(uuid.lastIndexOf('/') + 1);
-  }
-
-  /**
-   * Serialize a CMCD data object according to the rules defined in the
-   * section 3.2 of
-   * [CTA-5004](https://cdn.cta.tech/cta/media/media/resources/standards/pdfs/cta-5004-final.pdf).
-   */
-  static serialize(data) {
-    const results = [];
-    const isValid = value => !Number.isNaN(value) && value != null && value !== '' && value !== false;
-    const toRounded = value => Math.round(value);
-    const toHundred = value => toRounded(value / 100) * 100;
-    const toUrlSafe = value => encodeURIComponent(value);
-    const formatters = {
-      br: toRounded,
-      d: toRounded,
-      bl: toHundred,
-      dl: toHundred,
-      mtp: toHundred,
-      nor: toUrlSafe,
-      rtp: toHundred,
-      tb: toRounded
-    };
-    const keys = Object.keys(data || {}).sort();
-    for (const key of keys) {
-      let value = data[key];
-
-      // ignore invalid values
-      if (!isValid(value)) {
-        continue;
-      }
-
-      // Version should only be reported if not equal to 1.
-      if (key === 'v' && value === 1) {
-        continue;
-      }
-
-      // Playback rate should only be sent if not equal to 1.
-      if (key == 'pr' && value === 1) {
-        continue;
-      }
-
-      // Certain values require special formatting
-      const formatter = formatters[key];
-      if (formatter) {
-        value = formatter(value);
-      }
+      config,
+      hls,
+      media
+    } = this;
+    if (media === null) {
+      return 0;
+    }
 
-      // Serialize the key/value pair
-      const type = typeof value;
-      let result;
-      if (key === 'ot' || key === 'sf' || key === 'st') {
-        result = `${key}=${value}`;
-      } else if (type === 'boolean') {
-        result = key;
-      } else if (type === 'number') {
-        result = `${key}=${value}`;
-      } else {
-        result = `${key}=${JSON.stringify(value)}`;
+    // Check if currentTime is between unbuffered regions of partial fragments
+    const currentTime = media.currentTime;
+    const bufferInfo = BufferHelper.bufferInfo(media, currentTime, 0);
+    const startTime = currentTime < bufferInfo.start ? bufferInfo.start : bufferInfo.nextStart;
+    if (startTime) {
+      const bufferStarved = bufferInfo.len <= config.maxBufferHole;
+      const waiting = bufferInfo.len > 0 && bufferInfo.len < 1 && media.readyState < 3;
+      const gapLength = startTime - currentTime;
+      if (gapLength > 0 && (bufferStarved || waiting)) {
+        // Only allow large gaps to be skipped if it is a start gap, or all fragments in skip range are partial
+        if (gapLength > config.maxBufferHole) {
+          const {
+            fragmentTracker
+          } = this;
+          let startGap = false;
+          if (currentTime === 0) {
+            const startFrag = fragmentTracker.getAppendedFrag(0, PlaylistLevelType.MAIN);
+            if (startFrag && startTime < startFrag.end) {
+              startGap = true;
+            }
+          }
+          if (!startGap) {
+            const startProvisioned = partial || fragmentTracker.getAppendedFrag(currentTime, PlaylistLevelType.MAIN);
+            if (startProvisioned) {
+              let moreToLoad = false;
+              let pos = startProvisioned.end;
+              while (pos < startTime) {
+                const provisioned = fragmentTracker.getPartialFragment(pos);
+                if (provisioned) {
+                  pos += provisioned.duration;
+                } else {
+                  moreToLoad = true;
+                  break;
+                }
+              }
+              if (moreToLoad) {
+                return 0;
+              }
+            }
+          }
+        }
+        const targetTime = Math.max(startTime + SKIP_BUFFER_RANGE_START, currentTime + SKIP_BUFFER_HOLE_STEP_SECONDS);
+        logger.warn(`skipping hole, adjusting currentTime from ${currentTime} to ${targetTime}`);
+        this.moved = true;
+        this.stalled = null;
+        media.currentTime = targetTime;
+        if (partial && !partial.gap) {
+          const error = new Error(`fragment loaded with buffer holes, seeking from ${currentTime} to ${targetTime}`);
+          hls.trigger(Events.ERROR, {
+            type: ErrorTypes.MEDIA_ERROR,
+            details: ErrorDetails.BUFFER_SEEK_OVER_HOLE,
+            fatal: false,
+            error,
+            reason: error.message,
+            frag: partial
+          });
+        }
+        return targetTime;
       }
-      results.push(result);
     }
-    return results.join(',');
+    return 0;
   }
 
   /**
-   * Convert a CMCD data object to request headers according to the rules
-   * defined in the section 2.1 and 3.2 of
-   * [CTA-5004](https://cdn.cta.tech/cta/media/media/resources/standards/pdfs/cta-5004-final.pdf).
+   * Attempts to fix buffer stalls by advancing the mediaElement's current time by a small amount.
+   * @private
    */
-  static toHeaders(data) {
-    const keys = Object.keys(data);
-    const headers = {};
-    const headerNames = ['Object', 'Request', 'Session', 'Status'];
-    const headerGroups = [{}, {}, {}, {}];
-    const headerMap = {
-      br: 0,
-      d: 0,
-      ot: 0,
-      tb: 0,
-      bl: 1,
-      dl: 1,
-      mtp: 1,
-      nor: 1,
-      nrr: 1,
-      su: 1,
-      cid: 2,
-      pr: 2,
-      sf: 2,
-      sid: 2,
-      st: 2,
-      v: 2,
-      bs: 3,
-      rtp: 3
-    };
-    for (const key of keys) {
-      // Unmapped fields are mapped to the Request header
-      const index = headerMap[key] != null ? headerMap[key] : 1;
-      headerGroups[index][key] = data[key];
-    }
-    for (let i = 0; i < headerGroups.length; i++) {
-      const value = CMCDController.serialize(headerGroups[i]);
-      if (value) {
-        headers[`CMCD-${headerNames[i]}`] = value;
-      }
+  _tryNudgeBuffer() {
+    const {
+      config,
+      hls,
+      media,
+      nudgeRetry
+    } = this;
+    if (media === null) {
+      return;
     }
-    return headers;
-  }
-
-  /**
-   * Convert a CMCD data object to query args according to the rules
-   * defined in the section 2.2 and 3.2 of
-   * [CTA-5004](https://cdn.cta.tech/cta/media/media/resources/standards/pdfs/cta-5004-final.pdf).
-   */
-  static toQuery(data) {
-    return `CMCD=${encodeURIComponent(CMCDController.serialize(data))}`;
-  }
-
-  /**
-   * Append query args to a uri.
-   */
-  static appendQueryToUri(uri, query) {
-    if (!query) {
-      return uri;
+    const currentTime = media.currentTime;
+    this.nudgeRetry++;
+    if (nudgeRetry < config.nudgeMaxRetry) {
+      const targetTime = currentTime + (nudgeRetry + 1) * config.nudgeOffset;
+      // playback stalled in buffered area ... let's nudge currentTime to try to overcome this
+      const error = new Error(`Nudging 'currentTime' from ${currentTime} to ${targetTime}`);
+      logger.warn(error.message);
+      media.currentTime = targetTime;
+      hls.trigger(Events.ERROR, {
+        type: ErrorTypes.MEDIA_ERROR,
+        details: ErrorDetails.BUFFER_NUDGE_ON_STALL,
+        error,
+        fatal: false
+      });
+    } else {
+      const error = new Error(`Playhead still not moving while enough data buffered @${currentTime} after ${config.nudgeMaxRetry} nudges`);
+      logger.error(error.message);
+      hls.trigger(Events.ERROR, {
+        type: ErrorTypes.MEDIA_ERROR,
+        details: ErrorDetails.BUFFER_STALLED_ERROR,
+        error,
+        fatal: true
+      });
     }
-    const separator = uri.includes('?') ? '&' : '?';
-    return `${uri}${separator}${query}`;
   }
 }
 
-const PATHWAY_PENALTY_DURATION_MS = 300000;
-class ContentSteeringController {
-  constructor(hls) {
-    this.hls = void 0;
-    this.log = void 0;
-    this.loader = null;
-    this.uri = null;
-    this.pathwayId = '.';
-    this.pathwayPriority = null;
-    this.timeToLoad = 300;
-    this.reloadTimer = -1;
-    this.updated = 0;
-    this.started = false;
-    this.enabled = true;
-    this.levels = null;
-    this.audioTracks = null;
-    this.subtitleTracks = null;
-    this.penalizedPathways = {};
-    this.hls = hls;
-    this.log = logger.log.bind(logger, `[content-steering]:`);
-    this.registerListeners();
+const TICK_INTERVAL = 100; // how often to tick in ms
+
+class StreamController extends BaseStreamController {
+  constructor(hls, fragmentTracker, keyLoader) {
+    super(hls, fragmentTracker, keyLoader, '[stream-controller]', PlaylistLevelType.MAIN);
+    this.audioCodecSwap = false;
+    this.gapController = null;
+    this.level = -1;
+    this._forceStartLoad = false;
+    this.altAudio = false;
+    this.audioOnly = false;
+    this.fragPlaying = null;
+    this.onvplaying = null;
+    this.onvseeked = null;
+    this.fragLastKbps = 0;
+    this.couldBacktrack = false;
+    this.backtrackFragment = null;
+    this.audioCodecSwitch = false;
+    this.videoBuffer = null;
+    this._registerListeners();
   }
-  registerListeners() {
-    const hls = this.hls;
+  _registerListeners() {
+    const {
+      hls
+    } = this;
+    hls.on(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
+    hls.on(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
     hls.on(Events.MANIFEST_LOADING, this.onManifestLoading, this);
-    hls.on(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
     hls.on(Events.MANIFEST_PARSED, this.onManifestParsed, this);
+    hls.on(Events.LEVEL_LOADING, this.onLevelLoading, this);
+    hls.on(Events.LEVEL_LOADED, this.onLevelLoaded, this);
+    hls.on(Events.FRAG_LOAD_EMERGENCY_ABORTED, this.onFragLoadEmergencyAborted, this);
     hls.on(Events.ERROR, this.onError, this);
+    hls.on(Events.AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
+    hls.on(Events.AUDIO_TRACK_SWITCHED, this.onAudioTrackSwitched, this);
+    hls.on(Events.BUFFER_CREATED, this.onBufferCreated, this);
+    hls.on(Events.BUFFER_FLUSHED, this.onBufferFlushed, this);
+    hls.on(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
+    hls.on(Events.FRAG_BUFFERED, this.onFragBuffered, this);
   }
-  unregisterListeners() {
-    const hls = this.hls;
-    if (!hls) {
-      return;
-    }
+  _unregisterListeners() {
+    const {
+      hls
+    } = this;
+    hls.off(Events.MEDIA_ATTACHED, this.onMediaAttached, this);
+    hls.off(Events.MEDIA_DETACHING, this.onMediaDetaching, this);
     hls.off(Events.MANIFEST_LOADING, this.onManifestLoading, this);
-    hls.off(Events.MANIFEST_LOADED, this.onManifestLoaded, this);
     hls.off(Events.MANIFEST_PARSED, this.onManifestParsed, this);
-    hls.off(Events.ERROR, this.onError, this);
-  }
-  startLoad() {
-    this.started = true;
-    self.clearTimeout(this.reloadTimer);
-    if (this.enabled && this.uri) {
-      if (this.updated) {
-        const ttl = Math.max(this.timeToLoad * 1000 - (performance.now() - this.updated), 0);
-        this.scheduleRefresh(this.uri, ttl);
-      } else {
-        this.loadSteeringManifest(this.uri);
-      }
-    }
-  }
-  stopLoad() {
-    this.started = false;
-    if (this.loader) {
-      this.loader.destroy();
-      this.loader = null;
-    }
-    self.clearTimeout(this.reloadTimer);
-  }
-  destroy() {
-    this.unregisterListeners();
-    this.stopLoad();
-    // @ts-ignore
-    this.hls = null;
-    this.levels = this.audioTracks = this.subtitleTracks = null;
-  }
-  removeLevel(levelToRemove) {
-    const levels = this.levels;
-    if (levels) {
-      this.levels = levels.filter(level => level !== levelToRemove);
-    }
-  }
-  onManifestLoading() {
-    this.stopLoad();
-    this.enabled = true;
-    this.timeToLoad = 300;
-    this.updated = 0;
-    this.uri = null;
-    this.pathwayId = '.';
-    this.levels = this.audioTracks = this.subtitleTracks = null;
-  }
-  onManifestLoaded(event, data) {
-    const {
-      contentSteering
-    } = data;
-    if (contentSteering === null) {
-      return;
-    }
-    this.pathwayId = contentSteering.pathwayId;
-    this.uri = contentSteering.uri;
-    if (this.started) {
-      this.startLoad();
-    }
-  }
-  onManifestParsed(event, data) {
-    this.audioTracks = data.audioTracks;
-    this.subtitleTracks = data.subtitleTracks;
-  }
-  onError(event, data) {
-    const {
-      errorAction
-    } = data;
-    if ((errorAction == null ? void 0 : errorAction.action) === NetworkErrorAction.SendAlternateToPenaltyBox && errorAction.flags === ErrorActionFlags.MoveAllAlternatesMatchingHost) {
-      let pathwayPriority = this.pathwayPriority;
-      const pathwayId = this.pathwayId;
-      if (!this.penalizedPathways[pathwayId]) {
-        this.penalizedPathways[pathwayId] = performance.now();
-      }
-      if (!pathwayPriority && this.levels) {
-        // If PATHWAY-PRIORITY was not provided, list pathways for error handling
-        pathwayPriority = this.levels.reduce((pathways, level) => {
-          if (pathways.indexOf(level.pathwayId) === -1) {
-            pathways.push(level.pathwayId);
-          }
-          return pathways;
-        }, []);
-      }
-      if (pathwayPriority && pathwayPriority.length > 1) {
-        this.updatePathwayPriority(pathwayPriority);
-        errorAction.resolved = this.pathwayId !== pathwayId;
-      }
-    }
-  }
-  filterParsedLevels(levels) {
-    // Filter levels to only include those that are in the initial pathway
-    this.levels = levels;
-    let pathwayLevels = this.getLevelsForPathway(this.pathwayId);
-    if (pathwayLevels.length === 0) {
-      const pathwayId = levels[0].pathwayId;
-      this.log(`No levels found in Pathway ${this.pathwayId}. Setting initial Pathway to "${pathwayId}"`);
-      pathwayLevels = this.getLevelsForPathway(pathwayId);
-      this.pathwayId = pathwayId;
-    }
-    if (pathwayLevels.length !== levels.length) {
-      this.log(`Found ${pathwayLevels.length}/${levels.length} levels in Pathway "${this.pathwayId}"`);
-      return pathwayLevels;
-    }
-    return levels;
-  }
-  getLevelsForPathway(pathwayId) {
-    if (this.levels === null) {
-      return [];
-    }
-    return this.levels.filter(level => pathwayId === level.pathwayId);
-  }
-  updatePathwayPriority(pathwayPriority) {
-    this.pathwayPriority = pathwayPriority;
-    let levels;
-
-    // Evaluate if we should remove the pathway from the penalized list
-    const penalizedPathways = this.penalizedPathways;
-    const now = performance.now();
-    Object.keys(penalizedPathways).forEach(pathwayId => {
-      if (now - penalizedPathways[pathwayId] > PATHWAY_PENALTY_DURATION_MS) {
-        delete penalizedPathways[pathwayId];
-      }
-    });
-    for (let i = 0; i < pathwayPriority.length; i++) {
-      const pathwayId = pathwayPriority[i];
-      if (penalizedPathways[pathwayId]) {
-        continue;
-      }
-      if (pathwayId === this.pathwayId) {
-        return;
-      }
-      const selectedIndex = this.hls.nextLoadLevel;
-      const selectedLevel = this.hls.levels[selectedIndex];
-      levels = this.getLevelsForPathway(pathwayId);
-      if (levels.length > 0) {
-        this.log(`Setting Pathway to "${pathwayId}"`);
-        this.pathwayId = pathwayId;
-        this.hls.trigger(Events.LEVELS_UPDATED, {
-          levels
-        });
-        // Set LevelController's level to trigger LEVEL_SWITCHING which loads playlist if needed
-        const levelAfterChange = this.hls.levels[selectedIndex];
-        if (selectedLevel && levelAfterChange && this.levels) {
-          if (levelAfterChange.attrs['STABLE-VARIANT-ID'] !== selectedLevel.attrs['STABLE-VARIANT-ID'] && levelAfterChange.bitrate !== selectedLevel.bitrate) {
-            this.log(`Unstable Pathways change from bitrate ${selectedLevel.bitrate} to ${levelAfterChange.bitrate}`);
+    hls.off(Events.LEVEL_LOADED, this.onLevelLoaded, this);
+    hls.off(Events.FRAG_LOAD_EMERGENCY_ABORTED, this.onFragLoadEmergencyAborted, this);
+    hls.off(Events.ERROR, this.onError, this);
+    hls.off(Events.AUDIO_TRACK_SWITCHING, this.onAudioTrackSwitching, this);
+    hls.off(Events.AUDIO_TRACK_SWITCHED, this.onAudioTrackSwitched, this);
+    hls.off(Events.BUFFER_CREATED, this.onBufferCreated, this);
+    hls.off(Events.BUFFER_FLUSHED, this.onBufferFlushed, this);
+    hls.off(Events.LEVELS_UPDATED, this.onLevelsUpdated, this);
+    hls.off(Events.FRAG_BUFFERED, this.onFragBuffered, this);
+  }
+  onHandlerDestroying() {
+    this._unregisterListeners();
+    super.onHandlerDestroying();
+  }
+  startLoad(startPosition) {
+    if (this.levels) {
+      const {
+        lastCurrentTime,
+        hls
+      } = this;
+      this.stopLoad();
+      this.setInterval(TICK_INTERVAL);
+      this.level = -1;
+      if (!this.startFragRequested) {
+        // determine load level
+        let startLevel = hls.startLevel;
+        if (startLevel === -1) {
+          if (hls.config.testBandwidth && this.levels.length > 1) {
+            // -1 : guess start Level by doing a bitrate test by loading first fragment of lowest quality level
+            startLevel = 0;
+            this.bitrateTest = true;
+          } else {
+            startLevel = hls.firstAutoLevel;
           }
-          this.hls.nextLoadLevel = selectedIndex;
         }
-        break;
+        // set new level to playlist loader : this will trigger start level load
+        // hls.nextLoadLevel remains until it is set to a new value or until a new frag is successfully loaded
+        this.level = hls.nextLoadLevel = startLevel;
+        this.loadedmetadata = false;
+      }
+      // if startPosition undefined but lastCurrentTime set, set startPosition to last currentTime
+      if (lastCurrentTime > 0 && startPosition === -1) {
+        this.log(`Override startPosition with lastCurrentTime @${lastCurrentTime.toFixed(3)}`);
+        startPosition = lastCurrentTime;
       }
+      this.state = State.IDLE;
+      this.nextLoadPosition = this.startPosition = this.lastCurrentTime = startPosition;
+      this.tick();
+    } else {
+      this._forceStartLoad = true;
+      this.state = State.STOPPED;
     }
   }
-  clonePathways(pathwayClones) {
-    const levels = this.levels;
-    if (!levels) {
-      return;
-    }
-    const audioGroupCloneMap = {};
-    const subtitleGroupCloneMap = {};
-    pathwayClones.forEach(pathwayClone => {
-      const {
-        ID: cloneId,
-        'BASE-ID': baseId,
-        'URI-REPLACEMENT': uriReplacement
-      } = pathwayClone;
-      if (levels.some(level => level.pathwayId === cloneId)) {
-        return;
-      }
-      const clonedVariants = this.getLevelsForPathway(baseId).map(baseLevel => {
-        const levelParsed = _extends({}, baseLevel);
-        levelParsed.details = undefined;
-        levelParsed.url = performUriReplacement(baseLevel.uri, baseLevel.attrs['STABLE-VARIANT-ID'], 'PER-VARIANT-URIS', uriReplacement);
-        const attributes = new AttrList(baseLevel.attrs);
-        attributes['PATHWAY-ID'] = cloneId;
-        const clonedAudioGroupId = attributes.AUDIO && `${attributes.AUDIO}_clone_${cloneId}`;
-        const clonedSubtitleGroupId = attributes.SUBTITLES && `${attributes.SUBTITLES}_clone_${cloneId}`;
-        if (clonedAudioGroupId) {
-          audioGroupCloneMap[attributes.AUDIO] = clonedAudioGroupId;
-          attributes.AUDIO = clonedAudioGroupId;
-        }
-        if (clonedSubtitleGroupId) {
-          subtitleGroupCloneMap[attributes.SUBTITLES] = clonedSubtitleGroupId;
-          attributes.SUBTITLES = clonedSubtitleGroupId;
-        }
-        levelParsed.attrs = attributes;
-        const clonedLevel = new Level(levelParsed);
-        addGroupId(clonedLevel, 'audio', clonedAudioGroupId);
-        addGroupId(clonedLevel, 'text', clonedSubtitleGroupId);
-        return clonedLevel;
-      });
-      levels.push(...clonedVariants);
-      cloneRenditionGroups(this.audioTracks, audioGroupCloneMap, uriReplacement, cloneId);
-      cloneRenditionGroups(this.subtitleTracks, subtitleGroupCloneMap, uriReplacement, cloneId);
-    });
+  stopLoad() {
+    this._forceStartLoad = false;
+    super.stopLoad();
   }
-  loadSteeringManifest(uri) {
-    const config = this.hls.config;
-    const Loader = config.loader;
-    if (this.loader) {
-      this.loader.destroy();
-    }
-    this.loader = new Loader(config);
-    let url;
-    try {
-      url = new self.URL(uri);
-    } catch (error) {
-      this.enabled = false;
-      this.log(`Failed to parse Steering Manifest URI: ${uri}`);
-      return;
-    }
-    if (url.protocol !== 'data:') {
-      const throughput = (this.hls.bandwidthEstimate || config.abrEwmaDefaultEstimate) | 0;
-      url.searchParams.set('_HLS_pathway', this.pathwayId);
-      url.searchParams.set('_HLS_throughput', '' + throughput);
-    }
-    const context = {
-      responseType: 'json',
-      url: url.href
-    };
-    const loadPolicy = config.steeringManifestLoadPolicy.default;
-    const legacyRetryCompatibility = loadPolicy.errorRetry || loadPolicy.timeoutRetry || {};
-    const loaderConfig = {
-      loadPolicy,
-      timeout: loadPolicy.maxLoadTimeMs,
-      maxRetry: legacyRetryCompatibility.maxNumRetry || 0,
-      retryDelay: legacyRetryCompatibility.retryDelayMs || 0,
-      maxRetryDelay: legacyRetryCompatibility.maxRetryDelayMs || 0
-    };
-    const callbacks = {
-      onSuccess: (response, stats, context, networkDetails) => {
-        this.log(`Loaded steering manifest: "${url}"`);
-        const steeringData = response.data;
-        if (steeringData.VERSION !== 1) {
-          this.log(`Steering VERSION ${steeringData.VERSION} not supported!`);
-          return;
-        }
-        this.updated = performance.now();
-        this.timeToLoad = steeringData.TTL;
-        const {
-          'RELOAD-URI': reloadUri,
-          'PATHWAY-CLONES': pathwayClones,
-          'PATHWAY-PRIORITY': pathwayPriority
-        } = steeringData;
-        if (reloadUri) {
-          try {
-            this.uri = new self.URL(reloadUri, url).href;
-          } catch (error) {
-            this.enabled = false;
-            this.log(`Failed to parse Steering Manifest RELOAD-URI: ${reloadUri}`);
-            return;
+  doTick() {
+    switch (this.state) {
+      case State.WAITING_LEVEL:
+        {
+          const {
+            levels,
+            level
+          } = this;
+          const currentLevel = levels == null ? void 0 : levels[level];
+          const details = currentLevel == null ? void 0 : currentLevel.details;
+          if (details && (!details.live || this.levelLastLoaded === currentLevel)) {
+            if (this.waitForCdnTuneIn(details)) {
+              break;
+            }
+            this.state = State.IDLE;
+            break;
+          } else if (this.hls.nextLoadLevel !== this.level) {
+            this.state = State.IDLE;
+            break;
           }
+          break;
         }
-        this.scheduleRefresh(this.uri || context.url);
-        if (pathwayClones) {
-          this.clonePathways(pathwayClones);
-        }
-        if (pathwayPriority) {
-          this.updatePathwayPriority(pathwayPriority);
-        }
-      },
-      onError: (error, context, networkDetails, stats) => {
-        this.log(`Error loading steering manifest: ${error.code} ${error.text} (${context.url})`);
-        this.stopLoad();
-        if (error.code === 410) {
-          this.enabled = false;
-          this.log(`Steering manifest ${context.url} no longer available`);
-          return;
-        }
-        let ttl = this.timeToLoad * 1000;
-        if (error.code === 429) {
-          const loader = this.loader;
-          if (typeof (loader == null ? void 0 : loader.getResponseHeader) === 'function') {
-            const retryAfter = loader.getResponseHeader('Retry-After');
-            if (retryAfter) {
-              ttl = parseFloat(retryAfter) * 1000;
-            }
+      case State.FRAG_LOADING_WAITING_RETRY:
+        {
+          var _this$media;
+          const now = self.performance.now();
+          const retryDate = this.retryDate;
+          // if current time is gt than retryDate, or if media seeking let's switch to IDLE state to retry loading
+          if (!retryDate || now >= retryDate || (_this$media = this.media) != null && _this$media.seeking) {
+            const {
+              levels,
+              level
+            } = this;
+            const currentLevel = levels == null ? void 0 : levels[level];
+            this.resetStartWhenNotLoaded(currentLevel || null);
+            this.state = State.IDLE;
           }
-          this.log(`Steering manifest ${context.url} rate limited`);
-          return;
         }
-        this.scheduleRefresh(this.uri || context.url, ttl);
-      },
-      onTimeout: (stats, context, networkDetails) => {
-        this.log(`Timeout loading steering manifest (${context.url})`);
-        this.scheduleRefresh(this.uri || context.url);
-      }
-    };
-    this.log(`Requesting steering manifest: ${url}`);
-    this.loader.load(context, loaderConfig, callbacks);
-  }
-  scheduleRefresh(uri, ttlMs = this.timeToLoad * 1000) {
-    self.clearTimeout(this.reloadTimer);
-    this.reloadTimer = self.setTimeout(() => {
-      this.loadSteeringManifest(uri);
-    }, ttlMs);
+        break;
+    }
+    if (this.state === State.IDLE) {
+      this.doTickIdle();
+    }
+    this.onTickEnd();
   }
-}
-function cloneRenditionGroups(tracks, groupCloneMap, uriReplacement, cloneId) {
-  if (!tracks) {
-    return;
+  onTickEnd() {
+    super.onTickEnd();
+    this.checkBuffer();
+    this.checkFragmentChanged();
   }
-  Object.keys(groupCloneMap).forEach(audioGroupId => {
-    const clonedTracks = tracks.filter(track => track.groupId === audioGroupId).map(track => {
-      const clonedTrack = _extends({}, track);
-      clonedTrack.details = undefined;
-      clonedTrack.attrs = new AttrList(clonedTrack.attrs);
-      clonedTrack.url = clonedTrack.attrs.URI = performUriReplacement(track.url, track.attrs['STABLE-RENDITION-ID'], 'PER-RENDITION-URIS', uriReplacement);
-      clonedTrack.groupId = clonedTrack.attrs['GROUP-ID'] = groupCloneMap[audioGroupId];
-      clonedTrack.attrs['PATHWAY-ID'] = cloneId;
-      return clonedTrack;
-    });
-    tracks.push(...clonedTracks);
-  });
-}
-function performUriReplacement(uri, stableId, perOptionKey, uriReplacement) {
-  const {
-    HOST: host,
-    PARAMS: params,
-    [perOptionKey]: perOptionUris
-  } = uriReplacement;
-  let perVariantUri;
-  if (stableId) {
-    perVariantUri = perOptionUris == null ? void 0 : perOptionUris[stableId];
-    if (perVariantUri) {
-      uri = perVariantUri;
+  doTickIdle() {
+    const {
+      hls,
+      levelLastLoaded,
+      levels,
+      media
+    } = this;
+    const {
+      config,
+      nextLoadLevel: level
+    } = hls;
+
+    // if start level not parsed yet OR
+    // if video not attached AND start fragment already requested OR start frag prefetch not enabled
+    // exit loop, as we either need more info (level not parsed) or we need media to be attached to load new fragment
+    if (levelLastLoaded === null || !media && (this.startFragRequested || !config.startFragPrefetch)) {
+      return;
     }
-  }
-  const url = new self.URL(uri);
-  if (host && !perVariantUri) {
-    url.host = host;
-  }
-  if (params) {
-    Object.keys(params).sort().forEach(key => {
-      if (key) {
-        url.searchParams.set(key, params[key]);
+
+    // If the "main" level is audio-only but we are loading an alternate track in the same group, do not load anything
+    if (this.altAudio && this.audioOnly) {
+      return;
+    }
+    if (!(levels != null && levels[level])) {
+      return;
+    }
+    const levelInfo = levels[level];
+
+    // if buffer length is less than maxBufLen try to load a new fragment
+
+    const bufferInfo = this.getMainFwdBufferInfo();
+    if (bufferInfo === null) {
+      return;
+    }
+    const lastDetails = this.getLevelDetails();
+    if (lastDetails && this._streamEnded(bufferInfo, lastDetails)) {
+      const data = {};
+      if (this.altAudio) {
+        data.type = 'video';
       }
-    });
-  }
-  return url.href;
-}
+      this.hls.trigger(Events.BUFFER_EOS, data);
+      this.state = State.ENDED;
+      return;
+    }
 
-const AGE_HEADER_LINE_REGEX = /^age:\s*[\d.]+\s*$/im;
-class XhrLoader {
-  constructor(config) {
-    this.xhrSetup = void 0;
-    this.requestTimeout = void 0;
-    this.retryTimeout = void 0;
-    this.retryDelay = void 0;
-    this.config = null;
-    this.callbacks = null;
-    this.context = void 0;
-    this.loader = null;
-    this.stats = void 0;
-    this.xhrSetup = config ? config.xhrSetup || null : null;
-    this.stats = new LoadStats();
-    this.retryDelay = 0;
-  }
-  destroy() {
-    this.callbacks = null;
-    this.abortInternal();
-    this.loader = null;
-    this.config = null;
-  }
-  abortInternal() {
-    const loader = this.loader;
-    self.clearTimeout(this.requestTimeout);
-    self.clearTimeout(this.retryTimeout);
-    if (loader) {
-      loader.onreadystatechange = null;
-      loader.onprogress = null;
-      if (loader.readyState !== 4) {
-        this.stats.aborted = true;
-        loader.abort();
+    // set next load level : this will trigger a playlist load if needed
+    if (hls.loadLevel !== level && hls.manualLevel === -1) {
+      this.log(`Adapting to level ${level} from level ${this.level}`);
+    }
+    this.level = hls.nextLoadLevel = level;
+    const levelDetails = levelInfo.details;
+    // if level info not retrieved yet, switch state and wait for level retrieval
+    // if live playlist, ensure that new playlist has been refreshed to avoid loading/try to load
+    // a useless and outdated fragment (that might even introduce load error if it is already out of the live playlist)
+    if (!levelDetails || this.state === State.WAITING_LEVEL || levelDetails.live && this.levelLastLoaded !== levelInfo) {
+      this.level = level;
+      this.state = State.WAITING_LEVEL;
+      return;
+    }
+    const bufferLen = bufferInfo.len;
+
+    // compute max Buffer Length that we could get from this load level, based on level bitrate. don't buffer more than 60 MB and more than 30s
+    const maxBufLen = this.getMaxBufferLength(levelInfo.maxBitrate);
+
+    // Stay idle if we are still with buffer margins
+    if (bufferLen >= maxBufLen) {
+      return;
+    }
+    if (this.backtrackFragment && this.backtrackFragment.start > bufferInfo.end) {
+      this.backtrackFragment = null;
+    }
+    const targetBufferTime = this.backtrackFragment ? this.backtrackFragment.start : bufferInfo.end;
+    let frag = this.getNextFragment(targetBufferTime, levelDetails);
+    // Avoid backtracking by loading an earlier segment in streams with segments that do not start with a key frame (flagged by `couldBacktrack`)
+    if (this.couldBacktrack && !this.fragPrevious && frag && frag.sn !== 'initSegment' && this.fragmentTracker.getState(frag) !== FragmentState.OK) {
+      var _this$backtrackFragme;
+      const backtrackSn = ((_this$backtrackFragme = this.backtrackFragment) != null ? _this$backtrackFragme : frag).sn;
+      const fragIdx = backtrackSn - levelDetails.startSN;
+      const backtrackFrag = levelDetails.fragments[fragIdx - 1];
+      if (backtrackFrag && frag.cc === backtrackFrag.cc) {
+        frag = backtrackFrag;
+        this.fragmentTracker.removeFragment(backtrackFrag);
+      }
+    } else if (this.backtrackFragment && bufferInfo.len) {
+      this.backtrackFragment = null;
+    }
+    // Avoid loop loading by using nextLoadPosition set for backtracking and skipping consecutive GAP tags
+    if (frag && this.isLoopLoading(frag, targetBufferTime)) {
+      const gapStart = frag.gap;
+      if (!gapStart) {
+        // Cleanup the fragment tracker before trying to find the next unbuffered fragment
+        const type = this.audioOnly && !this.altAudio ? ElementaryStreamTypes.AUDIO : ElementaryStreamTypes.VIDEO;
+        const mediaBuffer = (type === ElementaryStreamTypes.VIDEO ? this.videoBuffer : this.mediaBuffer) || this.media;
+        if (mediaBuffer) {
+          this.afterBufferFlushed(mediaBuffer, type, PlaylistLevelType.MAIN);
+        }
       }
+      frag = this.getNextFragmentLoopLoading(frag, levelDetails, bufferInfo, PlaylistLevelType.MAIN, maxBufLen);
+    }
+    if (!frag) {
+      return;
+    }
+    if (frag.initSegment && !frag.initSegment.data && !this.bitrateTest) {
+      frag = frag.initSegment;
     }
+    this.loadFragment(frag, levelInfo, targetBufferTime);
   }
-  abort() {
-    var _this$callbacks;
-    this.abortInternal();
-    if ((_this$callbacks = this.callbacks) != null && _this$callbacks.onAbort) {
-      this.callbacks.onAbort(this.stats, this.context, this.loader);
+  loadFragment(frag, level, targetBufferTime) {
+    // Check if fragment is not loaded
+    const fragState = this.fragmentTracker.getState(frag);
+    this.fragCurrent = frag;
+    if (fragState === FragmentState.NOT_LOADED || fragState === FragmentState.PARTIAL) {
+      if (frag.sn === 'initSegment') {
+        this._loadInitSegment(frag, level);
+      } else if (this.bitrateTest) {
+        this.log(`Fragment ${frag.sn} of level ${frag.level} is being downloaded to test bitrate and will not be buffered`);
+        this._loadBitrateTestFrag(frag, level);
+      } else {
+        this.startFragRequested = true;
+        super.loadFragment(frag, level, targetBufferTime);
+      }
+    } else {
+      this.clearTrackerIfNeeded(frag);
     }
   }
-  load(context, config, callbacks) {
-    if (this.stats.loading.start) {
-      throw new Error('Loader can only be used once.');
+  getBufferedFrag(position) {
+    return this.fragmentTracker.getBufferedFrag(position, PlaylistLevelType.MAIN);
+  }
+  followingBufferedFrag(frag) {
+    if (frag) {
+      // try to get range of next fragment (500ms after this range)
+      return this.getBufferedFrag(frag.end + 0.5);
     }
-    this.stats.loading.start = self.performance.now();
-    this.context = context;
-    this.config = config;
-    this.callbacks = callbacks;
-    this.loadInternal();
+    return null;
   }
-  loadInternal() {
+
+  /*
+    on immediate level switch :
+     - pause playback if playing
+     - cancel any pending load request
+     - and trigger a buffer flush
+  */
+  immediateLevelSwitch() {
+    this.abortCurrentFrag();
+    this.flushMainBuffer(0, Number.POSITIVE_INFINITY);
+  }
+
+  /**
+   * try to switch ASAP without breaking video playback:
+   * in order to ensure smooth but quick level switching,
+   * we need to find the next flushable buffer range
+   * we should take into account new segment fetch time
+   */
+  nextLevelSwitch() {
     const {
-      config,
-      context
+      levels,
+      media
     } = this;
-    if (!config) {
-      return;
-    }
-    const xhr = this.loader = new self.XMLHttpRequest();
-    const stats = this.stats;
-    stats.loading.first = 0;
-    stats.loaded = 0;
-    stats.aborted = false;
-    const xhrSetup = this.xhrSetup;
-    if (xhrSetup) {
-      Promise.resolve().then(() => {
-        if (this.stats.aborted) return;
-        return xhrSetup(xhr, context.url);
-      }).catch(error => {
-        xhr.open('GET', context.url, true);
-        return xhrSetup(xhr, context.url);
-      }).then(() => {
-        if (this.stats.aborted) return;
-        this.openAndSendXhr(xhr, context, config);
-      }).catch(error => {
-        // IE11 throws an exception on xhr.open if attempting to access an HTTP resource over HTTPS
-        this.callbacks.onError({
-          code: xhr.status,
-          text: error.message
-        }, context, xhr, stats);
-        return;
-      });
-    } else {
-      this.openAndSendXhr(xhr, context, config);
+    // ensure that media is defined and that metadata are available (to retrieve currentTime)
+    if (media != null && media.readyState) {
+      let fetchdelay;
+      const fragPlayingCurrent = this.getAppendedFrag(media.currentTime);
+      if (fragPlayingCurrent && fragPlayingCurrent.start > 1) {
+        // flush buffer preceding current fragment (flush until current fragment start offset)
+        // minus 1s to avoid video freezing, that could happen if we flush keyframe of current video ...
+        this.flushMainBuffer(0, fragPlayingCurrent.start - 1);
+      }
+      const levelDetails = this.getLevelDetails();
+      if (levelDetails != null && levelDetails.live) {
+        const bufferInfo = this.getMainFwdBufferInfo();
+        // Do not flush in live stream with low buffer
+        if (!bufferInfo || bufferInfo.len < levelDetails.targetduration * 2) {
+          return;
+        }
+      }
+      if (!media.paused && levels) {
+        // add a safety delay of 1s
+        const nextLevelId = this.hls.nextLoadLevel;
+        const nextLevel = levels[nextLevelId];
+        const fragLastKbps = this.fragLastKbps;
+        if (fragLastKbps && this.fragCurrent) {
+          fetchdelay = this.fragCurrent.duration * nextLevel.maxBitrate / (1000 * fragLastKbps) + 1;
+        } else {
+          fetchdelay = 0;
+        }
+      } else {
+        fetchdelay = 0;
+      }
+      // this.log('fetchdelay:'+fetchdelay);
+      // find buffer range that will be reached once new fragment will be fetched
+      const bufferedFrag = this.getBufferedFrag(media.currentTime + fetchdelay);
+      if (bufferedFrag) {
+        // we can flush buffer range following this one without stalling playback
+        const nextBufferedFrag = this.followingBufferedFrag(bufferedFrag);
+        if (nextBufferedFrag) {
+          // if we are here, we can also cancel any loading/demuxing in progress, as they are useless
+          this.abortCurrentFrag();
+          // start flush position is in next buffered frag. Leave some padding for non-independent segments and smoother playback.
+          const maxStart = nextBufferedFrag.maxStartPTS ? nextBufferedFrag.maxStartPTS : nextBufferedFrag.start;
+          const fragDuration = nextBufferedFrag.duration;
+          const startPts = Math.max(bufferedFrag.end, maxStart + Math.min(Math.max(fragDuration - this.config.maxFragLookUpTolerance, fragDuration * (this.couldBacktrack ? 0.5 : 0.125)), fragDuration * (this.couldBacktrack ? 0.75 : 0.25)));
+          this.flushMainBuffer(startPts, Number.POSITIVE_INFINITY);
+        }
+      }
     }
   }
-  openAndSendXhr(xhr, context, config) {
-    if (!xhr.readyState) {
-      xhr.open('GET', context.url, true);
-    }
-    const headers = this.context.headers;
-    const {
-      maxTimeToFirstByteMs,
-      maxLoadTimeMs
-    } = config.loadPolicy;
-    if (headers) {
-      for (const header in headers) {
-        xhr.setRequestHeader(header, headers[header]);
-      }
+  abortCurrentFrag() {
+    const fragCurrent = this.fragCurrent;
+    this.fragCurrent = null;
+    this.backtrackFragment = null;
+    if (fragCurrent) {
+      fragCurrent.abortRequests();
+      this.fragmentTracker.removeFragment(fragCurrent);
     }
-    if (context.rangeEnd) {
-      xhr.setRequestHeader('Range', 'bytes=' + context.rangeStart + '-' + (context.rangeEnd - 1));
+    switch (this.state) {
+      case State.KEY_LOADING:
+      case State.FRAG_LOADING:
+      case State.FRAG_LOADING_WAITING_RETRY:
+      case State.PARSING:
+      case State.PARSED:
+        this.state = State.IDLE;
+        break;
     }
-    xhr.onreadystatechange = this.readystatechange.bind(this);
-    xhr.onprogress = this.loadprogress.bind(this);
-    xhr.responseType = context.responseType;
-    // setup timeout before we perform request
-    self.clearTimeout(this.requestTimeout);
-    config.timeout = maxTimeToFirstByteMs && isFiniteNumber(maxTimeToFirstByteMs) ? maxTimeToFirstByteMs : maxLoadTimeMs;
-    this.requestTimeout = self.setTimeout(this.loadtimeout.bind(this), config.timeout);
-    xhr.send();
+    this.nextLoadPosition = this.getLoadPosition();
   }
-  readystatechange() {
+  flushMainBuffer(startOffset, endOffset) {
+    super.flushMainBuffer(startOffset, endOffset, this.altAudio ? 'video' : null);
+  }
+  onMediaAttached(event, data) {
+    super.onMediaAttached(event, data);
+    const media = data.media;
+    this.onvplaying = this.onMediaPlaying.bind(this);
+    this.onvseeked = this.onMediaSeeked.bind(this);
+    media.addEventListener('playing', this.onvplaying);
+    media.addEventListener('seeked', this.onvseeked);
+    this.gapController = new GapController(this.config, media, this.fragmentTracker, this.hls);
+  }
+  onMediaDetaching() {
     const {
-      context,
-      loader: xhr,
-      stats
+      media
     } = this;
-    if (!context || !xhr) {
-      return;
+    if (media && this.onvplaying && this.onvseeked) {
+      media.removeEventListener('playing', this.onvplaying);
+      media.removeEventListener('seeked', this.onvseeked);
+      this.onvplaying = this.onvseeked = null;
+      this.videoBuffer = null;
+    }
+    this.fragPlaying = null;
+    if (this.gapController) {
+      this.gapController.destroy();
+      this.gapController = null;
+    }
+    super.onMediaDetaching();
+  }
+  onMediaPlaying() {
+    // tick to speed up FRAG_CHANGED triggering
+    this.tick();
+  }
+  onMediaSeeked() {
+    const media = this.media;
+    const currentTime = media ? media.currentTime : null;
+    if (isFiniteNumber(currentTime)) {
+      this.log(`Media seeked to ${currentTime.toFixed(3)}`);
     }
-    const readyState = xhr.readyState;
-    const config = this.config;
 
-    // don't proceed if xhr has been aborted
-    if (stats.aborted) {
+    // If seeked was issued before buffer was appended do not tick immediately
+    const bufferInfo = this.getMainFwdBufferInfo();
+    if (bufferInfo === null || bufferInfo.len === 0) {
+      this.warn(`Main forward buffer length on "seeked" event ${bufferInfo ? bufferInfo.len : 'empty'})`);
       return;
     }
 
-    // >= HEADERS_RECEIVED
-    if (readyState >= 2) {
-      if (stats.loading.first === 0) {
-        stats.loading.first = Math.max(self.performance.now(), stats.loading.start);
-        // readyState >= 2 AND readyState !==4 (readyState = HEADERS_RECEIVED || LOADING) rearm timeout as xhr not finished yet
-        if (config.timeout !== config.loadPolicy.maxLoadTimeMs) {
-          self.clearTimeout(this.requestTimeout);
-          config.timeout = config.loadPolicy.maxLoadTimeMs;
-          this.requestTimeout = self.setTimeout(this.loadtimeout.bind(this), config.loadPolicy.maxLoadTimeMs - (stats.loading.first - stats.loading.start));
-        }
-      }
-      if (readyState === 4) {
-        self.clearTimeout(this.requestTimeout);
-        xhr.onreadystatechange = null;
-        xhr.onprogress = null;
-        const status = xhr.status;
-        // http status between 200 to 299 are all successful
-        const useResponse = xhr.responseType !== 'text';
-        if (status >= 200 && status < 300 && (useResponse && xhr.response || xhr.responseText !== null)) {
-          stats.loading.end = Math.max(self.performance.now(), stats.loading.first);
-          const data = useResponse ? xhr.response : xhr.responseText;
-          const len = xhr.responseType === 'arraybuffer' ? data.byteLength : data.length;
-          stats.loaded = stats.total = len;
-          stats.bwEstimate = stats.total * 8000 / (stats.loading.end - stats.loading.first);
-          if (!this.callbacks) {
-            return;
-          }
-          const onProgress = this.callbacks.onProgress;
-          if (onProgress) {
-            onProgress(stats, context, data, xhr);
-          }
-          if (!this.callbacks) {
-            return;
-          }
-          const response = {
-            url: xhr.responseURL,
-            data: data,
-            code: status
-          };
-          this.callbacks.onSuccess(response, stats, context, xhr);
-        } else {
-          const retryConfig = config.loadPolicy.errorRetry;
-          const retryCount = stats.retry;
-          // if max nb of retries reached or if http status between 400 and 499 (such error cannot be recovered, retrying is useless), return error
-          if (shouldRetry(retryConfig, retryCount, false, status)) {
-            this.retry(retryConfig);
-          } else {
-            logger.error(`${status} while loading ${context.url}`);
-            this.callbacks.onError({
-              code: status,
-              text: xhr.statusText
-            }, context, xhr, stats);
-          }
-        }
-      }
-    }
+    // tick to speed up FRAG_CHANGED triggering
+    this.tick();
   }
-  loadtimeout() {
-    var _this$config;
-    const retryConfig = (_this$config = this.config) == null ? void 0 : _this$config.loadPolicy.timeoutRetry;
-    const retryCount = this.stats.retry;
-    if (shouldRetry(retryConfig, retryCount, true)) {
-      this.retry(retryConfig);
-    } else {
-      logger.warn(`timeout while loading ${this.context.url}`);
-      const callbacks = this.callbacks;
-      if (callbacks) {
-        this.abortInternal();
-        callbacks.onTimeout(this.stats, this.context, this.loader);
+  onManifestLoading() {
+    // reset buffer on manifest loading
+    this.log('Trigger BUFFER_RESET');
+    this.hls.trigger(Events.BUFFER_RESET, undefined);
+    this.fragmentTracker.removeAllFragments();
+    this.couldBacktrack = false;
+    this.startPosition = this.lastCurrentTime = this.fragLastKbps = 0;
+    this.levels = this.fragPlaying = this.backtrackFragment = this.levelLastLoaded = null;
+    this.altAudio = this.audioOnly = this.startFragRequested = false;
+  }
+  onManifestParsed(event, data) {
+    // detect if we have different kind of audio codecs used amongst playlists
+    let aac = false;
+    let heaac = false;
+    data.levels.forEach(level => {
+      const codec = level.audioCodec;
+      if (codec) {
+        aac = aac || codec.indexOf('mp4a.40.2') !== -1;
+        heaac = heaac || codec.indexOf('mp4a.40.5') !== -1;
       }
+    });
+    this.audioCodecSwitch = aac && heaac && !changeTypeSupported();
+    if (this.audioCodecSwitch) {
+      this.log('Both AAC/HE-AAC audio found in levels; declaring level codec as HE-AAC');
     }
+    this.levels = data.levels;
+    this.startFragRequested = false;
   }
-  retry(retryConfig) {
+  onLevelLoading(event, data) {
     const {
-      context,
-      stats
+      levels
     } = this;
-    this.retryDelay = getRetryDelay(retryConfig, stats.retry);
-    stats.retry++;
-    logger.warn(`${status ? 'HTTP Status ' + status : 'Timeout'} while loading ${context.url}, retrying ${stats.retry}/${retryConfig.maxNumRetry} in ${this.retryDelay}ms`);
-    // abort and reset internal state
-    this.abortInternal();
-    this.loader = null;
-    // schedule retry
-    self.clearTimeout(this.retryTimeout);
-    this.retryTimeout = self.setTimeout(this.loadInternal.bind(this), this.retryDelay);
-  }
-  loadprogress(event) {
-    const stats = this.stats;
-    stats.loaded = event.loaded;
-    if (event.lengthComputable) {
-      stats.total = event.total;
+    if (!levels || this.state !== State.IDLE) {
+      return;
+    }
+    const level = levels[data.level];
+    if (!level.details || level.details.live && this.levelLastLoaded !== level || this.waitForCdnTuneIn(level.details)) {
+      this.state = State.WAITING_LEVEL;
     }
   }
-  getCacheAge() {
-    let result = null;
-    if (this.loader && AGE_HEADER_LINE_REGEX.test(this.loader.getAllResponseHeaders())) {
-      const ageHeader = this.loader.getResponseHeader('age');
-      result = ageHeader ? parseFloat(ageHeader) : null;
+  onLevelLoaded(event, data) {
+    var _curLevel$details;
+    const {
+      levels
+    } = this;
+    const newLevelId = data.level;
+    const newDetails = data.details;
+    const duration = newDetails.totalduration;
+    if (!levels) {
+      this.warn(`Levels were reset while loading level ${newLevelId}`);
+      return;
+    }
+    this.log(`Level ${newLevelId} loaded [${newDetails.startSN},${newDetails.endSN}]${newDetails.lastPartSn ? `[part-${newDetails.lastPartSn}-${newDetails.lastPartIndex}]` : ''}, cc [${newDetails.startCC}, ${newDetails.endCC}] duration:${duration}`);
+    const curLevel = levels[newLevelId];
+    const fragCurrent = this.fragCurrent;
+    if (fragCurrent && (this.state === State.FRAG_LOADING || this.state === State.FRAG_LOADING_WAITING_RETRY)) {
+      if (fragCurrent.level !== data.level && fragCurrent.loader) {
+        this.abortCurrentFrag();
+      }
+    }
+    let sliding = 0;
+    if (newDetails.live || (_curLevel$details = curLevel.details) != null && _curLevel$details.live) {
+      var _this$levelLastLoaded;
+      this.checkLiveUpdate(newDetails);
+      if (newDetails.deltaUpdateFailed) {
+        return;
+      }
+      sliding = this.alignPlaylists(newDetails, curLevel.details, (_this$levelLastLoaded = this.levelLastLoaded) == null ? void 0 : _this$levelLastLoaded.details);
+    }
+    // override level info
+    curLevel.details = newDetails;
+    this.levelLastLoaded = curLevel;
+    this.hls.trigger(Events.LEVEL_UPDATED, {
+      details: newDetails,
+      level: newLevelId
+    });
+
+    // only switch back to IDLE state if we were waiting for level to start downloading a new fragment
+    if (this.state === State.WAITING_LEVEL) {
+      if (this.waitForCdnTuneIn(newDetails)) {
+        // Wait for Low-Latency CDN Tune-in
+        return;
+      }
+      this.state = State.IDLE;
     }
-    return result;
-  }
-  getResponseHeader(name) {
-    if (this.loader && new RegExp(`^${name}:\\s*[\\d.]+\\s*$`, 'im').test(this.loader.getAllResponseHeaders())) {
-      return this.loader.getResponseHeader(name);
+    if (!this.startFragRequested) {
+      this.setStartPosition(newDetails, sliding);
+    } else if (newDetails.live) {
+      this.synchronizeToLiveEdge(newDetails);
     }
-    return null;
-  }
-}
 
-function fetchSupported() {
-  if (
-  // @ts-ignore
-  self.fetch && self.AbortController && self.ReadableStream && self.Request) {
-    try {
-      new self.ReadableStream({}); // eslint-disable-line no-new
-      return true;
-    } catch (e) {
-      /* noop */
-    }
-  }
-  return false;
-}
-const BYTERANGE = /(\d+)-(\d+)\/(\d+)/;
-class FetchLoader {
-  constructor(config /* HlsConfig */) {
-    this.fetchSetup = void 0;
-    this.requestTimeout = void 0;
-    this.request = void 0;
-    this.response = void 0;
-    this.controller = void 0;
-    this.context = void 0;
-    this.config = null;
-    this.callbacks = null;
-    this.stats = void 0;
-    this.loader = null;
-    this.fetchSetup = config.fetchSetup || getRequest;
-    this.controller = new self.AbortController();
-    this.stats = new LoadStats();
-  }
-  destroy() {
-    this.loader = this.callbacks = null;
-    this.abortInternal();
+    // trigger handler right now
+    this.tick();
   }
-  abortInternal() {
-    const response = this.response;
-    if (!(response != null && response.ok)) {
-      this.stats.aborted = true;
-      this.controller.abort();
+  _handleFragmentLoadProgress(data) {
+    var _frag$initSegment;
+    const {
+      frag,
+      part,
+      payload
+    } = data;
+    const {
+      levels
+    } = this;
+    if (!levels) {
+      this.warn(`Levels were reset while fragment load was in progress. Fragment ${frag.sn} of level ${frag.level} will not be buffered`);
+      return;
     }
-  }
-  abort() {
-    var _this$callbacks;
-    this.abortInternal();
-    if ((_this$callbacks = this.callbacks) != null && _this$callbacks.onAbort) {
-      this.callbacks.onAbort(this.stats, this.context, this.response);
+    const currentLevel = levels[frag.level];
+    const details = currentLevel.details;
+    if (!details) {
+      this.warn(`Dropping fragment ${frag.sn} of level ${frag.level} after level details were reset`);
+      this.fragmentTracker.removeFragment(frag);
+      return;
     }
+    const videoCodec = currentLevel.videoCodec;
+
+    // time Offset is accurate if level PTS is known, or if playlist is not sliding (not live)
+    const accurateTimeOffset = details.PTSKnown || !details.live;
+    const initSegmentData = (_frag$initSegment = frag.initSegment) == null ? void 0 : _frag$initSegment.data;
+    const audioCodec = this._getAudioCodec(currentLevel);
+
+    // transmux the MPEG-TS data to ISO-BMFF segments
+    // this.log(`Transmuxing ${frag.sn} of [${details.startSN} ,${details.endSN}],level ${frag.level}, cc ${frag.cc}`);
+    const transmuxer = this.transmuxer = this.transmuxer || new TransmuxerInterface(this.hls, PlaylistLevelType.MAIN, this._handleTransmuxComplete.bind(this), this._handleTransmuxerFlush.bind(this));
+    const partIndex = part ? part.index : -1;
+    const partial = partIndex !== -1;
+    const chunkMeta = new ChunkMetadata(frag.level, frag.sn, frag.stats.chunkCount, payload.byteLength, partIndex, partial);
+    const initPTS = this.initPTS[frag.cc];
+    transmuxer.push(payload, initSegmentData, audioCodec, videoCodec, frag, part, details.totalduration, accurateTimeOffset, chunkMeta, initPTS);
   }
-  load(context, config, callbacks) {
-    const stats = this.stats;
-    if (stats.loading.start) {
-      throw new Error('Loader can only be used once.');
-    }
-    stats.loading.start = self.performance.now();
-    const initParams = getRequestParameters(context, this.controller.signal);
-    const onProgress = callbacks.onProgress;
-    const isArrayBuffer = context.responseType === 'arraybuffer';
-    const LENGTH = isArrayBuffer ? 'byteLength' : 'length';
-    const {
-      maxTimeToFirstByteMs,
-      maxLoadTimeMs
-    } = config.loadPolicy;
-    this.context = context;
-    this.config = config;
-    this.callbacks = callbacks;
-    this.request = this.fetchSetup(context, initParams);
-    self.clearTimeout(this.requestTimeout);
-    config.timeout = maxTimeToFirstByteMs && isFiniteNumber(maxTimeToFirstByteMs) ? maxTimeToFirstByteMs : maxLoadTimeMs;
-    this.requestTimeout = self.setTimeout(() => {
-      this.abortInternal();
-      callbacks.onTimeout(stats, context, this.response);
-    }, config.timeout);
-    self.fetch(this.request).then(response => {
-      this.response = this.loader = response;
-      const first = Math.max(self.performance.now(), stats.loading.start);
-      self.clearTimeout(this.requestTimeout);
-      config.timeout = maxLoadTimeMs;
-      this.requestTimeout = self.setTimeout(() => {
-        this.abortInternal();
-        callbacks.onTimeout(stats, context, this.response);
-      }, maxLoadTimeMs - (first - stats.loading.start));
-      if (!response.ok) {
-        const {
-          status,
-          statusText
-        } = response;
-        throw new FetchError(statusText || 'fetch, bad network response', status, response);
-      }
-      stats.loading.first = first;
-      stats.total = getContentLength(response.headers) || stats.total;
-      if (onProgress && isFiniteNumber(config.highWaterMark)) {
-        return this.loadProgressively(response, stats, context, config.highWaterMark, onProgress);
-      }
-      if (isArrayBuffer) {
-        return response.arrayBuffer();
-      }
-      if (context.responseType === 'json') {
-        return response.json();
+  onAudioTrackSwitching(event, data) {
+    // if any URL found on new audio track, it is an alternate audio track
+    const fromAltAudio = this.altAudio;
+    const altAudio = !!data.url;
+    // if we switch on main audio, ensure that main fragment scheduling is synced with media.buffered
+    // don't do anything if we switch to alt audio: audio stream controller is handling it.
+    // we will just have to change buffer scheduling on audioTrackSwitched
+    if (!altAudio) {
+      if (this.mediaBuffer !== this.media) {
+        this.log('Switching on main audio, use media.buffered to schedule main fragment loading');
+        this.mediaBuffer = this.media;
+        const fragCurrent = this.fragCurrent;
+        // we need to refill audio buffer from main: cancel any frag loading to speed up audio switch
+        if (fragCurrent) {
+          this.log('Switching to main audio track, cancel main fragment load');
+          fragCurrent.abortRequests();
+          this.fragmentTracker.removeFragment(fragCurrent);
+        }
+        // destroy transmuxer to force init segment generation (following audio switch)
+        this.resetTransmuxer();
+        // switch to IDLE state to load new fragment
+        this.resetLoadingState();
+      } else if (this.audioOnly) {
+        // Reset audio transmuxer so when switching back to main audio we're not still appending where we left off
+        this.resetTransmuxer();
       }
-      return response.text();
-    }).then(responseData => {
-      const {
-        response
-      } = this;
-      self.clearTimeout(this.requestTimeout);
-      stats.loading.end = Math.max(self.performance.now(), stats.loading.first);
-      const total = responseData[LENGTH];
-      if (total) {
-        stats.loaded = stats.total = total;
+      const hls = this.hls;
+      // If switching from alt to main audio, flush all audio and trigger track switched
+      if (fromAltAudio) {
+        hls.trigger(Events.BUFFER_FLUSHING, {
+          startOffset: 0,
+          endOffset: Number.POSITIVE_INFINITY,
+          type: null
+        });
+        this.fragmentTracker.removeAllFragments();
       }
-      const loaderResponse = {
-        url: response.url,
-        data: responseData,
-        code: response.status
-      };
-      if (onProgress && !isFiniteNumber(config.highWaterMark)) {
-        onProgress(stats, context, responseData, response);
+      hls.trigger(Events.AUDIO_TRACK_SWITCHED, data);
+    }
+  }
+  onAudioTrackSwitched(event, data) {
+    const trackId = data.id;
+    const altAudio = !!this.hls.audioTracks[trackId].url;
+    if (altAudio) {
+      const videoBuffer = this.videoBuffer;
+      // if we switched on alternate audio, ensure that main fragment scheduling is synced with video sourcebuffer buffered
+      if (videoBuffer && this.mediaBuffer !== videoBuffer) {
+        this.log('Switching on alternate audio, use video.buffered to schedule main fragment loading');
+        this.mediaBuffer = videoBuffer;
       }
-      callbacks.onSuccess(loaderResponse, stats, context, response);
-    }).catch(error => {
-      self.clearTimeout(this.requestTimeout);
-      if (stats.aborted) {
-        return;
+    }
+    this.altAudio = altAudio;
+    this.tick();
+  }
+  onBufferCreated(event, data) {
+    const tracks = data.tracks;
+    let mediaTrack;
+    let name;
+    let alternate = false;
+    for (const type in tracks) {
+      const track = tracks[type];
+      if (track.id === 'main') {
+        name = type;
+        mediaTrack = track;
+        // keep video source buffer reference
+        if (type === 'video') {
+          const videoTrack = tracks[type];
+          if (videoTrack) {
+            this.videoBuffer = videoTrack.buffer;
+          }
+        }
+      } else {
+        alternate = true;
       }
-      // CORS errors result in an undefined code. Set it to 0 here to align with XHR's behavior
-      // when destroying, 'error' itself can be undefined
-      const code = !error ? 0 : error.code || 0;
-      const text = !error ? null : error.message;
-      callbacks.onError({
-        code,
-        text
-      }, context, error ? error.details : null, stats);
-    });
+    }
+    if (alternate && mediaTrack) {
+      this.log(`Alternate track found, use ${name}.buffered to schedule main fragment loading`);
+      this.mediaBuffer = mediaTrack.buffer;
+    } else {
+      this.mediaBuffer = this.media;
+    }
   }
-  getCacheAge() {
-    let result = null;
-    if (this.response) {
-      const ageHeader = this.response.headers.get('age');
-      result = ageHeader ? parseFloat(ageHeader) : null;
+  onFragBuffered(event, data) {
+    const {
+      frag,
+      part
+    } = data;
+    if (frag && frag.type !== PlaylistLevelType.MAIN) {
+      return;
+    }
+    if (this.fragContextChanged(frag)) {
+      // If a level switch was requested while a fragment was buffering, it will emit the FRAG_BUFFERED event upon completion
+      // Avoid setting state back to IDLE, since that will interfere with a level switch
+      this.warn(`Fragment ${frag.sn}${part ? ' p: ' + part.index : ''} of level ${frag.level} finished buffering, but was aborted. state: ${this.state}`);
+      if (this.state === State.PARSED) {
+        this.state = State.IDLE;
+      }
+      return;
     }
-    return result;
-  }
-  getResponseHeader(name) {
-    return this.response ? this.response.headers.get(name) : null;
+    const stats = part ? part.stats : frag.stats;
+    this.fragLastKbps = Math.round(8 * stats.total / (stats.buffering.end - stats.loading.first));
+    if (frag.sn !== 'initSegment') {
+      this.fragPrevious = frag;
+    }
+    this.fragBufferedComplete(frag, part);
   }
-  loadProgressively(response, stats, context, highWaterMark = 0, onProgress) {
-    const chunkCache = new ChunkCache();
-    const reader = response.body.getReader();
-    const pump = () => {
-      return reader.read().then(data => {
-        if (data.done) {
-          if (chunkCache.dataLength) {
-            onProgress(stats, context, chunkCache.flush(), response);
-          }
-          return Promise.resolve(new ArrayBuffer(0));
+  onError(event, data) {
+    var _data$context;
+    if (data.fatal) {
+      this.state = State.ERROR;
+      return;
+    }
+    switch (data.details) {
+      case ErrorDetails.FRAG_GAP:
+      case ErrorDetails.FRAG_PARSING_ERROR:
+      case ErrorDetails.FRAG_DECRYPT_ERROR:
+      case ErrorDetails.FRAG_LOAD_ERROR:
+      case ErrorDetails.FRAG_LOAD_TIMEOUT:
+      case ErrorDetails.KEY_LOAD_ERROR:
+      case ErrorDetails.KEY_LOAD_TIMEOUT:
+        this.onFragmentOrKeyLoadError(PlaylistLevelType.MAIN, data);
+        break;
+      case ErrorDetails.LEVEL_LOAD_ERROR:
+      case ErrorDetails.LEVEL_LOAD_TIMEOUT:
+      case ErrorDetails.LEVEL_PARSING_ERROR:
+        // in case of non fatal error while loading level, if level controller is not retrying to load level, switch back to IDLE
+        if (!data.levelRetry && this.state === State.WAITING_LEVEL && ((_data$context = data.context) == null ? void 0 : _data$context.type) === PlaylistContextType.LEVEL) {
+          this.state = State.IDLE;
         }
-        const chunk = data.value;
-        const len = chunk.length;
-        stats.loaded += len;
-        if (len < highWaterMark || chunkCache.dataLength) {
-          // The current chunk is too small to to be emitted or the cache already has data
-          // Push it to the cache
-          chunkCache.push(chunk);
-          if (chunkCache.dataLength >= highWaterMark) {
-            // flush in order to join the typed arrays
-            onProgress(stats, context, chunkCache.flush(), response);
-          }
-        } else {
-          // If there's nothing cached already, and the chache is large enough
-          // just emit the progress event
-          onProgress(stats, context, chunk, response);
+        break;
+      case ErrorDetails.BUFFER_APPEND_ERROR:
+      case ErrorDetails.BUFFER_FULL_ERROR:
+        if (!data.parent || data.parent !== 'main') {
+          return;
         }
-        return pump();
-      }).catch(() => {
-        /* aborted */
-        return Promise.reject();
-      });
-    };
-    return pump();
+        if (data.details === ErrorDetails.BUFFER_APPEND_ERROR) {
+          this.resetLoadingState();
+          return;
+        }
+        if (this.reduceLengthAndFlushBuffer(data)) {
+          this.flushMainBuffer(0, Number.POSITIVE_INFINITY);
+        }
+        break;
+      case ErrorDetails.INTERNAL_EXCEPTION:
+        this.recoverWorkerError(data);
+        break;
+    }
   }
-}
-function getRequestParameters(context, signal) {
-  const initParams = {
-    method: 'GET',
-    mode: 'cors',
-    credentials: 'same-origin',
-    signal,
-    headers: new self.Headers(_extends({}, context.headers))
-  };
-  if (context.rangeEnd) {
-    initParams.headers.set('Range', 'bytes=' + context.rangeStart + '-' + String(context.rangeEnd - 1));
+
+  // Checks the health of the buffer and attempts to resolve playback stalls.
+  checkBuffer() {
+    const {
+      media,
+      gapController
+    } = this;
+    if (!media || !gapController || !media.readyState) {
+      // Exit early if we don't have media or if the media hasn't buffered anything yet (readyState 0)
+      return;
+    }
+    if (this.loadedmetadata || !BufferHelper.getBuffered(media).length) {
+      // Resolve gaps using the main buffer, whose ranges are the intersections of the A/V sourcebuffers
+      const activeFrag = this.state !== State.IDLE ? this.fragCurrent : null;
+      gapController.poll(this.lastCurrentTime, activeFrag);
+    }
+    this.lastCurrentTime = media.currentTime;
   }
-  return initParams;
-}
-function getByteRangeLength(byteRangeHeader) {
-  const result = BYTERANGE.exec(byteRangeHeader);
-  if (result) {
-    return parseInt(result[2]) - parseInt(result[1]) + 1;
+  onFragLoadEmergencyAborted() {
+    this.state = State.IDLE;
+    // if loadedmetadata is not set, it means that we are emergency switch down on first frag
+    // in that case, reset startFragRequested flag
+    if (!this.loadedmetadata) {
+      this.startFragRequested = false;
+      this.nextLoadPosition = this.startPosition;
+    }
+    this.tickImmediate();
   }
-}
-function getContentLength(headers) {
-  const contentRange = headers.get('Content-Range');
-  if (contentRange) {
-    const byteRangeLength = getByteRangeLength(contentRange);
-    if (isFiniteNumber(byteRangeLength)) {
-      return byteRangeLength;
+  onBufferFlushed(event, {
+    type
+  }) {
+    if (type !== ElementaryStreamTypes.AUDIO || this.audioOnly && !this.altAudio) {
+      const mediaBuffer = (type === ElementaryStreamTypes.VIDEO ? this.videoBuffer : this.mediaBuffer) || this.media;
+      this.afterBufferFlushed(mediaBuffer, type, PlaylistLevelType.MAIN);
+      this.tick();
     }
   }
-  const contentLength = headers.get('Content-Length');
-  if (contentLength) {
-    return parseInt(contentLength);
+  onLevelsUpdated(event, data) {
+    if (this.level > -1 && this.fragCurrent) {
+      this.level = this.fragCurrent.level;
+    }
+    this.levels = data.levels;
   }
-}
-function getRequest(context, initParams) {
-  return new self.Request(context.url, initParams);
-}
-class FetchError extends Error {
-  constructor(message, code, details) {
-    super(message);
-    this.code = void 0;
-    this.details = void 0;
-    this.code = code;
-    this.details = details;
+  swapAudioCodec() {
+    this.audioCodecSwap = !this.audioCodecSwap;
   }
-}
-
-const WHITESPACE_CHAR = /\s/;
-const Cues = {
-  newCue(track, startTime, endTime, captionScreen) {
-    const result = [];
-    let row;
-    // the type data states this is VTTCue, but it can potentially be a TextTrackCue on old browsers
-    let cue;
-    let indenting;
-    let indent;
-    let text;
-    const Cue = self.VTTCue || self.TextTrackCue;
-    for (let r = 0; r < captionScreen.rows.length; r++) {
-      row = captionScreen.rows[r];
-      indenting = true;
-      indent = 0;
-      text = '';
-      if (!row.isEmpty()) {
-        var _track$cues;
-        for (let c = 0; c < row.chars.length; c++) {
-          if (WHITESPACE_CHAR.test(row.chars[c].uchar) && indenting) {
-            indent++;
-          } else {
-            text += row.chars[c].uchar;
-            indenting = false;
-          }
-        }
-        // To be used for cleaning-up orphaned roll-up captions
-        row.cueStartTime = startTime;
 
-        // Give a slight bump to the endTime if it's equal to startTime to avoid a SyntaxError in IE
-        if (startTime === endTime) {
-          endTime += 0.0001;
-        }
-        if (indent >= 16) {
-          indent--;
-        } else {
-          indent++;
-        }
-        const cueText = fixLineBreaks(text.trim());
-        const id = generateCueId(startTime, endTime, cueText);
-
-        // If this cue already exists in the track do not push it
-        if (!(track != null && (_track$cues = track.cues) != null && _track$cues.getCueById(id))) {
-          cue = new Cue(startTime, endTime, cueText);
-          cue.id = id;
-          cue.line = r + 1;
-          cue.align = 'left';
-          // Clamp the position between 10 and 80 percent (CEA-608 PAC indent code)
-          // https://dvcs.w3.org/hg/text-tracks/raw-file/default/608toVTT/608toVTT.html#positioning-in-cea-608
-          // Firefox throws an exception and captions break with out of bounds 0-100 values
-          cue.position = 10 + Math.min(80, Math.floor(indent * 8 / 32) * 10);
-          result.push(cue);
-        }
-      }
+  /**
+   * Seeks to the set startPosition if not equal to the mediaElement's current time.
+   */
+  seekToStartPos() {
+    const {
+      media
+    } = this;
+    if (!media) {
+      return;
     }
-    if (track && result.length) {
-      // Sort bottom cues in reverse order so that they render in line order when overlapping in Chrome
-      result.sort((cueA, cueB) => {
-        if (cueA.line === 'auto' || cueB.line === 'auto') {
-          return 0;
-        }
-        if (cueA.line > 8 && cueB.line > 8) {
-          return cueB.line - cueA.line;
-        }
-        return cueA.line - cueB.line;
-      });
-      result.forEach(cue => addCueToTrack(track, cue));
+    const currentTime = media.currentTime;
+    let startPosition = this.startPosition;
+    // only adjust currentTime if different from startPosition or if startPosition not buffered
+    // at that stage, there should be only one buffered range, as we reach that code after first fragment has been buffered
+    if (startPosition >= 0 && currentTime < startPosition) {
+      if (media.seeking) {
+        this.log(`could not seek to ${startPosition}, already seeking at ${currentTime}`);
+        return;
+      }
+      const buffered = BufferHelper.getBuffered(media);
+      const bufferStart = buffered.length ? buffered.start(0) : 0;
+      const delta = bufferStart - startPosition;
+      if (delta > 0 && (delta < this.config.maxBufferHole || delta < this.config.maxFragLookUpTolerance)) {
+        this.log(`adjusting start position by ${delta} to match buffer start`);
+        startPosition += delta;
+        this.startPosition = startPosition;
+      }
+      this.log(`seek to target start position ${startPosition} from current time ${currentTime}`);
+      media.currentTime = startPosition;
     }
-    return result;
   }
-};
-
-/**
- * @deprecated use fragLoadPolicy.default
- */
-
-/**
- * @deprecated use manifestLoadPolicy.default and playlistLoadPolicy.default
- */
+  _getAudioCodec(currentLevel) {
+    let audioCodec = this.config.defaultAudioCodec || currentLevel.audioCodec;
+    if (this.audioCodecSwap && audioCodec) {
+      this.log('Swapping audio codec');
+      if (audioCodec.indexOf('mp4a.40.5') !== -1) {
+        audioCodec = 'mp4a.40.2';
+      } else {
+        audioCodec = 'mp4a.40.5';
+      }
+    }
+    return audioCodec;
+  }
+  _loadBitrateTestFrag(frag, level) {
+    frag.bitrateTest = true;
+    this._doFragLoad(frag, level).then(data => {
+      const {
+        hls
+      } = this;
+      if (!data || this.fragContextChanged(frag)) {
+        return;
+      }
+      level.fragmentError = 0;
+      this.state = State.IDLE;
+      this.startFragRequested = false;
+      this.bitrateTest = false;
+      const stats = frag.stats;
+      // Bitrate tests fragments are neither parsed nor buffered
+      stats.parsing.start = stats.parsing.end = stats.buffering.start = stats.buffering.end = self.performance.now();
+      hls.trigger(Events.FRAG_LOADED, data);
+      frag.bitrateTest = false;
+    });
+  }
+  _handleTransmuxComplete(transmuxResult) {
+    var _id3$samples;
+    const id = 'main';
+    const {
+      hls
+    } = this;
+    const {
+      remuxResult,
+      chunkMeta
+    } = transmuxResult;
+    const context = this.getCurrentContext(chunkMeta);
+    if (!context) {
+      this.resetWhenMissingContext(chunkMeta);
+      return;
+    }
+    const {
+      frag,
+      part,
+      level
+    } = context;
+    const {
+      video,
+      text,
+      id3,
+      initSegment
+    } = remuxResult;
+    const {
+      details
+    } = level;
+    // The audio-stream-controller handles audio buffering if Hls.js is playing an alternate audio track
+    const audio = this.altAudio ? undefined : remuxResult.audio;
 
-const defaultLoadPolicy = {
-  maxTimeToFirstByteMs: 8000,
-  maxLoadTimeMs: 20000,
-  timeoutRetry: null,
-  errorRetry: null
-};
+    // Check if the current fragment has been aborted. We check this by first seeing if we're still playing the current level.
+    // If we are, subsequently check if the currently loading fragment (fragCurrent) has changed.
+    if (this.fragContextChanged(frag)) {
+      this.fragmentTracker.removeFragment(frag);
+      return;
+    }
+    this.state = State.PARSING;
+    if (initSegment) {
+      if (initSegment != null && initSegment.tracks) {
+        const mapFragment = frag.initSegment || frag;
+        this._bufferInitSegment(level, initSegment.tracks, mapFragment, chunkMeta);
+        hls.trigger(Events.FRAG_PARSING_INIT_SEGMENT, {
+          frag: mapFragment,
+          id,
+          tracks: initSegment.tracks
+        });
+      }
 
-/**
- * @ignore
- * If possible, keep hlsDefaultConfig shallow
- * It is cloned whenever a new Hls instance is created, by keeping the config
- * shallow the properties are cloned, and we don't end up manipulating the default
- */
-const hlsDefaultConfig = _objectSpread2(_objectSpread2({
-  autoStartLoad: true,
-  // used by stream-controller
-  startPosition: -1,
-  // used by stream-controller
-  defaultAudioCodec: undefined,
-  // used by stream-controller
-  debug: false,
-  // used by logger
-  capLevelOnFPSDrop: false,
-  // used by fps-controller
-  capLevelToPlayerSize: false,
-  // used by cap-level-controller
-  ignoreDevicePixelRatio: false,
-  // used by cap-level-controller
-  initialLiveManifestSize: 1,
-  // used by stream-controller
-  maxBufferLength: 30,
-  // used by stream-controller
-  backBufferLength: Infinity,
-  // used by buffer-controller
-  maxBufferSize: 60 * 1000 * 1000,
-  // used by stream-controller
-  maxBufferHole: 0.1,
-  // used by stream-controller
-  highBufferWatchdogPeriod: 2,
-  // used by stream-controller
-  nudgeOffset: 0.1,
-  // used by stream-controller
-  nudgeMaxRetry: 3,
-  // used by stream-controller
-  maxFragLookUpTolerance: 0.25,
-  // used by stream-controller
-  liveSyncDurationCount: 3,
-  // used by latency-controller
-  liveMaxLatencyDurationCount: Infinity,
-  // used by latency-controller
-  liveSyncDuration: undefined,
-  // used by latency-controller
-  liveMaxLatencyDuration: undefined,
-  // used by latency-controller
-  maxLiveSyncPlaybackRate: 1,
-  // used by latency-controller
-  liveDurationInfinity: false,
-  // used by buffer-controller
-  /**
-   * @deprecated use backBufferLength
-   */
-  liveBackBufferLength: null,
-  // used by buffer-controller
-  maxMaxBufferLength: 600,
-  // used by stream-controller
-  enableWorker: true,
-  // used by transmuxer
-  workerPath: null,
-  // used by transmuxer
-  enableSoftwareAES: true,
-  // used by decrypter
-  startLevel: undefined,
-  // used by level-controller
-  startFragPrefetch: false,
-  // used by stream-controller
-  fpsDroppedMonitoringPeriod: 5000,
-  // used by fps-controller
-  fpsDroppedMonitoringThreshold: 0.2,
-  // used by fps-controller
-  appendErrorMaxRetry: 3,
-  // used by buffer-controller
-  loader: XhrLoader,
-  // loader: FetchLoader,
-  fLoader: undefined,
-  // used by fragment-loader
-  pLoader: undefined,
-  // used by playlist-loader
-  xhrSetup: undefined,
-  // used by xhr-loader
-  licenseXhrSetup: undefined,
-  // used by eme-controller
-  licenseResponseCallback: undefined,
-  // used by eme-controller
-  abrController: AbrController,
-  bufferController: BufferController,
-  capLevelController: CapLevelController,
-  errorController: ErrorController,
-  fpsController: FPSController,
-  stretchShortVideoTrack: false,
-  // used by mp4-remuxer
-  maxAudioFramesDrift: 1,
-  // used by mp4-remuxer
-  forceKeyFrameOnDiscontinuity: true,
-  // used by ts-demuxer
-  abrEwmaFastLive: 3,
-  // used by abr-controller
-  abrEwmaSlowLive: 9,
-  // used by abr-controller
-  abrEwmaFastVoD: 3,
-  // used by abr-controller
-  abrEwmaSlowVoD: 9,
-  // used by abr-controller
-  abrEwmaDefaultEstimate: 5e5,
-  // 500 kbps  // used by abr-controller
-  abrBandWidthFactor: 0.95,
-  // used by abr-controller
-  abrBandWidthUpFactor: 0.7,
-  // used by abr-controller
-  abrMaxWithRealBitrate: false,
-  // used by abr-controller
-  maxStarvationDelay: 4,
-  // used by abr-controller
-  maxLoadingDelay: 4,
-  // used by abr-controller
-  minAutoBitrate: 0,
-  // used by hls
-  emeEnabled: false,
-  // used by eme-controller
-  widevineLicenseUrl: undefined,
-  // used by eme-controller
-  drmSystems: {},
-  // used by eme-controller
-  drmSystemOptions: {},
-  // used by eme-controller
-  requestMediaKeySystemAccessFunc: requestMediaKeySystemAccess ,
-  // used by eme-controller
-  testBandwidth: true,
-  progressive: false,
-  lowLatencyMode: true,
-  cmcd: undefined,
-  enableDateRangeMetadataCues: true,
-  enableEmsgMetadataCues: true,
-  enableID3MetadataCues: true,
-  certLoadPolicy: {
-    default: defaultLoadPolicy
-  },
-  keyLoadPolicy: {
-    default: {
-      maxTimeToFirstByteMs: 8000,
-      maxLoadTimeMs: 20000,
-      timeoutRetry: {
-        maxNumRetry: 1,
-        retryDelayMs: 1000,
-        maxRetryDelayMs: 20000,
-        backoff: 'linear'
-      },
-      errorRetry: {
-        maxNumRetry: 8,
-        retryDelayMs: 1000,
-        maxRetryDelayMs: 20000,
-        backoff: 'linear'
+      // This would be nice if Number.isFinite acted as a typeguard, but it doesn't. See: https://github.com/Microsoft/TypeScript/issues/10038
+      const initPTS = initSegment.initPTS;
+      const timescale = initSegment.timescale;
+      if (isFiniteNumber(initPTS)) {
+        this.initPTS[frag.cc] = {
+          baseTime: initPTS,
+          timescale
+        };
+        hls.trigger(Events.INIT_PTS_FOUND, {
+          frag,
+          id,
+          initPTS,
+          timescale
+        });
       }
     }
-  },
-  manifestLoadPolicy: {
-    default: {
-      maxTimeToFirstByteMs: Infinity,
-      maxLoadTimeMs: 20000,
-      timeoutRetry: {
-        maxNumRetry: 2,
-        retryDelayMs: 0,
-        maxRetryDelayMs: 0
-      },
-      errorRetry: {
-        maxNumRetry: 1,
-        retryDelayMs: 1000,
-        maxRetryDelayMs: 8000
+
+    // Avoid buffering if backtracking this fragment
+    if (video && details && frag.sn !== 'initSegment') {
+      const prevFrag = details.fragments[frag.sn - 1 - details.startSN];
+      const isFirstFragment = frag.sn === details.startSN;
+      const isFirstInDiscontinuity = !prevFrag || frag.cc > prevFrag.cc;
+      if (remuxResult.independent !== false) {
+        const {
+          startPTS,
+          endPTS,
+          startDTS,
+          endDTS
+        } = video;
+        if (part) {
+          part.elementaryStreams[video.type] = {
+            startPTS,
+            endPTS,
+            startDTS,
+            endDTS
+          };
+        } else {
+          if (video.firstKeyFrame && video.independent && chunkMeta.id === 1 && !isFirstInDiscontinuity) {
+            this.couldBacktrack = true;
+          }
+          if (video.dropped && video.independent) {
+            // Backtrack if dropped frames create a gap after currentTime
+
+            const bufferInfo = this.getMainFwdBufferInfo();
+            const targetBufferTime = (bufferInfo ? bufferInfo.end : this.getLoadPosition()) + this.config.maxBufferHole;
+            const startTime = video.firstKeyFramePTS ? video.firstKeyFramePTS : startPTS;
+            if (!isFirstFragment && targetBufferTime < startTime - this.config.maxBufferHole && !isFirstInDiscontinuity) {
+              this.backtrack(frag);
+              return;
+            } else if (isFirstInDiscontinuity) {
+              // Mark segment with a gap to avoid loop loading
+              frag.gap = true;
+            }
+            // Set video stream start to fragment start so that truncated samples do not distort the timeline, and mark it partial
+            frag.setElementaryStreamInfo(video.type, frag.start, endPTS, frag.start, endDTS, true);
+          } else if (isFirstFragment && startPTS > MAX_START_GAP_JUMP) {
+            // Mark segment with a gap to skip large start gap
+            frag.gap = true;
+          }
+        }
+        frag.setElementaryStreamInfo(video.type, startPTS, endPTS, startDTS, endDTS);
+        if (this.backtrackFragment) {
+          this.backtrackFragment = frag;
+        }
+        this.bufferFragmentData(video, frag, part, chunkMeta, isFirstFragment || isFirstInDiscontinuity);
+      } else if (isFirstFragment || isFirstInDiscontinuity) {
+        // Mark segment with a gap to avoid loop loading
+        frag.gap = true;
+      } else {
+        this.backtrack(frag);
+        return;
       }
     }
-  },
-  playlistLoadPolicy: {
-    default: {
-      maxTimeToFirstByteMs: 10000,
-      maxLoadTimeMs: 20000,
-      timeoutRetry: {
-        maxNumRetry: 2,
-        retryDelayMs: 0,
-        maxRetryDelayMs: 0
-      },
-      errorRetry: {
-        maxNumRetry: 2,
-        retryDelayMs: 1000,
-        maxRetryDelayMs: 8000
+    if (audio) {
+      const {
+        startPTS,
+        endPTS,
+        startDTS,
+        endDTS
+      } = audio;
+      if (part) {
+        part.elementaryStreams[ElementaryStreamTypes.AUDIO] = {
+          startPTS,
+          endPTS,
+          startDTS,
+          endDTS
+        };
       }
+      frag.setElementaryStreamInfo(ElementaryStreamTypes.AUDIO, startPTS, endPTS, startDTS, endDTS);
+      this.bufferFragmentData(audio, frag, part, chunkMeta);
     }
-  },
-  fragLoadPolicy: {
-    default: {
-      maxTimeToFirstByteMs: 10000,
-      maxLoadTimeMs: 120000,
-      timeoutRetry: {
-        maxNumRetry: 4,
-        retryDelayMs: 0,
-        maxRetryDelayMs: 0
-      },
-      errorRetry: {
-        maxNumRetry: 6,
-        retryDelayMs: 1000,
-        maxRetryDelayMs: 8000
-      }
+    if (details && id3 != null && (_id3$samples = id3.samples) != null && _id3$samples.length) {
+      const emittedID3 = {
+        id,
+        frag,
+        details,
+        samples: id3.samples
+      };
+      hls.trigger(Events.FRAG_PARSING_METADATA, emittedID3);
     }
-  },
-  steeringManifestLoadPolicy: {
-    default: {
-      maxTimeToFirstByteMs: 10000,
-      maxLoadTimeMs: 20000,
-      timeoutRetry: {
-        maxNumRetry: 2,
-        retryDelayMs: 0,
-        maxRetryDelayMs: 0
-      },
-      errorRetry: {
-        maxNumRetry: 1,
-        retryDelayMs: 1000,
-        maxRetryDelayMs: 8000
-      }
-    } 
-  },
-  // These default settings are deprecated in favor of the above policies
-  // and are maintained for backwards compatibility
-  manifestLoadingTimeOut: 10000,
-  manifestLoadingMaxRetry: 1,
-  manifestLoadingRetryDelay: 1000,
-  manifestLoadingMaxRetryTimeout: 64000,
-  levelLoadingTimeOut: 10000,
-  levelLoadingMaxRetry: 4,
-  levelLoadingRetryDelay: 1000,
-  levelLoadingMaxRetryTimeout: 64000,
-  fragLoadingTimeOut: 20000,
-  fragLoadingMaxRetry: 6,
-  fragLoadingRetryDelay: 1000,
-  fragLoadingMaxRetryTimeout: 64000
-}, timelineConfig()), {}, {
-  subtitleStreamController: SubtitleStreamController ,
-  subtitleTrackController: SubtitleTrackController ,
-  timelineController: TimelineController ,
-  audioStreamController: AudioStreamController ,
-  audioTrackController: AudioTrackController ,
-  emeController: EMEController ,
-  cmcdController: CMCDController ,
-  contentSteeringController: ContentSteeringController 
-});
-function timelineConfig() {
-  return {
-    cueHandler: Cues,
-    // used by timeline-controller
-    enableWebVTT: true,
-    // used by timeline-controller
-    enableIMSC1: true,
-    // used by timeline-controller
-    enableCEA708Captions: true,
-    // used by timeline-controller
-    captionsTextTrack1Label: 'English',
-    // used by timeline-controller
-    captionsTextTrack1LanguageCode: 'en',
-    // used by timeline-controller
-    captionsTextTrack2Label: 'Spanish',
-    // used by timeline-controller
-    captionsTextTrack2LanguageCode: 'es',
-    // used by timeline-controller
-    captionsTextTrack3Label: 'Unknown CC',
-    // used by timeline-controller
-    captionsTextTrack3LanguageCode: '',
-    // used by timeline-controller
-    captionsTextTrack4Label: 'Unknown CC',
-    // used by timeline-controller
-    captionsTextTrack4LanguageCode: '',
-    // used by timeline-controller
-    renderTextTracksNatively: true
-  };
-}
+    if (details && text) {
+      const emittedText = {
+        id,
+        frag,
+        details,
+        samples: text.samples
+      };
+      hls.trigger(Events.FRAG_PARSING_USERDATA, emittedText);
+    }
+  }
+  _bufferInitSegment(currentLevel, tracks, frag, chunkMeta) {
+    if (this.state !== State.PARSING) {
+      return;
+    }
+    this.audioOnly = !!tracks.audio && !tracks.video;
 
-/**
- * @ignore
- */
-function mergeConfig(defaultConfig, userConfig) {
-  if ((userConfig.liveSyncDurationCount || userConfig.liveMaxLatencyDurationCount) && (userConfig.liveSyncDuration || userConfig.liveMaxLatencyDuration)) {
-    throw new Error("Illegal hls.js config: don't mix up liveSyncDurationCount/liveMaxLatencyDurationCount and liveSyncDuration/liveMaxLatencyDuration");
+    // if audio track is expected to come from audio stream controller, discard any coming from main
+    if (this.altAudio && !this.audioOnly) {
+      delete tracks.audio;
+    }
+    // include levelCodec in audio and video tracks
+    const {
+      audio,
+      video,
+      audiovideo
+    } = tracks;
+    if (audio) {
+      let audioCodec = currentLevel.audioCodec;
+      const ua = navigator.userAgent.toLowerCase();
+      if (this.audioCodecSwitch) {
+        if (audioCodec) {
+          if (audioCodec.indexOf('mp4a.40.5') !== -1) {
+            audioCodec = 'mp4a.40.2';
+          } else {
+            audioCodec = 'mp4a.40.5';
+          }
+        }
+        // In the case that AAC and HE-AAC audio codecs are signalled in manifest,
+        // force HE-AAC, as it seems that most browsers prefers it.
+        // don't force HE-AAC if mono stream, or in Firefox
+        if (audio.metadata.channelCount !== 1 && ua.indexOf('firefox') === -1) {
+          audioCodec = 'mp4a.40.5';
+        }
+      }
+      // HE-AAC is broken on Android, always signal audio codec as AAC even if variant manifest states otherwise
+      if (audioCodec && audioCodec.indexOf('mp4a.40.5') !== -1 && ua.indexOf('android') !== -1 && audio.container !== 'audio/mpeg') {
+        // Exclude mpeg audio
+        audioCodec = 'mp4a.40.2';
+        this.log(`Android: force audio codec to ${audioCodec}`);
+      }
+      if (currentLevel.audioCodec && currentLevel.audioCodec !== audioCodec) {
+        this.log(`Swapping manifest audio codec "${currentLevel.audioCodec}" for "${audioCodec}"`);
+      }
+      audio.levelCodec = audioCodec;
+      audio.id = 'main';
+      this.log(`Init audio buffer, container:${audio.container}, codecs[selected/level/parsed]=[${audioCodec || ''}/${currentLevel.audioCodec || ''}/${audio.codec}]`);
+    }
+    if (video) {
+      video.levelCodec = currentLevel.videoCodec;
+      video.id = 'main';
+      this.log(`Init video buffer, container:${video.container}, codecs[level/parsed]=[${currentLevel.videoCodec || ''}/${video.codec}]`);
+    }
+    if (audiovideo) {
+      this.log(`Init audiovideo buffer, container:${audiovideo.container}, codecs[level/parsed]=[${currentLevel.codecs}/${audiovideo.codec}]`);
+    }
+    this.hls.trigger(Events.BUFFER_CODECS, tracks);
+    // loop through tracks that are going to be provided to bufferController
+    Object.keys(tracks).forEach(trackName => {
+      const track = tracks[trackName];
+      const initSegment = track.initSegment;
+      if (initSegment != null && initSegment.byteLength) {
+        this.hls.trigger(Events.BUFFER_APPENDING, {
+          type: trackName,
+          data: initSegment,
+          frag,
+          part: null,
+          chunkMeta,
+          parent: frag.type
+        });
+      }
+    });
+    // trigger handler right now
+    this.tickImmediate();
   }
-  if (userConfig.liveMaxLatencyDurationCount !== undefined && (userConfig.liveSyncDurationCount === undefined || userConfig.liveMaxLatencyDurationCount <= userConfig.liveSyncDurationCount)) {
-    throw new Error('Illegal hls.js config: "liveMaxLatencyDurationCount" must be greater than "liveSyncDurationCount"');
+  getMainFwdBufferInfo() {
+    return this.getFwdBufferInfo(this.mediaBuffer ? this.mediaBuffer : this.media, PlaylistLevelType.MAIN);
   }
-  if (userConfig.liveMaxLatencyDuration !== undefined && (userConfig.liveSyncDuration === undefined || userConfig.liveMaxLatencyDuration <= userConfig.liveSyncDuration)) {
-    throw new Error('Illegal hls.js config: "liveMaxLatencyDuration" must be greater than "liveSyncDuration"');
+  backtrack(frag) {
+    this.couldBacktrack = true;
+    // Causes findFragments to backtrack through fragments to find the keyframe
+    this.backtrackFragment = frag;
+    this.resetTransmuxer();
+    this.flushBufferGap(frag);
+    this.fragmentTracker.removeFragment(frag);
+    this.fragPrevious = null;
+    this.nextLoadPosition = frag.start;
+    this.state = State.IDLE;
   }
-  const defaultsCopy = deepCpy(defaultConfig);
+  checkFragmentChanged() {
+    const video = this.media;
+    let fragPlayingCurrent = null;
+    if (video && video.readyState > 1 && video.seeking === false) {
+      const currentTime = video.currentTime;
+      /* if video element is in seeked state, currentTime can only increase.
+        (assuming that playback rate is positive ...)
+        As sometimes currentTime jumps back to zero after a
+        media decode error, check this, to avoid seeking back to
+        wrong position after a media decode error
+      */
 
-  // Backwards compatibility with deprecated config values
-  const deprecatedSettingTypes = ['manifest', 'level', 'frag'];
-  const deprecatedSettings = ['TimeOut', 'MaxRetry', 'RetryDelay', 'MaxRetryTimeout'];
-  deprecatedSettingTypes.forEach(type => {
-    const policyName = `${type === 'level' ? 'playlist' : type}LoadPolicy`;
-    const policyNotSet = userConfig[policyName] === undefined;
-    const report = [];
-    deprecatedSettings.forEach(setting => {
-      const deprecatedSetting = `${type}Loading${setting}`;
-      const value = userConfig[deprecatedSetting];
-      if (value !== undefined && policyNotSet) {
-        report.push(deprecatedSetting);
-        const settings = defaultsCopy[policyName].default;
-        userConfig[policyName] = {
-          default: settings
-        };
-        switch (setting) {
-          case 'TimeOut':
-            settings.maxLoadTimeMs = value;
-            settings.maxTimeToFirstByteMs = value;
-            break;
-          case 'MaxRetry':
-            settings.errorRetry.maxNumRetry = value;
-            settings.timeoutRetry.maxNumRetry = value;
-            break;
-          case 'RetryDelay':
-            settings.errorRetry.retryDelayMs = value;
-            settings.timeoutRetry.retryDelayMs = value;
-            break;
-          case 'MaxRetryTimeout':
-            settings.errorRetry.maxRetryDelayMs = value;
-            settings.timeoutRetry.maxRetryDelayMs = value;
-            break;
+      if (BufferHelper.isBuffered(video, currentTime)) {
+        fragPlayingCurrent = this.getAppendedFrag(currentTime);
+      } else if (BufferHelper.isBuffered(video, currentTime + 0.1)) {
+        /* ensure that FRAG_CHANGED event is triggered at startup,
+          when first video frame is displayed and playback is paused.
+          add a tolerance of 100ms, in case current position is not buffered,
+          check if current pos+100ms is buffered and use that buffer range
+          for FRAG_CHANGED event reporting */
+        fragPlayingCurrent = this.getAppendedFrag(currentTime + 0.1);
+      }
+      if (fragPlayingCurrent) {
+        this.backtrackFragment = null;
+        const fragPlaying = this.fragPlaying;
+        const fragCurrentLevel = fragPlayingCurrent.level;
+        if (!fragPlaying || fragPlayingCurrent.sn !== fragPlaying.sn || fragPlaying.level !== fragCurrentLevel) {
+          this.fragPlaying = fragPlayingCurrent;
+          this.hls.trigger(Events.FRAG_CHANGED, {
+            frag: fragPlayingCurrent
+          });
+          if (!fragPlaying || fragPlaying.level !== fragCurrentLevel) {
+            this.hls.trigger(Events.LEVEL_SWITCHED, {
+              level: fragCurrentLevel
+            });
+          }
         }
       }
-    });
-    if (report.length) {
-      logger.warn(`hls.js config: "${report.join('", "')}" setting(s) are deprecated, use "${policyName}": ${JSON.stringify(userConfig[policyName])}`);
     }
-  });
-  return _objectSpread2(_objectSpread2({}, defaultsCopy), userConfig);
-}
-function deepCpy(obj) {
-  if (obj && typeof obj === 'object') {
-    if (Array.isArray(obj)) {
-      return obj.map(deepCpy);
+  }
+  get nextLevel() {
+    const frag = this.nextBufferedFrag;
+    if (frag) {
+      return frag.level;
     }
-    return Object.keys(obj).reduce((result, key) => {
-      result[key] = deepCpy(obj[key]);
-      return result;
-    }, {});
+    return -1;
   }
-  return obj;
-}
-
-/**
- * @ignore
- */
-function enableStreamingMode(config) {
-  const currentLoader = config.loader;
-  if (currentLoader !== FetchLoader && currentLoader !== XhrLoader) {
-    // If a developer has configured their own loader, respect that choice
-    logger.log('[config]: Custom loader detected, cannot enable progressive streaming');
-    config.progressive = false;
-  } else {
-    const canStreamProgressively = fetchSupported();
-    if (canStreamProgressively) {
-      config.loader = FetchLoader;
-      config.progressive = true;
-      config.enableSoftwareAES = true;
-      logger.log('[config]: Progressive streaming enabled, using FetchLoader');
+  get currentFrag() {
+    const media = this.media;
+    if (media) {
+      return this.fragPlaying || this.getAppendedFrag(media.currentTime);
+    }
+    return null;
+  }
+  get currentProgramDateTime() {
+    const media = this.media;
+    if (media) {
+      const currentTime = media.currentTime;
+      const frag = this.currentFrag;
+      if (frag && isFiniteNumber(currentTime) && isFiniteNumber(frag.programDateTime)) {
+        const epocMs = frag.programDateTime + (currentTime - frag.start) * 1000;
+        return new Date(epocMs);
+      }
+    }
+    return null;
+  }
+  get currentLevel() {
+    const frag = this.currentFrag;
+    if (frag) {
+      return frag.level;
+    }
+    return -1;
+  }
+  get nextBufferedFrag() {
+    const frag = this.currentFrag;
+    if (frag) {
+      return this.followingBufferedFrag(frag);
     }
+    return null;
+  }
+  get forceStartLoad() {
+    return this._forceStartLoad;
   }
 }
 
@@ -25087,25 +27692,31 @@ function enableStreamingMode(config) {
  */
 class Hls {
   /**
-   * The runtime configuration used by the player. At instantiation this is combination of `hls.userConfig` merged over `Hls.DefaultConfig`.
+   * Get the video-dev/hls.js package version.
    */
+  static get version() {
+    return "1.5.1";
+  }
 
   /**
-   * The configuration object provided on player instantiation.
+   * Check if the required MediaSource Extensions are available.
    */
+  static isMSESupported() {
+    return isMSESupported();
+  }
 
   /**
-   * Get the video-dev/hls.js package version.
+   * Check if MediaSource Extensions are available and isTypeSupported checks pass for any baseline codecs.
    */
-  static get version() {
-    return "1.4.14";
+  static isSupported() {
+    return isSupported();
   }
 
   /**
-   * Check if the required MediaSource Extensions are available.
+   * Get the MediaSource global used for MSE playback (ManagedMediaSource, MediaSource, or WebKitMediaSource).
    */
-  static isSupported() {
-    return isSupported();
+  static getMediaSource() {
+    return getMediaSource();
   }
   static get Events() {
     return Events;
@@ -25139,12 +27750,19 @@ class Hls {
    * @param userConfig - Configuration options applied over `Hls.DefaultConfig`
    */
   constructor(userConfig = {}) {
+    /**
+     * The runtime configuration used by the player. At instantiation this is combination of `hls.userConfig` merged over `Hls.DefaultConfig`.
+     */
     this.config = void 0;
+    /**
+     * The configuration object provided on player instantiation.
+     */
     this.userConfig = void 0;
     this.coreComponents = void 0;
     this.networkControllers = void 0;
+    this.started = false;
     this._emitter = new EventEmitter();
-    this._autoLevelCapping = void 0;
+    this._autoLevelCapping = -1;
     this._maxHdcpLevel = null;
     this.abrController = void 0;
     this.bufferController = void 0;
@@ -25158,10 +27776,10 @@ class Hls {
     this.cmcdController = void 0;
     this._media = null;
     this.url = null;
+    this.triggeringException = void 0;
     enableLogs(userConfig.debug || false, 'Hls instance');
     const config = this.config = mergeConfig(Hls.DefaultConfig, userConfig);
     this.userConfig = userConfig;
-    this._autoLevelCapping = -1;
     if (config.progressive) {
       enableStreamingMode(config);
     }
@@ -25261,15 +27879,21 @@ class Hls {
     } else {
       try {
         return this.emit(event, event, eventObject);
-      } catch (e) {
-        logger.error('An internal error happened while handling event ' + event + '. Error message: "' + e.message + '". Here is a stacktrace:', e);
-        this.trigger(Events.ERROR, {
-          type: ErrorTypes.OTHER_ERROR,
-          details: ErrorDetails.INTERNAL_EXCEPTION,
-          fatal: false,
-          event: event,
-          error: e
-        });
+      } catch (error) {
+        logger.error('An internal error happened while handling event ' + event + '. Error message: "' + error.message + '". Here is a stacktrace:', error);
+        // Prevent recursion in error event handlers that throw #5497
+        if (!this.triggeringException) {
+          this.triggeringException = true;
+          const fatal = event === Events.ERROR;
+          this.trigger(Events.ERROR, {
+            type: ErrorTypes.OTHER_ERROR,
+            details: ErrorDetails.INTERNAL_EXCEPTION,
+            fatal,
+            event,
+            error
+          });
+          this.triggeringException = false;
+        }
       }
     }
     return false;
@@ -25329,6 +27953,8 @@ class Hls {
     const loadingSource = this.url = urlToolkitExports.buildAbsoluteURL(self.location.href, url, {
       alwaysNormalize: true
     });
+    this._autoLevelCapping = -1;
+    this._maxHdcpLevel = null;
     logger.log(`loadSource:${loadingSource}`);
     if (media && loadedSource && (loadedSource !== loadingSource || this.bufferController.hasSourceTypes())) {
       this.detachMedia();
@@ -25349,6 +27975,7 @@ class Hls {
    */
   startLoad(startPosition = -1) {
     logger.log(`startLoad(${startPosition})`);
+    this.started = true;
     this.networkControllers.forEach(controller => {
       controller.startLoad(startPosition);
     });
@@ -25359,11 +27986,37 @@ class Hls {
    */
   stopLoad() {
     logger.log('stopLoad');
+    this.started = false;
     this.networkControllers.forEach(controller => {
       controller.stopLoad();
     });
   }
 
+  /**
+   * Resumes stream controller segment loading if previously started.
+   */
+  resumeBuffering() {
+    if (this.started) {
+      this.networkControllers.forEach(controller => {
+        if ('fragmentLoader' in controller) {
+          controller.startLoad(-1);
+        }
+      });
+    }
+  }
+
+  /**
+   * Stops stream controller segment loading without changing 'started' state like stopLoad().
+   * This allows for media buffering to be paused without interupting playlist loading.
+   */
+  pauseBuffering() {
+    this.networkControllers.forEach(controller => {
+      if ('fragmentLoader' in controller) {
+        controller.stopLoad();
+      }
+    });
+  }
+
   /**
    * Swap through possible audio codecs in the stream (for example to switch from stereo to 5.1)
    */
@@ -25386,12 +28039,12 @@ class Hls {
       this.attachMedia(media);
     }
   }
-  removeLevel(levelIndex, urlId = 0) {
-    this.levelController.removeLevel(levelIndex, urlId);
+  removeLevel(levelIndex) {
+    this.levelController.removeLevel(levelIndex);
   }
 
   /**
-   * @returns an array of levels (variants) sorted by HDCP-LEVEL, BANDWIDTH, SCORE, and RESOLUTION (height)
+   * @returns an array of levels (variants) sorted by HDCP-LEVEL, RESOLUTION (height), FRAME-RATE, CODECS, VIDEO-RANGE, and BANDWIDTH
    */
   get levels() {
     const levels = this.levelController.levels;
@@ -25410,8 +28063,7 @@ class Hls {
    */
   set currentLevel(newLevel) {
     logger.log(`set currentLevel:${newLevel}`);
-    this.loadLevel = newLevel;
-    this.abrController.clearTimer();
+    this.levelController.manualLevel = newLevel;
     this.streamController.immediateLevelSwitch();
   }
 
@@ -25484,13 +28136,17 @@ class Hls {
   }
 
   /**
-   * Return start level (level of first fragment that will be played back)
-   * if not overrided by user, first level appearing in manifest will be used as start level
-   * if -1 : automatic start level selection, playback will start from level matching download bandwidth
-   * (determined from download of first segment)
+   * Return the desired start level for the first fragment that will be loaded.
+   * The default value of -1 indicates automatic start level selection.
+   * Setting hls.nextAutoLevel without setting a startLevel will result in
+   * the nextAutoLevel value being used for one fragment load.
    */
   get startLevel() {
-    return this.levelController.startLevel;
+    const startLevel = this.levelController.startLevel;
+    if (startLevel === -1 && this.abrController.forcedAutoLevel > -1) {
+      return this.abrController.forcedAutoLevel;
+    }
+    return startLevel;
   }
 
   /**
@@ -25529,7 +28185,6 @@ class Hls {
         this.autoLevelCapping = -1;
         this.streamController.nextLevelSwitch(); // Now we're uncapped, get the next level asap.
       }
-
       this.config.capLevelToPlayerSize = newCapLevelToPlayerSize;
     }
   }
@@ -25553,6 +28208,9 @@ class Hls {
     }
     return bwEstimator.getEstimate();
   }
+  set bandwidthEstimate(abrEwmaDefaultEstimate) {
+    this.abrController.resetEstimator(abrEwmaDefaultEstimate);
+  }
 
   /**
    * get time to first byte estimate
@@ -25575,14 +28233,16 @@ class Hls {
     if (this._autoLevelCapping !== newLevel) {
       logger.log(`set autoLevelCapping:${newLevel}`);
       this._autoLevelCapping = newLevel;
+      this.levelController.checkMaxAutoUpdated();
     }
   }
   get maxHdcpLevel() {
     return this._maxHdcpLevel;
   }
   set maxHdcpLevel(value) {
-    if (HdcpLevels.indexOf(value) > -1) {
+    if (isHdcpLevel(value) && this._maxHdcpLevel !== value) {
       this._maxHdcpLevel = value;
+      this.levelController.checkMaxAutoUpdated();
     }
   }
 
@@ -25630,7 +28290,7 @@ class Hls {
       maxHdcpLevel
     } = this;
     let maxAutoLevel;
-    if (autoLevelCapping === -1 && levels && levels.length) {
+    if (autoLevelCapping === -1 && levels != null && levels.length) {
       maxAutoLevel = levels.length - 1;
     } else {
       maxAutoLevel = autoLevelCapping;
@@ -25645,13 +28305,15 @@ class Hls {
     }
     return maxAutoLevel;
   }
+  get firstAutoLevel() {
+    return this.abrController.firstAutoLevel;
+  }
 
   /**
    * next automatically selected quality level
    */
   get nextAutoLevel() {
-    // ensure next auto level is between  min and max auto level
-    return Math.min(Math.max(this.abrController.nextAutoLevel, this.minAutoLevel), this.maxAutoLevel);
+    return this.abrController.nextAutoLevel;
   }
 
   /**
@@ -25662,7 +28324,7 @@ class Hls {
    * this value will be resetted to -1 by ABR controller.
    */
   set nextAutoLevel(nextLevel) {
-    this.abrController.nextAutoLevel = Math.max(this.minAutoLevel, nextLevel);
+    this.abrController.nextAutoLevel = nextLevel;
   }
 
   /**
@@ -25675,6 +28337,32 @@ class Hls {
     return this.streamController.getMainFwdBufferInfo();
   }
 
+  /**
+   * Find and select the best matching audio track, making a level switch when a Group change is necessary.
+   * Updates `hls.config.audioPreference`. Returns the selected track, or null when no matching track is found.
+   */
+  setAudioOption(audioOption) {
+    var _this$audioTrackContr;
+    return (_this$audioTrackContr = this.audioTrackController) == null ? void 0 : _this$audioTrackContr.setAudioOption(audioOption);
+  }
+  /**
+   * Find and select the best matching subtitle track, making a level switch when a Group change is necessary.
+   * Updates `hls.config.subtitlePreference`. Returns the selected track, or null when no matching track is found.
+   */
+  setSubtitleOption(subtitleOption) {
+    var _this$subtitleTrackCo;
+    (_this$subtitleTrackCo = this.subtitleTrackController) == null ? void 0 : _this$subtitleTrackCo.setSubtitleOption(subtitleOption);
+    return null;
+  }
+
+  /**
+   * Get the complete list of audio tracks across all media groups
+   */
+  get allAudioTracks() {
+    const audioTrackController = this.audioTrackController;
+    return audioTrackController ? audioTrackController.allAudioTracks : [];
+  }
+
   /**
    * Get the list of selectable audio tracks
    */
@@ -25701,6 +28389,14 @@ class Hls {
     }
   }
 
+  /**
+   * get the complete list of subtitle tracks across all media groups
+   */
+  get allSubtitleTracks() {
+    const subtitleTrackController = this.subtitleTrackController;
+    return subtitleTrackController ? subtitleTrackController.allSubtitleTracks : [];
+  }
+
   /**
    * get alternate subtitle tracks list from playlist
    */
diff --git a/34310.async.js b/34310.async.js
index 75d1b25d20..8746c3734e 100644
--- a/34310.async.js
+++ b/34310.async.js
@@ -1647,8 +1647,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1935,8 +1935,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/38059.async.js b/38059.async.js
index 49776f7085..d33ed31435 100644
--- a/38059.async.js
+++ b/38059.async.js
@@ -877,8 +877,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1165,8 +1165,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/41977.async.js b/41977.async.js
index d2971d1ea3..1d86c3b4b2 100644
--- a/41977.async.js
+++ b/41977.async.js
@@ -528,8 +528,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -816,8 +816,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/48923.async.js b/48923.async.js
index 8b1e3ea488..1c88aebfae 100644
--- a/48923.async.js
+++ b/48923.async.js
@@ -951,8 +951,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1239,8 +1239,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/49616.async.js b/49616.async.js
index 725d40ab19..85b71c61d5 100644
--- a/49616.async.js
+++ b/49616.async.js
@@ -528,8 +528,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -816,8 +816,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/53210.async.js b/53210.async.js
index ff297916bb..3257399484 100644
--- a/53210.async.js
+++ b/53210.async.js
@@ -2657,6 +2657,26 @@ var CompletionQuestionEditor = function CompletionQuestionEditor(_ref3) {
           })]
         });
       }
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, {
+      align: "middle",
+      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .Z.Item, {
+        name: "downcase",
+        valuePropName: "checked",
+        children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z, {})
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z, {
+        className: "ml10",
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u5B57\u6BCD\u5927\u5C0F\u5199"
+      })]
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, {
+      align: "middle",
+      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .Z.Item, {
+        name: "no_space",
+        valuePropName: "checked",
+        children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z, {})
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z, {
+        className: "ml10",
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u7A7A\u683C"
+      })]
     }), (standardAnswersValue === null || standardAnswersValue === void 0 ? void 0 : standardAnswersValue.length) > 1 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, {
       align: "middle",
       className: (standardAnswersValue === null || standardAnswersValue === void 0 ? void 0 : standardAnswersValue.length) > 1 ? 'mb30' : "".concat(_index_less_modules__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z.hide),
@@ -3429,6 +3449,7 @@ var CombinationCompletionQuestionEditor_CompletionQuestionEditor = function Comp
   var _form$getFieldValue;
   var questionTitlePlaceholder = _ref3.questionTitlePlaceholder,
     form = _ref3.form,
+    name = _ref3.name,
     _ref3$scoreByBlank = _ref3.scoreByBlank,
     scoreByBlank = _ref3$scoreByBlank === void 0 ? false : _ref3$scoreByBlank,
     answerKey = _ref3.answerKey,
@@ -3509,6 +3530,9 @@ var CombinationCompletionQuestionEditor_CompletionQuestionEditor = function Comp
   };
   // const standardAnswersValue = Form.useWatch(answerKey, form)
   var standardAnswersValue = (_form$getFieldValue = form.getFieldValue('sub_item_banks')) === null || _form$getFieldValue === void 0 || (_form$getFieldValue = _form$getFieldValue[answerKey === null || answerKey === void 0 ? void 0 : answerKey[0]]) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue[answerKey === null || answerKey === void 0 ? void 0 : answerKey[1]];
+  (0,_react_17_0_2_react.useEffect)(function () {
+    console.log("========", form.getFieldsValue());
+  }, [form]);
   return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
     className: QuestionEditormodules/* default */.Z.wrap,
     children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -3631,6 +3655,26 @@ var CombinationCompletionQuestionEditor_CompletionQuestionEditor = function Comp
           })]
         });
       }
+    }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+      align: "middle",
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+        name: [name, "downcase"],
+        valuePropName: "checked",
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_switch/* default */.Z, {})
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+        className: "ml10",
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u5B57\u6BCD\u5927\u5C0F\u5199"
+      })]
+    }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+      align: "middle",
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+        name: [name, "no_space"],
+        valuePropName: "checked",
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_switch/* default */.Z, {})
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+        className: "ml10",
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u7A7A\u683C"
+      })]
     }), (standardAnswersValue === null || standardAnswersValue === void 0 ? void 0 : standardAnswersValue.length) > 1 && /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
       align: "middle",
       className: (standardAnswersValue === null || standardAnswersValue === void 0 ? void 0 : standardAnswersValue.length) > 1 ? 'mb30' : "".concat(QuestionEditormodules/* default */.Z.hide),
@@ -4291,6 +4335,7 @@ var CombinationQuestionEditor = function CombinationQuestionEditor(_ref) {
                     form: form,
                     questionTitlePlaceholder: "\u8BF7\u7F16\u8F91\u9898\u5E72\u5E76\u8BBE\u7F6E\u586B\u7A7A\u9879",
                     scoreByBlank: false,
+                    name: name,
                     titleKey: [name, 'name'],
                     analysisKey: [name, 'analysis'],
                     isOrdered: [name, 'is_ordered'],
@@ -4391,7 +4436,9 @@ var CombinationQuestionEditor = function CombinationQuestionEditor(_ref) {
                       analysis: '',
                       is_ordered: true,
                       standard_answers: [],
-                      item_type: 'COMPLETION'
+                      item_type: 'COMPLETION',
+                      downcase: true,
+                      no_space: true
                     });
                     setActiveKey([fields === null || fields === void 0 ? void 0 : fields.length].concat(toConsumableArray_default()(activeKey)));
                   },
@@ -4648,8 +4695,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -4936,8 +4983,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
@@ -10730,6 +10777,7 @@ var jsx_runtime = __webpack_require__(37712);
 
 
 
+
 var _excluded = ["globalSetting", "loading", "dispatch", "isEdit", "editData"];
 
 
@@ -10773,6 +10821,10 @@ var CompletionEditor = function CompletionEditor(_ref, ref) {
     _useState12 = slicedToArray_default()(_useState11, 2),
     firstSetAnswerFlag = _useState12[0],
     setFirstSetAnswerFlag = _useState12[1];
+  var _useState13 = (0,_react_17_0_2_react.useState)({}),
+    _useState14 = slicedToArray_default()(_useState13, 2),
+    formValue = _useState14[0],
+    setFormValue = _useState14[1];
   (0,_react_17_0_2_react.useEffect)(function () {
     if (!editData || !isEdit) {
       return;
@@ -10780,6 +10832,7 @@ var CompletionEditor = function CompletionEditor(_ref, ref) {
     setTitle(editData === null || editData === void 0 ? void 0 : editData.name);
     setAnalysis(editData === null || editData === void 0 ? void 0 : editData.analysis);
     setChecked(editData === null || editData === void 0 ? void 0 : editData.is_ordered);
+    setFormValue(editData);
     setFirstSetAnswerFlag(true);
   }, [editData]);
   (0,_react_17_0_2_react.useEffect)(function () {
@@ -10830,7 +10883,9 @@ var CompletionEditor = function CompletionEditor(_ref, ref) {
       name: title,
       analysis: analysis,
       standard_answers: answerArray,
-      is_ordered: checked
+      is_ordered: checked,
+      downcase: formValue === null || formValue === void 0 ? void 0 : formValue.downcase,
+      no_space: formValue === null || formValue === void 0 ? void 0 : formValue.no_space
     };
   };
 
@@ -10943,6 +10998,28 @@ var CompletionEditor = function CompletionEditor(_ref, ref) {
           deleteChildAnswermain: handleDeleteChildAnswermain
         }, index);
       })
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
+        className: "".concat(editormodules.color333, " font14 mt20"),
+        checked: formValue.downcase,
+        onChange: function onChange(e) {
+          return setFormValue(objectSpread2_default()(objectSpread2_default()({}, formValue), {}, {
+            downcase: e.target.checked
+          }));
+        },
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u5B57\u6BCD\u5927\u5C0F\u5199"
+      })
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
+        className: "".concat(editormodules.color333, " font14 mt20"),
+        checked: formValue.no_space,
+        onChange: function onChange(e) {
+          return setFormValue(objectSpread2_default()(objectSpread2_default()({}, formValue), {}, {
+            no_space: e.target.checked
+          }));
+        },
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u7A7A\u683C"
+      })
     }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       className: "mt20",
       children: (answerList === null || answerList === void 0 ? void 0 : answerList.length) > 1 && /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
@@ -12130,6 +12207,7 @@ var CompletionQuestionEditor = function CompletionQuestionEditor(_ref3) {
   var _form$getFieldValue;
   var questionTitlePlaceholder = _ref3.questionTitlePlaceholder,
     form = _ref3.form,
+    name = _ref3.name,
     _ref3$scoreByBlank = _ref3.scoreByBlank,
     scoreByBlank = _ref3$scoreByBlank === void 0 ? false : _ref3$scoreByBlank,
     answerKey = _ref3.answerKey,
@@ -12313,6 +12391,26 @@ var CompletionQuestionEditor = function CompletionQuestionEditor(_ref3) {
           })]
         });
       }
+    }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+      align: "middle",
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+        name: [name, "downcase"],
+        valuePropName: "checked",
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_switch/* default */.Z, {})
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+        className: "ml10",
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u5B57\u6BCD\u5927\u5C0F\u5199"
+      })]
+    }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+      align: "middle",
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+        name: [name, "no_space"],
+        valuePropName: "checked",
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_switch/* default */.Z, {})
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+        className: "ml10",
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u7A7A\u683C"
+      })]
     }), (standardAnswersValue === null || standardAnswersValue === void 0 ? void 0 : standardAnswersValue.length) > 1 && /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
       align: "middle",
       className: (standardAnswersValue === null || standardAnswersValue === void 0 ? void 0 : standardAnswersValue.length) > 1 ? 'mb30' : "".concat(CombinationEditmodules.hide),
@@ -12802,6 +12900,7 @@ var CombinationEditor = function CombinationEditor(_ref, ref) {
                       answerKey: "is_answer"
                     }), (item_list === null || item_list === void 0 || (_item_list$name5 = item_list[name]) === null || _item_list$name5 === void 0 ? void 0 : _item_list$name5.item_type) == 'completion' && /*#__PURE__*/(0,jsx_runtime.jsx)(CompletionQuestionEditor, {
                       form: form,
+                      name: name,
                       questionTitlePlaceholder: "\u8BF7\u7F16\u8F91\u9898\u5E72\u5E76\u8BBE\u7F6E\u586B\u7A7A\u9879",
                       scoreByBlank: true,
                       titleKey: [name, 'name'],
@@ -13861,6 +13960,8 @@ var Page = function Page(_ref) {
                 });
               });
               body.standard_answers = _standard_answers;
+              body.downcase = editorData === null || editorData === void 0 ? void 0 : editorData.downcase;
+              body.no_space = editorData === null || editorData === void 0 ? void 0 : editorData.no_space;
             }
             if (type === 'SUBJECTIVE') {
               console.log('editorData');
@@ -13912,7 +14013,9 @@ var Page = function Page(_ref) {
                     difficulty: e.difficulty,
                     question_type: 3,
                     standard_answers: _standard_answers3,
-                    analysis: e.analysis
+                    analysis: e.analysis,
+                    downcase: e === null || e === void 0 ? void 0 : e.downcase,
+                    no_space: e === null || e === void 0 ? void 0 : e.no_space
                   };
                 } else if ((e === null || e === void 0 ? void 0 : e.item_type) == 'subjective') {
                   var _e$answer_texts;
diff --git a/5620.async.js b/5620.async.js
index 3f3c3bdfa5..a774cd69c0 100644
--- a/5620.async.js
+++ b/5620.async.js
@@ -1023,8 +1023,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1311,8 +1311,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/6305.async.js b/6305.async.js
index 173d527e7c..da5ff76b30 100644
--- a/6305.async.js
+++ b/6305.async.js
@@ -30,8 +30,8 @@ var message = __webpack_require__(8591);
 var dropdown = __webpack_require__(38854);
 // EXTERNAL MODULE: ./node_modules/_flv.js@1.5.0@flv.js/src/flv.js + 38 modules
 var flv = __webpack_require__(31087);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/authority.ts
 var authority = __webpack_require__(19654);
 // EXTERNAL MODULE: ./node_modules/_react-copy-to-clipboard@5.0.2@react-copy-to-clipboard/lib/index.js
@@ -522,8 +522,8 @@ var regex = /(android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini)/i;
     if (((_src4 = src) === null || _src4 === void 0 ? void 0 : _src4.indexOf('.m3u8')) > -1) {
       if (el.current.canPlayType('application/vnd.apple.mpegurl')) {
         el.current.src = src;
-      } else if (dist_hls/* default */.Z.isSupported()) {
-        var hls = new dist_hls/* default */.Z();
+      } else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+        var hls = new dist_hls/* default */.ZP();
         hls.loadSource(src);
         hls.attachMedia(el.current);
       }
diff --git a/64473.async.js b/64473.async.js
index 25d62dc49f..aa8572c89b 100644
--- a/64473.async.js
+++ b/64473.async.js
@@ -817,8 +817,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1105,8 +1105,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/40847.async.js b/68337.async.js
similarity index 86%
rename from 40847.async.js
rename to 68337.async.js
index 4e7e87ce05..be1e18cfb9 100644
--- a/40847.async.js
+++ b/68337.async.js
@@ -1,5 +1,5 @@
 "use strict";
-(self["webpackChunk"] = self["webpackChunk"] || []).push([[40847],{
+(self["webpackChunk"] = self["webpackChunk"] || []).push([[68337],{
 
 /***/ 25447:
 /*!********************************************************!*\
@@ -117,28 +117,139 @@ var AuthModal = function AuthModal(_ref) {
 
 /***/ }),
 
-/***/ 26646:
-/*!**********************************************************************!*\
-  !*** ./src/components/Header/components/Join/JoinClassroomModal.tsx ***!
-  \**********************************************************************/
+/***/ 83163:
+/*!**********************************************************************************!*\
+  !*** ./src/components/Header/components/Join/JoinClassroomModal.tsx + 2 modules ***!
+  \**********************************************************************************/
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/regeneratorRuntime.js */ 7557);
-/* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/asyncToGenerator.js */ 41498);
-/* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/slicedToArray.js */ 79800);
-/* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react */ 59301);
-/* harmony import */ var umi__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! umi */ 58308);
-/* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! antd */ 43418);
-/* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! antd */ 8591);
-/* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! antd */ 1056);
-/* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! antd */ 24905);
-/* harmony import */ var _service_home__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @/service/home */ 92414);
-/* harmony import */ var _components_AuthModal__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @/components/AuthModal */ 25447);
-/* harmony import */ var _utils_util__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @/utils/util */ 88123);
-/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! react/jsx-runtime */ 37712);
+
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, {
+  Z: function() { return /* binding */ Join_JoinClassroomModal; }
+});
+
+// EXTERNAL MODULE: ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/regeneratorRuntime.js
+var regeneratorRuntime = __webpack_require__(7557);
+var regeneratorRuntime_default = /*#__PURE__*/__webpack_require__.n(regeneratorRuntime);
+// EXTERNAL MODULE: ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/asyncToGenerator.js
+var asyncToGenerator = __webpack_require__(41498);
+var asyncToGenerator_default = /*#__PURE__*/__webpack_require__.n(asyncToGenerator);
+// EXTERNAL MODULE: ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/slicedToArray.js
+var slicedToArray = __webpack_require__(79800);
+var slicedToArray_default = /*#__PURE__*/__webpack_require__.n(slicedToArray);
+// EXTERNAL MODULE: ./node_modules/_react@17.0.2@react/index.js
+var _react_17_0_2_react = __webpack_require__(59301);
+// EXTERNAL MODULE: ./src/.umi-production/exports.ts + 15 modules
+var _umi_production_exports = __webpack_require__(58308);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/modal/index.js + 16 modules
+var modal = __webpack_require__(43418);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/message/index.js + 4 modules
+var message = __webpack_require__(8591);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/input/index.js + 5 modules
+var input = __webpack_require__(1056);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/checkbox/index.js + 3 modules
+var es_checkbox = __webpack_require__(24905);
+// EXTERNAL MODULE: ./src/service/home.ts
+var home = __webpack_require__(92414);
+// EXTERNAL MODULE: ./src/components/AuthModal/index.tsx + 3 modules
+var AuthModal = __webpack_require__(25447);
+// EXTERNAL MODULE: ./src/utils/util.tsx
+var util = __webpack_require__(88123);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/button/index.js
+var es_button = __webpack_require__(3113);
+// EXTERNAL MODULE: ./node_modules/_@ant-design_icons@5.2.6@@ant-design/icons/es/icons/ExclamationCircleOutlined.js + 1 modules
+var ExclamationCircleOutlined = __webpack_require__(80045);
+;// CONCATENATED MODULE: ./src/layouts/ShixunDetail/components/LateTip.less?modules
+// extracted by mini-css-extract-plugin
+/* harmony default export */ var LateTipmodules = ({"bottom":"bottom___z0ujX","yes":"yes___hodnN","no":"no___hiPz5"});
+// EXTERNAL MODULE: ./src/assets/images/AssistantCode3.jpeg
+var AssistantCode3 = __webpack_require__(32637);
+// EXTERNAL MODULE: ./node_modules/_react@17.0.2@react/jsx-runtime.js
+var jsx_runtime = __webpack_require__(37712);
+;// CONCATENATED MODULE: ./src/layouts/ShixunDetail/components/LateTip.tsx
+
+
+
+
+
+
+
+var LateTip = function LateTip(_ref) {
+  var classroomList = _ref.classroomList,
+    dispatch = _ref.dispatch,
+    user = _ref.user;
+  return /*#__PURE__*/(0,jsx_runtime.jsxs)(modal/* default */.Z, {
+    open: classroomList.actionTabs.key === "到期提示",
+    width: 464,
+    centered: true,
+    title: /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)(ExclamationCircleOutlined/* default */.Z, {
+        style: {
+          color: '#faad14',
+          fontSize: '18px'
+        }
+      }), " \u63D0\u793A"]
+    }),
+    onCancel: function onCancel() {
+      dispatch({
+        type: 'classroomList/setActionTabs',
+        payload: {
+          key: ""
+        }
+      });
+    },
+    footer: null,
+    children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+      style: {
+        textAlign: 'center',
+        marginBottom: 30
+      },
+      children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+        style: {
+          marginBottom: 20,
+          textAlign: 'left'
+        },
+        children: ["\u8BE5\u6559\u5B66\u8BFE\u5802\u7684\u8BD5\u7528\u5DF2\u5230\u671F\uFF0C\u76EE\u524D\u65E0\u6CD5\u652F\u6301", /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          style: {
+            color: '#FF9D18'
+          },
+          children: "\u8D85\u8FC750"
+        }), "\u4EBA\u7684\u6559\u5B66\u6D3B\u52A8\u3002\u5982\u6709\u4EFB\u4F55\u7591\u95EE\uFF0C\u8BF7\u968F\u65F6\u8054\u7CFB\u6211\u4EEC\u3002\u611F\u8C22\u60A8\u7684\u7406\u89E3\u4E0E\u652F\u6301\uFF01"]
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)("img", {
+        style: {
+          width: 130,
+          height: 130
+        },
+        src: AssistantCode3
+      })]
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      className: LateTipmodules.bottom,
+      children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, {
+        className: LateTipmodules.yes,
+        onClick: function onClick() {
+          dispatch({
+            type: 'classroomList/setActionTabs',
+            payload: {
+              key: ""
+            }
+          });
+        },
+        children: "\u6211\u77E5\u9053\u4E86"
+      })
+    })]
+  });
+};
+/* harmony default export */ var components_LateTip = ((0,_umi_production_exports.connect)(function (_ref2) {
+  var classroomList = _ref2.classroomList,
+    user = _ref2.user;
+  return {
+    classroomList: classroomList,
+    user: user
+  };
+})(LateTip));
+;// CONCATENATED MODULE: ./src/components/Header/components/Join/JoinClassroomModal.tsx
+
 
 
 
@@ -161,28 +272,29 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
   var visible = _ref.visible,
     user = _ref.user,
     _ref$onCancel = _ref.onCancel,
-    onCancel = _ref$onCancel === void 0 ? function () {} : _ref$onCancel;
-  var _useState = (0,react__WEBPACK_IMPORTED_MODULE_3__.useState)(),
-    _useState2 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2___default()(_useState, 2),
+    onCancel = _ref$onCancel === void 0 ? function () {} : _ref$onCancel,
+    dispatch = _ref.dispatch;
+  var _useState = (0,_react_17_0_2_react.useState)(),
+    _useState2 = slicedToArray_default()(_useState, 2),
     inputValue = _useState2[0],
     setInputValue = _useState2[1];
-  var _useState3 = (0,react__WEBPACK_IMPORTED_MODULE_3__.useState)([]),
-    _useState4 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2___default()(_useState3, 2),
+  var _useState3 = (0,_react_17_0_2_react.useState)([]),
+    _useState4 = slicedToArray_default()(_useState3, 2),
     checkedList = _useState4[0],
     setCheckedList = _useState4[1];
-  var _useState5 = (0,react__WEBPACK_IMPORTED_MODULE_3__.useState)(false),
-    _useState6 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2___default()(_useState5, 2),
+  var _useState5 = (0,_react_17_0_2_react.useState)(false),
+    _useState6 = slicedToArray_default()(_useState5, 2),
     isLoading = _useState6[0],
     setIsLoading = _useState6[1];
-  var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_3__.useState)(false),
-    _useState8 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2___default()(_useState7, 2),
+  var _useState7 = (0,_react_17_0_2_react.useState)(false),
+    _useState8 = slicedToArray_default()(_useState7, 2),
     visibleAuth = _useState8[0],
     setVisibleAuth = _useState8[1];
-  var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_3__.useState)(),
-    _useState10 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2___default()(_useState9, 2),
+  var _useState9 = (0,_react_17_0_2_react.useState)(),
+    _useState10 = slicedToArray_default()(_useState9, 2),
     occupationValue = _useState10[0],
     setOccupationValue = _useState10[1];
-  (0,react__WEBPACK_IMPORTED_MODULE_3__.useEffect)(function () {
+  (0,_react_17_0_2_react.useEffect)(function () {
     var _user$userInfo;
     if (user !== null && user !== void 0 && (_user$userInfo = user.userInfo) !== null && _user$userInfo !== void 0 && _user$userInfo.identity) {
       var _user$userInfo2;
@@ -191,12 +303,12 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
   }, [user]);
   var handlePrompt = function handlePrompt(course_id, message) {
     if (checkedList.includes(Type.Professor)) {
-      antd__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z.confirm({
+      modal/* default */.Z.confirm({
         centered: true,
         okText: '确定',
         cancelText: '取消',
         title: '提示',
-        content: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", {
+        content: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
           className: "tc",
           children: message || "申请已提交，请等待审核"
         }),
@@ -209,21 +321,21 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
     window.location.href = "/classrooms/".concat(course_id, "/students");
   };
   var handleOk = /*#__PURE__*/function () {
-    var _ref2 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().mark(function _callee() {
+    var _ref2 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee() {
       var res;
-      return _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().wrap(function _callee$(_context) {
+      return regeneratorRuntime_default()().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (inputValue) {
               _context.next = 3;
               break;
             }
-            antd__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .ZP.info('邀请码不能为空');
+            message/* default */.ZP.info('邀请码不能为空');
             return _context.abrupt("return");
           case 3:
             setIsLoading(true);
             _context.next = 6;
-            return (0,_service_home__WEBPACK_IMPORTED_MODULE_5__/* .applyToJoinCourse */ .cR)({
+            return (0,home/* applyToJoinCourse */.cR)({
               invite_code: inputValue,
               professor: checkedList.includes(Type.Professor) ? 1 : null,
               assistant_professor: checkedList.includes(Type.AssistantProfessor) ? 1 : null,
@@ -232,48 +344,57 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
           case 6:
             res = _context.sent;
             setIsLoading(false);
+            if ((res === null || res === void 0 ? void 0 : res.status) === -1) {
+              onCancel();
+              dispatch({
+                type: 'classroomList/setActionTabs',
+                payload: {
+                  key: '到期提示'
+                }
+              });
+            }
             if (!((res === null || res === void 0 ? void 0 : res.status) === -2)) {
-              _context.next = 22;
+              _context.next = 23;
               break;
             }
             handleCancel();
             if (!(res.message === "该课堂要求成员完成实名认证")) {
-              _context.next = 14;
+              _context.next = 15;
               break;
             }
             setVisibleAuth(true);
             setOccupationValue(1);
             return _context.abrupt("return");
-          case 14:
+          case 15:
             if (!(res.message === "该课堂要求成员完成职业认证")) {
-              _context.next = 18;
+              _context.next = 19;
               break;
             }
             setVisibleAuth(true);
             setOccupationValue(2);
             return _context.abrupt("return");
-          case 18:
+          case 19:
             if (!(res.message === "该课堂要求成员完成实名和职业认证")) {
-              _context.next = 22;
+              _context.next = 23;
               break;
             }
             setVisibleAuth(true);
             setOccupationValue(3);
             return _context.abrupt("return");
-          case 22:
+          case 23:
             if (!((res === null || res === void 0 ? void 0 : res.status) === 0)) {
-              _context.next = 27;
+              _context.next = 28;
               break;
             }
-            (0,_utils_util__WEBPACK_IMPORTED_MODULE_7__/* .trackEvent */ .L9)(['教学课堂', '首页', '加入课堂']);
+            (0,util/* trackEvent */.L9)(['教学课堂', '首页', '加入课堂']);
             handleCancel();
             if (res !== null && res !== void 0 && res.course_id) {
               handlePrompt(res.course_id, res.message);
             } else {
-              antd__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .ZP.success(res.message);
+              message/* default */.ZP.success(res.message);
             }
             return _context.abrupt("return");
-          case 27:
+          case 28:
           case "end":
             return _context.stop();
         }
@@ -284,8 +405,8 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
     };
   }();
   var handleCancel = /*#__PURE__*/function () {
-    var _ref3 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().mark(function _callee2() {
-      return _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().wrap(function _callee2$(_context2) {
+    var _ref3 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2() {
+      return regeneratorRuntime_default()().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             onCancel();
@@ -299,8 +420,8 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
       return _ref3.apply(this, arguments);
     };
   }();
-  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.Fragment, {
-    children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(antd__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z, {
+  return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+    children: [/*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, {
       centered: true,
       keyboard: false,
       closable: false,
@@ -309,12 +430,12 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
       confirmLoading: isLoading,
       onOk: handleOk,
       onCancel: handleCancel,
-      children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)("div", {
+      children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
         className: "tc",
-        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)("div", {
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("span", {
+        children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
             children: "\u8BFE\u5802\u9080\u8BF7\u7801\uFF1A"
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(antd__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, {
+          }), /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z, {
             placeholder: "\u8BF7\u8F93\u51655\u4F4D\u8BFE\u5802\u9080\u8BF7\u7801\u62166\u4F4D\u5206\u73ED\u9080\u8BF7\u7801",
             style: {
               width: 270
@@ -322,37 +443,37 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
             value: inputValue,
             onChange: function onChange(e) {
               if (e.target.value.length >= 7) {
-                antd__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .ZP.info('请输入5位课堂邀请码或6位分班邀请码！');
+                message/* default */.ZP.info('请输入5位课堂邀请码或6位分班邀请码！');
                 return;
               }
               setInputValue(e.target.value);
             }
           })]
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)("div", {
+        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
           className: "mt10 font14",
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("span", {
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
             children: "\u8EAB\u4EFD\uFF1A"
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z.Group, {
+          }), /*#__PURE__*/(0,jsx_runtime.jsxs)(es_checkbox/* default */.Z.Group, {
             value: checkedList,
             onChange: function onChange(value) {
               return setCheckedList(value);
             },
-            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z, {
+            children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
               value: Type.Professor,
               disabled: checkedList.includes(2),
               children: "\u6559\u5E08"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z, {
+            }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
               value: Type.AssistantProfessor,
               disabled: checkedList.includes(1),
               children: "\u52A9\u6559"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z, {
+            }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
               value: Type.Student,
               children: "\u5B66\u751F/\u53C2\u8D5B\u8005"
             })]
           })]
         })]
       })
-    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_components_AuthModal__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z, {
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)(components_LateTip, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(AuthModal/* default */.Z, {
       visible: visibleAuth,
       onCancel: function onCancel() {
         return setVisibleAuth(false);
@@ -361,7 +482,7 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
     })]
   });
 };
-/* harmony default export */ __webpack_exports__.Z = ((0,umi__WEBPACK_IMPORTED_MODULE_4__.connect)(function (_ref4) {
+/* harmony default export */ var Join_JoinClassroomModal = ((0,_umi_production_exports.connect)(function (_ref4) {
   var user = _ref4.user;
   return {
     user: user
@@ -370,9 +491,9 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
 
 /***/ }),
 
-/***/ 40847:
+/***/ 68337:
 /*!******************************************************!*\
-  !*** ./src/components/Header/index.tsx + 12 modules ***!
+  !*** ./src/components/Header/index.tsx + 14 modules ***!
   \******************************************************/
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
@@ -617,8 +738,8 @@ var JoinProjectModal = function JoinProjectModal(_ref) {
   });
 };
 /* harmony default export */ var Join_JoinProjectModal = (JoinProjectModal);
-// EXTERNAL MODULE: ./src/components/Header/components/Join/JoinClassroomModal.tsx
-var JoinClassroomModal = __webpack_require__(26646);
+// EXTERNAL MODULE: ./src/components/Header/components/Join/JoinClassroomModal.tsx + 2 modules
+var JoinClassroomModal = __webpack_require__(83163);
 ;// CONCATENATED MODULE: ./src/components/Header/components/Join/index.less?modules
 // extracted by mini-css-extract-plugin
 /* harmony default export */ var Joinmodules = ({"flex_box_center":"flex_box_center___cltIf","flex_space_between":"flex_space_between___fKr_O","flex_box_vertical_center":"flex_box_vertical_center____QfiA","flex_box_center_end":"flex_box_center_end___ysqmH","flex_box_column":"flex_box_column___CfE8K","rightMenu":"rightMenu___ADTOX","joinMenu":"joinMenu___aRGsf","joinBoard":"joinBoard___AeUvr","joinCol":"joinCol___fV4uL"});
@@ -1659,6 +1780,306 @@ var User = function User(_ref) {
     loading: loading.models.index
   };
 })(User));
+;// CONCATENATED MODULE: ./src/components/Header/components/DelayTip/index.less?modules
+// extracted by mini-css-extract-plugin
+/* harmony default export */ var DelayTipmodules = ({"tip":"tip___a6MfI"});
+// EXTERNAL MODULE: ./node_modules/_dayjs@1.11.10@dayjs/dayjs.min.js
+var dayjs_min = __webpack_require__(9498);
+var dayjs_min_default = /*#__PURE__*/__webpack_require__.n(dayjs_min);
+;// CONCATENATED MODULE: ./src/components/Header/components/DelayTip/index.tsx
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+var DelayTip_Type = /*#__PURE__*/function (Type) {
+  Type[Type["Professor"] = 1] = "Professor";
+  Type[Type["AssistantProfessor"] = 2] = "AssistantProfessor";
+  Type[Type["Student"] = 3] = "Student";
+  return Type;
+}(DelayTip_Type || {});
+var DelayTip = function DelayTip(_ref) {
+  var _window$location$path, _user$userInfo6, _user$userInfo9;
+  var visible = _ref.visible,
+    user = _ref.user,
+    _ref$onCancel = _ref.onCancel,
+    onCancel = _ref$onCancel === void 0 ? function () {} : _ref$onCancel,
+    dispatch = _ref.dispatch;
+  var _useState = (0,_react_17_0_2_react.useState)(),
+    _useState2 = slicedToArray_default()(_useState, 2),
+    inputValue = _useState2[0],
+    setInputValue = _useState2[1];
+  var _useState3 = (0,_react_17_0_2_react.useState)([]),
+    _useState4 = slicedToArray_default()(_useState3, 2),
+    checkedList = _useState4[0],
+    setCheckedList = _useState4[1];
+  var _useState5 = (0,_react_17_0_2_react.useState)(false),
+    _useState6 = slicedToArray_default()(_useState5, 2),
+    isLoading = _useState6[0],
+    setIsLoading = _useState6[1];
+  var _useState7 = (0,_react_17_0_2_react.useState)(false),
+    _useState8 = slicedToArray_default()(_useState7, 2),
+    visibleAuth = _useState8[0],
+    setVisibleAuth = _useState8[1];
+  var _useState9 = (0,_react_17_0_2_react.useState)(),
+    _useState10 = slicedToArray_default()(_useState9, 2),
+    occupationValue = _useState10[0],
+    setOccupationValue = _useState10[1];
+  var _useState11 = (0,_react_17_0_2_react.useState)(false),
+    _useState12 = slicedToArray_default()(_useState11, 2),
+    toastVisible = _useState12[0],
+    setToastVisible = _useState12[1];
+  var isclass = (_window$location$path = window.location.pathname) === null || _window$location$path === void 0 ? void 0 : _window$location$path.includes('classrooms/');
+  (0,_react_17_0_2_react.useEffect)(function () {
+    var _user$userInfo;
+    if (user !== null && user !== void 0 && (_user$userInfo = user.userInfo) !== null && _user$userInfo !== void 0 && _user$userInfo.identity) {
+      var _user$userInfo2;
+      setCheckedList([(user === null || user === void 0 || (_user$userInfo2 = user.userInfo) === null || _user$userInfo2 === void 0 ? void 0 : _user$userInfo2.identity) === 'student' ? 3 : 1]);
+    }
+  }, [user]);
+  (0,_react_17_0_2_react.useEffect)(function () {
+    var _user$userInfo3;
+    console.log(user === null || user === void 0 ? void 0 : user.userInfo);
+    if (user !== null && user !== void 0 && (_user$userInfo3 = user.userInfo) !== null && _user$userInfo3 !== void 0 && _user$userInfo3.user_status) {
+      var _user$userInfo4;
+      console.log(111);
+      if ((user === null || user === void 0 || (_user$userInfo4 = user.userInfo) === null || _user$userInfo4 === void 0 ? void 0 : _user$userInfo4.role) === 15) {
+        setToastVisible(false);
+        return;
+      } else {
+        var _localStorage, _localStorage2, _user$userInfo5;
+        var delaytip = isclass ? JSON.parse((_localStorage = localStorage) === null || _localStorage === void 0 ? void 0 : _localStorage.getItem('delaytip_class')) : JSON.parse((_localStorage2 = localStorage) === null || _localStorage2 === void 0 ? void 0 : _localStorage2.getItem('delaytip_user'));
+        if (delaytip && (delaytip === null || delaytip === void 0 ? void 0 : delaytip.login) === (user === null || user === void 0 || (_user$userInfo5 = user.userInfo) === null || _user$userInfo5 === void 0 ? void 0 : _user$userInfo5.login)) {
+          console.log(dayjs_min_default()(delaytip === null || delaytip === void 0 ? void 0 : delaytip.time).add(1, 'days'));
+          console.log(dayjs_min_default()(new Date()));
+          if (dayjs_min_default()(delaytip === null || delaytip === void 0 ? void 0 : delaytip.time).add(1, 'days').set({
+            hour: 0,
+            minute: 0,
+            second: 0
+          }) < dayjs_min_default()(new Date())) {
+            setToastVisible(true);
+          }
+        } else {
+          setToastVisible(true);
+        }
+      }
+    }
+  }, [user === null || user === void 0 || (_user$userInfo6 = user.userInfo) === null || _user$userInfo6 === void 0 ? void 0 : _user$userInfo6.user_status]);
+  var handlePrompt = function handlePrompt(course_id, message) {
+    if (checkedList.includes(DelayTip_Type.Professor)) {
+      modal/* default */.Z.confirm({
+        centered: true,
+        okText: '确定',
+        cancelText: '取消',
+        title: '提示',
+        content: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+          className: "tc",
+          children: message || "申请已提交，请等待审核"
+        }),
+        onOk: function onOk() {
+          window.location.href = "/classrooms/".concat(course_id, "/students");
+        }
+      });
+      return;
+    }
+    window.location.href = "/classrooms/".concat(course_id, "/students");
+  };
+  var handleOk = /*#__PURE__*/function () {
+    var _ref2 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee() {
+      var res;
+      return regeneratorRuntime_default()().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            if (inputValue) {
+              _context.next = 3;
+              break;
+            }
+            message/* default */.ZP.info('邀请码不能为空');
+            return _context.abrupt("return");
+          case 3:
+            setIsLoading(true);
+            _context.next = 6;
+            return (0,home/* applyToJoinCourse */.cR)({
+              invite_code: inputValue,
+              professor: checkedList.includes(DelayTip_Type.Professor) ? 1 : null,
+              assistant_professor: checkedList.includes(DelayTip_Type.AssistantProfessor) ? 1 : null,
+              student: checkedList.includes(DelayTip_Type.Student) ? 1 : null
+            });
+          case 6:
+            res = _context.sent;
+            setIsLoading(false);
+            if ((res === null || res === void 0 ? void 0 : res.status) === -1) {
+              dispatch({
+                type: 'classroomList/setActionTabs',
+                payload: {
+                  key: '到期提示'
+                }
+              });
+            }
+            if (!((res === null || res === void 0 ? void 0 : res.status) === -2)) {
+              _context.next = 23;
+              break;
+            }
+            handleCancel();
+            if (!(res.message === "该课堂要求成员完成实名认证")) {
+              _context.next = 15;
+              break;
+            }
+            setVisibleAuth(true);
+            setOccupationValue(1);
+            return _context.abrupt("return");
+          case 15:
+            if (!(res.message === "该课堂要求成员完成职业认证")) {
+              _context.next = 19;
+              break;
+            }
+            setVisibleAuth(true);
+            setOccupationValue(2);
+            return _context.abrupt("return");
+          case 19:
+            if (!(res.message === "该课堂要求成员完成实名和职业认证")) {
+              _context.next = 23;
+              break;
+            }
+            setVisibleAuth(true);
+            setOccupationValue(3);
+            return _context.abrupt("return");
+          case 23:
+            if (!((res === null || res === void 0 ? void 0 : res.status) === 0)) {
+              _context.next = 28;
+              break;
+            }
+            (0,util/* trackEvent */.L9)(['教学课堂', '首页', '加入课堂']);
+            handleCancel();
+            if (res !== null && res !== void 0 && res.course_id) {
+              handlePrompt(res.course_id, res.message);
+            } else {
+              message/* default */.ZP.success(res.message);
+            }
+            return _context.abrupt("return");
+          case 28:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function handleOk() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var handleCancel = /*#__PURE__*/function () {
+    var _ref3 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2() {
+      return regeneratorRuntime_default()().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            onCancel();
+          case 1:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function handleCancel() {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  var handleIgnore = function handleIgnore() {
+    if (isclass) {
+      var _user$userInfo7;
+      localStorage.setItem('delaytip_class', JSON.stringify({
+        time: new Date(),
+        login: user === null || user === void 0 || (_user$userInfo7 = user.userInfo) === null || _user$userInfo7 === void 0 ? void 0 : _user$userInfo7.login
+      }));
+    } else {
+      var _user$userInfo8;
+      localStorage.setItem('delaytip_user', JSON.stringify({
+        time: new Date(),
+        login: user === null || user === void 0 || (_user$userInfo8 = user.userInfo) === null || _user$userInfo8 === void 0 ? void 0 : _user$userInfo8.login
+      }));
+    }
+    setToastVisible(false);
+  };
+  var handleDelay = /*#__PURE__*/function () {
+    var _ref4 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee3() {
+      var res;
+      return regeneratorRuntime_default()().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            _context3.next = 2;
+            return (0,fetch/* default */.ZP)("/api/business_contacts.json", {
+              method: 'post'
+            });
+          case 2:
+            res = _context3.sent;
+            if ((res === null || res === void 0 ? void 0 : res.status) === 0) {
+              message/* default */.ZP.info('申请成功');
+            }
+          case 4:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function handleDelay() {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  return /*#__PURE__*/(0,jsx_runtime.jsx)(jsx_runtime.Fragment, {
+    children: toastVisible && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      style: {
+        background: 'rgba(255,24,24,0.1)',
+        color: '#E30000'
+      },
+      children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+        className: DelayTipmodules.tip,
+        children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)("i", {
+            className: "iconfont icon-tishi9 font14  mr10",
+            style: {
+              color: '#E30000'
+            }
+          }), isclass ? /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+            children: ["\u5C0A\u656C\u7684\u8001\u5E08\u60A8\u597D\uFF0C\u8D35\u5355\u4F4D\u8BD5\u7528\u671F\u5DF2\u7ED3\u675F\uFF0C\u60A8\u7684\u6559\u5B66\u8BFE\u5802\u7684", (user === null || user === void 0 || (_user$userInfo9 = user.userInfo) === null || _user$userInfo9 === void 0 ? void 0 : _user$userInfo9.user_status) == 2 ? '部分功能已被限制' : '功能将受到限制', "\uFF0C\u4E3A\u786E\u4FDD\u6821\u5185\u6559\u5B66\u4E0D\u53D7\u5F71\u54CD\uFF0C\u8BF7\u5148\u70B9\u51FB\u53F3\u4FA7\u7684\"\u7533\u8BF7\u5EF6\u671F\"\u6309\u94AE\uFF0C\u5E73\u53F0\u5C06\u63A8\u52A8\u89E3\u51B3\u76F8\u5173\u4E8B\u5B9C\u3002"]
+          }) : /*#__PURE__*/(0,jsx_runtime.jsx)(jsx_runtime.Fragment, {
+            children: "\u5C0A\u656C\u7684\u8001\u5E08\u60A8\u597D\uFF0C\u8D35\u5355\u4F4D\u8BD5\u7528\u671F\u5DF2\u7ED3\u675F\uFF0C\u76F8\u5173\u529F\u80FD\u5C06\u53D7\u5230\u9650\u5236\uFF0C\u4E3A\u786E\u4FDD\u6821\u5185\u6559\u5B66\u4E0D\u53D7\u5F71\u54CD\uFF0C\u8BF7\u5148\u70B9\u51FB\u53F3\u4FA7\u7684\"\u7533\u8BF7\u5EF6\u671F\"\u6309\u94AE\uFF0C\u5E73\u53F0\u5C06\u63A8\u52A8\u89E3\u51B3\u76F8\u5173\u4E8B\u5B9C\u3002"
+          })]
+        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+            className: "mr15",
+            style: {
+              color: '#666666',
+              cursor: 'pointer'
+            },
+            onClick: handleIgnore,
+            children: "\u5FFD\u7565"
+          }), /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+            style: {
+              color: '#165DFF',
+              cursor: 'pointer'
+            },
+            onClick: handleDelay,
+            children: "\u7533\u8BF7\u5EF6\u671F"
+          })]
+        })]
+      })
+    })
+  });
+};
+/* harmony default export */ var components_DelayTip = ((0,_umi_production_exports.connect)(function (_ref5) {
+  var user = _ref5.user;
+  return {
+    user: user
+  };
+})(DelayTip));
 // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/button/index.js
 var es_button = __webpack_require__(3113);
 ;// CONCATENATED MODULE: ./src/components/HomeModal/jqr.png
@@ -1879,7 +2300,6 @@ var Header_excluded = ["homePage", "user", "globalSetting", "loading", "dispatch
 
 
 
-var Header = layout/* default */.Z.Header;
 
 
 
@@ -1894,6 +2314,8 @@ var Header = layout/* default */.Z.Header;
 
 
 
+
+var Header = layout/* default */.Z.Header;
 var Search = input/* default */.Z.Search;
 function getCourseParam() {
   var _type$, _type$2;
@@ -2144,7 +2566,7 @@ var HeaderComponents = function HeaderComponents(_ref) {
           background: "".concat(location.pathname == '/training' ? 'rgba(0,0,0,0)' : '')
         },
         className: "".concat(globalSetting.isIlearning ? Headermodules["header-iearning"] : Headermodules.header, " ").concat(globalSetting.showHeaderFixed ? Headermodules.headerFixed : ''),
-        children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(Header, {
+        children: [(globalSetting === null || globalSetting === void 0 ? void 0 : globalSetting.showTip) && /*#__PURE__*/(0,jsx_runtime.jsx)(components_DelayTip, {}), /*#__PURE__*/(0,jsx_runtime.jsxs)(Header, {
           className: "header",
           style: {
             background: "".concat(location.pathname == '/training' ? 'rgba(0,0,0,0)' : ''),
@@ -2306,6 +2728,16 @@ var HeaderComponents = function HeaderComponents(_ref) {
   };
 })(HeaderComponents));
 
+/***/ }),
+
+/***/ 32637:
+/*!***********************************************!*\
+  !*** ./src/assets/images/AssistantCode3.jpeg ***!
+  \***********************************************/
+/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
+
+module.exports = __webpack_require__.p + "static/AssistantCode3.a8740efb.jpeg";
+
 /***/ })
 
 }]);
\ No newline at end of file
diff --git a/69244.async.js b/69244.async.js
index 7467d8e7ad..f09d7cc8e8 100644
--- a/69244.async.js
+++ b/69244.async.js
@@ -602,8 +602,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -890,8 +890,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/76006.async.js b/76006.async.js
index 503acefefa..96c412becb 100644
--- a/76006.async.js
+++ b/76006.async.js
@@ -951,8 +951,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1239,8 +1239,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/layouts__ShixunDetail__index.async.js b/layouts__ShixunDetail__index.async.js
index 7f532ef6b2..45548bdcc1 100644
--- a/layouts__ShixunDetail__index.async.js
+++ b/layouts__ShixunDetail__index.async.js
@@ -526,7 +526,8 @@ var AddTeacher = function AddTeacher(_ref) {
   var _actionTabs$selectArr, _actionTabs$selectArr2;
   var classroomList = _ref.classroomList,
     loading = _ref.loading,
-    dispatch = _ref.dispatch;
+    dispatch = _ref.dispatch,
+    onShow = _ref.onShow;
   var params = (0,_umi_production_exports.useParams)();
   var actionTabs = classroomList.actionTabs;
   var _useState = (0,_react_17_0_2_react.useState)([]),
@@ -673,7 +674,7 @@ var AddTeacher = function AddTeacher(_ref) {
               break;
             }
             message/* default */.ZP.error('请选择人数');
-            _context3.next = 8;
+            _context3.next = 9;
             break;
           case 4:
             _context3.next = 6;
@@ -687,6 +688,9 @@ var AddTeacher = function AddTeacher(_ref) {
             }));
           case 6:
             res = _context3.sent;
+            if ((res === null || res === void 0 ? void 0 : res.status) === -1) {
+              onShow();
+            }
             if (res.status === 0) {
               message/* default */.ZP.success('添加成功');
               dispatch({
@@ -705,7 +709,7 @@ var AddTeacher = function AddTeacher(_ref) {
               });
               _umi_production_exports.history.push("/classrooms/".concat(params.coursesId, "/teachers"));
             }
-          case 8:
+          case 9:
           case "end":
             return _context3.stop();
         }
@@ -1033,7 +1037,8 @@ var AddAssistant_AddTeacher = function AddTeacher(_ref) {
   var _actionTabs$selectArr, _actionTabs$selectArr2;
   var classroomList = _ref.classroomList,
     loading = _ref.loading,
-    dispatch = _ref.dispatch;
+    dispatch = _ref.dispatch,
+    onShow = _ref.onShow;
   var params = (0,_umi_production_exports.useParams)();
   var actionTabs = classroomList.actionTabs;
   var _useState = (0,_react_17_0_2_react.useState)([]),
@@ -1185,7 +1190,7 @@ var AddAssistant_AddTeacher = function AddTeacher(_ref) {
               break;
             }
             message/* default */.ZP.error('请选择人数');
-            _context3.next = 8;
+            _context3.next = 9;
             break;
           case 4:
             _context3.next = 6;
@@ -1199,6 +1204,9 @@ var AddAssistant_AddTeacher = function AddTeacher(_ref) {
             }));
           case 6:
             res = _context3.sent;
+            if ((res === null || res === void 0 ? void 0 : res.status) === -1) {
+              onShow();
+            }
             if (res.status === 0) {
               message/* default */.ZP.success('添加成功');
               dispatch({
@@ -1217,7 +1225,7 @@ var AddAssistant_AddTeacher = function AddTeacher(_ref) {
               });
               _umi_production_exports.history.push("/classrooms/".concat(params.coursesId, "/teachers"));
             }
-          case 8:
+          case 9:
           case "end":
             return _context3.stop();
         }
@@ -1568,7 +1576,9 @@ var AddStudent_AddTeacher = function AddTeacher(_ref) {
   var _actionTabs$selectArr, _actionTabs$selectArr2;
   var classroomList = _ref.classroomList,
     loading = _ref.loading,
-    dispatch = _ref.dispatch;
+    dispatch = _ref.dispatch,
+    onShow = _ref.onShow,
+    onShow1 = _ref.onShow1;
   var params = (0,_umi_production_exports.useParams)();
   var actionTabs = classroomList.actionTabs;
   var _useState = (0,_react_17_0_2_react.useState)([]),
@@ -1745,7 +1755,7 @@ var AddStudent_AddTeacher = function AddTeacher(_ref) {
               break;
             }
             message/* default */.ZP.error('请选择人数');
-            _context3.next = 9;
+            _context3.next = 10;
             break;
           case 4:
             setBtnLoading(true);
@@ -1756,6 +1766,10 @@ var AddStudent_AddTeacher = function AddTeacher(_ref) {
             }));
           case 7:
             res = _context3.sent;
+            if ((res === null || res === void 0 ? void 0 : res.status) === -1) {
+              onShow();
+              setBtnLoading(false);
+            }
             if (res.status === 0) {
               message/* default */.ZP.success('添加成功');
               dispatch({
@@ -1787,7 +1801,7 @@ var AddStudent_AddTeacher = function AddTeacher(_ref) {
                 });
               }
             }
-          case 9:
+          case 10:
           case "end":
             return _context3.stop();
         }
@@ -1820,6 +1834,9 @@ var AddStudent_AddTeacher = function AddTeacher(_ref) {
             }, true);
           case 8:
             res = _context5.sent;
+            if (res.status === -1) {
+              onShow1();
+            }
             if (res.status !== -1) {
               dispatch({
                 type: 'classroomList/setActionTabs',
@@ -1884,7 +1901,7 @@ var AddStudent_AddTeacher = function AddTeacher(_ref) {
               }
             }
             setBtnLoading(false);
-          case 11:
+          case 12:
           case "end":
             return _context5.stop();
         }
@@ -4327,7 +4344,7 @@ var SubmenuIcons = {
 };
 ;// CONCATENATED MODULE: ./src/layouts/ShixunDetail/index.less?modules
 // extracted by mini-css-extract-plugin
-/* harmony default export */ var ShixunDetailmodules = ({"flex_box_center":"flex_box_center___ztP5B","flex_space_between":"flex_space_between___ZnBAF","flex_box_vertical_center":"flex_box_vertical_center___sIQLg","flex_box_center_end":"flex_box_center_end___Yjb4r","flex_box_column":"flex_box_column___wx6hu","wrp":"wrp___eXSKX","classroomInfo":"classroomInfo___zfzoC","title":"title___BCkXZ","titleLeft":"titleLeft___XPuIq","classroomUser":"classroomUser___b_ny2","headPic":"headPic___pR9pz","teacherInfo":"teacherInfo___BeE5H","classroomDesc":"classroomDesc___csaXO","classroomDescBg":"classroomDescBg___OQixb","joinCouses":"joinCouses___RT5bw","bg":"bg___zCz6k","task_count":"task_count___GC5OH","container":"container___m1Tgk","leftMenuActions":"leftMenuActions___H7kfl","leftMenu":"leftMenu___aMBG9","menuText":"menuText___vgQ83","totalCount":"totalCount___AoAB2","actions":"actions___MsngA","open":"open___inDJH","actived":"actived___rqjRz","actived2":"actived2___x7Wvg","tipJoin":"tipJoin___uzlgb","badge":"badge___s6J4T","num":"num____292N","classromediv":"classromediv___AQhQT","glow":"glow___Ucfx9","st":"st___KjyfC","link":"link___aoTXV","sLink":"sLink___moIi9","iconH":"iconH___N915X","shareClassroom":"shareClassroom___WbdZI","copy":"copy___plAJS","btnWrap":"btnWrap___UOuN_","btn":"btn___DfMBs","tip":"tip___FDQL5","export":"export___Dr4oV"});
+/* harmony default export */ var ShixunDetailmodules = ({"flex_box_center":"flex_box_center___ztP5B","flex_space_between":"flex_space_between___ZnBAF","flex_box_vertical_center":"flex_box_vertical_center___sIQLg","flex_box_center_end":"flex_box_center_end___Yjb4r","flex_box_column":"flex_box_column___wx6hu","wrp":"wrp___eXSKX","classroomInfo":"classroomInfo___zfzoC","title":"title___BCkXZ","titleLeft":"titleLeft___XPuIq","classroomUser":"classroomUser___b_ny2","headPic":"headPic___pR9pz","teacherInfo":"teacherInfo___BeE5H","classroomDesc":"classroomDesc___csaXO","classroomDescBg":"classroomDescBg___OQixb","joinCouses":"joinCouses___RT5bw","bg":"bg___zCz6k","task_count":"task_count___GC5OH","container":"container___m1Tgk","leftMenuActions":"leftMenuActions___H7kfl","leftMenu":"leftMenu___aMBG9","menuText":"menuText___vgQ83","totalCount":"totalCount___AoAB2","actions":"actions___MsngA","open":"open___inDJH","actived":"actived___rqjRz","actived2":"actived2___x7Wvg","tipJoin":"tipJoin___uzlgb","badge":"badge___s6J4T","num":"num____292N","classromediv":"classromediv___AQhQT","glow":"glow___Ucfx9","st":"st___KjyfC","link":"link___aoTXV","sLink":"sLink___moIi9","iconH":"iconH___N915X","shareClassroom":"shareClassroom___WbdZI","copy":"copy___plAJS","btnWrap":"btnWrap___UOuN_","btn":"btn___DfMBs","tip":"tip___FDQL5","export":"export___Dr4oV","bottom":"bottom___DezCj","yes":"yes___SmiO1","no":"no____2dJW"});
 ;// CONCATENATED MODULE: ./src/layouts/ShixunDetail/LeftMenus/index.tsx
 
 
@@ -5969,16 +5986,24 @@ var ShixunDetail_ShixunsListPage = function ShixunsListPage(_ref) {
     setisshow = _useState8[1];
   var _useState9 = (0,_react_17_0_2_react.useState)(false),
     _useState10 = slicedToArray_default()(_useState9, 2),
-    visible = _useState10[0],
-    setVisible = _useState10[1];
+    modalVisble = _useState10[0],
+    setModalVisible = _useState10[1];
   var _useState11 = (0,_react_17_0_2_react.useState)(false),
     _useState12 = slicedToArray_default()(_useState11, 2),
-    tipsVisible = _useState12[0],
-    setTipsVisible = _useState12[1];
+    modalVisble1 = _useState12[0],
+    setModalVisible1 = _useState12[1];
   var _useState13 = (0,_react_17_0_2_react.useState)(false),
     _useState14 = slicedToArray_default()(_useState13, 2),
-    iscopyshow = _useState14[0],
-    setiscopyshow = _useState14[1];
+    visible = _useState14[0],
+    setVisible = _useState14[1];
+  var _useState15 = (0,_react_17_0_2_react.useState)(false),
+    _useState16 = slicedToArray_default()(_useState15, 2),
+    tipsVisible = _useState16[0],
+    setTipsVisible = _useState16[1];
+  var _useState17 = (0,_react_17_0_2_react.useState)(false),
+    _useState18 = slicedToArray_default()(_useState17, 2),
+    iscopyshow = _useState18[0],
+    setiscopyshow = _useState18[1];
   var localtion = (0,_umi_production_exports.useLocation)();
   var _useSearchParams = (0,_umi_production_exports.useSearchParams)(),
     _useSearchParams2 = slicedToArray_default()(_useSearchParams, 1),
@@ -6006,10 +6031,22 @@ var ShixunDetail_ShixunsListPage = function ShixunsListPage(_ref) {
       return true;
     }
   });
-  var _useState15 = (0,_react_17_0_2_react.useState)(false),
-    _useState16 = slicedToArray_default()(_useState15, 2),
-    classroomscloseisshow = _useState16[0],
-    setclassroomscloseisshow = _useState16[1];
+  (0,_react_17_0_2_react.useEffect)(function () {
+    dispatch({
+      type: 'globalSetting/delayTipToggle',
+      payload: true
+    });
+    return function () {
+      dispatch({
+        type: 'globalSetting/delayTipToggle',
+        payload: false
+      });
+    };
+  }, []);
+  var _useState19 = (0,_react_17_0_2_react.useState)(false),
+    _useState20 = slicedToArray_default()(_useState19, 2),
+    classroomscloseisshow = _useState20[0],
+    setclassroomscloseisshow = _useState20[1];
   (0,_react_17_0_2_react.useEffect)(function () {
     var time = dayjs_min_default()().add(0, 'days').unix();
     var lasttime = localStorage.getItem('classroomsclose');
@@ -6090,12 +6127,12 @@ var ShixunDetail_ShixunsListPage = function ShixunsListPage(_ref) {
     return _addinfo.apply(this, arguments);
   }
   function _addinfo() {
-    _addinfo = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee10(code) {
+    _addinfo = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee11(code) {
       var res;
-      return regeneratorRuntime_default()().wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
+      return regeneratorRuntime_default()().wrap(function _callee11$(_context11) {
+        while (1) switch (_context11.prev = _context11.next) {
           case 0:
-            _context10.next = 2;
+            _context11.next = 2;
             return (0,fetch/* default */.ZP)("/api/courses/apply_to_join_course.json", {
               method: 'post',
               body: {
@@ -6104,7 +6141,15 @@ var ShixunDetail_ShixunsListPage = function ShixunsListPage(_ref) {
               }
             });
           case 2:
-            res = _context10.sent;
+            res = _context11.sent;
+            if ((res === null || res === void 0 ? void 0 : res.status) === -1) {
+              dispatch({
+                type: 'classroomList/setActionTabs',
+                payload: {
+                  key: '到期提示'
+                }
+              });
+            }
             if (res.status === 401) {
               localStorage.setItem('addinfo', '1');
               localStorage.setItem('classromeurl', location.pathname + localtion.search);
@@ -6112,11 +6157,11 @@ var ShixunDetail_ShixunsListPage = function ShixunsListPage(_ref) {
               getTopBar();
               getMenus();
             }
-          case 4:
+          case 5:
           case "end":
-            return _context10.stop();
+            return _context11.stop();
         }
-      }, _callee10);
+      }, _callee11);
     }));
     return _addinfo.apply(this, arguments);
   }
@@ -7121,7 +7166,22 @@ var ShixunDetail_ShixunsListPage = function ShixunsListPage(_ref) {
           })
         })]
       })
-    }), /*#__PURE__*/(0,jsx_runtime.jsx)(AddCategory, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(Rename, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(components_ExportScore, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(components_AddTeacher, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(AddAssistant, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(AddStudent, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(components_JoinCourses, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(SwitchStudents, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(components_MoocModal, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(components_CopyRecordModal, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(AddInfo, {}), shareStatus && /*#__PURE__*/(0,jsx_runtime.jsx)(components_ShareModal, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, {
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)(AddCategory, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(Rename, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(components_ExportScore, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(components_AddTeacher, {
+      onShow: function onShow() {
+        return setModalVisible1(true);
+      }
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)(AddAssistant, {
+      onShow: function onShow() {
+        return setModalVisible1(true);
+      }
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)(AddStudent, {
+      onShow: function onShow() {
+        return setModalVisible1(true);
+      },
+      onShow1: function onShow1() {
+        return setModalVisible(true);
+      }
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)(components_JoinCourses, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(SwitchStudents, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(components_MoocModal, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(components_CopyRecordModal, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(AddInfo, {}), shareStatus && /*#__PURE__*/(0,jsx_runtime.jsx)(components_ShareModal, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, {
       open: iscopyshow,
       title: /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
         children: [/*#__PURE__*/(0,jsx_runtime.jsx)(ExclamationCircleOutlined/* default */.Z, {
@@ -7155,15 +7215,91 @@ var ShixunDetail_ShixunsListPage = function ShixunsListPage(_ref) {
           src: AssistantCode3
         })]
       })
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, {
+      open: modalVisble,
+      width: 464,
+      centered: true,
+      title: /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+        children: [/*#__PURE__*/(0,jsx_runtime.jsx)(ExclamationCircleOutlined/* default */.Z, {
+          style: {
+            color: '#faad14',
+            fontSize: '18px'
+          }
+        }), " \u63D0\u793A"]
+      }),
+      okText: "\u786E\u5B9A",
+      onCancel: function onCancel() {
+        return setModalVisible(false);
+      },
+      onOk: function onOk() {
+        return setModalVisible(false);
+      },
+      children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+        children: ["\u5BFC\u5165\u5931\u8D25\uFF0C\u5F53\u524D\u5BFC\u5165\u7684\u6570\u636E\u5DF2\u8D85\u8FC750\u4EBA\u3002\u76EE\u524D\u60A8\u7684\u6559\u5B66\u8BFE\u5802", /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          style: {
+            color: '#FF9D18'
+          },
+          children: "\u4EC5\u652F\u630150\u4EBA\u4EE5\u4E0B"
+        }), "\u7684\u6559\u5B66\u6D3B\u52A8\u3002"]
+      })
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, {
+      open: modalVisble1,
+      width: 464,
+      centered: true,
+      title: /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+        children: [/*#__PURE__*/(0,jsx_runtime.jsx)(ExclamationCircleOutlined/* default */.Z, {
+          style: {
+            color: '#faad14',
+            fontSize: '18px'
+          }
+        }), " \u63D0\u793A"]
+      }),
+      okText: "\u7533\u8BF7\u5EF6\u671F",
+      onOk: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee10() {
+        var res;
+        return regeneratorRuntime_default()().wrap(function _callee10$(_context10) {
+          while (1) switch (_context10.prev = _context10.next) {
+            case 0:
+              _context10.next = 2;
+              return (0,fetch/* default */.ZP)("/api/business_contacts.json", {
+                method: 'post'
+              });
+            case 2:
+              res = _context10.sent;
+              if ((res === null || res === void 0 ? void 0 : res.status) === 0) {
+                message/* default */.ZP.info('申请成功');
+              }
+            case 4:
+            case "end":
+              return _context10.stop();
+          }
+        }, _callee10);
+      })),
+      onCancel: function onCancel() {
+        return setModalVisible1(false);
+      },
+      children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+        children: ["\u5C0A\u656C\u7684\u8001\u5E08\u60A8\u597D\uFF0C\u8D35\u5355\u4F4D\u8BD5\u7528\u671F\u5DF2\u8FC7\uFF0C\u76EE\u524D\u60A8\u7684\u6559\u5B66\u8BFE\u5802", /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          style: {
+            color: '#FF9D18'
+          },
+          children: "\u4EC5\u652F\u630150\u4EBA\u4EE5\u4E0B"
+        }), "\u7684\u6559\u5B66\u6D3B\u52A8\uFF0C\u4E3A\u786E\u4FDD\u60A8\u7684\u8BFE\u7A0B\u540E\u7EED\u8BD5\u7528\u4E0D\u53D7\u5F71\u54CD\uFF0C\u8BF7\u5148\u70B9\u51FB\u53F3\u4FA7\u7684\u201C", /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          style: {
+            color: '#165DFF'
+          },
+          children: "\u7533\u8BF7\u5EF6\u671F"
+        }), "\u201D\u6309\u94AE\uFF0C\u5E73\u53F0\u5C06\u63A8\u52A8\u89E3\u51B3\u76F8\u5173\u4E8B\u5B9C\u3002"]
+      })
     })]
   });
 };
-/* harmony default export */ var ShixunDetail = ((0,_umi_production_exports.connect)(function (_ref10) {
-  var classroomList = _ref10.classroomList,
-    loading = _ref10.loading,
-    globalSetting = _ref10.globalSetting,
-    user = _ref10.user,
-    shixunHomeworks = _ref10.shixunHomeworks;
+/* harmony default export */ var ShixunDetail = ((0,_umi_production_exports.connect)(function (_ref11) {
+  var classroomList = _ref11.classroomList,
+    loading = _ref11.loading,
+    globalSetting = _ref11.globalSetting,
+    user = _ref11.user,
+    shixunHomeworks = _ref11.shixunHomeworks;
   return {
     classroomList: classroomList,
     globalSetting: globalSetting,
diff --git a/layouts__ShixunDetail__index.chunk.css b/layouts__ShixunDetail__index.chunk.css
index dfd10e48eb..5b11b00352 100644
--- a/layouts__ShixunDetail__index.chunk.css
+++ b/layouts__ShixunDetail__index.chunk.css
@@ -841,6 +841,44 @@
   cursor: pointer;
   background-color: #ededed;
 }
+.tip___FDQL5 {
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 12px;
+  margin-top: 15px;
+}
+.bottom___DezCj {
+  width: 100%;
+  text-align: center;
+  margin-bottom: 15px;
+}
+.bottom___DezCj .yes___SmiO1 {
+  width: 88px;
+  height: 32px;
+  background: #3061D0;
+  box-shadow: 0px 2px 4px 0px #E0DFE1, inset 0px 1px 3px 0px rgba(255, 255, 255, 0.5);
+  border-radius: 2px;
+  font-weight: 400;
+  color: #FFFFFF !important;
+  border: 0px;
+}
+.bottom___DezCj .yes___SmiO1:hover {
+  background: #5784de;
+}
+.bottom___DezCj .no____2dJW {
+  margin-right: 20px;
+  width: 60px;
+  height: 32px;
+  background: #F8F9FC;
+  border-radius: 2px;
+  opacity: 0.5;
+  border: 1px solid #C3CFE0;
+  font-weight: 400;
+  color: #464F66 !important;
+  line-height: 14px;
+}
 
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/layouts/ShixunDetail/components/MoocModal/index.less?modules ***!
diff --git a/layouts__SimpleLayouts.async.js b/layouts__SimpleLayouts.async.js
index 490c8c871e..a177c6a272 100644
--- a/layouts__SimpleLayouts.async.js
+++ b/layouts__SimpleLayouts.async.js
@@ -30,8 +30,8 @@ var _react_17_0_2_react = __webpack_require__(59301);
 var config_provider = __webpack_require__(92736);
 // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/locale/zh_CN.js + 4 modules
 var zh_CN = __webpack_require__(81863);
-// EXTERNAL MODULE: ./src/components/Header/index.tsx + 12 modules
-var Header = __webpack_require__(40847);
+// EXTERNAL MODULE: ./src/components/Header/index.tsx + 14 modules
+var Header = __webpack_require__(68337);
 // EXTERNAL MODULE: ./src/.umi-production/exports.ts + 15 modules
 var _umi_production_exports = __webpack_require__(58308);
 // EXTERNAL MODULE: ./node_modules/_dayjs@1.11.10@dayjs/dayjs.min.js
@@ -1988,16 +1988,6 @@ if (false) {}
 
 /***/ }),
 
-/***/ 32637:
-/*!***********************************************!*\
-  !*** ./src/assets/images/AssistantCode3.jpeg ***!
-  \***********************************************/
-/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
-
-module.exports = __webpack_require__.p + "static/AssistantCode3.a8740efb.jpeg";
-
-/***/ }),
-
 /***/ 9936:
 /*!**************************************!*\
   !*** ./src/assets/images/delete.png ***!
diff --git a/layouts__SimpleLayouts.chunk.css b/layouts__SimpleLayouts.chunk.css
index 465149f38c..2f616b9444 100644
--- a/layouts__SimpleLayouts.chunk.css
+++ b/layouts__SimpleLayouts.chunk.css
@@ -332,6 +332,40 @@
   font-size: 16px;
 }
 
+/*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/layouts/ShixunDetail/components/LateTip.less?modules ***!
+  \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.bottom___z0ujX {
+  width: 100%;
+  text-align: center;
+  margin-bottom: 15px;
+}
+.bottom___z0ujX .yes___hodnN {
+  width: 88px;
+  height: 32px;
+  background: #3061D0;
+  box-shadow: 0px 2px 4px 0px #E0DFE1, inset 0px 1px 3px 0px rgba(255, 255, 255, 0.5);
+  border-radius: 2px;
+  font-weight: 400;
+  color: #FFFFFF !important;
+  border: 0px;
+}
+.bottom___z0ujX .yes___hodnN:hover {
+  background: #5784de;
+}
+.bottom___z0ujX .no___hiPz5 {
+  margin-right: 20px;
+  width: 60px;
+  height: 32px;
+  background: #F8F9FC;
+  border-radius: 2px;
+  opacity: 0.5;
+  border: 1px solid #C3CFE0;
+  font-weight: 400;
+  color: #464F66 !important;
+  line-height: 14px;
+}
+
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/components/Header/components/Join/index.less?modules ***!
   \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -520,6 +554,19 @@
   color: #979797;
 }
 
+/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/components/Header/components/DelayTip/index.less?modules ***!
+  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.tip___a6MfI {
+  width: 1200px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 12px;
+  margin: 0 auto;
+}
+
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/components/Footer/BeforeFooter/index.less?modules ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
diff --git a/layouts__index.async.js b/layouts__index.async.js
index e4ce53b952..9d41afe61c 100644
--- a/layouts__index.async.js
+++ b/layouts__index.async.js
@@ -2861,8 +2861,8 @@ var spin = __webpack_require__(71418);
 // EXTERNAL MODULE: ./node_modules/_dayjs@1.11.10@dayjs/dayjs.min.js
 var dayjs_min = __webpack_require__(9498);
 var dayjs_min_default = /*#__PURE__*/__webpack_require__.n(dayjs_min);
-// EXTERNAL MODULE: ./src/components/Header/index.tsx + 12 modules
-var Header = __webpack_require__(40847);
+// EXTERNAL MODULE: ./src/components/Header/index.tsx + 14 modules
+var Header = __webpack_require__(68337);
 // EXTERNAL MODULE: ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/toConsumableArray.js
 var toConsumableArray = __webpack_require__(37205);
 var toConsumableArray_default = /*#__PURE__*/__webpack_require__.n(toConsumableArray);
diff --git a/layouts__index.chunk.css b/layouts__index.chunk.css
index 70acd927c8..fc9c226466 100644
--- a/layouts__index.chunk.css
+++ b/layouts__index.chunk.css
@@ -479,6 +479,40 @@
   font-size: 16px;
 }
 
+/*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/layouts/ShixunDetail/components/LateTip.less?modules ***!
+  \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.bottom___z0ujX {
+  width: 100%;
+  text-align: center;
+  margin-bottom: 15px;
+}
+.bottom___z0ujX .yes___hodnN {
+  width: 88px;
+  height: 32px;
+  background: #3061D0;
+  box-shadow: 0px 2px 4px 0px #E0DFE1, inset 0px 1px 3px 0px rgba(255, 255, 255, 0.5);
+  border-radius: 2px;
+  font-weight: 400;
+  color: #FFFFFF !important;
+  border: 0px;
+}
+.bottom___z0ujX .yes___hodnN:hover {
+  background: #5784de;
+}
+.bottom___z0ujX .no___hiPz5 {
+  margin-right: 20px;
+  width: 60px;
+  height: 32px;
+  background: #F8F9FC;
+  border-radius: 2px;
+  opacity: 0.5;
+  border: 1px solid #C3CFE0;
+  font-weight: 400;
+  color: #464F66 !important;
+  line-height: 14px;
+}
+
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/components/Header/components/Join/index.less?modules ***!
   \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -667,6 +701,19 @@
   color: #979797;
 }
 
+/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/components/Header/components/DelayTip/index.less?modules ***!
+  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.tip___a6MfI {
+  width: 1200px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 12px;
+  margin: 0 auto;
+}
+
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/components/PodModal/index.less?modules ***!
   \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
diff --git a/p__Account__index.async.js b/p__Account__index.async.js
index 23f896bdc9..39d9c4072a 100644
--- a/p__Account__index.async.js
+++ b/p__Account__index.async.js
@@ -395,6 +395,18 @@ var AccountPage = function AccountPage(_ref) {
     dispatch = _ref.dispatch,
     props = objectWithoutProperties_default()(_ref, Account_excluded);
   var location = (0,_umi_production_exports.useLocation)();
+  (0,_react_17_0_2_react.useEffect)(function () {
+    dispatch({
+      type: 'globalSetting/delayTipToggle',
+      payload: true
+    });
+    return function () {
+      dispatch({
+        type: 'globalSetting/delayTipToggle',
+        payload: false
+      });
+    };
+  }, []);
   (0,_react_17_0_2_react.useEffect)(function () {
     var _user$userInfo;
     if (!((_user$userInfo = user.userInfo) !== null && _user$userInfo !== void 0 && _user$userInfo.login)) {
diff --git a/p__Classrooms__Index__index.async.js b/p__Classrooms__Index__index.async.js
index 2891530b5a..f27bb4a677 100644
--- a/p__Classrooms__Index__index.async.js
+++ b/p__Classrooms__Index__index.async.js
@@ -117,28 +117,139 @@ var AuthModal = function AuthModal(_ref) {
 
 /***/ }),
 
-/***/ 26646:
-/*!**********************************************************************!*\
-  !*** ./src/components/Header/components/Join/JoinClassroomModal.tsx ***!
-  \**********************************************************************/
+/***/ 83163:
+/*!**********************************************************************************!*\
+  !*** ./src/components/Header/components/Join/JoinClassroomModal.tsx + 2 modules ***!
+  \**********************************************************************************/
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/regeneratorRuntime.js */ 7557);
-/* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/asyncToGenerator.js */ 41498);
-/* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/slicedToArray.js */ 79800);
-/* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react */ 59301);
-/* harmony import */ var umi__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! umi */ 58308);
-/* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! antd */ 43418);
-/* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! antd */ 8591);
-/* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! antd */ 1056);
-/* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! antd */ 24905);
-/* harmony import */ var _service_home__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @/service/home */ 92414);
-/* harmony import */ var _components_AuthModal__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @/components/AuthModal */ 25447);
-/* harmony import */ var _utils_util__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @/utils/util */ 88123);
-/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! react/jsx-runtime */ 37712);
+
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, {
+  Z: function() { return /* binding */ Join_JoinClassroomModal; }
+});
+
+// EXTERNAL MODULE: ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/regeneratorRuntime.js
+var regeneratorRuntime = __webpack_require__(7557);
+var regeneratorRuntime_default = /*#__PURE__*/__webpack_require__.n(regeneratorRuntime);
+// EXTERNAL MODULE: ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/asyncToGenerator.js
+var asyncToGenerator = __webpack_require__(41498);
+var asyncToGenerator_default = /*#__PURE__*/__webpack_require__.n(asyncToGenerator);
+// EXTERNAL MODULE: ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/slicedToArray.js
+var slicedToArray = __webpack_require__(79800);
+var slicedToArray_default = /*#__PURE__*/__webpack_require__.n(slicedToArray);
+// EXTERNAL MODULE: ./node_modules/_react@17.0.2@react/index.js
+var _react_17_0_2_react = __webpack_require__(59301);
+// EXTERNAL MODULE: ./src/.umi-production/exports.ts + 15 modules
+var _umi_production_exports = __webpack_require__(58308);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/modal/index.js + 16 modules
+var modal = __webpack_require__(43418);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/message/index.js + 4 modules
+var message = __webpack_require__(8591);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/input/index.js + 5 modules
+var input = __webpack_require__(1056);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/checkbox/index.js + 3 modules
+var es_checkbox = __webpack_require__(24905);
+// EXTERNAL MODULE: ./src/service/home.ts
+var home = __webpack_require__(92414);
+// EXTERNAL MODULE: ./src/components/AuthModal/index.tsx + 3 modules
+var AuthModal = __webpack_require__(25447);
+// EXTERNAL MODULE: ./src/utils/util.tsx
+var util = __webpack_require__(88123);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/button/index.js
+var es_button = __webpack_require__(3113);
+// EXTERNAL MODULE: ./node_modules/_@ant-design_icons@5.2.6@@ant-design/icons/es/icons/ExclamationCircleOutlined.js + 1 modules
+var ExclamationCircleOutlined = __webpack_require__(80045);
+;// CONCATENATED MODULE: ./src/layouts/ShixunDetail/components/LateTip.less?modules
+// extracted by mini-css-extract-plugin
+/* harmony default export */ var LateTipmodules = ({"bottom":"bottom___z0ujX","yes":"yes___hodnN","no":"no___hiPz5"});
+// EXTERNAL MODULE: ./src/assets/images/AssistantCode3.jpeg
+var AssistantCode3 = __webpack_require__(32637);
+// EXTERNAL MODULE: ./node_modules/_react@17.0.2@react/jsx-runtime.js
+var jsx_runtime = __webpack_require__(37712);
+;// CONCATENATED MODULE: ./src/layouts/ShixunDetail/components/LateTip.tsx
+
+
+
+
+
+
+
+var LateTip = function LateTip(_ref) {
+  var classroomList = _ref.classroomList,
+    dispatch = _ref.dispatch,
+    user = _ref.user;
+  return /*#__PURE__*/(0,jsx_runtime.jsxs)(modal/* default */.Z, {
+    open: classroomList.actionTabs.key === "到期提示",
+    width: 464,
+    centered: true,
+    title: /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)(ExclamationCircleOutlined/* default */.Z, {
+        style: {
+          color: '#faad14',
+          fontSize: '18px'
+        }
+      }), " \u63D0\u793A"]
+    }),
+    onCancel: function onCancel() {
+      dispatch({
+        type: 'classroomList/setActionTabs',
+        payload: {
+          key: ""
+        }
+      });
+    },
+    footer: null,
+    children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+      style: {
+        textAlign: 'center',
+        marginBottom: 30
+      },
+      children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+        style: {
+          marginBottom: 20,
+          textAlign: 'left'
+        },
+        children: ["\u8BE5\u6559\u5B66\u8BFE\u5802\u7684\u8BD5\u7528\u5DF2\u5230\u671F\uFF0C\u76EE\u524D\u65E0\u6CD5\u652F\u6301", /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          style: {
+            color: '#FF9D18'
+          },
+          children: "\u8D85\u8FC750"
+        }), "\u4EBA\u7684\u6559\u5B66\u6D3B\u52A8\u3002\u5982\u6709\u4EFB\u4F55\u7591\u95EE\uFF0C\u8BF7\u968F\u65F6\u8054\u7CFB\u6211\u4EEC\u3002\u611F\u8C22\u60A8\u7684\u7406\u89E3\u4E0E\u652F\u6301\uFF01"]
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)("img", {
+        style: {
+          width: 130,
+          height: 130
+        },
+        src: AssistantCode3
+      })]
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      className: LateTipmodules.bottom,
+      children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, {
+        className: LateTipmodules.yes,
+        onClick: function onClick() {
+          dispatch({
+            type: 'classroomList/setActionTabs',
+            payload: {
+              key: ""
+            }
+          });
+        },
+        children: "\u6211\u77E5\u9053\u4E86"
+      })
+    })]
+  });
+};
+/* harmony default export */ var components_LateTip = ((0,_umi_production_exports.connect)(function (_ref2) {
+  var classroomList = _ref2.classroomList,
+    user = _ref2.user;
+  return {
+    classroomList: classroomList,
+    user: user
+  };
+})(LateTip));
+;// CONCATENATED MODULE: ./src/components/Header/components/Join/JoinClassroomModal.tsx
+
 
 
 
@@ -161,28 +272,29 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
   var visible = _ref.visible,
     user = _ref.user,
     _ref$onCancel = _ref.onCancel,
-    onCancel = _ref$onCancel === void 0 ? function () {} : _ref$onCancel;
-  var _useState = (0,react__WEBPACK_IMPORTED_MODULE_3__.useState)(),
-    _useState2 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2___default()(_useState, 2),
+    onCancel = _ref$onCancel === void 0 ? function () {} : _ref$onCancel,
+    dispatch = _ref.dispatch;
+  var _useState = (0,_react_17_0_2_react.useState)(),
+    _useState2 = slicedToArray_default()(_useState, 2),
     inputValue = _useState2[0],
     setInputValue = _useState2[1];
-  var _useState3 = (0,react__WEBPACK_IMPORTED_MODULE_3__.useState)([]),
-    _useState4 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2___default()(_useState3, 2),
+  var _useState3 = (0,_react_17_0_2_react.useState)([]),
+    _useState4 = slicedToArray_default()(_useState3, 2),
     checkedList = _useState4[0],
     setCheckedList = _useState4[1];
-  var _useState5 = (0,react__WEBPACK_IMPORTED_MODULE_3__.useState)(false),
-    _useState6 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2___default()(_useState5, 2),
+  var _useState5 = (0,_react_17_0_2_react.useState)(false),
+    _useState6 = slicedToArray_default()(_useState5, 2),
     isLoading = _useState6[0],
     setIsLoading = _useState6[1];
-  var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_3__.useState)(false),
-    _useState8 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2___default()(_useState7, 2),
+  var _useState7 = (0,_react_17_0_2_react.useState)(false),
+    _useState8 = slicedToArray_default()(_useState7, 2),
     visibleAuth = _useState8[0],
     setVisibleAuth = _useState8[1];
-  var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_3__.useState)(),
-    _useState10 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2___default()(_useState9, 2),
+  var _useState9 = (0,_react_17_0_2_react.useState)(),
+    _useState10 = slicedToArray_default()(_useState9, 2),
     occupationValue = _useState10[0],
     setOccupationValue = _useState10[1];
-  (0,react__WEBPACK_IMPORTED_MODULE_3__.useEffect)(function () {
+  (0,_react_17_0_2_react.useEffect)(function () {
     var _user$userInfo;
     if (user !== null && user !== void 0 && (_user$userInfo = user.userInfo) !== null && _user$userInfo !== void 0 && _user$userInfo.identity) {
       var _user$userInfo2;
@@ -191,12 +303,12 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
   }, [user]);
   var handlePrompt = function handlePrompt(course_id, message) {
     if (checkedList.includes(Type.Professor)) {
-      antd__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z.confirm({
+      modal/* default */.Z.confirm({
         centered: true,
         okText: '确定',
         cancelText: '取消',
         title: '提示',
-        content: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", {
+        content: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
           className: "tc",
           children: message || "申请已提交，请等待审核"
         }),
@@ -209,21 +321,21 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
     window.location.href = "/classrooms/".concat(course_id, "/students");
   };
   var handleOk = /*#__PURE__*/function () {
-    var _ref2 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().mark(function _callee() {
+    var _ref2 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee() {
       var res;
-      return _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().wrap(function _callee$(_context) {
+      return regeneratorRuntime_default()().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (inputValue) {
               _context.next = 3;
               break;
             }
-            antd__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .ZP.info('邀请码不能为空');
+            message/* default */.ZP.info('邀请码不能为空');
             return _context.abrupt("return");
           case 3:
             setIsLoading(true);
             _context.next = 6;
-            return (0,_service_home__WEBPACK_IMPORTED_MODULE_5__/* .applyToJoinCourse */ .cR)({
+            return (0,home/* applyToJoinCourse */.cR)({
               invite_code: inputValue,
               professor: checkedList.includes(Type.Professor) ? 1 : null,
               assistant_professor: checkedList.includes(Type.AssistantProfessor) ? 1 : null,
@@ -232,48 +344,57 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
           case 6:
             res = _context.sent;
             setIsLoading(false);
+            if ((res === null || res === void 0 ? void 0 : res.status) === -1) {
+              onCancel();
+              dispatch({
+                type: 'classroomList/setActionTabs',
+                payload: {
+                  key: '到期提示'
+                }
+              });
+            }
             if (!((res === null || res === void 0 ? void 0 : res.status) === -2)) {
-              _context.next = 22;
+              _context.next = 23;
               break;
             }
             handleCancel();
             if (!(res.message === "该课堂要求成员完成实名认证")) {
-              _context.next = 14;
+              _context.next = 15;
               break;
             }
             setVisibleAuth(true);
             setOccupationValue(1);
             return _context.abrupt("return");
-          case 14:
+          case 15:
             if (!(res.message === "该课堂要求成员完成职业认证")) {
-              _context.next = 18;
+              _context.next = 19;
               break;
             }
             setVisibleAuth(true);
             setOccupationValue(2);
             return _context.abrupt("return");
-          case 18:
+          case 19:
             if (!(res.message === "该课堂要求成员完成实名和职业认证")) {
-              _context.next = 22;
+              _context.next = 23;
               break;
             }
             setVisibleAuth(true);
             setOccupationValue(3);
             return _context.abrupt("return");
-          case 22:
+          case 23:
             if (!((res === null || res === void 0 ? void 0 : res.status) === 0)) {
-              _context.next = 27;
+              _context.next = 28;
               break;
             }
-            (0,_utils_util__WEBPACK_IMPORTED_MODULE_7__/* .trackEvent */ .L9)(['教学课堂', '首页', '加入课堂']);
+            (0,util/* trackEvent */.L9)(['教学课堂', '首页', '加入课堂']);
             handleCancel();
             if (res !== null && res !== void 0 && res.course_id) {
               handlePrompt(res.course_id, res.message);
             } else {
-              antd__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .ZP.success(res.message);
+              message/* default */.ZP.success(res.message);
             }
             return _context.abrupt("return");
-          case 27:
+          case 28:
           case "end":
             return _context.stop();
         }
@@ -284,8 +405,8 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
     };
   }();
   var handleCancel = /*#__PURE__*/function () {
-    var _ref3 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().mark(function _callee2() {
-      return _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().wrap(function _callee2$(_context2) {
+    var _ref3 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2() {
+      return regeneratorRuntime_default()().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             onCancel();
@@ -299,8 +420,8 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
       return _ref3.apply(this, arguments);
     };
   }();
-  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.Fragment, {
-    children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(antd__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z, {
+  return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+    children: [/*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, {
       centered: true,
       keyboard: false,
       closable: false,
@@ -309,12 +430,12 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
       confirmLoading: isLoading,
       onOk: handleOk,
       onCancel: handleCancel,
-      children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)("div", {
+      children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
         className: "tc",
-        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)("div", {
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("span", {
+        children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
             children: "\u8BFE\u5802\u9080\u8BF7\u7801\uFF1A"
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(antd__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, {
+          }), /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z, {
             placeholder: "\u8BF7\u8F93\u51655\u4F4D\u8BFE\u5802\u9080\u8BF7\u7801\u62166\u4F4D\u5206\u73ED\u9080\u8BF7\u7801",
             style: {
               width: 270
@@ -322,37 +443,37 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
             value: inputValue,
             onChange: function onChange(e) {
               if (e.target.value.length >= 7) {
-                antd__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .ZP.info('请输入5位课堂邀请码或6位分班邀请码！');
+                message/* default */.ZP.info('请输入5位课堂邀请码或6位分班邀请码！');
                 return;
               }
               setInputValue(e.target.value);
             }
           })]
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)("div", {
+        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
           className: "mt10 font14",
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("span", {
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
             children: "\u8EAB\u4EFD\uFF1A"
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z.Group, {
+          }), /*#__PURE__*/(0,jsx_runtime.jsxs)(es_checkbox/* default */.Z.Group, {
             value: checkedList,
             onChange: function onChange(value) {
               return setCheckedList(value);
             },
-            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z, {
+            children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
               value: Type.Professor,
               disabled: checkedList.includes(2),
               children: "\u6559\u5E08"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z, {
+            }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
               value: Type.AssistantProfessor,
               disabled: checkedList.includes(1),
               children: "\u52A9\u6559"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z, {
+            }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
               value: Type.Student,
               children: "\u5B66\u751F/\u53C2\u8D5B\u8005"
             })]
           })]
         })]
       })
-    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_components_AuthModal__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z, {
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)(components_LateTip, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(AuthModal/* default */.Z, {
       visible: visibleAuth,
       onCancel: function onCancel() {
         return setVisibleAuth(false);
@@ -361,7 +482,7 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
     })]
   });
 };
-/* harmony default export */ __webpack_exports__.Z = ((0,umi__WEBPACK_IMPORTED_MODULE_4__.connect)(function (_ref4) {
+/* harmony default export */ var Join_JoinClassroomModal = ((0,_umi_production_exports.connect)(function (_ref4) {
   var user = _ref4.user;
   return {
     user: user
@@ -484,8 +605,8 @@ var util = __webpack_require__(88123);
 /* harmony default export */ var Indexmodules = ({"flex_box_center":"flex_box_center___DkrHL","flex_space_between":"flex_space_between___AVnAe","flex_box_vertical_center":"flex_box_vertical_center___IgAyB","flex_box_center_end":"flex_box_center_end___PJeUj","flex_box_column":"flex_box_column___efYJH","page":"page___zYygn","center":"center___g76d7"});
 // EXTERNAL MODULE: ./src/utils/authority.ts
 var authority = __webpack_require__(19654);
-// EXTERNAL MODULE: ./src/components/Header/components/Join/JoinClassroomModal.tsx
-var JoinClassroomModal = __webpack_require__(26646);
+// EXTERNAL MODULE: ./src/components/Header/components/Join/JoinClassroomModal.tsx + 2 modules
+var JoinClassroomModal = __webpack_require__(83163);
 // EXTERNAL MODULE: ./node_modules/_react@17.0.2@react/jsx-runtime.js
 var jsx_runtime = __webpack_require__(37712);
 ;// CONCATENATED MODULE: ./src/pages/Classrooms/Index/index.tsx
@@ -760,6 +881,16 @@ var Page = function Page(_ref) {
   };
 })(Page));
 
+/***/ }),
+
+/***/ 32637:
+/*!***********************************************!*\
+  !*** ./src/assets/images/AssistantCode3.jpeg ***!
+  \***********************************************/
+/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
+
+module.exports = __webpack_require__.p + "static/AssistantCode3.a8740efb.jpeg";
+
 /***/ })
 
 }]);
\ No newline at end of file
diff --git a/p__Classrooms__Index__index.chunk.css b/p__Classrooms__Index__index.chunk.css
index 80d739874b..8999269943 100644
--- a/p__Classrooms__Index__index.chunk.css
+++ b/p__Classrooms__Index__index.chunk.css
@@ -81,3 +81,37 @@
   font-size: 16px;
 }
 
+/*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/layouts/ShixunDetail/components/LateTip.less?modules ***!
+  \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.bottom___z0ujX {
+  width: 100%;
+  text-align: center;
+  margin-bottom: 15px;
+}
+.bottom___z0ujX .yes___hodnN {
+  width: 88px;
+  height: 32px;
+  background: #3061D0;
+  box-shadow: 0px 2px 4px 0px #E0DFE1, inset 0px 1px 3px 0px rgba(255, 255, 255, 0.5);
+  border-radius: 2px;
+  font-weight: 400;
+  color: #FFFFFF !important;
+  border: 0px;
+}
+.bottom___z0ujX .yes___hodnN:hover {
+  background: #5784de;
+}
+.bottom___z0ujX .no___hiPz5 {
+  margin-right: 20px;
+  width: 60px;
+  height: 32px;
+  background: #F8F9FC;
+  border-radius: 2px;
+  opacity: 0.5;
+  border: 1px solid #C3CFE0;
+  font-weight: 400;
+  color: #464F66 !important;
+  line-height: 14px;
+}
+
diff --git a/p__Classrooms__Lists__Attendance__index.async.js b/p__Classrooms__Lists__Attendance__index.async.js
index 41dd058127..dd01ae2564 100644
--- a/p__Classrooms__Lists__Attendance__index.async.js
+++ b/p__Classrooms__Lists__Attendance__index.async.js
@@ -1929,7 +1929,7 @@ var Attendance_ShixunsListPage = function ShixunsListPage(_ref) {
         style: {
           position: 'absolute',
           right: 130,
-          top: 0,
+          top: 3,
           height: 30
         },
         onClick: function onClick() {
diff --git a/p__Classrooms__Lists__CommonHomework__Comment__index.async.js b/p__Classrooms__Lists__CommonHomework__Comment__index.async.js
index 8083da6f3f..533a518187 100644
--- a/p__Classrooms__Lists__CommonHomework__Comment__index.async.js
+++ b/p__Classrooms__Lists__CommonHomework__Comment__index.async.js
@@ -528,8 +528,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -816,8 +816,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__Classrooms__Lists__CommonHomework__Detail__index.async.js b/p__Classrooms__Lists__CommonHomework__Detail__index.async.js
index 6e79f91bab..f96ab92520 100644
--- a/p__Classrooms__Lists__CommonHomework__Detail__index.async.js
+++ b/p__Classrooms__Lists__CommonHomework__Detail__index.async.js
@@ -2602,8 +2602,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -2890,8 +2890,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__Classrooms__Lists__CourseGroup__List__index.async.js b/p__Classrooms__Lists__CourseGroup__List__index.async.js
index e5064c3b5b..7c96b44976 100644
--- a/p__Classrooms__Lists__CourseGroup__List__index.async.js
+++ b/p__Classrooms__Lists__CourseGroup__List__index.async.js
@@ -1741,7 +1741,9 @@ var ShixunsListPage = function ShixunsListPage(_ref) {
   (0,_react_17_0_2_react.useEffect)(function () {
     dispatch({
       type: 'classroomList/getCourseGroupsList',
-      payload: objectSpread2_default()({}, params)
+      payload: objectSpread2_default()(objectSpread2_default()({}, params), {}, {
+        is_list: true
+      })
     });
   }, [params['categoryId']]);
   (0,_react_17_0_2_react.useEffect)(function () {
@@ -1759,7 +1761,9 @@ var ShixunsListPage = function ShixunsListPage(_ref) {
     params.limit = pageSize;
     dispatch({
       type: 'classroomList/getCourseGroupsList',
-      payload: objectSpread2_default()({}, params)
+      payload: objectSpread2_default()(objectSpread2_default()({}, params), {}, {
+        is_list: true
+      })
     });
   };
   var onMenuSelect = function onMenuSelect(v) {
@@ -1812,7 +1816,9 @@ var ShixunsListPage = function ShixunsListPage(_ref) {
               message/* default */.ZP.success('操作成功');
               dispatch({
                 type: 'classroomList/getCourseGroupsList',
-                payload: objectSpread2_default()({}, params)
+                payload: objectSpread2_default()(objectSpread2_default()({}, params), {}, {
+                  is_list: true
+                })
               });
             }
           case 4:
@@ -2071,7 +2077,9 @@ var ShixunsListPage = function ShixunsListPage(_ref) {
                   if (data.status === 0) {
                     dispatch({
                       type: 'classroomList/getCourseGroupsList',
-                      payload: objectSpread2_default()({}, params)
+                      payload: objectSpread2_default()(objectSpread2_default()({}, params), {}, {
+                        is_list: true
+                      })
                     });
                   }
                 case 4:
@@ -2134,7 +2142,9 @@ var ShixunsListPage = function ShixunsListPage(_ref) {
               params.page = 1;
               dispatch({
                 type: 'classroomList/getCourseGroupsList',
-                payload: objectSpread2_default()({}, params)
+                payload: objectSpread2_default()(objectSpread2_default()({}, params), {}, {
+                  is_list: true
+                })
               });
             }
           })
diff --git a/p__Classrooms__Lists__Exercise__Add__index.async.js b/p__Classrooms__Lists__Exercise__Add__index.async.js
index bbd573d011..53c93a9951 100644
--- a/p__Classrooms__Lists__Exercise__Add__index.async.js
+++ b/p__Classrooms__Lists__Exercise__Add__index.async.js
@@ -2384,6 +2384,26 @@ var CompletionQuestionEditor = function CompletionQuestionEditor(_ref3) {
           })]
         });
       }
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, {
+      align: "middle",
+      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .Z.Item, {
+        name: "downcase",
+        valuePropName: "checked",
+        children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z, {})
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z, {
+        className: "ml10",
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u5B57\u6BCD\u5927\u5C0F\u5199"
+      })]
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, {
+      align: "middle",
+      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .Z.Item, {
+        name: "no_space",
+        valuePropName: "checked",
+        children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z, {})
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z, {
+        className: "ml10",
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u7A7A\u683C"
+      })]
     }), (standardAnswersValue === null || standardAnswersValue === void 0 ? void 0 : standardAnswersValue.length) > 1 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, {
       align: "middle",
       className: (standardAnswersValue === null || standardAnswersValue === void 0 ? void 0 : standardAnswersValue.length) > 1 ? 'mb30' : "".concat(_index_less_modules__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z.hide),
@@ -3189,8 +3209,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -3477,8 +3497,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
@@ -9800,6 +9820,7 @@ var CombinationCompletionQuestionEditor_CompletionQuestionEditor = function Comp
   var _form$getFieldValue;
   var questionTitlePlaceholder = _ref3.questionTitlePlaceholder,
     form = _ref3.form,
+    name = _ref3.name,
     scoreByBlank = _ref3.scoreByBlank,
     answerKey = _ref3.answerKey,
     _ref3$titleKey = _ref3.titleKey,
@@ -10014,6 +10035,26 @@ var CombinationCompletionQuestionEditor_CompletionQuestionEditor = function Comp
           })]
         });
       }
+    }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+      align: "middle",
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+        name: [name, "downcase"],
+        valuePropName: "checked",
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_switch/* default */.Z, {})
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+        className: "ml10",
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u5B57\u6BCD\u5927\u5C0F\u5199"
+      })]
+    }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+      align: "middle",
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+        name: [name, "no_space"],
+        valuePropName: "checked",
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_switch/* default */.Z, {})
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+        className: "ml10",
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u7A7A\u683C"
+      })]
     }), (standardAnswersValue === null || standardAnswersValue === void 0 ? void 0 : standardAnswersValue.length) > 1 && /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
       align: "middle",
       className: (standardAnswersValue === null || standardAnswersValue === void 0 ? void 0 : standardAnswersValue.length) > 1 ? 'mb30' : "".concat(QuestionEditormodules.hide),
@@ -10762,6 +10803,7 @@ var CombinationQuestionEditor = function CombinationQuestionEditor(_ref) {
                     answerKey: "is_answer"
                   }), (item_list === null || item_list === void 0 || (_item_list$name12 = item_list[name]) === null || _item_list$name12 === void 0 ? void 0 : _item_list$name12.question_type) == 3 && /*#__PURE__*/(0,jsx_runtime.jsx)(CombinationCompletionQuestionEditor_CompletionQuestionEditor, {
                     form: form,
+                    name: name,
                     questionTitlePlaceholder: "\u8BF7\u7F16\u8F91\u9898\u5E72\u5E76\u8BBE\u7F6E\u586B\u7A7A\u9879",
                     scoreByBlank: [name, 'use_blank_score'],
                     titleKey: [name, 'name'],
@@ -10869,7 +10911,9 @@ var CombinationQuestionEditor = function CombinationQuestionEditor(_ref) {
                       standard_answers: [],
                       question_type: 3,
                       item_type: 'COMPLETION',
-                      use_blank_score: true
+                      use_blank_score: true,
+                      downcase: true,
+                      no_space: true
                     });
                     setActiveKey([fields === null || fields === void 0 ? void 0 : fields.length].concat(toConsumableArray_default()(activeKey)));
                   },
@@ -14935,7 +14979,9 @@ var AddNewPaper = function AddNewPaper(_ref) {
                     keywords: [],
                     use_blank_score: true,
                     allow_student_debug: false,
-                    submit_rule: 1
+                    submit_rule: 1,
+                    downcase: true,
+                    no_space: true
                   });
                 }
               },
diff --git a/p__Classrooms__Lists__Exercise__Answer__index.async.js b/p__Classrooms__Lists__Exercise__Answer__index.async.js
index 96b8e70bd2..c1f515acb3 100644
--- a/p__Classrooms__Lists__Exercise__Answer__index.async.js
+++ b/p__Classrooms__Lists__Exercise__Answer__index.async.js
@@ -1883,8 +1883,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -2171,8 +2171,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
@@ -6249,7 +6249,7 @@ var dayjs_min = __webpack_require__(9498);
 var dayjs_min_default = /*#__PURE__*/__webpack_require__.n(dayjs_min);
 ;// CONCATENATED MODULE: ./src/pages/Classrooms/Lists/Exercise/Answer/index.less?modules
 // extracted by mini-css-extract-plugin
-/* harmony default export */ var Answermodules = ({"flex_box_center":"flex_box_center___ariLt","flex_space_between":"flex_space_between___MC6sH","flex_box_vertical_center":"flex_box_vertical_center___tJHfy","flex_box_center_end":"flex_box_center_end___AfB_t","flex_box_column":"flex_box_column___xX4Fj","bg":"bg___nHBEZ","wrapper":"wrapper___TZKl8","exerciseAlert":"exerciseAlert___QUMwm","title":"title___rj6Q0","content":"content___Te7Wz","baseMargin":"baseMargin___BRmsh","noWrap":"noWrap___X6AS3","singleItem":"singleItem___GkaDR","questionIcons":"questionIcons___XoGYC","green":"green___iIYnV","orange":"orange___EIhiL","greenTip":"greenTip___WwiUh","redTip":"redTip___aWSt4","orangeTip":"orangeTip___j5g_H","pollDesc":"pollDesc___yDT2Q","answered":"answered___d2hE7","unanswer":"unanswer___AdOhE","anchor":"anchor___z3CaP","answerFlag":"answerFlag___wwTKa","flagActive":"flagActive___piG3D","flagHalf":"flagHalf___E29dd","answerStudentFlag":"answerStudentFlag___HRVt8","answerStudentActive":"answerStudentActive___kM6r4","questionItem":"questionItem___q6Hgu","questionScore":"questionScore___RW5tm","itemType":"itemType___pPqzT","itemFlag":"itemFlag___j5TSr","answerWrap":"answerWrap___G9dnn","answerSubjective":"answerSubjective___LRVKJ","otherInput":"otherInput___SxNAw","submitButton":"submitButton___zPo7H","randomFlag":"randomFlag___TOZ2H","answerTrue":"answerTrue___fgIW0","answerFalse":"answerFalse___gAQD8","answerHalf":"answerHalf___h40sX","renderHtml":"renderHtml___UerV1","simpleText":"simpleText___ZKx7o","answerYes":"answerYes___AA0oM","answerNo":"answerNo___gMGLy","answerInfo":"answerInfo___tB4Wz","answerProgress":"answerProgress___CbmXy","answerSheetWrap":"answerSheetWrap___aPipx","answerSheetQuestionTitle":"answerSheetQuestionTitle___P18Ss","answerSheet":"answerSheet___yhxK1","answerSheetItem":"answerSheetItem___DIH2V","qindex":"qindex___XuKA8","markIcon":"markIcon___ZTkqb","active":"active___WSsrt","partialActive":"partialActive___K6lsa","selected":"selected___grFyM","countDown":"countDown___OzcWL","cnText":"cnText___TvFjV","red":"red___Mge1h","refreshBtn":"refreshBtn___lK1MX","fold":"fold___id0EJ","cardList":"cardList___xKhMX","withQrcode":"withQrcode___qphZK","iframe":"iframe___pMMQx","eduTip":"eduTip___hXWhK","eduQrcode":"eduQrcode____qxcx","eduVideo":"eduVideo___mufWJ","eduUsername":"eduUsername___tiufh","startAnswer":"startAnswer___AA7n5","eduSubmit":"eduSubmit___UPIsJ","eduTitle":"eduTitle___jCJrO","wrpAnswer":"wrpAnswer___AVK1Y","simpleMd":"simpleMd___ZGbXj","videomodal":"videomodal___bYarH","mainPart":"mainPart___Fqvw7","userInfoText":"userInfoText___nqL8p","answerSheetBottom":"answerSheetBottom___yXf5u","tooltipWrap":"tooltipWrap___AxG9B","leftPart":"leftPart___P4Ook","rightPart":"rightPart___De4P3","questionPart":"questionPart___GTq66","questionTypeTitle":"questionTypeTitle___r6Fo9","questionTypeInfo":"questionTypeInfo___JfpWv","toIframeBtn":"toIframeBtn___gRKtn","bottom":"bottom___coSlv","markBtn":"markBtn___ZCLGF","changeButton":"changeButton___sBTjl","prevBtn":"prevBtn___lgCPG","analysisWrap":"analysisWrap___JoCnb","greyBg":"greyBg___vgesc","fixHeader":"fixHeader___RoNxE","exerciseTitle":"exerciseTitle___Dtp56","commitModal":"commitModal___zqvNA","commitItem":"commitItem___mjYF6","commitInfoLabel":"commitInfoLabel___KtIjW","commitInfoValue":"commitInfoValue___DCyRn","cameraHeader":"cameraHeader___Pqhwb","dottedLineWrapper":"dottedLineWrapper___ONO9c","leftHalfCircle":"leftHalfCircle___RNJN7","dottedLine":"dottedLine___qWy4W","rightHalfCircle":"rightHalfCircle___s3_hr","orangeNum":"orangeNum___IYnup","teachAnalysis":"teachAnalysis___FH6fk","teachAnalysisModal":"teachAnalysisModal___RcKVp"});
+/* harmony default export */ var Answermodules = ({"flex_box_center":"flex_box_center___ariLt","flex_space_between":"flex_space_between___MC6sH","flex_box_vertical_center":"flex_box_vertical_center___tJHfy","flex_box_center_end":"flex_box_center_end___AfB_t","flex_box_column":"flex_box_column___xX4Fj","bg":"bg___nHBEZ","wrapper":"wrapper___TZKl8","exerciseAlert":"exerciseAlert___QUMwm","title":"title___rj6Q0","content":"content___Te7Wz","baseMargin":"baseMargin___BRmsh","noWrap":"noWrap___X6AS3","singleItem":"singleItem___GkaDR","questionIcons":"questionIcons___XoGYC","green":"green___iIYnV","orange":"orange___EIhiL","greenTip":"greenTip___WwiUh","redTip":"redTip___aWSt4","orangeTip":"orangeTip___j5g_H","pollDesc":"pollDesc___yDT2Q","answered":"answered___d2hE7","unanswer":"unanswer___AdOhE","anchor":"anchor___z3CaP","answerFlag":"answerFlag___wwTKa","flagActive":"flagActive___piG3D","flagHalf":"flagHalf___E29dd","answerStudentFlag":"answerStudentFlag___HRVt8","answerStudentActive":"answerStudentActive___kM6r4","questionItem":"questionItem___q6Hgu","questionScore":"questionScore___RW5tm","itemType":"itemType___pPqzT","itemFlag":"itemFlag___j5TSr","answerWrap":"answerWrap___G9dnn","answerSubjective":"answerSubjective___LRVKJ","otherInput":"otherInput___SxNAw","submitButton":"submitButton___zPo7H","randomFlag":"randomFlag___TOZ2H","answerTrue":"answerTrue___fgIW0","answerFalse":"answerFalse___gAQD8","answerHalf":"answerHalf___h40sX","renderHtml":"renderHtml___UerV1","simpleText":"simpleText___ZKx7o","answerYes":"answerYes___AA0oM","answerNo":"answerNo___gMGLy","answerInfo":"answerInfo___tB4Wz","answerProgress":"answerProgress___CbmXy","answerSheetWrap":"answerSheetWrap___aPipx","answerSheetQuestionTitle":"answerSheetQuestionTitle___P18Ss","answerSheet":"answerSheet___yhxK1","answerSheetItem":"answerSheetItem___DIH2V","qindex":"qindex___XuKA8","markIcon":"markIcon___ZTkqb","active":"active___WSsrt","yes":"yes___knuOK","no":"no___gv_cs","bf":"bf___pJfi5","partialActive":"partialActive___K6lsa","selected":"selected___grFyM","countDown":"countDown___OzcWL","cnText":"cnText___TvFjV","red":"red___Mge1h","refreshBtn":"refreshBtn___lK1MX","fold":"fold___id0EJ","cardList":"cardList___xKhMX","withQrcode":"withQrcode___qphZK","iframe":"iframe___pMMQx","eduTip":"eduTip___hXWhK","eduQrcode":"eduQrcode____qxcx","eduVideo":"eduVideo___mufWJ","eduUsername":"eduUsername___tiufh","startAnswer":"startAnswer___AA7n5","eduSubmit":"eduSubmit___UPIsJ","eduTitle":"eduTitle___jCJrO","wrpAnswer":"wrpAnswer___AVK1Y","simpleMd":"simpleMd___ZGbXj","videomodal":"videomodal___bYarH","mainPart":"mainPart___Fqvw7","userInfoText":"userInfoText___nqL8p","answerSheetBottom":"answerSheetBottom___yXf5u","tooltipWrap":"tooltipWrap___AxG9B","leftPart":"leftPart___P4Ook","rightPart":"rightPart___De4P3","questionPart":"questionPart___GTq66","questionTypeTitle":"questionTypeTitle___r6Fo9","questionTypeInfo":"questionTypeInfo___JfpWv","toIframeBtn":"toIframeBtn___gRKtn","bottom":"bottom___coSlv","markBtn":"markBtn___ZCLGF","changeButton":"changeButton___sBTjl","prevBtn":"prevBtn___lgCPG","analysisWrap":"analysisWrap___JoCnb","greyBg":"greyBg___vgesc","fixHeader":"fixHeader___RoNxE","exerciseTitle":"exerciseTitle___Dtp56","commitModal":"commitModal___zqvNA","commitItem":"commitItem___mjYF6","commitInfoLabel":"commitInfoLabel___KtIjW","commitInfoValue":"commitInfoValue___DCyRn","cameraHeader":"cameraHeader___Pqhwb","dottedLineWrapper":"dottedLineWrapper___ONO9c","leftHalfCircle":"leftHalfCircle___RNJN7","dottedLine":"dottedLine___qWy4W","rightHalfCircle":"rightHalfCircle___s3_hr","orangeNum":"orangeNum___IYnup","teachAnalysis":"teachAnalysis___FH6fk","teachAnalysisModal":"teachAnalysisModal___RcKVp"});
 // EXTERNAL MODULE: ./src/components/Exercise/ip.tsx
 var Exercise_ip = __webpack_require__(57646);
 // EXTERNAL MODULE: ./src/utils/authority.ts
@@ -7714,7 +7714,7 @@ var Answer_scoreStatusMapping = {
   1: 'c-green'
 };
 var Answer = function Answer(_ref) {
-  var _user$userInfo, _user$userInfo2, _user$userInfo3, _answerData$exercise4, _answerData$exercise22, _answerData$exercise23, _answerData$exercise24, _answerData$exercise25, _answerData$exercise26, _answerData$exercise27, _answerData$exercise28, _answerData$exercise29, _answerData$exercise30, _answerData$exercise31, _answerData$exercise_14, _answerData$exercise32, _answerData$exercise33, _answerData$exercise34, _answerData$exercise35, _answerData$exercise36, _answerData$exercise37, _answerData$question_5, _answerData$exercise_15, _answerData$question_6, _answerData$exercise_16, _answerData$exercise_17, _answerData$exercise_18, _answerData$exercise_19, _answerData$exercise_20, _answerData$exercise38, _answerData$exercise_21, _answerData$exercise_22, _answerData$exercise_24, _answerData$exercise_25, _answerData$exercise_26, _answerData$exercise39, _answerData$exercise40, _answerData$exercise41, _answerData$exercise42, _answerData$exercise_27;
+  var _user$userInfo, _user$userInfo2, _user$userInfo3, _answerData$exercise4, _answerData$exercise28, _answerData$exercise29, _answerData$exercise30, _answerData$exercise31, _answerData$exercise32, _answerData$exercise33, _answerData$exercise34, _answerData$exercise35, _answerData$exercise36, _answerData$exercise37, _answerData$exercise_14, _answerData$exercise38, _answerData$exercise39, _answerData$exercise40, _answerData$exercise41, _answerData$exercise42, _answerData$exercise43, _answerData$question_8, _answerData$exercise_15, _answerData$question_9, _answerData$exercise_16, _answerData$exercise_17, _answerData$exercise_18, _answerData$exercise_19, _answerData$exercise_20, _answerData$exercise44, _answerData$exercise_21, _answerData$exercise45, _answerData$exercise46, _answerData$exercise_22, _answerData$exercise_24, _answerData$exercise_25, _answerData$exercise_26, _answerData$exercise47, _answerData$exercise48, _answerData$exercise49, _answerData$exercise50, _answerData$exercise_27;
   var globalSetting = _ref.globalSetting,
     loading = _ref.loading,
     user = _ref.user,
@@ -9951,7 +9951,7 @@ var Answer = function Answer(_ref) {
         gutter: [20, 20],
         children: obj === null || obj === void 0 || (_obj$items = obj.items) === null || _obj$items === void 0 ? void 0 : _obj$items.map(function (item, k) {
           if (item.question_type === key) {
-            var _answerData$question_2, _answerData$question_3, _answerData$question_4;
+            var _answerData$question_2, _answerData$question_3, _answerData$question_4, _answerData$question_5, _answerData$question_6, _answerData$question_7;
             return /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
               children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
                 onClick: function onClick() {
@@ -9973,15 +9973,27 @@ var Answer = function Answer(_ref) {
                   });
                 },
                 className: "\n                ".concat(Answermodules.answerSheetItem, "\n                ").concat(answerData !== null && answerData !== void 0 && (_answerData$question_2 = answerData.question_status) !== null && _answerData$question_2 !== void 0 && _answerData$question_2.some(function (val) {
-                  return val.ques_id === item.question_id && (val === null || val === void 0 ? void 0 : val.ques_status) === 1;
+                  var _answerData$exercise16;
+                  return val.ques_id === item.question_id && (val === null || val === void 0 ? void 0 : val.ques_status) === 1 && (answerData === null || answerData === void 0 || (_answerData$exercise16 = answerData.exercise) === null || _answerData$exercise16 === void 0 ? void 0 : _answerData$exercise16.exercise_status) !== 3;
                 }) ? Answermodules.active : '', "\n                ").concat(answerData !== null && answerData !== void 0 && (_answerData$question_3 = answerData.question_status) !== null && _answerData$question_3 !== void 0 && _answerData$question_3.some(function (val) {
-                  return val.ques_id === item.question_id && (val === null || val === void 0 ? void 0 : val.ques_status) === 2;
-                }) ? Answermodules.partialActive : '', "\n                ").concat(index === oneindex && k === twoindex ? Answermodules.selected : '', "\n                "),
+                  var _answerData$exercise17;
+                  return val.ques_id === item.question_id && (val === null || val === void 0 ? void 0 : val.ques_status) === 2 && (answerData === null || answerData === void 0 || (_answerData$exercise17 = answerData.exercise) === null || _answerData$exercise17 === void 0 ? void 0 : _answerData$exercise17.exercise_status) !== 3;
+                }) ? Answermodules.partialActive : '', "\n                ").concat(answerData !== null && answerData !== void 0 && (_answerData$question_4 = answerData.question_status) !== null && _answerData$question_4 !== void 0 && _answerData$question_4.some(function (val) {
+                  var _answerData$exercise18;
+                  return val.ques_id === item.question_id && (val === null || val === void 0 ? void 0 : val.score_status) === 1 && (answerData === null || answerData === void 0 || (_answerData$exercise18 = answerData.exercise) === null || _answerData$exercise18 === void 0 ? void 0 : _answerData$exercise18.exercise_status) === 3;
+                }) ? Answermodules.yes : '', "\n                ").concat(answerData !== null && answerData !== void 0 && (_answerData$question_5 = answerData.question_status) !== null && _answerData$question_5 !== void 0 && _answerData$question_5.some(function (val) {
+                  var _answerData$exercise19;
+                  return val.ques_id === item.question_id && (val === null || val === void 0 ? void 0 : val.score_status) === 2 && (answerData === null || answerData === void 0 || (_answerData$exercise19 = answerData.exercise) === null || _answerData$exercise19 === void 0 ? void 0 : _answerData$exercise19.exercise_status) === 3;
+                }) ? Answermodules.no : '', "\n                ").concat(answerData !== null && answerData !== void 0 && (_answerData$question_6 = answerData.question_status) !== null && _answerData$question_6 !== void 0 && _answerData$question_6.some(function (val) {
+                  var _answerData$exercise20;
+                  return val.ques_id === item.question_id && (val === null || val === void 0 ? void 0 : val.score_status) === 3 && (answerData === null || answerData === void 0 || (_answerData$exercise20 = answerData.exercise) === null || _answerData$exercise20 === void 0 ? void 0 : _answerData$exercise20.exercise_status) === 3;
+                }) ? Answermodules.bf : '', "\n\n                ").concat(index === oneindex && k === twoindex ? Answermodules.selected : '', "\n                "),
                 children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
                   className: Answermodules.qindex,
                   children: k + 1
-                }), (answerData === null || answerData === void 0 || (_answerData$question_4 = answerData.question_status) === null || _answerData$question_4 === void 0 ? void 0 : _answerData$question_4.some(function (val) {
-                  return val.ques_id === item.question_id && (val === null || val === void 0 ? void 0 : val.ques_status) === 2;
+                }), (answerData === null || answerData === void 0 || (_answerData$question_7 = answerData.question_status) === null || _answerData$question_7 === void 0 ? void 0 : _answerData$question_7.some(function (val) {
+                  var _answerData$exercise21;
+                  return val.ques_id === item.question_id && (val === null || val === void 0 ? void 0 : val.ques_status) === 2 && (answerData === null || answerData === void 0 || (_answerData$exercise21 = answerData.exercise) === null || _answerData$exercise21 === void 0 ? void 0 : _answerData$exercise21.exercise_status) !== 3;
                 })) && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
                   style: {
                     height: 12,
@@ -10001,7 +10013,7 @@ var Answer = function Answer(_ref) {
     });
   };
   var renderQuestion = function renderQuestion(item, i) {
-    var _item$schools, _answerData$exercise16, _answerData$exercise17;
+    var _item$schools, _answerData$exercise22, _answerData$exercise23;
     var answerText = '';
     var answerBool = (item === null || item === void 0 ? void 0 : item.question_type) === 0 || (item === null || item === void 0 ? void 0 : item.question_type) === 1;
     if (answerBool) {
@@ -10059,7 +10071,7 @@ var Answer = function Answer(_ref) {
         list: item === null || item === void 0 ? void 0 : item.answer_comments
       }),
       // 实训题 ，答题
-      (item === null || item === void 0 ? void 0 : item.question_type) == 5 && (answerData === null || answerData === void 0 || (_answerData$exercise16 = answerData.exercise) === null || _answerData$exercise16 === void 0 ? void 0 : _answerData$exercise16.user_exercise_status) === 0 && (item === null || item === void 0 ? void 0 : item.answer_status) != 3 && /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, {
+      (item === null || item === void 0 ? void 0 : item.question_type) == 5 && (answerData === null || answerData === void 0 || (_answerData$exercise22 = answerData.exercise) === null || _answerData$exercise22 === void 0 ? void 0 : _answerData$exercise22.user_exercise_status) === 0 && (item === null || item === void 0 ? void 0 : item.answer_status) != 3 && /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, {
         justify: "end",
         className: "mt20",
         children: /*#__PURE__*/(0,jsx_runtime.jsx)(AsyncButton/* AsyncButton */.Z, {
@@ -10083,7 +10095,7 @@ var Answer = function Answer(_ref) {
         })
       }),
       // 编程题 ，答题
-      (0,authority/* isStudent */.dE)() && (answerData === null || answerData === void 0 || (_answerData$exercise17 = answerData.exercise) === null || _answerData$exercise17 === void 0 ? void 0 : _answerData$exercise17.user_exercise_status) === 0 && (item === null || item === void 0 ? void 0 : item.question_type) == 6 && /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, {
+      (0,authority/* isStudent */.dE)() && (answerData === null || answerData === void 0 || (_answerData$exercise23 = answerData.exercise) === null || _answerData$exercise23 === void 0 ? void 0 : _answerData$exercise23.user_exercise_status) === 0 && (item === null || item === void 0 ? void 0 : item.question_type) == 6 && /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, {
         justify: "end",
         className: "mt20",
         children: /*#__PURE__*/(0,jsx_runtime.jsx)(AsyncButton/* AsyncButton */.Z, {
@@ -10107,10 +10119,10 @@ var Answer = function Answer(_ref) {
   var switchType = (0,_react_17_0_2_react.useRef)();
   var switchData = (0,_react_17_0_2_react.useRef)({});
   var skipPrevQuestion = function skipPrevQuestion() {
-    var _answerData$exercise_5, _answerData$exercise18, _currentQuestionItem$2;
+    var _answerData$exercise_5, _answerData$exercise24, _currentQuestionItem$2;
     window.blur();
     var currentQuestionItem = (_answerData$exercise_5 = answerData.exercise_question_types) === null || _answerData$exercise_5 === void 0 || (_answerData$exercise_5 = _answerData$exercise_5[oneindex]) === null || _answerData$exercise_5 === void 0 || (_answerData$exercise_5 = _answerData$exercise_5.items) === null || _answerData$exercise_5 === void 0 ? void 0 : _answerData$exercise_5[twoindex];
-    if (!ischecked && (answerData === null || answerData === void 0 || (_answerData$exercise18 = answerData.exercise) === null || _answerData$exercise18 === void 0 ? void 0 : _answerData$exercise18.user_exercise_status) === 0 && (0,authority/* isStudent */.dE)()) {
+    if (!ischecked && (answerData === null || answerData === void 0 || (_answerData$exercise24 = answerData.exercise) === null || _answerData$exercise24 === void 0 ? void 0 : _answerData$exercise24.user_exercise_status) === 0 && (0,authority/* isStudent */.dE)()) {
       var _currentQuestionItem$;
       if (!(currentQuestionItem !== null && currentQuestionItem !== void 0 && currentQuestionItem.repeat_answer) && (currentQuestionItem === null || currentQuestionItem === void 0 || (_currentQuestionItem$ = currentQuestionItem.user_answer) === null || _currentQuestionItem$ === void 0 ? void 0 : _currentQuestionItem$.length) > 0) {
         if ((currentQuestionItem === null || currentQuestionItem === void 0 ? void 0 : currentQuestionItem.ques_status) === 0) {
@@ -10139,11 +10151,11 @@ var Answer = function Answer(_ref) {
     settwoindex(twoindex);
   };
   var skipNextQuestion = function skipNextQuestion() {
-    var _answerData$exercise_6, _answerData$exercise19, _currentQuestionItem$4;
+    var _answerData$exercise_6, _answerData$exercise25, _currentQuestionItem$4;
     window.blur();
     var currentQuestionItem = (_answerData$exercise_6 = answerData.exercise_question_types) === null || _answerData$exercise_6 === void 0 || (_answerData$exercise_6 = _answerData$exercise_6[oneindex]) === null || _answerData$exercise_6 === void 0 || (_answerData$exercise_6 = _answerData$exercise_6.items) === null || _answerData$exercise_6 === void 0 ? void 0 : _answerData$exercise_6[twoindex];
     //提示不允许重复作答弹窗的逻辑
-    if (!ischecked && (answerData === null || answerData === void 0 || (_answerData$exercise19 = answerData.exercise) === null || _answerData$exercise19 === void 0 ? void 0 : _answerData$exercise19.user_exercise_status) === 0 && (0,authority/* isStudent */.dE)()) {
+    if (!ischecked && (answerData === null || answerData === void 0 || (_answerData$exercise25 = answerData.exercise) === null || _answerData$exercise25 === void 0 ? void 0 : _answerData$exercise25.user_exercise_status) === 0 && (0,authority/* isStudent */.dE)()) {
       var _currentQuestionItem$3;
       if (!(currentQuestionItem !== null && currentQuestionItem !== void 0 && currentQuestionItem.repeat_answer) && (currentQuestionItem === null || currentQuestionItem === void 0 || (_currentQuestionItem$3 = currentQuestionItem.user_answer) === null || _currentQuestionItem$3 === void 0 ? void 0 : _currentQuestionItem$3.length) > 0) {
         if ((currentQuestionItem === null || currentQuestionItem === void 0 ? void 0 : currentQuestionItem.ques_status) === 0) {
@@ -10172,10 +10184,10 @@ var Answer = function Answer(_ref) {
     settwoindex(twoindex);
   };
   var skipAppointQuestion = function skipAppointQuestion(p) {
-    var _answerData$exercise_7, _answerData$exercise20, _currentQuestionItem$6;
+    var _answerData$exercise_7, _answerData$exercise26, _currentQuestionItem$6;
     var record = p || skipData.current;
     var currentQuestionItem = (_answerData$exercise_7 = answerData.exercise_question_types) === null || _answerData$exercise_7 === void 0 || (_answerData$exercise_7 = _answerData$exercise_7[oneindex]) === null || _answerData$exercise_7 === void 0 || (_answerData$exercise_7 = _answerData$exercise_7.items) === null || _answerData$exercise_7 === void 0 ? void 0 : _answerData$exercise_7[twoindex];
-    if (!ischecked && (answerData === null || answerData === void 0 || (_answerData$exercise20 = answerData.exercise) === null || _answerData$exercise20 === void 0 ? void 0 : _answerData$exercise20.user_exercise_status) === 0 && (0,authority/* isStudent */.dE)()) {
+    if (!ischecked && (answerData === null || answerData === void 0 || (_answerData$exercise26 = answerData.exercise) === null || _answerData$exercise26 === void 0 ? void 0 : _answerData$exercise26.user_exercise_status) === 0 && (0,authority/* isStudent */.dE)()) {
       var _currentQuestionItem$5;
       if (!(currentQuestionItem !== null && currentQuestionItem !== void 0 && currentQuestionItem.repeat_answer) && (currentQuestionItem === null || currentQuestionItem === void 0 || (_currentQuestionItem$5 = currentQuestionItem.user_answer) === null || _currentQuestionItem$5 === void 0 ? void 0 : _currentQuestionItem$5.length) > 0) {
         if ((currentQuestionItem === null || currentQuestionItem === void 0 ? void 0 : currentQuestionItem.ques_status) === 0) {
@@ -10200,7 +10212,7 @@ var Answer = function Answer(_ref) {
   };
   var handleRefresh = /*#__PURE__*/function () {
     var _ref24 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee27() {
-      var _answerData$exercise21;
+      var _answerData$exercise27;
       var res;
       return regeneratorRuntime_default()().wrap(function _callee27$(_context27) {
         while (1) switch (_context27.prev = _context27.next) {
@@ -10216,7 +10228,7 @@ var Answer = function Answer(_ref) {
             return initData();
           case 5:
             res = _context27.sent;
-            if (!(answerData !== null && answerData !== void 0 && (_answerData$exercise21 = answerData.exercise) !== null && _answerData$exercise21 !== void 0 && _answerData$exercise21.left_time)) {
+            if (!(answerData !== null && answerData !== void 0 && (_answerData$exercise27 = answerData.exercise) !== null && _answerData$exercise27 !== void 0 && _answerData$exercise27.left_time)) {
               _context27.next = 9;
               break;
             }
@@ -10291,7 +10303,7 @@ var Answer = function Answer(_ref) {
   return /*#__PURE__*/(0,jsx_runtime.jsxs)(spin/* default */.Z, {
     size: 'middle',
     spinning: isSpin,
-    children: [openFullScreen && (answerData === null || answerData === void 0 || (_answerData$exercise22 = answerData.exercise) === null || _answerData$exercise22 === void 0 ? void 0 : _answerData$exercise22.user_exercise_status) === 0 && /*#__PURE__*/(0,jsx_runtime.jsx)(recordScreen/* default */.Z, {
+    children: [openFullScreen && (answerData === null || answerData === void 0 || (_answerData$exercise28 = answerData.exercise) === null || _answerData$exercise28 === void 0 ? void 0 : _answerData$exercise28.user_exercise_status) === 0 && /*#__PURE__*/(0,jsx_runtime.jsx)(recordScreen/* default */.Z, {
       exerciseUserInfo: exercise.exerciseUserInfo,
       iframe: iframe,
       socket: socket,
@@ -10330,16 +10342,16 @@ var Answer = function Answer(_ref) {
         align: "middle",
         className: "edu-container",
         children: [/*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
-          children: (0,util/* exerciseTips */.vB)(answerData === null || answerData === void 0 || (_answerData$exercise23 = answerData.exercise) === null || _answerData$exercise23 === void 0 ? void 0 : _answerData$exercise23.exercise_status)
+          children: (0,util/* exerciseTips */.vB)(answerData === null || answerData === void 0 || (_answerData$exercise29 = answerData.exercise) === null || _answerData$exercise29 === void 0 ? void 0 : _answerData$exercise29.exercise_status)
         }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
           className: "".concat(Answermodules.exerciseTitle, " ml10"),
-          title: answerData === null || answerData === void 0 || (_answerData$exercise24 = answerData.exercise) === null || _answerData$exercise24 === void 0 ? void 0 : _answerData$exercise24.exercise_name,
-          children: answerData === null || answerData === void 0 || (_answerData$exercise25 = answerData.exercise) === null || _answerData$exercise25 === void 0 ? void 0 : _answerData$exercise25.exercise_name
+          title: answerData === null || answerData === void 0 || (_answerData$exercise30 = answerData.exercise) === null || _answerData$exercise30 === void 0 ? void 0 : _answerData$exercise30.exercise_name,
+          children: answerData === null || answerData === void 0 || (_answerData$exercise31 = answerData.exercise) === null || _answerData$exercise31 === void 0 ? void 0 : _answerData$exercise31.exercise_name
         }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
           style: {
             marginLeft: 'auto'
           },
-          children: !((0,authority/* isAdmin */.GJ)() || (0,authority/* isStudent */.dE)() && (answerData === null || answerData === void 0 || (_answerData$exercise26 = answerData.exercise) === null || _answerData$exercise26 === void 0 ? void 0 : _answerData$exercise26.user_exercise_status) == 1) && !!(answerData !== null && answerData !== void 0 && (_answerData$exercise27 = answerData.exercise) !== null && _answerData$exercise27 !== void 0 && _answerData$exercise27.left_time) && /*#__PURE__*/(0,jsx_runtime.jsxs)("aside", {
+          children: !((0,authority/* isAdmin */.GJ)() || (0,authority/* isStudent */.dE)() && (answerData === null || answerData === void 0 || (_answerData$exercise32 = answerData.exercise) === null || _answerData$exercise32 === void 0 ? void 0 : _answerData$exercise32.user_exercise_status) == 1) && !!(answerData !== null && answerData !== void 0 && (_answerData$exercise33 = answerData.exercise) !== null && _answerData$exercise33 !== void 0 && _answerData$exercise33.left_time) && /*#__PURE__*/(0,jsx_runtime.jsxs)("aside", {
             className: "".concat(Answermodules.countDown, " ").concat(countDownColor),
             children: [/*#__PURE__*/(0,jsx_runtime.jsx)("i", {
               className: "iconfont icon-daojishi",
@@ -10355,7 +10367,7 @@ var Answer = function Answer(_ref) {
             })]
           })
         }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
-          children: !((0,authority/* isAdmin */.GJ)() || (0,authority/* isStudent */.dE)() && (answerData === null || answerData === void 0 || (_answerData$exercise28 = answerData.exercise) === null || _answerData$exercise28 === void 0 ? void 0 : _answerData$exercise28.user_exercise_status) == 1) && exercise.actionTabs.key !== 'student-unlock' && normalClose && /*#__PURE__*/(0,jsx_runtime.jsxs)(AsyncButton/* AsyncButton */.Z, {
+          children: !((0,authority/* isAdmin */.GJ)() || (0,authority/* isStudent */.dE)() && (answerData === null || answerData === void 0 || (_answerData$exercise34 = answerData.exercise) === null || _answerData$exercise34 === void 0 ? void 0 : _answerData$exercise34.user_exercise_status) == 1) && exercise.actionTabs.key !== 'student-unlock' && normalClose && /*#__PURE__*/(0,jsx_runtime.jsxs)(AsyncButton/* AsyncButton */.Z, {
             className: "".concat(Answermodules.refreshBtn, " ml30"),
             onClick: handleRefresh,
             children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
@@ -10363,7 +10375,7 @@ var Answer = function Answer(_ref) {
             }), "\u5237\u65B0"]
           })
         }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
-          children: (0,authority/* isStudent */.dE)() && (answerData === null || answerData === void 0 || (_answerData$exercise29 = answerData.exercise) === null || _answerData$exercise29 === void 0 ? void 0 : _answerData$exercise29.user_exercise_status) === 0 && /*#__PURE__*/(0,jsx_runtime.jsx)(AsyncButton/* AsyncButton */.Z, {
+          children: (0,authority/* isStudent */.dE)() && (answerData === null || answerData === void 0 || (_answerData$exercise35 = answerData.exercise) === null || _answerData$exercise35 === void 0 ? void 0 : _answerData$exercise35.user_exercise_status) === 0 && /*#__PURE__*/(0,jsx_runtime.jsx)(AsyncButton/* AsyncButton */.Z, {
             className: "".concat(Answermodules.submitButton, " ml10"),
             type: "primary",
             onClick: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee28() {
@@ -10388,7 +10400,7 @@ var Answer = function Answer(_ref) {
             children: "\u4EA4\u5377"
           })
         }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
-          children: ((answerData === null || answerData === void 0 || (_answerData$exercise30 = answerData.exercise) === null || _answerData$exercise30 === void 0 ? void 0 : _answerData$exercise30.commit_status) == 1 || (answerData === null || answerData === void 0 || (_answerData$exercise31 = answerData.exercise) === null || _answerData$exercise31 === void 0 ? void 0 : _answerData$exercise31.exercise_status) == 3) && (answerData === null || answerData === void 0 || (_answerData$exercise_14 = answerData.exercise_answer_user) === null || _answerData$exercise_14 === void 0 ? void 0 : _answerData$exercise_14.analysis) && /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+          children: ((answerData === null || answerData === void 0 || (_answerData$exercise36 = answerData.exercise) === null || _answerData$exercise36 === void 0 ? void 0 : _answerData$exercise36.commit_status) == 1 || (answerData === null || answerData === void 0 || (_answerData$exercise37 = answerData.exercise) === null || _answerData$exercise37 === void 0 ? void 0 : _answerData$exercise37.exercise_status) == 3) && (answerData === null || answerData === void 0 || (_answerData$exercise_14 = answerData.exercise_answer_user) === null || _answerData$exercise_14 === void 0 ? void 0 : _answerData$exercise_14.analysis) && /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
             className: Answermodules.teachAnalysis,
             onClick: function onClick() {
               return setTeachAnalysisModal(true);
@@ -10404,7 +10416,7 @@ var Answer = function Answer(_ref) {
       })
     }), /*#__PURE__*/(0,jsx_runtime.jsxs)("section", {
       className: "edu-container ".concat(Answermodules.wrapper, " ").concat(isEducation && Answermodules.wrpAnswer),
-      children: [(answerData === null || answerData === void 0 || (_answerData$exercise32 = answerData.exercise) === null || _answerData$exercise32 === void 0 || (_answerData$exercise32 = _answerData$exercise32.exercise_description) === null || _answerData$exercise32 === void 0 ? void 0 : _answerData$exercise32.length) > 0 && /*#__PURE__*/(0,jsx_runtime.jsx)(es_alert/* default */.Z, {
+      children: [(answerData === null || answerData === void 0 || (_answerData$exercise38 = answerData.exercise) === null || _answerData$exercise38 === void 0 || (_answerData$exercise38 = _answerData$exercise38.exercise_description) === null || _answerData$exercise38 === void 0 ? void 0 : _answerData$exercise38.length) > 0 && /*#__PURE__*/(0,jsx_runtime.jsx)(es_alert/* default */.Z, {
         className: Answermodules.exerciseAlert,
         description: /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
           wrap: false,
@@ -10415,7 +10427,7 @@ var Answer = function Answer(_ref) {
             children: "\u8003\u8BD5\u987B\u77E5"
           }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
             className: Answermodules.content,
-            children: answerData === null || answerData === void 0 || (_answerData$exercise33 = answerData.exercise) === null || _answerData$exercise33 === void 0 ? void 0 : _answerData$exercise33.exercise_description
+            children: answerData === null || answerData === void 0 || (_answerData$exercise39 = answerData.exercise) === null || _answerData$exercise39 === void 0 ? void 0 : _answerData$exercise39.exercise_description
           })]
         }),
         closable: true
@@ -10446,7 +10458,7 @@ var Answer = function Answer(_ref) {
                     children: "\u59D3\u540D"
                   }), /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
                     className: "ml10 ".concat(Answermodules.userInfoText),
-                    children: (answerData === null || answerData === void 0 || (_answerData$exercise34 = answerData.exercise) === null || _answerData$exercise34 === void 0 ? void 0 : _answerData$exercise34.user_name) || '- -'
+                    children: (answerData === null || answerData === void 0 || (_answerData$exercise40 = answerData.exercise) === null || _answerData$exercise40 === void 0 ? void 0 : _answerData$exercise40.user_name) || '- -'
                   })]
                 }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
                   children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
@@ -10456,10 +10468,10 @@ var Answer = function Answer(_ref) {
                     children: "\u5B66\u53F7"
                   }), /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
                     className: "ml10 ".concat(Answermodules.userInfoText),
-                    children: (answerData === null || answerData === void 0 || (_answerData$exercise35 = answerData.exercise) === null || _answerData$exercise35 === void 0 ? void 0 : _answerData$exercise35.student_id) || '- -'
+                    children: (answerData === null || answerData === void 0 || (_answerData$exercise41 = answerData.exercise) === null || _answerData$exercise41 === void 0 ? void 0 : _answerData$exercise41.student_id) || '- -'
                   })]
                 })]
-              }), showAnswerCard && (0,authority/* isStudent */.dE)() && ((_answerData$exercise36 = answerData.exercise) === null || _answerData$exercise36 === void 0 ? void 0 : _answerData$exercise36.user_exercise_status) === 0 && ((_answerData$exercise37 = answerData.exercise) === null || _answerData$exercise37 === void 0 ? void 0 : _answerData$exercise37.open_phone_video_recording) && /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+              }), showAnswerCard && (0,authority/* isStudent */.dE)() && ((_answerData$exercise42 = answerData.exercise) === null || _answerData$exercise42 === void 0 ? void 0 : _answerData$exercise42.user_exercise_status) === 0 && ((_answerData$exercise43 = answerData.exercise) === null || _answerData$exercise43 === void 0 ? void 0 : _answerData$exercise43.open_phone_video_recording) && /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
                 className: Answermodules.eduQrcode,
                 style: {
                   marginTop: 10
@@ -10487,9 +10499,9 @@ var Answer = function Answer(_ref) {
                         style: {
                           color: '#165DFF'
                         },
-                        children: answerData === null || answerData === void 0 || (_answerData$question_5 = answerData.question_status) === null || _answerData$question_5 === void 0 || (_answerData$question_5 = _answerData$question_5.filter(function (val) {
+                        children: answerData === null || answerData === void 0 || (_answerData$question_8 = answerData.question_status) === null || _answerData$question_8 === void 0 || (_answerData$question_8 = _answerData$question_8.filter(function (val) {
                           return val.ques_status === 1;
-                        })) === null || _answerData$question_5 === void 0 ? void 0 : _answerData$question_5.length
+                        })) === null || _answerData$question_8 === void 0 ? void 0 : _answerData$question_8.length
                       }), /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
                         style: {
                           color: '#999999'
@@ -10501,9 +10513,9 @@ var Answer = function Answer(_ref) {
                     children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_progress/* default */.Z, {
                       strokeColor: "#165dffa6",
                       trailColor: "#0000000d",
-                      percent: (answerData === null || answerData === void 0 || (_answerData$question_6 = answerData.question_status) === null || _answerData$question_6 === void 0 || (_answerData$question_6 = _answerData$question_6.filter(function (val) {
+                      percent: (answerData === null || answerData === void 0 || (_answerData$question_9 = answerData.question_status) === null || _answerData$question_9 === void 0 || (_answerData$question_9 = _answerData$question_9.filter(function (val) {
                         return val.ques_status === 1;
-                      })) === null || _answerData$question_6 === void 0 ? void 0 : _answerData$question_6.length) / (answerData === null || answerData === void 0 || (_answerData$exercise_16 = answerData.exercise_types) === null || _answerData$exercise_16 === void 0 ? void 0 : _answerData$exercise_16.q_counts) * 100,
+                      })) === null || _answerData$question_9 === void 0 ? void 0 : _answerData$question_9.length) / (answerData === null || answerData === void 0 || (_answerData$exercise_16 = answerData.exercise_types) === null || _answerData$exercise_16 === void 0 ? void 0 : _answerData$exercise_16.q_counts) * 100,
                       showInfo: false
                     })
                   }), /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, {
@@ -10542,7 +10554,7 @@ var Answer = function Answer(_ref) {
                   children: /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
                     flex: "1",
                     children: /*#__PURE__*/(0,jsx_runtime.jsx)("aside", {
-                      className: "".concat(Answermodules.cardList, " ").concat((_answerData$exercise38 = answerData.exercise) !== null && _answerData$exercise38 !== void 0 && _answerData$exercise38.open_phone_video_recording ? Answermodules.withQrcode : ''),
+                      className: "".concat(Answermodules.cardList, " ").concat((_answerData$exercise44 = answerData.exercise) !== null && _answerData$exercise44 !== void 0 && _answerData$exercise44.open_phone_video_recording ? Answermodules.withQrcode : ''),
                       children: answerData === null || answerData === void 0 || (_answerData$exercise_21 = answerData.exercise_question_types) === null || _answerData$exercise_21 === void 0 ? void 0 : _answerData$exercise_21.map(function (er, index) {
                         return /*#__PURE__*/(0,jsx_runtime.jsx)(_react_17_0_2_react.Fragment, {
                           children: renderCardList(er, index)
@@ -10552,7 +10564,7 @@ var Answer = function Answer(_ref) {
                   })
                 })]
               })]
-            }), (0,authority/* isStudent */.dE)() && /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+            }), (0,authority/* isStudent */.dE)() && (answerData === null || answerData === void 0 || (_answerData$exercise45 = answerData.exercise) === null || _answerData$exercise45 === void 0 ? void 0 : _answerData$exercise45.exercise_status) !== 3 && /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
               justify: "space-around",
               align: "middle",
               className: Answermodules.answerSheetBottom,
@@ -10588,6 +10600,53 @@ var Answer = function Answer(_ref) {
                   }
                 }), "\u6807\u8BB0"]
               })]
+            }), (0,authority/* isStudent */.dE)() && (answerData === null || answerData === void 0 || (_answerData$exercise46 = answerData.exercise) === null || _answerData$exercise46 === void 0 ? void 0 : _answerData$exercise46.exercise_status) === 3 && /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+              justify: "space-around",
+              align: "middle",
+              className: Answermodules.answerSheetBottom,
+              children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
+                className: Answermodules.tooltipWrap,
+                children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+                  className: Answermodules.answerYes,
+                  style: {
+                    background: '#028D01',
+                    height: 8,
+                    width: 8,
+                    borderRadius: '50%'
+                  }
+                }), "\u6B63\u786E"]
+              }), /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
+                className: Answermodules.tooltipWrap,
+                children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+                  style: {
+                    background: '#FB3226',
+                    height: 8,
+                    width: 8,
+                    borderRadius: '50%'
+                  },
+                  className: "".concat(Answermodules.answerNo, " ml10")
+                }), "\u9519\u8BEF"]
+              }), /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
+                className: Answermodules.tooltipWrap,
+                children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+                  style: {
+                    background: '#E77400',
+                    height: 8,
+                    width: 8,
+                    borderRadius: '50%'
+                  },
+                  className: "".concat(Answermodules.answerNo, " ml10")
+                }), "\u90E8\u5206\u5F97\u5206"]
+              }), /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
+                className: Answermodules.tooltipWrap,
+                children: [/*#__PURE__*/(0,jsx_runtime.jsx)("i", {
+                  className: "iconfont icon-biaoji1",
+                  style: {
+                    marginRight: 4,
+                    color: '#FFB538'
+                  }
+                }), "\u6807\u8BB0"]
+              })]
             })]
           })
         }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
@@ -10801,10 +10860,10 @@ var Answer = function Answer(_ref) {
               display: isopen ? 'flex' : 'none'
             },
             children: /*#__PURE__*/(0,jsx_runtime.jsx)(CaptureVideo/* default */.Z, {
-              number: (answerData === null || answerData === void 0 || (_answerData$exercise39 = answerData.exercise) === null || _answerData$exercise39 === void 0 ? void 0 : _answerData$exercise39.photo_count) - (answerData === null || answerData === void 0 || (_answerData$exercise40 = answerData.exercise) === null || _answerData$exercise40 === void 0 ? void 0 : _answerData$exercise40.take_photo),
-              take_photo: answerData === null || answerData === void 0 || (_answerData$exercise41 = answerData.exercise) === null || _answerData$exercise41 === void 0 ? void 0 : _answerData$exercise41.take_photo,
+              number: (answerData === null || answerData === void 0 || (_answerData$exercise47 = answerData.exercise) === null || _answerData$exercise47 === void 0 ? void 0 : _answerData$exercise47.photo_count) - (answerData === null || answerData === void 0 || (_answerData$exercise48 = answerData.exercise) === null || _answerData$exercise48 === void 0 ? void 0 : _answerData$exercise48.take_photo),
+              take_photo: answerData === null || answerData === void 0 || (_answerData$exercise49 = answerData.exercise) === null || _answerData$exercise49 === void 0 ? void 0 : _answerData$exercise49.take_photo,
               ref: captureRef,
-              time: (_answerData$exercise42 = answerData.exercise) === null || _answerData$exercise42 === void 0 ? void 0 : _answerData$exercise42.left_time,
+              time: (_answerData$exercise50 = answerData.exercise) === null || _answerData$exercise50 === void 0 ? void 0 : _answerData$exercise50.left_time,
               update: initData,
               supportCamera: function supportCamera(type) {
                 if (type === 2) {
diff --git a/p__Classrooms__Lists__Exercise__Answer__index.chunk.css b/p__Classrooms__Lists__Exercise__Answer__index.chunk.css
index a35ab3e4ce..5eb67f95ca 100644
--- a/p__Classrooms__Lists__Exercise__Answer__index.chunk.css
+++ b/p__Classrooms__Lists__Exercise__Answer__index.chunk.css
@@ -547,6 +547,21 @@
   background: #3061D0;
   color: #fff;
 }
+[id="educoder"] .answerSheet___yhxK1 .answerSheetItem___DIH2V.yes___knuOK {
+  background: #E0F4E4;
+  color: #028D01;
+  border: 1px solid #E0F4E4 !important;
+}
+[id="educoder"] .answerSheet___yhxK1 .answerSheetItem___DIH2V.no___gv_cs {
+  background: #FFD5D0;
+  color: #FB3226;
+  border: 1px solid #FFD5D0 !important;
+}
+[id="educoder"] .answerSheet___yhxK1 .answerSheetItem___DIH2V.bf___pJfi5 {
+  background: #FFE5C4;
+  color: #E77400;
+  border: 1px solid #FFE5C4 !important;
+}
 [id="educoder"] .answerSheet___yhxK1 .answerSheetItem___DIH2V.partialActive___K6lsa {
   background: #EEEEEE;
   color: #fff;
diff --git a/p__Classrooms__Lists__Exercise__Detail__index.async.js b/p__Classrooms__Lists__Exercise__Detail__index.async.js
index 0bb90294e8..caa304b09b 100644
--- a/p__Classrooms__Lists__Exercise__Detail__index.async.js
+++ b/p__Classrooms__Lists__Exercise__Detail__index.async.js
@@ -3349,8 +3349,8 @@ var lodash = __webpack_require__(89392);
 var lodash_default = /*#__PURE__*/__webpack_require__.n(lodash);
 // EXTERNAL MODULE: ./node_modules/_flv.js@1.5.0@flv.js/src/flv.js + 38 modules
 var flv = __webpack_require__(31087);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var hls = __webpack_require__(27627);
 ;// CONCATENATED MODULE: ./src/components/Video/LivePlay/index.jsx
 
 
@@ -12839,7 +12839,7 @@ var MinusCircleOutlined = __webpack_require__(87306);
 var PlusCircleOutlined = __webpack_require__(71029);
 ;// CONCATENATED MODULE: ./src/pages/Classrooms/Lists/Exercise/Detail/components/ConfigWorks/index.less?modules
 // extracted by mini-css-extract-plugin
-/* harmony default export */ var ConfigWorksmodules = ({"flex_box_center":"flex_box_center___Onpg9","flex_space_between":"flex_space_between___nYRpC","flex_box_vertical_center":"flex_box_vertical_center___NGA7H","flex_box_center_end":"flex_box_center_end___a2dUm","flex_box_column":"flex_box_column___c5CN2","form":"form___TDc55","buttonFixed":"buttonFixed___oKPiL","buttonWrap":"buttonWrap___LDtpG","button":"button___ydPRd","scoreSettingWrapper":"scoreSettingWrapper___L7weV","ipItem":"ipItem___nAf_u","ipWrp":"ipWrp___x3LTQ","tagWrap":"tagWrap___PMN4b","tag":"tag___Auf1J","padding":"padding___veqnd","unlockKeyWrapper":"unlockKeyWrapper___UOERJ","unlockKeyInput":"unlockKeyInput___ItI9I","mb40":"mb40___eMjps","mb28":"mb28___ZxJPY","mainRuleText":"mainRuleText___U5cJS","minorRuleText":"minorRuleText___aZezx","contentInterval":"contentInterval___slPV9","CompetitionsListzhezhao":"CompetitionsListzhezhao___bTlUp","numberInput":"numberInput____ONIt","publishRuleIndex":"publishRuleIndex___s2cVA","publishRuleContent":"publishRuleContent___HohmS","groupSelector":"groupSelector___Zxqsw","addAndDelete":"addAndDelete___saTVM","deleteIcon":"deleteIcon___vnkck","addIcon":"addIcon___Yz7Ef","cancelBtn":"cancelBtn___p8Klw","submitBtn":"submitBtn___pmm2G","remindForm":"remindForm___K6X21","remindItem":"remindItem___Z7rRb","remindInput":"remindInput___r_wq3","addRemind":"addRemind___jbnIp","disabled":"disabled___ebijK"});
+/* harmony default export */ var ConfigWorksmodules = ({"flex_box_center":"flex_box_center___Onpg9","flex_space_between":"flex_space_between___nYRpC","flex_box_vertical_center":"flex_box_vertical_center___NGA7H","flex_box_center_end":"flex_box_center_end___a2dUm","flex_box_column":"flex_box_column___c5CN2","formDom":"formDom___ahHwX","form":"form___TDc55","buttonFixed":"buttonFixed___oKPiL","buttonWrap":"buttonWrap___LDtpG","button":"button___ydPRd","scoreSettingWrapper":"scoreSettingWrapper___L7weV","ipItem":"ipItem___nAf_u","ipWrp":"ipWrp___x3LTQ","tagWrap":"tagWrap___PMN4b","tag":"tag___Auf1J","padding":"padding___veqnd","unlockKeyWrapper":"unlockKeyWrapper___UOERJ","unlockKeyInput":"unlockKeyInput___ItI9I","mb40":"mb40___eMjps","mb28":"mb28___ZxJPY","mainRuleText":"mainRuleText___U5cJS","minorRuleText":"minorRuleText___aZezx","contentInterval":"contentInterval___slPV9","CompetitionsListzhezhao":"CompetitionsListzhezhao___bTlUp","numberInput":"numberInput____ONIt","publishRuleIndex":"publishRuleIndex___s2cVA","publishRuleContent":"publishRuleContent___HohmS","groupSelector":"groupSelector___Zxqsw","addAndDelete":"addAndDelete___saTVM","deleteIcon":"deleteIcon___vnkck","addIcon":"addIcon___Yz7Ef","cancelBtn":"cancelBtn___p8Klw","submitBtn":"submitBtn___pmm2G","remindForm":"remindForm___K6X21","remindItem":"remindItem___Z7rRb","remindInput":"remindInput___r_wq3","addRemind":"addRemind___jbnIp","disabled":"disabled___ebijK"});
 // EXTERNAL MODULE: ./node_modules/_@ant-design_icons@5.2.6@@ant-design/icons/es/icons/QuestionCircleOutlined.js + 1 modules
 var QuestionCircleOutlined = __webpack_require__(98815);
 ;// CONCATENATED MODULE: ./src/pages/Classrooms/Lists/Exercise/Detail/components/ConfigWorks/components/MakeUp.tsx
@@ -14476,13 +14476,16 @@ var AddIPRange_AddIPRange = function AddIPRange(_ref) {
 
 
 var PreventCheatingSettings_PublishSettings = function PublishSettings(_ref) {
-  var _data$public_ip2, _data$public_ip3, _data$inner_ip2, _data$inner_ip3, _exercise$commonHeade;
+  var _workSetting$exercise, _workSetting$exercise2, _data$public_ip, _data$public_ip2, _data$inner_ip, _data$inner_ip2, _exercise$commonHeade;
   var exercise = _ref.exercise,
     globalSetting = _ref.globalSetting,
     loading = _ref.loading,
     dispatch = _ref.dispatch;
   var workSetting = exercise.workSetting,
     commonHeader = exercise.commonHeader;
+  var _Form$useForm = es_form/* default */.Z.useForm(),
+    _Form$useForm2 = slicedToArray_default()(_Form$useForm, 1),
+    form = _Form$useForm2[0];
   var params = (0,_umi_production_exports.useParams)();
   params.category = params.categoryId;
   var _useState = (0,_react_17_0_2_react.useState)(false),
@@ -14493,48 +14496,56 @@ var PreventCheatingSettings_PublishSettings = function PublishSettings(_ref) {
     _useState4 = slicedToArray_default()(_useState3, 2),
     pageLoading = _useState4[0],
     setPageLoading = _useState4[1];
-  var _useState5 = (0,_react_17_0_2_react.useState)({
-      question_random: false,
-      choice_random: false,
-      start_password: "",
-      login_restrict: false,
-      is_start_locked: false,
-      ip_limit: 'no',
-      identity_verify: false,
-      //考试前人脸身份核验
-      open_phone_video_recording: false,
-      //考试中开启手机视频录制
-      open_camera: false,
-      //考试中启用拍照监考
-      photo_count: 5,
-      //本场考试最多拍摄次数
-      screen_open: false,
-      //切屏后强制交卷
-      screen_num: 3,
-      //切屏后强制交卷次数 
-      screen_sec: 5,
-      //切屏后强制交卷时间
-      ip_bind: false,
-      //限制考试访问IP选择框
-      ip_bind_type: false,
-      //IP地址绑定方式
-      public_ip: [],
-      //限制考试访问公网IP地址范围
-      inner_ip: [],
-      //限制考试访问内网IP地址范围
-      is_locked: false,
-      //是否开启考试解锁码
-      unlock_key: '',
-      //考试解锁码
-      screen_shot_open: false //考试截图功能
-    }),
+  var initData = {
+    question_random: false,
+    choice_random: false,
+    start_password: (workSetting === null || workSetting === void 0 || (_workSetting$exercise = workSetting.exercise) === null || _workSetting$exercise === void 0 ? void 0 : _workSetting$exercise.start_password) || "",
+    login_restrict: false,
+    is_start_locked: false,
+    use_blank_score: false,
+    //多选题部分得分
+    ip_limit: false,
+    // false:"no",true:"pub"
+    identity_verify: false,
+    //考试前人脸身份核验
+    open_phone_video_recording: false,
+    //考试中开启手机视频录制
+    open_camera: false,
+    //考试中启用拍照监考
+    photo_count: 5,
+    //本场考试最多拍摄次数
+    screen_open: false,
+    //切屏后强制交卷
+    screen_num: 3,
+    //切屏后强制交卷次数 
+    screen_sec: 5,
+    //切屏后强制交卷时间
+    ip_bind: false,
+    //限制考试访问IP选择框
+    ip_bind_type: false,
+    //IP地址绑定方式
+    public_ip: [],
+    //限制考试访问公网IP地址范围
+    inner_ip: [],
+    //限制考试访问内网IP地址范围
+    is_locked: false,
+    //是否开启考试解锁码
+    unlock_key: (workSetting === null || workSetting === void 0 || (_workSetting$exercise2 = workSetting.exercise) === null || _workSetting$exercise2 === void 0 ? void 0 : _workSetting$exercise2.unlock_key) || '',
+    //考试解锁码
+    screen_shot_open: false //考试截图功能
+  };
+  var _useState5 = (0,_react_17_0_2_react.useState)(initData),
     _useState6 = slicedToArray_default()(_useState5, 2),
     data = _useState6[0],
     setData = _useState6[1];
+  var _useState7 = (0,_react_17_0_2_react.useState)(false),
+    _useState8 = slicedToArray_default()(_useState7, 2),
+    isChangeData = _useState8[0],
+    setIsChangeData = _useState8[1];
   (0,_react_17_0_2_react.useEffect)(function () {
-    var _workSetting$exercise;
+    var _workSetting$exercise3;
     setDefaultData();
-    if (!(0,authority/* isAdminOrCreator */.aN)() && !(workSetting !== null && workSetting !== void 0 && (_workSetting$exercise = workSetting.exercise) !== null && _workSetting$exercise !== void 0 && _workSetting$exercise.is_creator)) {
+    if (!(0,authority/* isAdminOrCreator */.aN)() && !(workSetting !== null && workSetting !== void 0 && (_workSetting$exercise3 = workSetting.exercise) !== null && _workSetting$exercise3 !== void 0 && _workSetting$exercise3.is_creator)) {
       setDisabled(true);
     }
   }, [workSetting]);
@@ -14547,7 +14558,8 @@ var PreventCheatingSettings_PublishSettings = function PublishSettings(_ref) {
   (0,_react_17_0_2_react.useEffect)(function () {
     if (exercise.actionTabs.key === 'insterIp') {
       if (exercise.actionTabs.data.ip) data[exercise.actionTabs.type] = [].concat(toConsumableArray_default()(data[exercise.actionTabs.type] || []), toConsumableArray_default()(exercise.actionTabs.data.ip));else data[exercise.actionTabs.type] = [].concat(toConsumableArray_default()(data[exercise.actionTabs.type] || []), ["".concat(exercise.actionTabs.data.startIP, ",").concat(exercise.actionTabs.data.startIP.substring(0, exercise.actionTabs.data.startIP.lastIndexOf(".")) + '.' + exercise.actionTabs.data.endIP)]);
-      setData(objectSpread2_default()({}, data));
+      upDataForm(data);
+      setIsChangeData(true);
     }
   }, [exercise.actionTabs]);
   var setDefaultData = function setDefaultData() {
@@ -14556,18 +14568,24 @@ var PreventCheatingSettings_PublishSettings = function PublishSettings(_ref) {
       var _res$exercise;
       data[item] = res === null || res === void 0 || (_res$exercise = res['exercise']) === null || _res$exercise === void 0 ? void 0 : _res$exercise[item];
     });
-    setData(data);
-    handleIsSetData("");
+    upDataForm(objectSpread2_default()(objectSpread2_default()({}, data), {}, {
+      ip_limit: data.ip_limit !== "no"
+    }));
   };
-  var handleSubmit = function handleSubmit() {
-    var _data$public_ip, _data$inner_ip;
-    var bodyData = JSON.parse(JSON.stringify(data));
-    bodyData.categoryId = params.categoryId;
-    if (data.open_camera && data.photo_count < 1) {
+  var upDataForm = function upDataForm(ValueAll) {
+    setData(ValueAll);
+    form.setFieldsValue(ValueAll);
+  };
+  var handleSubmit = function handleSubmit(ValueAll) {
+    var _ValueAll$public_ip, _ValueAll$inner_ip;
+    // const bodyData = JSON.parse(JSON.stringify(data));
+    ValueAll.categoryId = params.categoryId;
+    ValueAll.ip_limit = ValueAll.ip_limit ? "pub" : "no";
+    if (ValueAll.open_camera && ValueAll.photo_count < 1) {
       message/* default */.ZP.error('请填写本场考试最大拍摄次数');
       throw new String("请填写本场考试最大拍摄次数");
     }
-    if (!data.start_password && data.is_start_locked) {
+    if (!ValueAll.start_password && ValueAll.is_start_locked) {
       message/* default */.ZP.error('请填写开考密码');
       return;
     }
@@ -14576,11 +14594,11 @@ var PreventCheatingSettings_PublishSettings = function PublishSettings(_ref) {
     //   throw new String("请填写公网IP地址");
     // }
 
-    if (data.ip_limit !== "no" && !((_data$public_ip = data.public_ip) !== null && _data$public_ip !== void 0 && _data$public_ip.length) && !((_data$inner_ip = data.inner_ip) !== null && _data$inner_ip !== void 0 && _data$inner_ip.length)) {
+    if (ValueAll.ip_limit !== "no" && !((_ValueAll$public_ip = ValueAll.public_ip) !== null && _ValueAll$public_ip !== void 0 && _ValueAll$public_ip.length) && !((_ValueAll$inner_ip = ValueAll.inner_ip) !== null && _ValueAll$inner_ip !== void 0 && _ValueAll$inner_ip.length)) {
       message/* default */.ZP.error('请填写公网IP或内网IP地址');
       throw new String("请填写内网IP地址");
     }
-    if (data.open_camera || data.screen_open) {
+    if (ValueAll.open_camera || ValueAll.screen_open) {
       var modal = es_modal/* default */.Z.confirm({
         title: "考试说明",
         className: "custom-modal-divider",
@@ -14588,7 +14606,7 @@ var PreventCheatingSettings_PublishSettings = function PublishSettings(_ref) {
         width: 750,
         content: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
           className: "font16 p20",
-          children: [data.open_camera && /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+          children: [ValueAll.open_camera && /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
             justify: "start",
             className: "mt20",
             children: [/*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
@@ -14603,7 +14621,7 @@ var PreventCheatingSettings_PublishSettings = function PublishSettings(_ref) {
                 children: "\u8FD9\u9700\u8981\u8C03\u7528\u5B66\u751F\u7528\u6237\u7684\u6444\u50CF\u8BBE\u5907"
               }), "\u3002Educoder\u5E73\u53F0\u5C06\u4F1A\u4E25\u683C\u4FDD\u62A4\u6240\u6709\u5B66\u751F\u7684\u7167\u7247\u548C\u89C6\u9891\uFF0C\u5E76\u627F\u8BFA\u4E0D\u5728\u672C\u5E73\u53F0\u4EE5\u5916\u4F7F\u7528\u3002", /*#__PURE__*/(0,jsx_runtime.jsx)("br", {}), "\u8BF7\u786E\u8BA4\uFF1A\u4E3A\u4E25\u683C\u76D1\u7763\u8003\u8BD5\u4EE5\u83B7\u5F97\u516C\u5E73\uFF0C\u60A8\u540C\u610F\u5E76\u548C\u8981\u6C42Educoder\u5E73\u53F0\u5728\u672C\u6B21\u8003\u8BD5\u4E2D\u8C03\u7528\u5B66\u751F\u7528\u6237\u7684\u6444\u50CF\u8BBE\u5907\u5E76\u83B7\u53D6\u5B66\u751F\u7684\u5F71\u50CF\u4FE1\u606F\u3002"]
             })]
-          }), data.screen_open && /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+          }), ValueAll.screen_open && /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
             justify: "start",
             className: "mt20",
             children: [/*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
@@ -14643,14 +14661,14 @@ var PreventCheatingSettings_PublishSettings = function PublishSettings(_ref) {
           })]
         }),
         onOk: function onOk() {
-          handleUpdate(bodyData);
+          handleUpdate(ValueAll);
         },
         okButtonProps: {
           disabled: true
         }
       });
     } else {
-      handleUpdate(bodyData);
+      handleUpdate(ValueAll);
     }
   };
   var handleUpdate = /*#__PURE__*/function () {
@@ -14670,7 +14688,6 @@ var PreventCheatingSettings_PublishSettings = function PublishSettings(_ref) {
             setPageLoading(false);
             if (res.status === 0) {
               message/* default */.ZP.success('保存成功');
-              handleIsSetData("");
               dispatch({
                 type: 'exercise/getCommonHeader',
                 payload: objectSpread2_default()({}, params)
@@ -14680,6 +14697,7 @@ var PreventCheatingSettings_PublishSettings = function PublishSettings(_ref) {
                 payload: objectSpread2_default()({}, params)
               });
               // setDisabled(true)
+              setIsChangeData(false);
             }
           case 6:
           case "end":
@@ -14692,12 +14710,16 @@ var PreventCheatingSettings_PublishSettings = function PublishSettings(_ref) {
     };
   }();
   (0,_react_17_0_2_react.useEffect)(function () {
-    handleIsSetData("表单未保存");
-    window.addEventListener('beforeunload', handleBeforeunload);
+    if (isChangeData) {
+      handleIsSetData("表单未保存");
+      window.addEventListener('beforeunload', handleBeforeunload);
+    } else {
+      handleIsSetData("");
+    }
     return function () {
       window.removeEventListener('beforeunload', handleBeforeunload);
     };
-  }, [data]);
+  }, [isChangeData]);
   var handleBeforeunload = function handleBeforeunload(event) {
     event.preventDefault();
     event.returnValue = '';
@@ -14712,300 +14734,475 @@ var PreventCheatingSettings_PublishSettings = function PublishSettings(_ref) {
     });
   };
   return /*#__PURE__*/(0,jsx_runtime.jsxs)("section", {
-    className: ConfigWorksmodules.form,
-    children: [/*#__PURE__*/(0,jsx_runtime.jsx)(spin/* default */.Z, {
+    className: ConfigWorksmodules.formDom,
+    children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(spin/* default */.Z, {
       spinning: loading['exercise/getWorkSetting'] || pageLoading,
-      children: /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
-        align: "top",
-        wrap: false,
-        justify: "space-between",
-        className: "mt30 ".concat(ConfigWorksmodules.mb28),
-        children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
-          children: [!(commonHeader !== null && commonHeader !== void 0 && commonHeader.is_random) && /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, {
-            className: "".concat(ConfigWorksmodules.mb28),
+      children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(es_form/* default */.Z, {
+        form: form,
+        name: "basicForm",
+        initialValues: initData,
+        colon: false,
+        onValuesChange: function onValuesChange(changeValue, ValueAll) {
+          console.log("onValuesChange", ValueAll);
+          var Values = ValueAll;
+          var _loop = function _loop() {
+            if (name == "is_locked" && !ValueAll[name]) {
+              Values.login_restrict = false;
+            }
+            if (name == "login_restrict" && ValueAll[name]) {
+              Values.is_locked = true;
+            }
+            if (name == "screen_shot_open" && ValueAll[name]) {
+              var modal = es_modal/* default */.Z.confirm({
+                title: '提示',
+                icon: null,
+                centered: true,
+                okText: '确定',
+                cancelText: '取消',
+                content: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+                  children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+                    className: "mb10",
+                    children: ["1.\u5F00\u542F\u540E\uFF0C\u5B66\u751F\u4F5C\u7B54\u524D", /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+                      style: {
+                        color: '#F59A23'
+                      },
+                      children: "\u9700\u8981\u9009\u62E9\u4E3B\u5C4F\u5E55\u8FDB\u884C\u5171\u4EAB\uFF0C\u8003\u8BD5\u4F5C\u7B54\u8FC7\u7A0B\u4E2D\u4E5F\u4E0D\u5141\u8BB8\u5173\u95ED\u5C4F\u5E55\u5171\u4EAB\uFF0C\u5426\u5219\u5C06\u4F1A\u76F4\u63A5\u9000\u51FA\u8003\u8BD5\uFF1B"
+                    })]
+                  }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+                    children: "2.\u6559\u5E08\u53EF\u5728\u8003\u8BD5\u76D1\u63A7\u9875\u9762\u67E5\u770B\u622A\u5C4F\u8BB0\u5F55\u3002"
+                  })]
+                }),
+                onOk: function () {
+                  var _onOk = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2() {
+                    return regeneratorRuntime_default()().wrap(function _callee2$(_context2) {
+                      while (1) switch (_context2.prev = _context2.next) {
+                        case 0:
+                          Values.screen_shot_open = true;
+                          upDataForm(Values);
+                        case 2:
+                        case "end":
+                          return _context2.stop();
+                      }
+                    }, _callee2);
+                  }));
+                  function onOk() {
+                    return _onOk.apply(this, arguments);
+                  }
+                  return onOk;
+                }(),
+                onCancel: function onCancel() {
+                  Values.screen_shot_open = false;
+                  upDataForm(Values);
+                  modal.destroy();
+                }
+              });
+              return 1; // break
+            }
+            if ((name == "ip_bind" || name == "ip_limit") && !ValueAll["is_locked"] && ValueAll[name]) {
+              Values.is_locked = true;
+            }
+            if (name == "open_camera") {
+              Values.photo_count = Values.photo_count || 5;
+            }
+          };
+          for (var name in changeValue) {
+            if (_loop()) break;
+          }
+          upDataForm(Values);
+          setIsChangeData(true);
+        },
+        onFinish: handleSubmit,
+        children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(es_form/* default */.Z.Item, {
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
+            children: "\u4F7F\u7528\u63A8\u8350\u8BBE\u7F6E"
+          }), /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+            overlayStyle: {
+              maxWidth: 600
+            },
+            title: "点击不同的考试模式，系统会自动勾选对应模式推荐的防作弊设置，设置项支持进行修改。",
+            children: /*#__PURE__*/(0,jsx_runtime.jsx)(QuestionCircleOutlined/* default */.Z, {
+              style: {
+                cursor: 'pointer',
+                color: '#4C6FFF',
+                marginLeft: 8
+              }
+            })
+          }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, {
+            className: "ml20",
+            onClick: function onClick() {
+              upDataForm(objectSpread2_default()(objectSpread2_default()({}, initData), {}, {
+                question_random: true,
+                choice_random: true,
+                is_start_locked: true,
+                is_locked: true,
+                login_restrict: true,
+                screen_open: true,
+                ip_bind: true
+              }));
+            },
+            children: "\u6B63\u5F0F\u8003\u8BD5\u6A21\u5F0F"
+          }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, {
+            className: "ml20",
+            onClick: function onClick() {
+              upDataForm(objectSpread2_default()(objectSpread2_default()({}, initData), {}, {
+                question_random: true,
+                choice_random: true
+              }));
+            },
+            children: "\u6A21\u62DF\u8003\u8BD5\u6A21\u5F0F"
+          })]
+        }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+          name: "question_random",
+          valuePropName: "checked",
+          children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
+            disabled: disabled,
+            children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
+              children: "\u5C0F\u9898\u9898\u76EE\u987A\u5E8F\u968F\u673A\u6253\u4E71"
+            })
+          })
+        }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+          name: "choice_random",
+          valuePropName: "checked",
+          children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
+            disabled: disabled,
+            children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
+              children: "\u9009\u62E9\u9898\u9009\u9879\u987A\u5E8F\u968F\u673A\u6253\u4E71"
+            })
+          })
+        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          className: "ant-form-item",
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+            name: "is_start_locked",
+            valuePropName: "checked",
+            style: {
+              marginBottom: 0
+            },
             children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
-              checked: data.question_random,
               disabled: disabled,
-              onChange: function onChange(e) {
-                data.question_random = e.target.checked;
-                setData(Object.assign({}, data));
-              },
-              children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
-                children: "\u5C0F\u9898\u9898\u76EE\u987A\u5E8F\u968F\u673A\u6253\u4E71"
+              children: /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+                children: [/*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
+                  children: "\u5F00\u8003\u5BC6\u7801"
+                }), /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+                  placement: "right",
+                  overlayStyle: {
+                    maxWidth: 600
+                  },
+                  title: "勾选后，学生第一次进入考试时，需要输入开考密码才能进入考试答题页面。",
+                  children: /*#__PURE__*/(0,jsx_runtime.jsx)(QuestionCircleOutlined/* default */.Z, {
+                    style: {
+                      cursor: 'pointer',
+                      color: '#4C6FFF',
+                      marginLeft: 8
+                    }
+                  })
+                })]
               })
             })
-          }), !(commonHeader !== null && commonHeader !== void 0 && commonHeader.is_random) && /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, {
-            className: ConfigWorksmodules.mb28,
+          }), data.is_start_locked && (0,authority/* isAdmin */.GJ)() ? /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+            className: ConfigWorksmodules.unlockKeyWrapper,
+            align: "middle",
+            children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+              name: "start_password",
+              style: {
+                marginBottom: 0
+              },
+              children: /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z, {
+                className: ConfigWorksmodules.unlockKeyInput,
+                disabled: disabled,
+                placeholder: "\u8BF7\u8F93\u5165\u5F00\u8003\u5BC6\u7801"
+              })
+            }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+              children: !disabled && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, {
+                type: "link",
+                onClick: function onClick() {
+                  form.setFieldsValue({
+                    start_password: Math.floor(Math.random() * 1000000).toString().padStart(6, '0')
+                  });
+                },
+                children: "\u6362\u4E00\u6362"
+              })
+            })]
+          }) : /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+            hidden: true,
+            name: "start_password",
+            label: "开考密码(只用来在被隐藏的是时候进行收集数据)"
+          })]
+        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          className: "ant-form-item",
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+            name: "is_locked",
+            valuePropName: "checked",
+            style: {
+              marginBottom: 0
+            },
             children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
-              checked: data.choice_random,
               disabled: disabled,
-              onChange: function onChange(e) {
-                data.choice_random = e.target.checked;
-                setData(Object.assign({}, data));
-              },
-              children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
-                children: "\u9009\u62E9\u9898\u9009\u9879\u987A\u5E8F\u968F\u673A\u6253\u4E71"
+              children: /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+                children: [/*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
+                  children: "\u8003\u8BD5\u89E3\u9501\u7801"
+                }), /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+                  placement: "right",
+                  overlayStyle: {
+                    maxWidth: 600
+                  },
+                  title: "勾选后，如果学生在考试中途退出想再继续考试，需要使用解锁码进行解锁。",
+                  children: /*#__PURE__*/(0,jsx_runtime.jsx)(QuestionCircleOutlined/* default */.Z, {
+                    style: {
+                      cursor: 'pointer',
+                      color: '#4C6FFF',
+                      marginLeft: 8
+                    }
+                  })
+                })]
               })
             })
-          }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
-            children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
-              span: 24,
-              className: ConfigWorksmodules.mb28,
-              children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
-                checked: data.identity_verify,
-                disabled: !(0,authority/* isCommonSuperAdminOrOperation */.ag)() || disabled,
-                onChange: function onChange(e) {
-                  data.identity_verify = e.target.checked;
-                  setData(Object.assign({}, data));
+          }), data.is_locked && (0,authority/* isAdmin */.GJ)() ? /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+            className: ConfigWorksmodules.unlockKeyWrapper,
+            align: "middle",
+            children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+              style: {
+                marginBottom: 0
+              },
+              name: "unlock_key",
+              children: /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z, {
+                className: ConfigWorksmodules.unlockKeyInput,
+                disabled: disabled,
+                placeholder: "\u8BF7\u8F93\u5165\u8003\u8BD5\u89E3\u9501\u7801"
+              })
+            }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+              children: !disabled && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, {
+                type: "link",
+                onClick: function onClick() {
+                  form.setFieldsValue({
+                    unlock_key: Math.floor(Math.random() * 1000000).toString().padStart(6, '0')
+                  });
                 },
-                children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
-                  children: "\u8003\u8BD5\u524D\u4EBA\u8138\u8EAB\u4EFD\u6838\u9A8C"
-                })
+                children: "\u6362\u4E00\u6362"
+              })
+            })]
+          }) : /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+            hidden: true,
+            name: "unlock_key",
+            label: "考试解锁码(只用来在被隐藏的是时候进行收集数据)"
+          })]
+        }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+          name: "login_restrict",
+          valuePropName: "checked",
+          children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
+            disabled: disabled,
+            children: /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+              children: [/*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
+                children: "\u8003\u8BD5\u767B\u5F55\u9650\u5236"
               }), /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
                 placement: "right",
                 overlayStyle: {
                   maxWidth: 600
                 },
-                title: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-                  children: "\u52FE\u9009\u540E\uFF0C\u5B66\u751F\u5F00\u59CB\u8003\u8BD5\u524D\u5C06\u4F1A\u8981\u6C42\u8C03\u7528\u6444\u50CF\u5934\u5B8C\u6210\u62CD\u7167\u91C7\u96C6\uFF0C\u7CFB\u7EDF\u5C06\u81EA\u52A8\u5BF9\u91C7\u96C6\u7684\u5B66\u751F\u7167\u7247\u4E0E\u5DF2\u5F55\u5165\u7167\u7247\u8FDB\u884C\u6BD4\u5BF9\u5BA1\u6838\uFF08\u6559\u5E08/\u52A9\u6559\u4E5F\u53EF\u8FDB\u884C\u624B\u52A8\u5BA1\u6838\uFF09\uFF0C\u5BA1\u6838\u901A\u8FC7\u4E4B\u540E\u5B66\u751F\u624D\u80FD\u5F00\u59CB\u8003\u8BD5\u3002"
-                }),
+                title: "勾选后，学生在考试期间第二次及后续登录系统时，需要监考老师输入考试解锁码才能登录系统",
                 children: /*#__PURE__*/(0,jsx_runtime.jsx)(QuestionCircleOutlined/* default */.Z, {
                   style: {
-                    marginLeft: 4,
                     cursor: 'pointer',
-                    color: '#4C6FFF'
+                    color: '#4C6FFF',
+                    marginLeft: 8
                   }
                 })
               })]
-            }), /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
-              span: 24,
-              className: ConfigWorksmodules.mb28,
-              children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
-                checked: data.open_phone_video_recording,
-                disabled: !(0,authority/* isCommonSuperAdminOrOperation */.ag)() || disabled,
-                onChange: function onChange(e) {
-                  data.open_phone_video_recording = e.target.checked;
-                  setData(Object.assign({}, data));
-                },
-                children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
-                  children: "\u8003\u8BD5\u4E2D\u5F00\u542F\u624B\u673A\u89C6\u9891\u5F55\u5236"
+            })
+          })
+        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          className: "ant-form-item",
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+            name: "screen_open",
+            valuePropName: "checked",
+            children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
+              disabled: disabled,
+              children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
+                children: "\u5207\u5C4F\u540E\u5F3A\u5236\u4EA4\u5377"
+              })
+            })
+          }), data.screen_open ? /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+            children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+              gutter: 10,
+              className: "c-grey-333 ".concat(ConfigWorksmodules.unlockKeyWrapper),
+              align: "middle",
+              wrap: false,
+              children: [/*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+                children: "\u8003\u8BD5\u8FC7\u7A0B\u4E2D\u5207\u6362\u9875\u9762\u8D85\u8FC7"
+              }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+                children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+                  name: "screen_num",
+                  style: {
+                    marginBottom: 0
+                  },
+                  children: /*#__PURE__*/(0,jsx_runtime.jsx)(input_number/* default */.Z, {
+                    size: 'middle',
+                    disabled: disabled,
+                    min: 0,
+                    max: 10
+                  })
                 })
-              }), /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
-                placement: "right",
-                overlayStyle: {
-                  maxWidth: 600
-                },
-                title: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-                  children: "\u52FE\u9009\u540E\uFF0C\u5B66\u751F\u5F00\u59CB\u8003\u8BD5\u524D\u5FC5\u987B\u5148\u5F00\u542F\u624B\u673A\u5F55\u5236\u89C6\u9891\uFF0C\u7531\u6559\u5E08/\u52A9\u6559\u5728\u8BD5\u5377\u8BE6\u60C5-\u6444\u50CF\u76D1\u63A7\u9875\u9762\u5BF9\u5B66\u751F\u8FDB\u884C\u8EAB\u4EFD\u5BA1\u6838\u3002"
-                }),
-                children: /*#__PURE__*/(0,jsx_runtime.jsx)(QuestionCircleOutlined/* default */.Z, {
+              }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+                children: "\uFF08\u6B21\uFF09\u540E\u5C06\u88AB\u5F3A\u5236\u4EA4\u5377\uFF0C\u5207\u6362\u5230\u5176\u4ED6\u9875\u9762"
+              }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+                children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+                  name: "screen_sec",
                   style: {
-                    cursor: 'pointer',
-                    color: '#4C6FFF'
-                  }
+                    marginBottom: 0
+                  },
+                  children: /*#__PURE__*/(0,jsx_runtime.jsx)(input_number/* default */.Z, {
+                    size: 'middle',
+                    disabled: disabled,
+                    min: 0,
+                    max: 60
+                  })
                 })
+              }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+                children: "\uFF08\u79D2\uFF09\u540E\u5373\u5224\u5B9A\u4E3A\u5207\u5C4F\u3002"
               })]
-            }), /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
-              span: 24,
-              className: data.open_camera ? 'mb20' : ConfigWorksmodules.mb28,
-              children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
-                checked: data.open_camera,
-                disabled: disabled,
-                onChange: function onChange(e) {
-                  // if (!data.time) {
-                  //   message.error('不限时长的考试不可开启摄像头，请填写考试时长')
-                  //   return;
-                  // }
-                  data.open_camera = e.target.checked;
-                  data.photo_count = data.photo_count || 5;
-                  setData(Object.assign({}, data));
-                },
-                children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
-                  children: "\u8003\u8BD5\u4E2D\u542F\u7528\u62CD\u7167\u529F\u80FD\u8FDB\u884C\u76D1\u8003\u548C\u884C\u4E3A\u5206\u6790"
-                })
-              }), /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
-                placement: "right",
-                overlayStyle: {
-                  maxWidth: 600
-                },
-                title: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-                  children: "\u9009\u4E2D\uFF0C\u5219\u4F1A\u5728\u8003\u8BD5\u8FC7\u7A0B\u4E2D\u4F7F\u7528\u7535\u8111\u6444\u50CF\u5934\u968F\u673A\u6293\u62CD\u7167\u7247\uFF0C\u7528\u4E8E\u76D1\u8003\u548C\u5B66\u4E60\u884C\u4E3A\u5206\u6790\uFF0C\u5206\u6790\u7ED3\u679C\u53EF\u5728\u5B66\u751F\u7B54\u5377\u4E2D\u67E5\u770B\u3002"
-                }),
-                children: /*#__PURE__*/(0,jsx_runtime.jsx)(QuestionCircleOutlined/* default */.Z, {
+            }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+              gutter: 10,
+              className: "c-grey-333 ".concat(ConfigWorksmodules.unlockKeyWrapper),
+              align: "middle",
+              wrap: false,
+              children: [/*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+                children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+                  name: "screen_shot_open",
+                  valuePropName: "checked",
                   style: {
-                    cursor: 'pointer',
-                    color: '#4C6FFF'
-                  }
+                    marginBottom: 0
+                  },
+                  children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_switch/* default */.Z, {
+                    disabled: disabled || !data.screen_open
+                  })
                 })
+              }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+                children: "\u5B66\u751F\u9000\u51FA\u5168\u5C4F\u6216\u5207\u6362\u9875\u9762\u540E\u8FDB\u884C\u622A\u5C4F"
               })]
-            }), data.open_camera && /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
-              span: 24,
-              className: "".concat(ConfigWorksmodules.contentInterval, " ").concat(ConfigWorksmodules.mb28),
-              children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-                children: "\u672C\u573A\u8003\u8BD5\u6700\u591A\u62CD\u6444\uFF1A"
-              }), /*#__PURE__*/(0,jsx_runtime.jsx)(input_number/* default */.Z, {
-                size: 'middle',
-                disabled: disabled || !data.open_camera,
-                min: 1,
-                defaultValue: 5,
-                max: (0,authority/* isSuperAdmins */.Ny)() ? 1000 : 10,
-                value: data.photo_count,
-                onChange: function onChange(value) {
-                  data.photo_count = value;
-                  setData(objectSpread2_default()({}, data));
-                }
-              }), /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-                className: "ml10",
-                children: "(\u6B21)"
-              }), /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-                className: "c-grey-c font12 ml10",
-                children: "(\u8BF7\u586B\u5199\u4E0D\u5927\u4E8E10\u7684\u6B63\u6574\u6570)"
-              })]
-            }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
-              span: 24,
-              className: data.screen_open ? 'mb20' : ConfigWorksmodules.mb28,
-              children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
-                checked: data.screen_open,
-                disabled: disabled,
-                onChange: function onChange(e) {
-                  data.screen_open = e.target.checked;
-                  setData(Object.assign({}, data));
-                },
-                children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
-                  children: "\u5207\u5C4F\u540E\u5F3A\u5236\u4EA4\u5377"
-                })
+            })]
+          }) : /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+            children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+              hidden: true,
+              name: "screen_num",
+              label: "(只用来在被隐藏的是时候进行收集数据)"
+            }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+              hidden: true,
+              name: "screen_sec",
+              label: "(只用来在被隐藏的是时候进行收集数据)"
+            }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+              hidden: true,
+              name: "screen_shot_open",
+              label: "(只用来在被隐藏的是时候进行收集数据)"
+            })]
+          })]
+        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          className: "ant-form-item",
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+            name: "ip_bind",
+            valuePropName: "checked",
+            style: {
+              marginBottom: 0
+            },
+            children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
+              disabled: disabled,
+              children: /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+                children: [/*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
+                  children: "IP\u5730\u5740\u7ED1\u5B9A"
+                }), /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+                  placement: "right",
+                  overlayStyle: {
+                    maxWidth: 600
+                  },
+                  title: "勾选后，开始考试的学生账号将自动与设备公网IP或内网IP进行绑定。如遇特殊情况，可由教师/助教进行IP解绑。",
+                  children: /*#__PURE__*/(0,jsx_runtime.jsx)(QuestionCircleOutlined/* default */.Z, {
+                    style: {
+                      cursor: 'pointer',
+                      color: '#4C6FFF',
+                      marginLeft: 8
+                    }
+                  })
+                })]
               })
-            }), data.screen_open && /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
-              span: 24,
-              className: "".concat(ConfigWorksmodules.contentInterval, " mb20"),
+            })
+          }), data.ip_bind && (0,authority/* isAdmin */.GJ)() ? /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+            className: ConfigWorksmodules.unlockKeyWrapper,
+            style: {
+              flexDirection: "column"
+            },
+            children: [data.ip_bind_type && /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
+              className: "mb10",
               children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-                className: "c-grey-333 mr10",
-                children: "\u8003\u8BD5\u8FC7\u7A0B\u4E2D\u5207\u6362\u9875\u9762\u8D85\u8FC7"
-              }), /*#__PURE__*/(0,jsx_runtime.jsx)(input_number/* default */.Z, {
-                size: 'middle',
-                disabled: disabled,
-                min: 0,
-                defaultValue: 3,
-                max: 10,
-                value: data.screen_num,
-                onChange: function onChange(value) {
-                  data.screen_num = value;
-                  setData(objectSpread2_default()({}, data));
-                }
-              }), /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-                className: "c-grey-333 mr10",
-                children: "\uFF08\u6B21\uFF09\u540E\u5C06\u88AB\u5F3A\u5236\u4EA4\u5377\uFF0C\u5207\u6362\u5230\u5176\u4ED6\u9875\u9762"
-              }), /*#__PURE__*/(0,jsx_runtime.jsx)(input_number/* default */.Z, {
-                size: 'middle',
-                disabled: disabled,
-                min: 0,
-                defaultValue: 5,
-                max: 60,
-                value: data.screen_sec,
-                onChange: function onChange(value) {
-                  data.screen_sec = value;
-                  setData(objectSpread2_default()({}, data));
-                }
-              }), /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-                className: "c-grey-333",
-                children: "\uFF08\u79D2\uFF09\u540E\u5373\u5224\u5B9A\u4E3A\u5207\u5C4F\u3002"
-              })]
-            }), data.screen_open && /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
-              span: 24,
-              className: "".concat(ConfigWorksmodules.contentInterval, " ").concat(ConfigWorksmodules.mb28),
-              children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_switch/* default */.Z, {
-                disabled: disabled || !data.screen_open,
-                checked: data.screen_shot_open,
-                onChange: function onChange(value) {
-                  if (value) {
-                    es_modal/* default */.Z.confirm({
-                      icon: null,
-                      centered: true,
-                      okText: '确定',
-                      cancelText: '取消',
-                      title: '提示',
-                      content: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
-                        children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
-                          className: "mb10",
-                          children: ["1.\u5F00\u542F\u540E\uFF0C\u5B66\u751F\u4F5C\u7B54\u524D", /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-                            style: {
-                              color: '#F59A23'
-                            },
-                            children: "\u9700\u8981\u9009\u62E9\u4E3B\u5C4F\u5E55\u8FDB\u884C\u5171\u4EAB\uFF0C\u8003\u8BD5\u4F5C\u7B54\u8FC7\u7A0B\u4E2D\u4E5F\u4E0D\u5141\u8BB8\u5173\u95ED\u5C4F\u5E55\u5171\u4EAB\uFF0C\u5426\u5219\u5C06\u4F1A\u76F4\u63A5\u9000\u51FA\u8003\u8BD5\uFF1B"
-                          })]
-                        }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-                          children: "2.\u6559\u5E08\u53EF\u5728\u8003\u8BD5\u76D1\u63A7\u9875\u9762\u67E5\u770B\u622A\u5C4F\u8BB0\u5F55\u3002"
-                        })]
-                      }),
-                      onOk: function () {
-                        var _onOk = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2() {
-                          return regeneratorRuntime_default()().wrap(function _callee2$(_context2) {
-                            while (1) switch (_context2.prev = _context2.next) {
-                              case 0:
-                                data.screen_shot_open = value;
-                                setData(objectSpread2_default()({}, data));
-                              case 2:
-                              case "end":
-                                return _context2.stop();
-                            }
-                          }, _callee2);
-                        }));
-                        function onOk() {
-                          return _onOk.apply(this, arguments);
-                        }
-                        return onOk;
-                      }()
-                    });
-                    return;
-                  }
-                  data.screen_shot_open = value;
-                  setData(objectSpread2_default()({}, data));
-                }
-              }), /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-                className: "ml10",
-                children: "\u5B66\u751F\u9000\u51FA\u5168\u5C4F\u6216\u5207\u6362\u9875\u9762\u540E\u8FDB\u884C\u622A\u5C4F"
+                className: "c-red",
+                children: "\uFF08\u53EA\u5141\u8BB8\u5728Chrome\u8C37\u6B4C\u6D4F\u89C8\u5668\u4F5C\u7B54\uFF0C\u5E76\u4E14\u8981\u6C42\u5B66\u751F\u5B89\u88C5WebRTC Leak Prevent\u63D2\u4EF6\uFF09"
+              }), /*#__PURE__*/(0,jsx_runtime.jsx)("a", {
+                className: "c-blue",
+                target: "_blank",
+                href: "https://www.educoder.net/forums/4478",
+                children: "\u5982\u4F55\u5B89\u88C5WebRTC Leak Prevent\u63D2\u4EF6?"
               })]
-            }), /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
-              span: 24,
-              className: ConfigWorksmodules.mb28,
-              children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
-                checked: data.ip_limit !== 'no',
-                disabled: disabled,
-                onChange: function onChange(e) {
-                  // data.ip_bind = e.target.checked;
-                  // if (data.ip_bind) {
-                  //   data.ip_limit = data.ip_limit === "no" ? 'pub' : data.ip_limit
-                  // }
-                  if (data.ip_limit === 'no') {
-                    data.ip_limit = 'pub';
-                    if (!data.is_locked) {
-                      data.is_locked = true;
-                    }
-                  } else {
-                    data.ip_limit = 'no';
-                  }
-                  setData(Object.assign({}, data));
-                },
-                children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
+            }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+              name: "ip_bind_type",
+              style: {
+                marginBottom: 0
+              },
+              children: /*#__PURE__*/(0,jsx_runtime.jsxs)(es_radio/* default.Group */.ZP.Group, {
+                children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_radio/* default */.ZP, {
+                  value: false,
+                  children: "\u7ED1\u5B9A\u5916\u7F51IP"
+                }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_radio/* default */.ZP, {
+                  value: true,
+                  children: "\u7ED1\u5B9A\u5185\u7F51IP"
+                })]
+              })
+            })]
+          }) : /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+            hidden: true,
+            name: "ip_bind_type",
+            label: "(只用来在被隐藏的是时候进行收集数据)"
+          })]
+        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          className: "ant-form-item",
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+            name: "ip_limit",
+            valuePropName: "checked",
+            style: {
+              marginBottom: 0
+            },
+            children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
+              disabled: disabled,
+              children: /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+                children: [/*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
                   children: "\u9650\u5236\u8003\u8BD5\u8BBF\u95EEIP"
-                })
-              }), /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
-                placement: "right",
-                overlayStyle: {
-                  maxWidth: 600
-                },
-                title: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-                  children: "\u52FE\u9009\u540E\uFF0C\u4E0D\u5728IP\u8303\u56F4\u4E2D\u7684\u8BBE\u5907\u5C06\u65E0\u6CD5\u53C2\u52A0\u8003\u8BD5\u3002"
-                }),
-                children: /*#__PURE__*/(0,jsx_runtime.jsx)(QuestionCircleOutlined/* default */.Z, {
-                  style: {
-                    cursor: 'pointer',
-                    color: '#4C6FFF'
-                  }
-                })
-              })]
-            }), data.ip_limit !== 'no' && /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
-              className: "mt15 ".concat(ConfigWorksmodules.contentInterval),
+                }), /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+                  placement: "right",
+                  overlayStyle: {
+                    maxWidth: 600
+                  },
+                  title: "勾选后，不在IP范围中的设备将无法参加考试。",
+                  children: /*#__PURE__*/(0,jsx_runtime.jsx)(QuestionCircleOutlined/* default */.Z, {
+                    style: {
+                      cursor: 'pointer',
+                      color: '#4C6FFF',
+                      marginLeft: 8
+                    }
+                  })
+                })]
+              })
+            })
+          }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+            name: "public_ip",
+            label: "公网IP地址范围(只用来在被隐藏的是时候进行收集数据)",
+            hidden: true
+          }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+            name: "inner_ip",
+            label: "内网IP地址范围(只用来在被隐藏的是时候进行收集数据)",
+            hidden: true
+          }), (data === null || data === void 0 ? void 0 : data.ip_limit) && /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+            className: ConfigWorksmodules.unlockKeyWrapper,
+            style: {
+              flexDirection: "column"
+            },
+            children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
+              className: "mb10",
               children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
                 className: "c-red",
                 children: "\uFF08\u53EA\u5141\u8BB8\u5728Chrome\u8C37\u6B4C\u6D4F\u89C8\u5668\u4F5C\u7B54\uFF0C\u5E76\u4E14\u8981\u6C42\u5B66\u751F\u5B89\u88C5WebRTC Leak Prevent\u63D2\u4EF6\uFF09"
@@ -15015,18 +15212,14 @@ var PreventCheatingSettings_PublishSettings = function PublishSettings(_ref) {
                 href: "https://www.educoder.net/forums/4478",
                 children: "\u5982\u4F55\u5B89\u88C5WebRTC Leak Prevent\u63D2\u4EF6?"
               })]
-            })]
-          }), data.ip_limit !== 'no' && /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
-            children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
-              className: "mt15 ".concat(ConfigWorksmodules.contentInterval, " ").concat(ConfigWorksmodules.ipWrp),
+            }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+              className: "mt15 ".concat(ConfigWorksmodules.ipWrp),
               children: [/*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
-                children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-                  children: "\u516C\u7F51IP\u5730\u5740\u8303\u56F4\uFF1A"
-                })
+                children: "\u516C\u7F51IP\u5730\u5740\u8303\u56F4\uFF1A"
               }), /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
-                children: [!((_data$public_ip2 = data.public_ip) !== null && _data$public_ip2 !== void 0 && _data$public_ip2.length) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+                children: [!((_data$public_ip = data.public_ip) !== null && _data$public_ip !== void 0 && _data$public_ip.length) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
                   children: "\u5F53\u524D\u8FD8\u672A\u8BBE\u7F6EIP\u8303\u56F4"
-                }), (_data$public_ip3 = data.public_ip) === null || _data$public_ip3 === void 0 ? void 0 : _data$public_ip3.map(function (item, key) {
+                }), (_data$public_ip2 = data.public_ip) === null || _data$public_ip2 === void 0 ? void 0 : _data$public_ip2.map(function (item, key) {
                   return /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
                     className: ConfigWorksmodules.ipItem,
                     children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("i", {
@@ -15064,15 +15257,15 @@ var PreventCheatingSettings_PublishSettings = function PublishSettings(_ref) {
                 })]
               })]
             }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
-              className: "mt15 ".concat(ConfigWorksmodules.contentInterval, " ").concat(ConfigWorksmodules.ipWrp, " ").concat(ConfigWorksmodules.mb28),
+              className: "mt15 ".concat(ConfigWorksmodules.ipWrp),
               children: [/*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
                 children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
                   children: "\u5185\u7F51IP\u5730\u5740\u8303\u56F4\uFF1A"
                 })
               }), /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
-                children: [!((_data$inner_ip2 = data.inner_ip) !== null && _data$inner_ip2 !== void 0 && _data$inner_ip2.length) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+                children: [!((_data$inner_ip = data.inner_ip) !== null && _data$inner_ip !== void 0 && _data$inner_ip.length) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
                   children: "\u5F53\u524D\u8FD8\u672A\u8BBE\u7F6EIP\u8303\u56F4"
-                }), (_data$inner_ip3 = data.inner_ip) === null || _data$inner_ip3 === void 0 ? void 0 : _data$inner_ip3.map(function (item, key) {
+                }), (_data$inner_ip2 = data.inner_ip) === null || _data$inner_ip2 === void 0 ? void 0 : _data$inner_ip2.map(function (item, key) {
                   return /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
                     className: ConfigWorksmodules.ipItem,
                     children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("i", {
@@ -15108,209 +15301,151 @@ var PreventCheatingSettings_PublishSettings = function PublishSettings(_ref) {
                 })]
               })]
             })]
-          }), /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, {
-            children: /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
-              span: 24,
-              className: ConfigWorksmodules.mb28,
-              children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
-                checked: data.ip_bind,
-                disabled: disabled,
-                onChange: function onChange(e) {
-                  data.ip_bind = e.target.checked;
-                  if (!data.is_locked && data.ip_bind) {
-                    data.is_locked = true;
-                  }
-                  setData(Object.assign({}, data));
-                },
-                children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
-                  children: "IP\u5730\u5740\u7ED1\u5B9A"
-                })
-              }), /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
-                placement: "right",
-                overlayStyle: {
-                  maxWidth: 600
-                },
-                title: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-                  children: "\u52FE\u9009\u540E\uFF0C\u5F00\u59CB\u8003\u8BD5\u7684\u5B66\u751F\u8D26\u53F7\u5C06\u81EA\u52A8\u4E0E\u8BBE\u5907\u516C\u7F51IP\u6216\u5185\u7F51IP\u8FDB\u884C\u7ED1\u5B9A\u3002\u5982\u9047\u7279\u6B8A\u60C5\u51B5\uFF0C\u53EF\u7531\u6559\u5E08/\u52A9\u6559\u8FDB\u884CIP\u89E3\u7ED1\u3002"
-                }),
-                children: /*#__PURE__*/(0,jsx_runtime.jsx)(QuestionCircleOutlined/* default */.Z, {
-                  style: {
-                    cursor: 'pointer',
-                    color: '#4C6FFF'
-                  }
-                })
-              }), data.ip_bind && (0,authority/* isAdmin */.GJ)() && /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
-                className: ConfigWorksmodules.unlockKeyWrapper,
-                children: [data.ip_bind_type && /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
-                  span: 24,
-                  className: "mb10",
-                  children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-                    className: "c-red",
-                    children: "\uFF08\u53EA\u5141\u8BB8\u5728Chrome\u8C37\u6B4C\u6D4F\u89C8\u5668\u4F5C\u7B54\uFF0C\u5E76\u4E14\u8981\u6C42\u5B66\u751F\u5B89\u88C5WebRTC Leak Prevent\u63D2\u4EF6\uFF09"
-                  }), /*#__PURE__*/(0,jsx_runtime.jsx)("a", {
-                    className: "c-blue",
-                    target: "_blank",
-                    href: "https://www.educoder.net/forums/4478",
-                    children: "\u5982\u4F55\u5B89\u88C5WebRTC Leak Prevent\u63D2\u4EF6?"
-                  })]
-                }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
-                  children: /*#__PURE__*/(0,jsx_runtime.jsxs)(es_radio/* default.Group */.ZP.Group, {
-                    onChange: function onChange(e) {
-                      data.ip_bind_type = e.target.value;
-                      setData(Object.assign({}, data));
-                    },
-                    value: data.ip_bind_type,
-                    children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_radio/* default */.ZP, {
-                      value: false,
-                      children: "\u7ED1\u5B9A\u5916\u7F51IP"
-                    }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_radio/* default */.ZP, {
-                      value: true,
-                      children: "\u7ED1\u5B9A\u5185\u7F51IP"
-                    })]
+          })]
+        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          className: "ant-form-item",
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+            name: "open_camera",
+            valuePropName: "checked",
+            style: {
+              marginBottom: 0
+            },
+            children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
+              disabled: disabled,
+              children: /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+                children: [/*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
+                  children: "\u8003\u8BD5\u4E2D\u542F\u7528\u62CD\u7167\u529F\u80FD\u8FDB\u884C\u76D1\u8003\u548C\u884C\u4E3A\u5206\u6790"
+                }), /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+                  placement: "right",
+                  overlayStyle: {
+                    maxWidth: 600
+                  },
+                  title: "选中，则会在考试过程中使用电脑摄像头随机抓拍照片，用于监考和学习行为分析，分析结果可在学生答卷中查看。",
+                  children: /*#__PURE__*/(0,jsx_runtime.jsx)(QuestionCircleOutlined/* default */.Z, {
+                    style: {
+                      cursor: 'pointer',
+                      color: '#4C6FFF',
+                      marginLeft: 8
+                    }
                   })
                 })]
-              })]
+              })
             })
-          }), /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, {
-            children: /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
-              span: 24,
-              className: ConfigWorksmodules.mb28,
-              children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
-                checked: data.is_locked,
-                disabled: disabled,
-                onChange: function onChange(e) {
-                  data.is_locked = e.target.checked;
-                  if (!e.target.checked) data.login_restrict = false;
-                  setData(Object.assign({}, data));
+          }), data.open_camera ? /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+            gutter: 10,
+            className: "c-grey-333 ".concat(ConfigWorksmodules.unlockKeyWrapper),
+            align: "middle",
+            wrap: false,
+            children: [/*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+              children: "\u672C\u573A\u8003\u8BD5\u6700\u591A\u62CD\u6444\uFF1A"
+            }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+              children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+                name: "photo_count",
+                style: {
+                  marginBottom: 0
                 },
-                children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
-                  children: "\u8003\u8BD5\u89E3\u9501\u7801"
+                children: /*#__PURE__*/(0,jsx_runtime.jsx)(input_number/* default */.Z, {
+                  size: 'middle',
+                  disabled: disabled || !data.open_camera,
+                  min: 1,
+                  max: (0,authority/* isSuperAdmins */.Ny)() ? 1000 : 10
                 })
+              })
+            }), /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
+              children: ["\uFF08\u6B21\uFF09", /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+                className: "c-grey-c font12 ml10",
+                children: "\u8BF7\u586B\u5199\u4E0D\u5927\u4E8E10\u7684\u6B63\u6574\u6570"
+              })]
+            })]
+          }) : /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+            hidden: true,
+            name: "photo_count",
+            label: "(只用来在被隐藏的是时候进行收集数据)"
+          })]
+        }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+          name: "identity_verify",
+          valuePropName: "checked",
+          children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
+            disabled: !(0,authority/* isCommonSuperAdminOrOperation */.ag)() || disabled,
+            children: /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+              children: [/*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
+                children: "\u8003\u8BD5\u524D\u4EBA\u8138\u8EAB\u4EFD\u6838\u9A8C"
               }), /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
                 placement: "right",
                 overlayStyle: {
                   maxWidth: 600
                 },
-                title: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-                  children: "\u52FE\u9009\u540E\uFF0C\u5982\u679C\u5B66\u751F\u5728\u8003\u8BD5\u4E2D\u9014\u9000\u51FA\u60F3\u518D\u7EE7\u7EED\u8003\u8BD5\uFF0C\u9700\u8981\u4F7F\u7528\u89E3\u9501\u7801\u8FDB\u884C\u89E3\u9501\u3002"
-                }),
+                title: "勾选后，学生开始考试前将会要求调用摄像头完成拍照采集，系统将自动对采集的学生照片与已录入照片进行比对审核（教师/助教也可进行手动审核），审核通过之后学生才能开始考试。",
                 children: /*#__PURE__*/(0,jsx_runtime.jsx)(QuestionCircleOutlined/* default */.Z, {
                   style: {
                     cursor: 'pointer',
-                    color: '#4C6FFF'
+                    color: '#4C6FFF',
+                    marginLeft: 8
                   }
                 })
-              }), /*#__PURE__*/(0,jsx_runtime.jsx)("br", {}), data.is_locked && (0,authority/* isAdmin */.GJ)() && /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
-                className: ConfigWorksmodules.unlockKeyWrapper,
-                children: [/*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z, {
-                  placeholder: "\u8BF7\u8F93\u5165\u8003\u8BD5\u89E3\u9501\u7801",
-                  value: data.unlock_key,
-                  disabled: disabled,
-                  onChange: function onChange(e) {
-                    return setData(function (prevData) {
-                      return objectSpread2_default()(objectSpread2_default()({}, prevData), {}, {
-                        unlock_key: e.target.value
-                      });
-                    });
-                  },
-                  className: ConfigWorksmodules.unlockKeyInput
-                }), data.is_locked && !disabled && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, {
-                  type: "link",
-                  onClick: function onClick() {
-                    data.unlock_key = Math.floor(Math.random() * 1000000);
-                    setData(objectSpread2_default()({}, data));
-                  },
-                  children: "\u6362\u4E00\u6362"
-                })]
               })]
             })
-          }), /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, {
-            children: /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
-              span: 24,
-              className: ConfigWorksmodules.mb28,
-              children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
-                checked: data.login_restrict,
-                disabled: disabled,
-                onChange: function onChange(e) {
-                  data.login_restrict = e.target.checked;
-                  if (e.target.checked) data.is_locked = true;
-                  setData(Object.assign({}, data));
-                },
-                children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
-                  children: "\u8003\u8BD5\u767B\u5F55\u9650\u5236"
-                })
+          })
+        }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+          name: "open_phone_video_recording",
+          valuePropName: "checked",
+          children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
+            disabled: !(0,authority/* isCommonSuperAdminOrOperation */.ag)() || disabled,
+            children: /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+              children: [/*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
+                children: "\u8003\u8BD5\u4E2D\u5F00\u542F\u624B\u673A\u89C6\u9891\u5F55\u5236"
               }), /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
                 placement: "right",
                 overlayStyle: {
                   maxWidth: 600
                 },
-                title: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-                  children: "\u52FE\u9009\u540E\uFF0C\u5B66\u751F\u5728\u8003\u8BD5\u671F\u95F4\u7B2C\u4E8C\u6B21\u53CA\u540E\u7EED\u767B\u5F55\u7CFB\u7EDF\u65F6\uFF0C\u9700\u8981\u76D1\u8003\u8001\u5E08\u8F93\u5165\u8003\u8BD5\u89E3\u9501\u7801\u624D\u80FD\u767B\u5F55\u7CFB\u7EDF"
-                }),
+                title: "勾选后，学生开始考试前必须先开启手机录制视频，由教师/助教在试卷详情-摄像监控页面对学生进行身份审核。",
                 children: /*#__PURE__*/(0,jsx_runtime.jsx)(QuestionCircleOutlined/* default */.Z, {
                   style: {
                     cursor: 'pointer',
-                    color: '#4C6FFF'
+                    color: '#4C6FFF',
+                    marginLeft: 8
                   }
                 })
               })]
             })
-          }), /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, {
-            children: /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
-              span: 24,
-              className: ConfigWorksmodules.mb28,
-              children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
-                checked: data.is_start_locked,
-                disabled: disabled,
-                onChange: function onChange(e) {
-                  data.is_start_locked = e.target.checked;
-                  setData(Object.assign({}, data));
-                },
-                children: /*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
-                  children: "\u5F00\u8003\u5BC6\u7801"
-                })
+          })
+        }), (commonHeader === null || commonHeader === void 0 ? void 0 : commonHeader.is_random) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+          name: "use_blank_score",
+          valuePropName: "checked",
+          children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
+            disabled: (commonHeader === null || commonHeader === void 0 ? void 0 : commonHeader.exercise_status) != 1 ? true : disabled,
+            children: /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+              children: [/*#__PURE__*/(0,jsx_runtime.jsx)("strong", {
+                children: "\u591A\u9009\u9898\u90E8\u5206\u5F97\u5206"
               }), /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
                 placement: "right",
                 overlayStyle: {
                   maxWidth: 600
                 },
-                title: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-                  children: "\u52FE\u9009\u540E\uFF0C\u5B66\u751F\u7B2C\u4E00\u6B21\u8FDB\u5165\u8003\u8BD5\u65F6\uFF0C\u9700\u8981\u8F93\u5165\u5F00\u8003\u5BC6\u7801\u624D\u80FD\u8FDB\u5165\u8003\u8BD5\u7B54\u9898\u9875\u9762"
+                title: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+                  children: ["\u672A\u52FE\u9009 \u5168\u5BF9\u7ED9\u5206\uFF1A\u9009\u4E2D\u7684\u7B54\u6848\u5168\u90E8\u6B63\u786E\u4E14\u672A\u6F0F\u9009\u6B63\u786E\u7B54\u6848\uFF0C\u5219\u83B7\u5F97\u8BE5\u5C0F\u9898\u7684\u5206\u503C\u3002", /*#__PURE__*/(0,jsx_runtime.jsx)("br", {}), "\u5DF2\u52FE\u9009 \u6F0F\u9009\u7ED9\u5206\uFF1A\u9009\u4E2D\u7684\u7B54\u6848\u5168\u90E8\u6B63\u786E\u4F46\u6709\u6F0F\u9009\u6B63\u786E\u7B54\u6848\uFF0C\u5219\u83B7\u5F97\u7684\u5206\u503C=\u9009\u4E2D\u7684\u7B54\u6848\u4E2A\u6570 * (\u8BE5\u5C0F\u9898\u5206\u503C / \u6B63\u786E\u7B54\u6848\u7684\u4E2A\u6570)\uFF1B"]
                 }),
                 children: /*#__PURE__*/(0,jsx_runtime.jsx)(QuestionCircleOutlined/* default */.Z, {
                   style: {
                     cursor: 'pointer',
-                    color: '#4C6FFF'
+                    color: '#4C6FFF',
+                    marginLeft: 8
                   }
                 })
-              }), /*#__PURE__*/(0,jsx_runtime.jsx)("br", {}), data.is_start_locked && (0,authority/* isAdmin */.GJ)() && /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, {
-                className: ConfigWorksmodules.unlockKeyWrapper,
-                children: /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z, {
-                  value: data.start_password,
-                  disabled: disabled,
-                  placeholder: "\u8BF7\u8F93\u5165\u5F00\u8003\u5BC6\u7801",
-                  onChange: function onChange(e) {
-                    return setData(function (prevData) {
-                      return objectSpread2_default()(objectSpread2_default()({}, prevData), {}, {
-                        start_password: e.target.value
-                      });
-                    });
-                  },
-                  className: ConfigWorksmodules.unlockKeyInput
-                })
               })]
             })
-          })]
-        }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
-          children: ((0,authority/* isAdminOrCreator */.aN)() || (exercise === null || exercise === void 0 || (_exercise$commonHeade = exercise.commonHeader) === null || _exercise$commonHeade === void 0 ? void 0 : _exercise$commonHeade.exercise_author)) && /*#__PURE__*/(0,jsx_runtime.jsx)(FixedButton/* FixedButton */.t, {
-            okText: "\u4FDD\u5B58\u8BBE\u7F6E",
-            onCancel: function onCancel() {
-              setDefaultData();
-            },
-            onOk: handleSubmit
           })
         })]
-      })
+      }), ((0,authority/* isAdminOrCreator */.aN)() || (exercise === null || exercise === void 0 || (_exercise$commonHeade = exercise.commonHeader) === null || _exercise$commonHeade === void 0 ? void 0 : _exercise$commonHeade.exercise_author)) && /*#__PURE__*/(0,jsx_runtime.jsx)(FixedButton/* FixedButton */.t, {
+        okText: "\u4FDD\u5B58\u8BBE\u7F6E",
+        onCancel: function onCancel() {
+          setDefaultData();
+        },
+        onOk: function onOk() {
+          form.submit();
+        }
+      })]
     }), /*#__PURE__*/(0,jsx_runtime.jsx)(components_AddIPRange, {})]
   });
 };
@@ -16184,7 +16319,7 @@ var DistinguishExerciseSettings_PublishSettings = function PublishSettings(_ref)
                 }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
                   children: "1.\u6709\u5B66\u751F\u4EA4\u5377;"
                 }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-                  children: "2.\u8003\u8BD5\u72B6\u6001\u4E3A\"\u5DF2\u7ED3\u675F\";"
+                  children: "2.\u8003\u8BD5\u72B6\u6001\u4E3A\"\u5DF2\u622A\u6B62\";"
                 }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
                   children: "3.\u8BD5\u5377\u542B\u6709\u586B\u7A7A\u3001\u7F16\u7A0B\u3001\u5B9E\u8BAD\u3001\u7B80\u7B54\u9898\u4E2D\u4EFB\u610F\u9898\u578B\u3002"
                 }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -16969,9 +17104,9 @@ var StatisticsResult_WorkList = function WorkList(_ref) {
                           style: {
                             alignItems: 'center'
                           },
-                          children: [item.ques_type === 2 || item.ques_type === 3 || item.ques_type === 4 ? '' : /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
+                          children: [item.ques_type === 2 || item.ques_type === 3 || item.ques_type === 4 || (ite === null || ite === void 0 ? void 0 : ite.ques_type) === 4 ? '' : /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
                             children: [util/* ZimuSort */.oV[key], ". "]
-                          }), item.ques_type === 4 ? /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+                          }), item.ques_type === 4 || ite.ques_type === 4 ? /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
                             flex: 1,
                             className: "ml10",
                             children: /*#__PURE__*/(0,jsx_runtime.jsx)(RenderHtml/* default */.Z, {
@@ -17043,7 +17178,8 @@ var StatisticsResult_WorkList = function WorkList(_ref) {
                   }), /*#__PURE__*/(0,jsx_runtime.jsx)(divider/* default */.Z, {
                     style: {
                       margin: 0,
-                      marginBottom: 20
+                      marginBottom: 20,
+                      marginTop: 10
                     }
                   }), val === null || val === void 0 ? void 0 : val.challenge_details.map(function (j, index) {
                     return /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
@@ -17087,14 +17223,17 @@ var StatisticsResult_WorkList = function WorkList(_ref) {
                     }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
                       flex: '60px',
                       className: "tc",
-                      children: item.effictive_counts
+                      children: val === null || val === void 0 ? void 0 : val.challenge_details.reduce(function (acc, curr) {
+                        return acc + curr.choice_users_count;
+                      }, 0)
                     }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
                       flex: '200px'
                     })]
                   }), /*#__PURE__*/(0,jsx_runtime.jsx)(divider/* default */.Z, {
                     style: {
                       margin: 0,
-                      marginBottom: 20
+                      marginBottom: 20,
+                      marginTop: 10
                     }
                   })]
                 }, key) : /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
@@ -20616,8 +20755,6 @@ var StepPreview = __webpack_require__(70021);
 var skeleton = __webpack_require__(59981);
 // EXTERNAL MODULE: ./src/utils/fetch.ts
 var fetch = __webpack_require__(78092);
-// EXTERNAL MODULE: ./node_modules/_lodash@4.17.21@lodash/lodash.js
-var lodash = __webpack_require__(89392);
 // EXTERNAL MODULE: ./src/utils/util.tsx
 var util = __webpack_require__(88123);
 // EXTERNAL MODULE: ./node_modules/_react@17.0.2@react/jsx-runtime.js
@@ -20636,7 +20773,6 @@ var jsx_runtime = __webpack_require__(37712);
 
 
 
-
 var PaperlibraryPage = function PaperlibraryPage(_ref) {
   var _useLocation, _userInfo$course;
   var paperlibrary = _ref.paperlibrary,
@@ -20757,7 +20893,7 @@ var PaperlibraryPage = function PaperlibraryPage(_ref) {
   //换一题
   var handleExchange = /*#__PURE__*/function () {
     var _ref3 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2(record, other) {
-      var res, _clonePreviewData$que, clonePreviewData;
+      var res;
       return regeneratorRuntime_default()().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -20771,19 +20907,21 @@ var PaperlibraryPage = function PaperlibraryPage(_ref) {
           case 2:
             res = _context2.sent;
             if (res !== null && res !== void 0 && res.question) {
-              clonePreviewData = (0,lodash.cloneDeep)(editData);
-              clonePreviewData.questionList = clonePreviewData === null || clonePreviewData === void 0 || (_clonePreviewData$que = clonePreviewData.questionList) === null || _clonePreviewData$que === void 0 ? void 0 : _clonePreviewData$que.map(function (e) {
-                if (e.type === other.type) {
-                  var new_questions = (0,lodash.cloneDeep)(e === null || e === void 0 ? void 0 : e.questions);
-                  new_questions.splice(other.index, 1, res === null || res === void 0 ? void 0 : res.question);
-                  // console.log(e?.questions, new_questions, other.index, 'new_questions')
-                  return objectSpread2_default()(objectSpread2_default()({}, e), {}, {
-                    questions: new_questions
-                  });
-                }
-                return e;
-              });
-              setEditData(clonePreviewData);
+              getEditData(0);
+              // let clonePreviewData = cloneDeep(editData)
+              // clonePreviewData.questionList = clonePreviewData?.questionList?.map((e: any) => {
+              //   if (e.type === other.type) {
+              //     const new_questions = cloneDeep(e?.questions);
+              //     new_questions.splice(other.index, 1, res?.question);
+              //     // console.log(e?.questions, new_questions, other.index, 'new_questions')
+              //     return {
+              //       ...e, questions: new_questions
+              //     }
+              //   }
+              //   return e
+              // })
+
+              // setEditData(clonePreviewData)
             }
           case 4:
           case "end":
diff --git a/p__Classrooms__Lists__Exercise__Detail__index.chunk.css b/p__Classrooms__Lists__Exercise__Detail__index.chunk.css
index 7d34e71a3b..07a10156fe 100644
--- a/p__Classrooms__Lists__Exercise__Detail__index.chunk.css
+++ b/p__Classrooms__Lists__Exercise__Detail__index.chunk.css
@@ -1545,6 +1545,29 @@ div[class~="ant-modal-confirm-content"] {
   flex-direction: column;
   box-orient: block-axis;
 }
+.formDom___ahHwX {
+  margin-top: 30px;
+  margin-bottom: 20px;
+  padding-bottom: 40px;
+}
+.formDom___ahHwX strong {
+  font-weight: normal;
+  color: #333;
+  font-size: 16px;
+}
+.formDom___ahHwX label[class~='ant-radio-wrapper'],
+.formDom___ahHwX label[class~='ant-checkbox-wrapper'] {
+  font-size: 16px;
+  font-weight: 500;
+  color: #333333;
+}
+.formDom___ahHwX label[class~='ant-radio-wrapper'] span,
+.formDom___ahHwX label[class~='ant-checkbox-wrapper'] span {
+  color: #333333;
+}
+.formDom___ahHwX div[class~='ant-form-item'] {
+  margin-bottom: 28px;
+}
 .form___TDc55 {
   margin-bottom: 20px;
   padding-bottom: 40px;
diff --git a/p__Classrooms__Lists__Exercise__ImitateAnswer__index.async.js b/p__Classrooms__Lists__Exercise__ImitateAnswer__index.async.js
index 6120a642ea..afe581690c 100644
--- a/p__Classrooms__Lists__Exercise__ImitateAnswer__index.async.js
+++ b/p__Classrooms__Lists__Exercise__ImitateAnswer__index.async.js
@@ -1408,8 +1408,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1696,8 +1696,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__Classrooms__Lists__Exercise__Review__index.async.js b/p__Classrooms__Lists__Exercise__Review__index.async.js
index 88090a2ab8..f71217542f 100644
--- a/p__Classrooms__Lists__Exercise__Review__index.async.js
+++ b/p__Classrooms__Lists__Exercise__Review__index.async.js
@@ -2420,7 +2420,8 @@ var Shixun = function Shixun(_ref) {
                 _context2.next = 2;
                 return (0,classrooms/* getCommitIdContent */.Lk)(record.game_identifier, {
                   path: (_record$path = record.path) === null || _record$path === void 0 || (_record$path = _record$path.replace(/\；/g, ";")) === null || _record$path === void 0 || (_record$path = _record$path.split(";")) === null || _record$path === void 0 ? void 0 : _record$path[0],
-                  query_index: record.query_index
+                  query_index: record.query_index,
+                  exercise_id: exerciseId
                 });
               case 2:
                 res = _context2.sent;
diff --git a/p__Classrooms__Lists__Exercise__index.async.js b/p__Classrooms__Lists__Exercise__index.async.js
index df4b825db6..a0fa4f36b7 100644
--- a/p__Classrooms__Lists__Exercise__index.async.js
+++ b/p__Classrooms__Lists__Exercise__index.async.js
@@ -1776,7 +1776,7 @@ var Unlock = __webpack_require__(61847);
 
 
 var List = function List(_ref) {
-  var _v$exercise_tips, _v$exercise_tips2, _v$exercise_tips3, _classroomList$Assist3, _v$exercise_tips5, _v$exercise_tips6, _v$exercise_tips7, _v$exercise_tips8, _v$exercise_tips9, _v$group_status, _v$group_status2, _v$group_status3, _v$exercise_tips10, _v$exercise_tips11;
+  var _v$exercise_tips, _v$exercise_tips2, _v$exercise_tips3, _classroomList$Assist3, _v$exercise_tips5, _v$exercise_tips6, _v$exercise_tips7, _v$exercise_tips8, _v$exercise_tips9, _v$exercise_tips10, _v$exercise_tips11;
   var v = _ref.v,
     k = _ref.k,
     match = _ref.match,
@@ -1887,7 +1887,7 @@ var List = function List(_ref) {
       text: '考试中',
       value: 2
     }, {
-      text: '已结束',
+      text: '已截止',
       value: 3
     }],
     onFilter: function onFilter(value, record) {
@@ -1915,7 +1915,7 @@ var List = function List(_ref) {
             style: {
               background: '#FC2D6B'
             }
-          }), "\u5DF2\u7ED3\u675F"]
+          }), "\u5DF2\u622A\u6B62"]
         })]
       });
     }
@@ -1928,7 +1928,7 @@ var List = function List(_ref) {
     showSorterTooltip: false,
     sortOrder: params.order_by === "publish_time" ? params.sort_direction === "desc" ? "descend" : "ascend" : null
   }, {
-    title: '结束时间',
+    title: '截止时间',
     dataIndex: 'end_time',
     key: 'end_time',
     sorter: true,
@@ -2008,7 +2008,7 @@ var List = function List(_ref) {
           backgroundColor: '#FC2D6B'
         },
         className: "tag-style mr10",
-        children: "\u5DF2\u7ED3\u675F"
+        children: "\u5DF2\u622A\u6B62"
       });
     }
     if (v !== null && v !== void 0 && v.includes('未开始')) {
@@ -2029,13 +2029,13 @@ var List = function List(_ref) {
         children: "\u8003\u8BD5\u4E2D"
       });
     }
-    if (v !== null && v !== void 0 && v.includes('已结束')) {
+    if (v !== null && v !== void 0 && v.includes('已截止')) {
       return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
         style: {
           backgroundColor: '#FC2D6B'
         },
         className: "tag-style mr10",
-        children: "\u5DF2\u7ED3\u675F"
+        children: "\u5DF2\u622A\u6B62"
       });
     }
   };
@@ -2089,7 +2089,7 @@ var List = function List(_ref) {
             },
             className: "tag-style-fzb iconfont icon-fangzuobi",
             children: "\u5DF2\u5F00\u542F\u9632\u4F5C\u5F0A"
-          }), (v === null || v === void 0 || (_v$exercise_tips2 = v.exercise_tips) === null || _v$exercise_tips2 === void 0 ? void 0 : _v$exercise_tips2.includes('已结束')) && (v === null || v === void 0 || (_v$exercise_tips3 = v.exercise_tips) === null || _v$exercise_tips3 === void 0 ? void 0 : _v$exercise_tips3.includes('未提交')) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          }), (v === null || v === void 0 || (_v$exercise_tips2 = v.exercise_tips) === null || _v$exercise_tips2 === void 0 ? void 0 : _v$exercise_tips2.includes('已截止')) && (v === null || v === void 0 || (_v$exercise_tips3 = v.exercise_tips) === null || _v$exercise_tips3 === void 0 ? void 0 : _v$exercise_tips3.includes('未提交')) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
             style: {
               flexShrink: 0,
               backgroundColor: '#B8B8B8'
@@ -2335,7 +2335,7 @@ var List = function List(_ref) {
                 className: "font16 c-grey-999",
                 children: "\u8FDF\u5230\u7981\u6B62\u7B54\u9898"
               })
-            }), !v.off_limits && v.current_status === 0 && v.exercise_status > 1 && !((_v$exercise_tips5 = v.exercise_tips) !== null && _v$exercise_tips5 !== void 0 && _v$exercise_tips5.includes('已结束')) && /*#__PURE__*/(0,jsx_runtime.jsx)("a", {
+            }), !v.off_limits && v.current_status === 0 && v.exercise_status > 1 && !((_v$exercise_tips5 = v.exercise_tips) !== null && _v$exercise_tips5 !== void 0 && _v$exercise_tips5.includes('已截止')) && /*#__PURE__*/(0,jsx_runtime.jsx)("a", {
               onClick: function onClick(e) {
                 e.stopPropagation();
                 e.preventDefault();
@@ -2376,7 +2376,7 @@ var List = function List(_ref) {
                 };
               }()),
               children: "\u67E5\u770B\u8003\u8BD5"
-            }), !v.off_limits && v.current_status === 2 && v.exercise_status > 1 && !((_v$exercise_tips6 = v.exercise_tips) !== null && _v$exercise_tips6 !== void 0 && _v$exercise_tips6.includes('已结束')) && /*#__PURE__*/(0,jsx_runtime.jsx)("a", {
+            }), !v.off_limits && v.current_status === 2 && v.exercise_status > 1 && !((_v$exercise_tips6 = v.exercise_tips) !== null && _v$exercise_tips6 !== void 0 && _v$exercise_tips6.includes('已截止')) && /*#__PURE__*/(0,jsx_runtime.jsx)("a", {
               style: {
                 color: (v === null || v === void 0 ? void 0 : v.is_redo) === 1 && 'red'
               },
@@ -2467,27 +2467,35 @@ var List = function List(_ref) {
             letterSpacing: 2
           },
           className: "c-grey-333 mr15",
-          children: "\u73ED\u7EA7\u4F7F\u7528\u60C5\u51B5\uFF1A"
+          children: "\u63D0\u4EA4\u72B6\u6001\uFF1A"
         }), /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
           className: "c-grey-333 mr20",
           children: ["\u672A\u5F00\u59CB", /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-            children: v === null || v === void 0 || (_v$group_status = v.group_status) === null || _v$group_status === void 0 ? void 0 : _v$group_status[0]
+            children: v === null || v === void 0 ? void 0 : v.unanswer_users
           })]
         }), /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
           className: "c-grey-333 mr20",
           children: ["\u8003\u8BD5\u4E2D ", /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
             style: {
-              color: '#4EACFF'
+              color: 'rgb(90, 184, 145)'
+            },
+            children: v === null || v === void 0 ? void 0 : v.answering_users
+          })]
+        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+          className: "c-grey-333 mr20",
+          children: ["\u5DF2\u4EA4\u5377 ", /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+            style: {
+              color: '#FC2D6B'
             },
-            children: v === null || v === void 0 || (_v$group_status2 = v.group_status) === null || _v$group_status2 === void 0 ? void 0 : _v$group_status2[1]
+            children: v === null || v === void 0 ? void 0 : v.answer_users
           })]
         }), /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
           className: "c-grey-333",
-          children: ["\u5DF2\u7ED3\u675F ", /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          children: ["\u5DF2\u4EA4\u5377/\u672A\u7B54 ", /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
             style: {
               color: '#FC2D6B'
             },
-            children: v === null || v === void 0 || (_v$group_status3 = v.group_status) === null || _v$group_status3 === void 0 ? void 0 : _v$group_status3[2]
+            children: v === null || v === void 0 ? void 0 : v.commit_with_no_answers_users
           })]
         })]
       }), (0,authority/* isAdmin */.GJ)() && !(v !== null && v !== void 0 && (_v$exercise_tips10 = v.exercise_tips) !== null && _v$exercise_tips10 !== void 0 && _v$exercise_tips10.includes('未开始')) && isshow && lists.length > 5 && /*#__PURE__*/(0,jsx_runtime.jsx)(table/* default */.Z, {
@@ -2835,7 +2843,7 @@ var ShixunsListPage = function ShixunsListPage(_ref) {
   },
   //新增集中阅卷tab
   {
-    name: '已结束',
+    name: '已截止',
     id: 3,
     total: (_detailExerciseList$e5 = detailExerciseList.exercises_counts) === null || _detailExerciseList$e5 === void 0 ? void 0 : _detailExerciseList$e5.end_counts
   }];
diff --git a/p__Classrooms__Lists__Graduation__Tasks__Detail__index.async.js b/p__Classrooms__Lists__Graduation__Tasks__Detail__index.async.js
index d578e49d4d..1b73de7bff 100644
--- a/p__Classrooms__Lists__Graduation__Tasks__Detail__index.async.js
+++ b/p__Classrooms__Lists__Graduation__Tasks__Detail__index.async.js
@@ -1003,8 +1003,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1291,8 +1291,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__Classrooms__Lists__Graduation__Topics__Detail__index.async.js b/p__Classrooms__Lists__Graduation__Topics__Detail__index.async.js
index 580af5910b..0441f77fc9 100644
--- a/p__Classrooms__Lists__Graduation__Topics__Detail__index.async.js
+++ b/p__Classrooms__Lists__Graduation__Topics__Detail__index.async.js
@@ -1003,8 +1003,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1291,8 +1291,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__Classrooms__Lists__GroupHomework__Detail__index.async.js b/p__Classrooms__Lists__GroupHomework__Detail__index.async.js
index e24ee618df..2b4b52b9c8 100644
--- a/p__Classrooms__Lists__GroupHomework__Detail__index.async.js
+++ b/p__Classrooms__Lists__GroupHomework__Detail__index.async.js
@@ -2568,8 +2568,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -2856,8 +2856,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
@@ -15674,7 +15674,8 @@ var Detail_ShixunsListPage = function ShixunsListPage(_ref) {
     }), /*#__PURE__*/(0,jsx_runtime.jsx)(components_Group, {
       cb: function cb() {
         setStudentGroupingIndex(studentGroupingIndex + 1);
-        setActiveTabs('5');
+        setActiveTabs('0');
+        getData();
       }
     }), /*#__PURE__*/(0,jsx_runtime.jsx)(components_ExchangeGroup, {
       cb: function cb() {
diff --git a/p__Classrooms__Lists__Polls__Answer__index.async.js b/p__Classrooms__Lists__Polls__Answer__index.async.js
index a82e372759..41732555be 100644
--- a/p__Classrooms__Lists__Polls__Answer__index.async.js
+++ b/p__Classrooms__Lists__Polls__Answer__index.async.js
@@ -337,7 +337,7 @@ var mapping = {
   3: "主观题"
 };
 var Answer = function Answer(_ref) {
-  var _answerData$course, _user$userInfo, _answerData$poll, _answerData$poll2, _answerData$poll3, _answerData$poll4, _answerData$questions2, _answerData$question_2, _answerData$question_3, _answerData$question_4, _answerData$question_5, _answerData$question_6, _answerData$question_7, _answerData$question_8, _answerData$question_9, _answerData$poll5;
+  var _answerData$course, _answerData$question_2, _answerData$poll, _answerData$poll2, _answerData$poll3, _answerData$poll4, _answerData$questions2, _answerData$question_3, _answerData$question_4, _answerData$question_5, _answerData$question_6, _answerData$question_7, _answerData$question_8, _answerData$question_9, _answerData$question_10, _answerData$poll5;
   var globalSetting = _ref.globalSetting,
     loading = _ref.loading,
     user = _ref.user,
@@ -516,7 +516,7 @@ var Answer = function Answer(_ref) {
               children: "\u95EE\u5377\u8BE6\u60C5"
             })
           }), /*#__PURE__*/(0,jsx_runtime.jsx)(breadcrumb/* default */.Z.Item, {
-            children: (_user$userInfo = user.userInfo) === null || _user$userInfo === void 0 ? void 0 : _user$userInfo.real_name
+            children: answerData === null || answerData === void 0 || (_answerData$question_2 = answerData.question_types) === null || _answerData$question_2 === void 0 ? void 0 : _answerData$question_2.user_name
           })]
         })
       }), /*#__PURE__*/(0,jsx_runtime.jsx)("aside", {
@@ -604,23 +604,23 @@ var Answer = function Answer(_ref) {
           maxHeight: '60%',
           padding: '20px'
         },
-        children: ["\u5171", answerData === null || answerData === void 0 || (_answerData$question_2 = answerData.question_types) === null || _answerData$question_2 === void 0 ? void 0 : _answerData$question_2.q_counts, "\u9053\u9898\uFF1A", /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+        children: ["\u5171", answerData === null || answerData === void 0 || (_answerData$question_3 = answerData.question_types) === null || _answerData$question_3 === void 0 ? void 0 : _answerData$question_3.q_counts, "\u9053\u9898\uFF1A", /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
           style: {
             display: 'flex',
             margin: '5px 0px'
           },
-          children: [(answerData === null || answerData === void 0 || (_answerData$question_3 = answerData.question_types) === null || _answerData$question_3 === void 0 ? void 0 : _answerData$question_3.q_singles) > 0 && /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+          children: [(answerData === null || answerData === void 0 || (_answerData$question_4 = answerData.question_types) === null || _answerData$question_4 === void 0 ? void 0 : _answerData$question_4.q_singles) > 0 && /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
             className: " c-grey-999",
-            children: ["\u5355\u9009\u9898 ", answerData === null || answerData === void 0 || (_answerData$question_4 = answerData.question_types) === null || _answerData$question_4 === void 0 ? void 0 : _answerData$question_4.q_singles, "\u9898"]
-          }), (answerData === null || answerData === void 0 || (_answerData$question_5 = answerData.question_types) === null || _answerData$question_5 === void 0 ? void 0 : _answerData$question_5.q_doubles) > 0 && /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+            children: ["\u5355\u9009\u9898 ", answerData === null || answerData === void 0 || (_answerData$question_5 = answerData.question_types) === null || _answerData$question_5 === void 0 ? void 0 : _answerData$question_5.q_singles, "\u9898"]
+          }), (answerData === null || answerData === void 0 || (_answerData$question_6 = answerData.question_types) === null || _answerData$question_6 === void 0 ? void 0 : _answerData$question_6.q_doubles) > 0 && /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
             style: {
               margin: '0px 5px'
             },
             className: " c-grey-999",
-            children: ["\u591A\u9009\u9898 ", answerData === null || answerData === void 0 || (_answerData$question_6 = answerData.question_types) === null || _answerData$question_6 === void 0 ? void 0 : _answerData$question_6.q_doubles, "\u9898"]
-          }), (answerData === null || answerData === void 0 || (_answerData$question_7 = answerData.question_types) === null || _answerData$question_7 === void 0 ? void 0 : _answerData$question_7.q_mains) > 0 && /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+            children: ["\u591A\u9009\u9898 ", answerData === null || answerData === void 0 || (_answerData$question_7 = answerData.question_types) === null || _answerData$question_7 === void 0 ? void 0 : _answerData$question_7.q_doubles, "\u9898"]
+          }), (answerData === null || answerData === void 0 || (_answerData$question_8 = answerData.question_types) === null || _answerData$question_8 === void 0 ? void 0 : _answerData$question_8.q_mains) > 0 && /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
             className: " c-grey-999",
-            children: ["\u4E3B\u89C2\u9898 ", answerData === null || answerData === void 0 || (_answerData$question_8 = answerData.question_types) === null || _answerData$question_8 === void 0 ? void 0 : _answerData$question_8.q_mains, "\u9898"]
+            children: ["\u4E3B\u89C2\u9898 ", answerData === null || answerData === void 0 || (_answerData$question_9 = answerData.question_types) === null || _answerData$question_9 === void 0 ? void 0 : _answerData$question_9.q_mains, "\u9898"]
           })]
         }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
           style: {
@@ -664,7 +664,7 @@ var Answer = function Answer(_ref) {
             children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_anchor/* default */.Z, {
               affix: false,
               className: Answermodules.anchor,
-              children: answerData === null || answerData === void 0 || (_answerData$question_9 = answerData.question_answered) === null || _answerData$question_9 === void 0 ? void 0 : _answerData$question_9.map(function (item, key) {
+              children: answerData === null || answerData === void 0 || (_answerData$question_10 = answerData.question_answered) === null || _answerData$question_10 === void 0 ? void 0 : _answerData$question_10.map(function (item, key) {
                 return /*#__PURE__*/(0,jsx_runtime.jsx)(es_anchor/* default */.Z.Link, {
                   className: "".concat(Answermodules.answerFlag, " ").concat(item.ques_status == 1 ? Answermodules.answerActive : isclick && item.is_necessary === 1 ? Answermodules.redactivie : ''),
                   href: "#Anchor_".concat(key),
diff --git a/p__Classrooms__Lists__ProgramHomework__Comment__index.async.js b/p__Classrooms__Lists__ProgramHomework__Comment__index.async.js
index 2f22100a09..4e44e84801 100644
--- a/p__Classrooms__Lists__ProgramHomework__Comment__index.async.js
+++ b/p__Classrooms__Lists__ProgramHomework__Comment__index.async.js
@@ -530,8 +530,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -818,8 +818,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__Classrooms__Lists__ProgramHomework__Detail__index.async.js b/p__Classrooms__Lists__ProgramHomework__Detail__index.async.js
index 86c7aa47de..53d3073f61 100644
--- a/p__Classrooms__Lists__ProgramHomework__Detail__index.async.js
+++ b/p__Classrooms__Lists__ProgramHomework__Detail__index.async.js
@@ -817,8 +817,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1105,8 +1105,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__Classrooms__Lists__ShixunHomeworks__Comment__index.async.js b/p__Classrooms__Lists__ShixunHomeworks__Comment__index.async.js
index 8ff42ae81f..b52214a569 100644
--- a/p__Classrooms__Lists__ShixunHomeworks__Comment__index.async.js
+++ b/p__Classrooms__Lists__ShixunHomeworks__Comment__index.async.js
@@ -1372,8 +1372,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1660,8 +1660,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__Classrooms__Lists__ShixunHomeworks__Detail__index.async.js b/p__Classrooms__Lists__ShixunHomeworks__Detail__index.async.js
index 47095034b9..22d99014db 100644
--- a/p__Classrooms__Lists__ShixunHomeworks__Detail__index.async.js
+++ b/p__Classrooms__Lists__ShixunHomeworks__Detail__index.async.js
@@ -2202,8 +2202,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -2490,8 +2490,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__Classrooms__Lists__Video__Statistics__index.async.js b/p__Classrooms__Lists__Video__Statistics__index.async.js
index a3d4d96e05..a6b93efbc2 100644
--- a/p__Classrooms__Lists__Video__Statistics__index.async.js
+++ b/p__Classrooms__Lists__Video__Statistics__index.async.js
@@ -458,7 +458,7 @@ var ShixunsListPage = function ShixunsListPage(_ref) {
           })
         })]
       })]
-    }), /*#__PURE__*/(0,jsx_runtime.jsx)("aside", {
+    }), type == 'a' && /*#__PURE__*/(0,jsx_runtime.jsx)("aside", {
       className: "tc mb50 mt30",
       children: /*#__PURE__*/(0,jsx_runtime.jsx)(pagination/* default */.Z, {
         showSizeChanger: false,
diff --git a/p__Graduations__Lists__Topics__index.async.js b/p__Graduations__Lists__Topics__index.async.js
index 2ac7794c3f..23f87c9425 100644
--- a/p__Graduations__Lists__Topics__index.async.js
+++ b/p__Graduations__Lists__Topics__index.async.js
@@ -1331,8 +1331,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1619,8 +1619,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__Innovation__Detail__index.async.js b/p__Innovation__Detail__index.async.js
index 10d470e422..5d6a35a807 100644
--- a/p__Innovation__Detail__index.async.js
+++ b/p__Innovation__Detail__index.async.js
@@ -6726,8 +6726,8 @@ var TabPane = tabs/* default */.Z.TabPane;
 /* harmony default export */ var Collaboratemodules = ({"bg":"bg___Onnmh","wrap":"wrap___VTtdp","modal":"modal___MArZa","content":"content___a69LK","head":"head____zVzr","headCount":"headCount___GhK7o","button":"button___DoAh3","itemWrap":"itemWrap___UR35k","imgWrap":"imgWrap___DpS0R","img":"img___N9se3","manager":"manager___m4Mzg","itemContent":"itemContent___Ut7hr","nameWrap":"nameWrap___y73uS","name":"name___hJUHg","actionGroup":"actionGroup___QEytf","deleteIcon":"deleteIcon___XGFcN","schoolWrap":"schoolWrap___qsoOp","school":"school___yh8l2","countWrap":"countWrap___MQKPn","deletetitle":"deletetitle___nAICN","yseTitle":"yseTitle___t5fzp"});
 // EXTERNAL MODULE: ./node_modules/_@ant-design_icons@5.2.6@@ant-design/icons/es/icons/PlusOutlined.js + 1 modules
 var PlusOutlined = __webpack_require__(378);
-// EXTERNAL MODULE: ./src/components/Header/index.tsx + 12 modules
-var Header = __webpack_require__(40847);
+// EXTERNAL MODULE: ./src/components/Header/index.tsx + 14 modules
+var Header = __webpack_require__(68337);
 // EXTERNAL MODULE: ./src/utils/fetch.ts
 var fetch = __webpack_require__(78092);
 ;// CONCATENATED MODULE: ./src/pages/Innovation/Tasks/Collaborate/index.tsx
diff --git a/p__Innovation__Detail__index.chunk.css b/p__Innovation__Detail__index.chunk.css
index 7a550f5b6b..b1fda6abdc 100644
--- a/p__Innovation__Detail__index.chunk.css
+++ b/p__Innovation__Detail__index.chunk.css
@@ -3122,6 +3122,40 @@ button[class~='ant-btn-default']:disabled.btn___In02G {
   font-size: 16px;
 }
 
+/*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/layouts/ShixunDetail/components/LateTip.less?modules ***!
+  \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.bottom___z0ujX {
+  width: 100%;
+  text-align: center;
+  margin-bottom: 15px;
+}
+.bottom___z0ujX .yes___hodnN {
+  width: 88px;
+  height: 32px;
+  background: #3061D0;
+  box-shadow: 0px 2px 4px 0px #E0DFE1, inset 0px 1px 3px 0px rgba(255, 255, 255, 0.5);
+  border-radius: 2px;
+  font-weight: 400;
+  color: #FFFFFF !important;
+  border: 0px;
+}
+.bottom___z0ujX .yes___hodnN:hover {
+  background: #5784de;
+}
+.bottom___z0ujX .no___hiPz5 {
+  margin-right: 20px;
+  width: 60px;
+  height: 32px;
+  background: #F8F9FC;
+  border-radius: 2px;
+  opacity: 0.5;
+  border: 1px solid #C3CFE0;
+  font-weight: 400;
+  color: #464F66 !important;
+  line-height: 14px;
+}
+
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/components/Header/components/Join/index.less?modules ***!
   \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -3310,3 +3344,16 @@ button[class~='ant-btn-default']:disabled.btn___In02G {
   color: #979797;
 }
 
+/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/components/Header/components/DelayTip/index.less?modules ***!
+  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.tip___a6MfI {
+  width: 1200px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 12px;
+  margin: 0 auto;
+}
+
diff --git a/p__Innovation__Tasks__index.async.js b/p__Innovation__Tasks__index.async.js
index 06f0d19d82..abec83da0c 100644
--- a/p__Innovation__Tasks__index.async.js
+++ b/p__Innovation__Tasks__index.async.js
@@ -2917,8 +2917,8 @@ var TabPane = tabs/* default */.Z.TabPane;
 /* harmony default export */ var Collaboratemodules = ({"bg":"bg___Onnmh","wrap":"wrap___VTtdp","modal":"modal___MArZa","content":"content___a69LK","head":"head____zVzr","headCount":"headCount___GhK7o","button":"button___DoAh3","itemWrap":"itemWrap___UR35k","imgWrap":"imgWrap___DpS0R","img":"img___N9se3","manager":"manager___m4Mzg","itemContent":"itemContent___Ut7hr","nameWrap":"nameWrap___y73uS","name":"name___hJUHg","actionGroup":"actionGroup___QEytf","deleteIcon":"deleteIcon___XGFcN","schoolWrap":"schoolWrap___qsoOp","school":"school___yh8l2","countWrap":"countWrap___MQKPn","deletetitle":"deletetitle___nAICN","yseTitle":"yseTitle___t5fzp"});
 // EXTERNAL MODULE: ./node_modules/_@ant-design_icons@5.2.6@@ant-design/icons/es/icons/PlusOutlined.js + 1 modules
 var PlusOutlined = __webpack_require__(378);
-// EXTERNAL MODULE: ./src/components/Header/index.tsx + 12 modules
-var Header = __webpack_require__(40847);
+// EXTERNAL MODULE: ./src/components/Header/index.tsx + 14 modules
+var Header = __webpack_require__(68337);
 // EXTERNAL MODULE: ./src/utils/fetch.ts
 var fetch = __webpack_require__(78092);
 ;// CONCATENATED MODULE: ./src/pages/Innovation/Tasks/Collaborate/index.tsx
diff --git a/p__Innovation__Tasks__index.chunk.css b/p__Innovation__Tasks__index.chunk.css
index 65262a4af9..c02edf252e 100644
--- a/p__Innovation__Tasks__index.chunk.css
+++ b/p__Innovation__Tasks__index.chunk.css
@@ -3212,6 +3212,40 @@ button[class~='ant-btn-default']:disabled.btn___In02G {
   font-size: 16px;
 }
 
+/*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/layouts/ShixunDetail/components/LateTip.less?modules ***!
+  \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.bottom___z0ujX {
+  width: 100%;
+  text-align: center;
+  margin-bottom: 15px;
+}
+.bottom___z0ujX .yes___hodnN {
+  width: 88px;
+  height: 32px;
+  background: #3061D0;
+  box-shadow: 0px 2px 4px 0px #E0DFE1, inset 0px 1px 3px 0px rgba(255, 255, 255, 0.5);
+  border-radius: 2px;
+  font-weight: 400;
+  color: #FFFFFF !important;
+  border: 0px;
+}
+.bottom___z0ujX .yes___hodnN:hover {
+  background: #5784de;
+}
+.bottom___z0ujX .no___hiPz5 {
+  margin-right: 20px;
+  width: 60px;
+  height: 32px;
+  background: #F8F9FC;
+  border-radius: 2px;
+  opacity: 0.5;
+  border: 1px solid #C3CFE0;
+  font-weight: 400;
+  color: #464F66 !important;
+  line-height: 14px;
+}
+
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/components/Header/components/Join/index.less?modules ***!
   \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -3400,3 +3434,16 @@ button[class~='ant-btn-default']:disabled.btn___In02G {
   color: #979797;
 }
 
+/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/components/Header/components/DelayTip/index.less?modules ***!
+  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.tip___a6MfI {
+  width: 1200px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 12px;
+  margin: 0 auto;
+}
+
diff --git a/p__IntrainCourse__index.async.js b/p__IntrainCourse__index.async.js
index 1473f6154b..5f6755cff8 100644
--- a/p__IntrainCourse__index.async.js
+++ b/p__IntrainCourse__index.async.js
@@ -712,6 +712,10 @@ var IntrainCoursePage = function IntrainCoursePage(_ref2) {
     _useState22 = slicedToArray_default()(_useState21, 2),
     searchName = _useState22[0],
     setSearchName = _useState22[1];
+  var _useState23 = (0,_react_17_0_2_react.useState)(false),
+    _useState24 = slicedToArray_default()(_useState23, 2),
+    cateLoding = _useState24[0],
+    setCateLoading = _useState24[1];
   (0,_react_17_0_2_react.useEffect)(function () {
     !asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee() {
       return regeneratorRuntime_default()().wrap(function _callee$(_context) {
@@ -720,15 +724,31 @@ var IntrainCoursePage = function IntrainCoursePage(_ref2) {
             dispatch({
               type: 'intraincourse/getBannerList'
             }); // 获取顶部轮播图和底部广告
+            // dispatch({ type: 'intraincourse/getCateHotDiscount', payload: { tag_ids: [] } }); // 获取顶部分类-热门推荐-限时低价
+            _context.next = 3;
+            return dispatch({
+              type: 'intraincourse/getTopCategoryList',
+              payload: {
+                tag_ids: []
+              }
+            });
+          case 3:
+            // 获取顶部分类
             dispatch({
-              type: 'intraincourse/getCateHotDiscount',
+              type: 'intraincourse/getHotList',
               payload: {
                 tag_ids: []
               }
-            }); // 获取顶部分类-热门推荐-限时低价
-            _context.next = 4;
+            }); // 获取顶部热门推荐
+            dispatch({
+              type: 'intraincourse/getDiscountList',
+              payload: {
+                tag_ids: []
+              }
+            }); // 获取顶部限时低价
+            _context.next = 7;
             return getAllCourse();
-          case 4:
+          case 7:
             // 获取所有课程
             dispatch({
               type: 'intraincourse/getTags'
@@ -742,7 +762,7 @@ var IntrainCoursePage = function IntrainCoursePage(_ref2) {
             dispatch({
               type: 'intraincourse/getInfoShow'
             }); // 获取用户的信息
-          case 7:
+          case 10:
           case "end":
             return _context.stop();
         }
@@ -1088,21 +1108,21 @@ var IntrainCoursePage = function IntrainCoursePage(_ref2) {
   var UserReview = function UserReview(_ref7) {
     var TopTitleValue = _ref7.TopTitleValue,
       BannerList = _ref7.BannerList;
-    var _useState23 = (0,_react_17_0_2_react.useState)(''),
-      _useState24 = slicedToArray_default()(_useState23, 2),
-      comment = _useState24[0],
-      setComment = _useState24[1];
+    var _useState25 = (0,_react_17_0_2_react.useState)(''),
+      _useState26 = slicedToArray_default()(_useState25, 2),
+      comment = _useState26[0],
+      setComment = _useState26[1];
     (0,_react_17_0_2_react.useEffect)(function () {
       BannerList.length > 0 ? setComment(BannerList[0].comment) : '';
     }, [BannerList]);
-    var _useState25 = (0,_react_17_0_2_react.useState)(0),
-      _useState26 = slicedToArray_default()(_useState25, 2),
-      itemState = _useState26[0],
-      setItemState = _useState26[1];
-    var _useState27 = (0,_react_17_0_2_react.useState)(false),
+    var _useState27 = (0,_react_17_0_2_react.useState)(0),
       _useState28 = slicedToArray_default()(_useState27, 2),
-      userLoading = _useState28[0],
-      setUserLoading = _useState28[1];
+      itemState = _useState28[0],
+      setItemState = _useState28[1];
+    var _useState29 = (0,_react_17_0_2_react.useState)(false),
+      _useState30 = slicedToArray_default()(_useState29, 2),
+      userLoading = _useState30[0],
+      setUserLoading = _useState30[1];
     return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
       className: IntrainCoursemodules.UserReview,
       children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
@@ -1333,64 +1353,87 @@ var IntrainCoursePage = function IntrainCoursePage(_ref2) {
             })]
           }, index);
         })]
-      }), intraincourse.TopCategoryList.length > 1 ? /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
-        className: "".concat(IntrainCoursemodules.CustomTags),
-        children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-          style: {
-            paddingRight: "".concat(intraincourse.TopCategoryList.length > 14 ? '50px' : '')
+      }), /*#__PURE__*/(0,jsx_runtime.jsxs)(spin/* default */.Z, {
+        spinning: cateLoding,
+        children: [intraincourse.TopCategoryList.length > 1 ? /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          className: "".concat(IntrainCoursemodules.CustomTags),
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+            style: {
+              paddingRight: "".concat(intraincourse.TopCategoryList.length > 14 ? '50px' : '')
+            },
+            className: "".concat(IntrainCoursemodules.centNavDiv, " ").concat(openClose ? IntrainCoursemodules.centNavDivOpen : ''),
+            children: intraincourse.TopCategoryList.map(function (item, index) {
+              return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+                className: "".concat(IntrainCoursemodules.centNav, " ").concat(centNavId == item.id ? IntrainCoursemodules.centNavActive : ''),
+                onClick: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee5() {
+                  return regeneratorRuntime_default()().wrap(function _callee5$(_context5) {
+                    while (1) switch (_context5.prev = _context5.next) {
+                      case 0:
+                        if (item.id != -1) {
+                          allParamet.tag_ids = [item.id];
+                          setAllParamet(allParamet);
+                        } else {
+                          allParamet.tag_ids = [];
+                          setAllParamet(allParamet);
+                        }
+                        setCateLoading(true);
+                        // dispatch({ type: 'intraincourse/getCateHotDiscount', payload: { tag_ids: item.id != -1 ? item.id : '' } });
+                        _context5.next = 4;
+                        return dispatch({
+                          type: 'intraincourse/getHotList',
+                          payload: {
+                            tag_ids: item.id != -1 ? item.id : ''
+                          }
+                        });
+                      case 4:
+                        // 获取顶部热门推荐
+                        dispatch({
+                          type: 'intraincourse/getDiscountList',
+                          payload: {
+                            tag_ids: item.id != -1 ? item.id : ''
+                          }
+                        }); // 获取顶部限时低价
+                        setCateLoading(false);
+                        getAllCourse();
+                        setCentNavId(item.id);
+                      case 8:
+                      case "end":
+                        return _context5.stop();
+                    }
+                  }, _callee5);
+                })),
+                children: item.name
+              }, index);
+            })
+          }), intraincourse.TopCategoryList.length > 14 ? /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+            className: IntrainCoursemodules.OpenClose,
+            onClick: function onClick() {
+              return setOpenClose(!openClose);
+            },
+            children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+              children: openClose ? '收起' : '展开'
+            }), /*#__PURE__*/(0,jsx_runtime.jsx)(LeftOutlined/* default */.Z, {
+              className: "".concat(IntrainCoursemodules.OpenIcon, " ").concat(openClose ? IntrainCoursemodules.CloseIcon : '')
+            })]
+          }) : /*#__PURE__*/(0,jsx_runtime.jsx)(jsx_runtime.Fragment, {})]
+        }) : /*#__PURE__*/(0,jsx_runtime.jsx)(jsx_runtime.Fragment, {}), intraincourse.HotList.length > 0 ? /*#__PURE__*/(0,jsx_runtime.jsx)(BannerComponent, {
+          TopTitleValue: {
+            img: /*#__PURE__*/(0,jsx_runtime.jsx)("img", {
+              src: icon.rmtj
+            }),
+            title: '热门推荐'
           },
-          className: "".concat(IntrainCoursemodules.centNavDiv, " ").concat(openClose ? IntrainCoursemodules.centNavDivOpen : ''),
-          children: intraincourse.TopCategoryList.map(function (item, index) {
-            return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-              className: "".concat(IntrainCoursemodules.centNav, " ").concat(centNavId == item.id ? IntrainCoursemodules.centNavActive : ''),
-              onClick: function onClick() {
-                if (item.id != -1) {
-                  allParamet.tag_ids = [item.id];
-                  setAllParamet(allParamet);
-                } else {
-                  allParamet.tag_ids = [];
-                  setAllParamet(allParamet);
-                }
-                dispatch({
-                  type: 'intraincourse/getCateHotDiscount',
-                  payload: {
-                    tag_ids: item.id != -1 ? item.id : ''
-                  }
-                });
-                getAllCourse();
-                setCentNavId(item.id);
-              },
-              children: item.name
-            }, index);
-          })
-        }), intraincourse.TopCategoryList.length > 14 ? /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
-          className: IntrainCoursemodules.OpenClose,
-          onClick: function onClick() {
-            return setOpenClose(!openClose);
+          BannerList: intraincourse.HotList
+        }) : /*#__PURE__*/(0,jsx_runtime.jsx)(jsx_runtime.Fragment, {}), intraincourse.DiscountList.length > 0 ? /*#__PURE__*/(0,jsx_runtime.jsx)(BannerComponent, {
+          TopTitleValue: {
+            img: /*#__PURE__*/(0,jsx_runtime.jsx)("img", {
+              src: icon.xshk
+            }),
+            title: '限时好课'
           },
-          children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-            children: openClose ? '收起' : '展开'
-          }), /*#__PURE__*/(0,jsx_runtime.jsx)(LeftOutlined/* default */.Z, {
-            className: "".concat(IntrainCoursemodules.OpenIcon, " ").concat(openClose ? IntrainCoursemodules.CloseIcon : '')
-          })]
+          BannerList: intraincourse.DiscountList
         }) : /*#__PURE__*/(0,jsx_runtime.jsx)(jsx_runtime.Fragment, {})]
-      }) : /*#__PURE__*/(0,jsx_runtime.jsx)(jsx_runtime.Fragment, {}), intraincourse.HotList.length > 0 ? /*#__PURE__*/(0,jsx_runtime.jsx)(BannerComponent, {
-        TopTitleValue: {
-          img: /*#__PURE__*/(0,jsx_runtime.jsx)("img", {
-            src: icon.rmtj
-          }),
-          title: '热门推荐'
-        },
-        BannerList: intraincourse.HotList
-      }) : /*#__PURE__*/(0,jsx_runtime.jsx)(jsx_runtime.Fragment, {}), intraincourse.DiscountList.length > 0 ? /*#__PURE__*/(0,jsx_runtime.jsx)(BannerComponent, {
-        TopTitleValue: {
-          img: /*#__PURE__*/(0,jsx_runtime.jsx)("img", {
-            src: icon.xshk
-          }),
-          title: '限时好课'
-        },
-        BannerList: intraincourse.DiscountList
-      }) : /*#__PURE__*/(0,jsx_runtime.jsx)(jsx_runtime.Fragment, {}), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+      }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
         className: IntrainCoursemodules.AllCourse,
         children: [/*#__PURE__*/(0,jsx_runtime.jsx)(TopTitle, {
           img: /*#__PURE__*/(0,jsx_runtime.jsx)("img", {
@@ -1691,9 +1734,9 @@ var IntrainCoursePage = function IntrainCoursePage(_ref2) {
     }), /*#__PURE__*/(0,jsx_runtime.jsx)(FixeRight, {})]
   });
 };
-/* harmony default export */ var IntrainCourse = ((0,_umi_production_exports.connect)(function (_ref9) {
-  var user = _ref9.user,
-    intraincourse = _ref9.intraincourse;
+/* harmony default export */ var IntrainCourse = ((0,_umi_production_exports.connect)(function (_ref10) {
+  var user = _ref10.user,
+    intraincourse = _ref10.intraincourse;
   return {
     user: user,
     intraincourse: intraincourse
diff --git a/p__IntrainCourse__index.chunk.css b/p__IntrainCourse__index.chunk.css
index 5c53bcb19a..2e48d05874 100644
--- a/p__IntrainCourse__index.chunk.css
+++ b/p__IntrainCourse__index.chunk.css
@@ -955,10 +955,11 @@
 }
 .body___CgzAR .Cent___ISiU9 .CustomTags___fDxDW {
   width: 1200px;
-  margin-top: 40px;
   overflow: hidden;
   white-space: nowrap;
   position: relative;
+  margin: 0 auto;
+  padding-top: 40px;
 }
 .body___CgzAR .Cent___ISiU9 .CustomTags___fDxDW .centNavDiv___J7CEL {
   display: flex;
diff --git a/p__MyProblem__index.async.js b/p__MyProblem__index.async.js
index 0748ebfef8..811e09fa51 100644
--- a/p__MyProblem__index.async.js
+++ b/p__MyProblem__index.async.js
@@ -1021,8 +1021,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1309,8 +1309,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__Paperlibrary__Add__index.async.js b/p__Paperlibrary__Add__index.async.js
index 8993d661f3..10ea578679 100644
--- a/p__Paperlibrary__Add__index.async.js
+++ b/p__Paperlibrary__Add__index.async.js
@@ -2458,6 +2458,26 @@ var CompletionQuestionEditor = function CompletionQuestionEditor(_ref3) {
           })]
         });
       }
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, {
+      align: "middle",
+      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .Z.Item, {
+        name: "downcase",
+        valuePropName: "checked",
+        children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z, {})
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z, {
+        className: "ml10",
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u5B57\u6BCD\u5927\u5C0F\u5199"
+      })]
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, {
+      align: "middle",
+      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .Z.Item, {
+        name: "no_space",
+        valuePropName: "checked",
+        children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z, {})
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z, {
+        className: "ml10",
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u7A7A\u683C"
+      })]
     }), (standardAnswersValue === null || standardAnswersValue === void 0 ? void 0 : standardAnswersValue.length) > 1 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, {
       align: "middle",
       className: (standardAnswersValue === null || standardAnswersValue === void 0 ? void 0 : standardAnswersValue.length) > 1 ? 'mb30' : "".concat(_index_less_modules__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z.hide),
@@ -3263,8 +3283,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -3551,8 +3571,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
@@ -9619,6 +9639,7 @@ var CombinationCompletionQuestionEditor_CompletionQuestionEditor = function Comp
   var _form$getFieldValue;
   var questionTitlePlaceholder = _ref3.questionTitlePlaceholder,
     form = _ref3.form,
+    name = _ref3.name,
     scoreByBlank = _ref3.scoreByBlank,
     answerKey = _ref3.answerKey,
     _ref3$titleKey = _ref3.titleKey,
@@ -9833,6 +9854,26 @@ var CombinationCompletionQuestionEditor_CompletionQuestionEditor = function Comp
           })]
         });
       }
+    }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+      align: "middle",
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+        name: [name, "downcase"],
+        valuePropName: "checked",
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_switch/* default */.Z, {})
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+        className: "ml10",
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u5B57\u6BCD\u5927\u5C0F\u5199"
+      })]
+    }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+      align: "middle",
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+        name: [name, "no_space"],
+        valuePropName: "checked",
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_switch/* default */.Z, {})
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+        className: "ml10",
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u7A7A\u683C"
+      })]
     }), (standardAnswersValue === null || standardAnswersValue === void 0 ? void 0 : standardAnswersValue.length) > 1 && /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
       align: "middle",
       className: (standardAnswersValue === null || standardAnswersValue === void 0 ? void 0 : standardAnswersValue.length) > 1 ? 'mb30' : "".concat(QuestionEditormodules.hide),
@@ -10601,6 +10642,7 @@ var CombinationQuestionEditor = function CombinationQuestionEditor(_ref) {
                   }), (item_list === null || item_list === void 0 || (_item_list$name12 = item_list[name]) === null || _item_list$name12 === void 0 ? void 0 : _item_list$name12.question_type) == 3 && /*#__PURE__*/(0,jsx_runtime.jsx)(CombinationCompletionQuestionEditor_CompletionQuestionEditor, {
                     form: form,
                     questionTitlePlaceholder: "\u8BF7\u7F16\u8F91\u9898\u5E72\u5E76\u8BBE\u7F6E\u586B\u7A7A\u9879",
+                    name: name,
                     scoreByBlank: [name, 'use_blank_score'],
                     titleKey: [name, 'name'],
                     analysisKey: [name, 'analysis'],
@@ -10707,7 +10749,9 @@ var CombinationQuestionEditor = function CombinationQuestionEditor(_ref) {
                       standard_answers: [],
                       question_type: 3,
                       item_type: 'COMPLETION',
-                      use_blank_score: true
+                      use_blank_score: true,
+                      downcase: true,
+                      no_space: true
                     });
                     setActiveKey([fields === null || fields === void 0 ? void 0 : fields.length].concat(toConsumableArray_default()(activeKey)));
                   },
@@ -14587,7 +14631,9 @@ var AddNewPaper = function AddNewPaper(_ref) {
                   use_blank_score: true,
                   keywords: [],
                   allow_student_debug: false,
-                  submit_rule: 1
+                  submit_rule: 1,
+                  downcase: true,
+                  no_space: true
                 });
               }
             },
diff --git a/p__Paperlibrary__Random__Edit__index.async.js b/p__Paperlibrary__Random__Edit__index.async.js
index f728158926..9db4a60f08 100644
--- a/p__Paperlibrary__Random__Edit__index.async.js
+++ b/p__Paperlibrary__Random__Edit__index.async.js
@@ -630,6 +630,300 @@ var lodash = __webpack_require__(89392);
 
 
 
+// import { getRandomExam } from '@/service/randomPaper'
+// import { Content, RuleValueKeyType } from '@/service/randomPaper/types'
+// import { RequestResType, getArrayType } from '@/types'
+// import { Reducer, createContext } from 'react'
+// import { cloneDeep } from 'lodash'
+
+// type ActionType = { type: 'init', payload: Partial<RequestResType<typeof getRandomExam>> }
+//     | { type: 'updateBaseInfo', payload: Partial<RequestResType<typeof getRandomExam>>['examination_bank'] }
+//     | { type: 'deleteQuestionType', payload: string }
+//     | { type: 'setQuestionType', payload: string[] }
+//     | { type: 'updateItemTypes', payload: Partial<RequestResType<typeof getRandomExam>>['item_types'] }
+//     | { type: 'deleteRule', payload: { itemType: string, id: number } }
+//     | { type: 'changeQuestionNum', payload: { itemType: string, id?: number, num: number } }
+//     | { type: 'changeQuestionScore', payload: { itemType: string, score: number } }
+//     | { type: 'editRule', payload: { itemType: string, tableData: Content[], randomRuleType: RuleValueKeyType } }
+//     | { type: 'addShixun', payload: { shixunList: getArrayType<Partial<RequestResType<typeof getRandomExam>>['item_types']>['item_banks'] } }
+//     | { type: 'deleteShixunQuestion', payload: { shixunId: number } }
+//     | { type: 'changeQuestionPracticalScore', payload: { score: number, id: any, Pid: number } }
+
+// enum RuleValueType {
+//     FileFolder = 1,
+//     Difficulty,
+//     Knowledge
+// }
+
+// const DataContext = createContext<{
+//     data: Partial<RequestResType<typeof getRandomExam>>,
+//     disabled: boolean,
+//     dispatch: React.Dispatch<ActionType>,
+//     setPreview: React.Dispatch<React.SetStateAction<{ show: boolean, data: any }>>
+//     getData: (id: string) => Promise<void>,
+//     handlePreview: () => Promise<void>
+// }>(null)
+
+// const RuleValueMap = {
+//     [RuleValueKeyType.OnlyFileFolder]: [RuleValueType.FileFolder],
+//     [RuleValueKeyType.OnlyKnowledge]: [RuleValueType.Knowledge],
+//     [RuleValueKeyType.OnlyDifficulty]: [RuleValueType.Difficulty],
+//     [RuleValueKeyType.FileFolderAndDiff]: [RuleValueType.FileFolder, RuleValueType.Difficulty],
+//     [RuleValueKeyType.FileFolderAndKnowledge]: [RuleValueType.FileFolder, RuleValueType.Knowledge],
+//     [RuleValueKeyType.KnowledgeAndDiff]: [RuleValueType.Knowledge, RuleValueType.Difficulty],
+//     [RuleValueKeyType.All]: [RuleValueType.Knowledge, RuleValueType.Difficulty, RuleValueType.FileFolder]
+// }
+
+// const compareTwoArr = <T>(target: T[], source: T[]) => {
+//     if (target.length !== source.length) {
+//         return false
+//     }
+//     for (const sourceValue of source) {
+//         if (!target.includes(sourceValue)) {
+//             return false
+//         }
+//     }
+//     return true
+// }
+
+// const getRuleValue = (userSelect: RuleValueType[]) => {
+//     for (const [ruleKey, ruleValueArr] of Object.entries(RuleValueMap)) {
+//         if (compareTwoArr(userSelect, ruleValueArr)) {
+//             return ruleKey as RuleValueKeyType
+//         }
+//     }
+// }
+
+// const questionTypeMap: Record<string, string> = {
+//     SINGLE: '单选题',
+//     MULTIPLE: '多选题',
+//     COMPLETION: '填空题',
+//     JUDGMENT: '判断题',
+//     SUBJECTIVE: '简答题',
+//     PROGRAM: '编程题',
+//     BPROGRAM: '程序填空题',
+//     COMBINATION: '组合题',
+//     PRACTICAL: '实训题'
+// }
+
+// const difficultyMap: Record<string, { label: string, color: string }> = {
+//     '1': { label: '简单', color: '#46B70E' },
+//     '2': { label: '适中', color: '#165DFF' },
+//     '3': { label: '困难', color: '#EE6F1A' }
+// }
+
+// const getFixedNumber = (num: number) => num && parseFloat(num.toFixed(1))
+
+// const reducer: Reducer<Partial<RequestResType<typeof getRandomExam>>, ActionType> = (
+//     state,
+//     action
+// ) => {
+//     switch (action.type) {
+//         //初始化
+//         case 'init': {
+//             return action.payload
+//         }
+//         //只更新试卷的基础信息部分
+//         case 'updateBaseInfo': {
+//             return {
+//                 ...state,
+//                 examination_bank: action.payload
+//             }
+//         }
+//         //删除某个题型
+//         case 'deleteQuestionType': {
+//             const { item_types } = state
+//             const newItemTypes = item_types.filter(item => item.item_type !== action.payload)
+//             state.examination_bank.question_count = getFixedNumber(newItemTypes.reduce((acc, cur) => acc + cur.item_bank_count, 0))
+//             state.examination_bank.total_score = getFixedNumber(newItemTypes.reduce((acc, cur) => acc + cur.total_score, 0))
+
+//             return {
+//                 ...state,
+//                 item_types: newItemTypes
+//             }
+//         }
+//         //批量增删题型
+//         case 'setQuestionType': {
+//             const { item_types = [] } = state
+//             const prevItemTypes = item_types.map(item => item.item_type)
+//             const newItemTypes = item_types.filter(item => action.payload.includes(item.item_type))
+//             for (const itemType of action.payload) {
+//                 if (!prevItemTypes.includes(itemType)) {
+//                     if (itemType === 'PRACTICAL') {
+//                         newItemTypes.push({
+//                             item_type: itemType,
+//                             contents: [],
+//                             item_banks: [],
+//                             item_bank_count: 0,
+//                             item_bank_num: 0,
+//                             item_type_text: questionTypeMap[itemType],
+//                             random_rule_type: RuleValueKeyType.Shixun,
+//                             score: 0,
+//                             total_score: 0
+//                         })
+//                     } else {
+//                         newItemTypes.push({
+//                             item_type: itemType,
+//                             contents: [],
+//                             item_bank_count: 0,
+//                             item_type_text: questionTypeMap[itemType],
+//                             // random_rule_type: '1',
+//                             score: 0,
+//                             total_score: 0
+//                         })
+//                     }
+//                 }
+//             }
+//             return {
+//                 ...state,
+//                 item_types: newItemTypes
+//             }
+//         }
+//         //调整题型顺序 
+//         case 'updateItemTypes': {
+//             return {
+//                 ...state,
+//                 item_types: action.payload
+//             }
+//         }
+//         //删除抽题规则
+//         case 'deleteRule': {
+//             const stateCopy: typeof state = cloneDeep(state)
+//             const currentItem = stateCopy.item_types.find(item => item.item_type === action.payload.itemType)
+//             const deleteRule = currentItem.contents.find(content => (content.id === action.payload.id && content.is_share == action.payload.is_share))
+//             currentItem.contents = currentItem.contents.filter(content => (content !== deleteRule))
+//             if (currentItem.contents?.length === 0) currentItem.random_rule_type = [];
+//             currentItem.item_bank_count -= deleteRule?.quanlity
+//             stateCopy.examination_bank.question_count -= deleteRule?.quanlity
+//             currentItem.total_score -= deleteRule?.quanlity * currentItem.score
+//             stateCopy.examination_bank.total_score -= deleteRule?.quanlity * currentItem.score
+//             currentItem.total_score = getFixedNumber(currentItem.total_score)
+//             stateCopy.examination_bank.total_score = getFixedNumber(stateCopy.examination_bank.total_score)
+//             stateCopy.contents = currentItem.contents
+//             return stateCopy
+//         }
+//         case 'changeQuestionNum': {
+//             const stateCopy: typeof state = cloneDeep(state)
+
+//             const currentItem = stateCopy.item_types.find(item => item.item_type === action.payload.itemType)
+//             const countitems = currentItem?.contents?.find(item => item.id === action.payload.id)
+
+//             if (action.payload.itemType === 'PRACTICAL') {
+//                 if (action.payload.num) {
+//                     stateCopy.examination_bank.question_count = stateCopy.examination_bank.question_count - currentItem.item_bank_count + action.payload.num
+
+//                     stateCopy.examination_bank.total_score = getFixedNumber(stateCopy.examination_bank.total_score - currentItem.total_score + (action.payload.num * currentItem.score))
+//                 }
+//                 if (action.payload.score) {
+//                     stateCopy.examination_bank.total_score = getFixedNumber(stateCopy.examination_bank.total_score - currentItem.total_score + (action.payload.num * currentItem.score))
+//                 }
+//                 currentItem.item_bank_count = action.payload.num
+//                 currentItem.total_score = getFixedNumber(currentItem.item_bank_count * currentItem.score)
+//                 return stateCopy
+//             }
+//             stateCopy.examination_bank.question_count = stateCopy.examination_bank.question_count - countitems?.quanlity + action.payload.num
+//             const currentRule = currentItem.contents.find(content => (content.id === action.payload.id && content.teacher_group_id === action.payload.teacher_group_id))
+//             currentRule.quanlity = action.payload.num
+//             let newItemBankCount = 0, newTotalScore = 0
+//             for (const content of currentItem.contents) {
+//                 newItemBankCount += content?.quanlity
+//                 newTotalScore += content?.quanlity * currentItem.score
+//             }
+
+//             // stateCopy.examination_bank.question_count = stateCopy?.item_types?.map((item => item.item_bank_count))?.reduce((a, b) => a + b)
+
+//             stateCopy.examination_bank.total_score = getFixedNumber(stateCopy.examination_bank.total_score - currentItem.total_score + newTotalScore)
+//             currentItem.item_bank_count = newItemBankCount
+//             currentItem.total_score = getFixedNumber(newTotalScore)
+//             return stateCopy
+//         }
+//         case 'changeQuestionScore': {
+//             const stateCopy: typeof state = cloneDeep(state)
+//             const currentItem = stateCopy.item_types.find(item => item.item_type === action.payload.itemType)
+//             currentItem.score = action.payload.score
+//             currentItem.total_score = getFixedNumber(currentItem.item_bank_count * currentItem.score)
+//             stateCopy.examination_bank.total_score = getFixedNumber(stateCopy.item_types.reduce((acc, cur) => acc + cur.total_score, 0))
+//             return stateCopy
+//         }
+//         case 'changeQuestionPracticalScore': {
+
+//             if (action.payload.id === '重置分数') {
+//                 const stateCopy: typeof state = cloneDeep(state)
+//                 let items = JSON.parse(localStorage.getItem('randomitem_types'))
+//                 const currentItem = stateCopy.item_types.find(item => item.item_type === 'PRACTICAL')?.item_banks?.find(item => item.id === action.payload.Pid)
+//                 currentItem.challenges = items.challenges
+//                 currentItem.score = items.score
+
+//                 return stateCopy
+//             }
+
+//             const stateCopy: typeof state = cloneDeep(state)
+
+//             const currentItem = stateCopy.item_types.find(item => item.item_type === 'PRACTICAL')?.item_banks?.find(item => item.id === action.payload.Pid).challenges?.find((item: { id: any }) => item.id === action.payload.id)
+//             const currentItem1 = stateCopy.item_types.find(item => item.item_type === 'PRACTICAL')?.item_banks?.find(item => item.id === action.payload.Pid)
+//             const currentItem2 = stateCopy.item_types.find(item => item.item_type === 'PRACTICAL')
+//             console.log('----', currentItem1);
+
+//             currentItem.score = action.payload.score
+//             currentItem1.score = parseFloat(currentItem1.challenges?.map(item => item.score)?.reduce((a: any, b: any) => parseFloat(a) + parseFloat(b)))?.toFixed(1)
+//             currentItem2.total_score = parseFloat(currentItem2.item_banks?.map(item => item.score)?.reduce((a: any, b: any) => parseFloat(a) + parseFloat(b)))?.toFixed(1)
+//             stateCopy.examination_bank.question_count = stateCopy?.item_types?.reduce((acc, cur) => acc + cur?.item_bank_count, 0)
+//             // console.log('----', stateCopy?.item_types?.map((item: any) => item.total_score)?.reduce((acc: any, cur: any) => parseFloat(acc) + parseFloat(cur.total_score)));
+
+//             stateCopy.examination_bank.total_score = parseFloat(stateCopy.item_types?.map((item: any) => item.total_score)?.reduce((acc: any, cur: any) => parseFloat(acc) + parseFloat(cur)))?.toFixed(1)
+//             // stateCopy.examination_bank.total_score = getFixedNumber(stateCopy.item_types.reduce((acc, cur) => acc + cur.total_score, 0))
+//             return stateCopy
+//         }
+//         case 'editRule': {
+//             const stateCopy: typeof state = cloneDeep(state)
+//             const currentItem = stateCopy.item_types.find(item => item.item_type === action.payload.itemType)
+//             currentItem.contents = action.payload.tableData.map(content => ({ ...content, item_type: action.payload.itemType, random_rule_type: action.payload.randomRuleType }))
+//             currentItem.random_rule_type = action.payload.randomRuleType
+//             currentItem.item_bank_count = currentItem.contents.reduce((acc, cur) => acc + cur?.quanlity, 0)
+//             currentItem.score = currentItem.score || 1;
+//             currentItem.total_score = getFixedNumber(currentItem.item_bank_count * currentItem.score)
+//             stateCopy.examination_bank.question_count = stateCopy.item_types.reduce((acc, cur) => acc + cur.item_bank_count, 0)
+//             stateCopy.examination_bank.total_score = getFixedNumber(stateCopy.item_types.reduce((acc, cur) => acc + cur.total_score, 0))
+//             return stateCopy
+//         }
+//         case 'addShixun': {
+//             const stateCopy: typeof state = cloneDeep(state)
+//             const currentItem = stateCopy.item_types.find(item => item.item_type === 'PRACTICAL')
+
+//             stateCopy.examination_bank.question_count = stateCopy.examination_bank.question_count + 1
+
+//             currentItem.item_banks = action.payload.shixunList
+
+//             currentItem.item_bank_num = currentItem.item_banks.length
+//             currentItem.item_bank_count = currentItem.item_bank_count || 1
+//             currentItem.score = currentItem.item_banks?.map((item: any) => item.score)?.reduce((a, b) => a + b)
+//             currentItem.total_score = currentItem.total_score || currentItem.score * currentItem.item_bank_count
+//             stateCopy.examination_bank.total_score = stateCopy?.item_types?.map(item => item.total_score).reduce((a, b) => a + b)
+
+//             return stateCopy
+//         }
+//         case 'deleteShixunQuestion': {
+//             const stateCopy: typeof state = cloneDeep(state)
+//             const currentItem = stateCopy.item_types.find(item => item.item_type === 'PRACTICAL')
+//             currentItem.item_banks = currentItem.item_banks.filter(item => item.id !== action.payload.shixunId)
+
+//             currentItem.item_bank_num -= 1
+//             currentItem.total_score = currentItem.item_banks?.length === 0 ? 0 : parseFloat(currentItem.item_banks?.map((item: any) => item.score)?.reduce((a, b) => parseFloat(a) + parseFloat(b))).toFixed(1)
+//             stateCopy.examination_bank.total_score = parseFloat(stateCopy?.item_types?.map(item => item.total_score)?.reduce((a, b) => parseFloat(a) + parseFloat(b))).toFixed(1)
+
+//             if (currentItem.item_bank_count > currentItem.item_bank_num) {
+//                 currentItem.item_bank_count -= 1
+//                 currentItem.total_score = currentItem.item_banks?.length === 0 ? 0 : currentItem.item_banks?.map((item: any) => item.score)?.reduce((a, b) => a + b)
+//                 currentItem.total_score = getFixedNumber(currentItem.total_score)
+//             }
+//             return stateCopy
+//         }
+
+//     }
+// }
+
+// export { reducer, ActionType, difficultyMap, RuleValueType, RuleValueKeyType, RuleValueMap, getRuleValue, DataContext }
+
 
 
 
@@ -1316,7 +1610,7 @@ var SetScore = function SetScore(_ref) {
     _useState2 = slicedToArray_default()(_useState, 2),
     tempData = _useState2[0],
     setTempData = _useState2[1];
-  console.log('---', tempData);
+  console.log('--xxx-', tempData);
   (0,_react_17_0_2_react.useEffect)(function () {
     if (open) {
       setTempData((0,lodash.cloneDeep)(data));
@@ -1335,7 +1629,7 @@ var SetScore = function SetScore(_ref) {
     // }
     return (_total = total) === null || _total === void 0 ? void 0 : _total.toFixed(1);
   }, [tempData]);
-  return /*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, {
+  return open ? /*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, {
     title: /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
       className: QuestionInfomodules.setScoreModalTitle,
       justify: "space-between",
@@ -1374,15 +1668,38 @@ var SetScore = function SetScore(_ref) {
             style: {
               color: '#9096A3'
             },
-            children: ["\u6BCF\u9898", /*#__PURE__*/(0,jsx_runtime.jsx)(input_number/* default */.Z, {
+            children: ["\u6BCF", (record === null || record === void 0 ? void 0 : record.item_type) === "PRACTICAL" ? '题' : "题", /*#__PURE__*/(0,jsx_runtime.jsx)(input_number/* default */.Z, {
               precision: 1,
               size: "large",
               className: "ml10 mr10",
               min: 0.1,
               disabled: (record === null || record === void 0 ? void 0 : record.item_bank_count) === 0,
-              max: 100,
-              value: score,
+              max: 100
+              // value={score}
+              ,
               onChange: function onChange(v) {
+                // if (record?.item_type === "PRACTICAL") {
+                //     const dataCopy = tempData
+                //     const currentItem = dataCopy.item_types.find(item => item.item_type === item_type)
+                //     currentItem.score = Number(v)
+
+                //     currentItem.item_banks = currentItem?.item_banks?.map((item: any) => {
+                //         return {
+                //             ...item,
+                //             score: Number(v * item?.challenges?.length).toFixed(1),
+                //             challenges: item?.challenges?.map((val: any) => {
+                //                 return {
+                //                     ...val,
+                //                     score: Number(v)
+                //                 }
+                //             })
+                //         }
+                //     })
+
+                //     setTempData({ ...dataCopy })
+
+                //     // currentItem.score = Number(v)*currentItem
+                // } else {
                 var dataCopy = tempData;
                 var currentItem = dataCopy.item_types.find(function (item) {
                   return item.item_type === item_type;
@@ -1394,6 +1711,7 @@ var SetScore = function SetScore(_ref) {
                   return Number(acc) + Number(cur.total_score);
                 }, 0);
                 setTempData(objectSpread2_default()({}, dataCopy));
+                // }
               }
             }), "\u5206"]
           });
@@ -1403,7 +1721,7 @@ var SetScore = function SetScore(_ref) {
       rowKey: "item_type",
       pagination: false
     })
-  });
+  }) : null;
 };
 /* harmony default export */ var SetScoreModal = (SetScore);
 // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/tabs/index.js + 24 modules
@@ -3972,7 +4290,7 @@ var SelectShixunModal = function SelectShixunModal(_ref) {
             for (_iterator2.s(); !(_step2 = _iterator2.n()).done;) {
               var newRow = _step2.value;
               if (newRow && newSelectedRowKeys.includes(newRow.id) && !existKeys.includes(newRow.id)) {
-                var _newRow$author_name;
+                var _newRow$author_name, _newRow$challenge_nam, _newRow$challenge_nam2;
                 newRows.push({
                   id: newRow.id,
                   difficulty: newRow.level,
@@ -3981,6 +4299,14 @@ var SelectShixunModal = function SelectShixunModal(_ref) {
                   real_name: newRow === null || newRow === void 0 || (_newRow$author_name = newRow.author_name) === null || _newRow$author_name === void 0 ? void 0 : _newRow$author_name.split('、')[0],
                   school_name: newRow.author_school_name,
                   challenge_names: newRow.challenge_names,
+                  challenges: (_newRow$challenge_nam = newRow.challenge_names) === null || _newRow$challenge_nam === void 0 ? void 0 : _newRow$challenge_nam.map(function (item, index) {
+                    return {
+                      subject: item,
+                      id: index,
+                      score: 5
+                    };
+                  }),
+                  score: ((_newRow$challenge_nam2 = newRow.challenge_names) === null || _newRow$challenge_nam2 === void 0 ? void 0 : _newRow$challenge_nam2.length) * 5,
                   study_count: newRow.study_count,
                   challenges_count: newRow.challenges_count
                 });
@@ -4566,9 +4892,15 @@ var ShixunDetail = function ShixunDetail(_ref) {
           }, {
             title: '难度',
             dataIndex: 'difficulty'
-          }, {
+          },
+          // {
+          //     title: <span>分值<Tooltip title="实训题分值等于各关卡分值之和"><QuestionCircleOutlined /></Tooltip></span>,
+          //     dataIndex: 'score'
+          // },
+          {
             title: '操作',
             align: 'right',
+            width: 180,
             render: function render(value, record, index) {
               var _ref2 = record || {},
                 id = _ref2.id,
@@ -4581,12 +4913,12 @@ var ShixunDetail = function ShixunDetail(_ref) {
                 study_count = _ref2.study_count,
                 _ref2$challenges = _ref2.challenges,
                 challenges = _ref2$challenges === void 0 ? [] : _ref2$challenges;
-              console.log('---', challenges);
               return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
                 children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
                   style: {
                     color: '#165DFF',
-                    cursor: 'pointer'
+                    cursor: 'pointer',
+                    marginLeft: 20
                   },
                   onClick: function onClick() {
                     modal/* default */.Z.confirm({
@@ -4765,12 +5097,14 @@ var QuestionDetail = function QuestionDetail(_ref3) {
               color: '#3061D0'
             },
             children: questionInfo === null || questionInfo === void 0 ? void 0 : questionInfo.item_bank_count
-          }), "\u5C0F\u9898\uFF0C\u5171", /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-            style: {
-              color: '#3061D0'
-            },
-            children: questionInfo === null || questionInfo === void 0 ? void 0 : questionInfo.total_score
-          }), "\u5206\uFF09"]
+          }), "\u5C0F\u9898 ", /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+            children: ["\uFF0C\u5171", /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+              style: {
+                color: '#3061D0'
+              },
+              children: questionInfo === null || questionInfo === void 0 ? void 0 : questionInfo.total_score
+            }), "\u5206"]
+          }), "\uFF09"]
         })]
       }), !disabled && /*#__PURE__*/(0,jsx_runtime.jsx)("i", {
         className: "iconfont icon-shanchutimu ".concat(QuestionDetailmodules.deleteIcon),
@@ -5452,6 +5786,7 @@ var QuestionInfo = function QuestionInfo(_ref) {
           return regeneratorRuntime_default()().wrap(function _callee10$(_context10) {
             while (1) switch (_context10.prev = _context10.next) {
               case 0:
+                console.log('---newData', newData);
                 scoreSettings = newData.item_types.map(function (item) {
                   return {
                     item_type: item.item_type,
@@ -5459,14 +5794,14 @@ var QuestionInfo = function QuestionInfo(_ref) {
                   };
                 });
                 if (!urlParams.id) {
-                  _context10.next = 8;
+                  _context10.next = 9;
                   break;
                 }
-                _context10.next = 4;
+                _context10.next = 5;
                 return setItemTypeScore(urlParams.id, {
                   score_settings: scoreSettings
                 });
-              case 4:
+              case 5:
                 res = _context10.sent;
                 if (res.status === 0) {
                   // getData(urlParams.id)
@@ -5475,14 +5810,14 @@ var QuestionInfo = function QuestionInfo(_ref) {
                     payload: newData
                   });
                 }
-                _context10.next = 12;
+                _context10.next = 13;
                 break;
-              case 8:
-                _context10.next = 10;
+              case 9:
+                _context10.next = 11;
                 return setItemTypeScores(urlParams.categoryId, {
                   score_settings: scoreSettings
                 });
-              case 10:
+              case 11:
                 _res2 = _context10.sent;
                 if (_res2.status === 0) {
                   // getData(urlParams.id)
@@ -5491,9 +5826,9 @@ var QuestionInfo = function QuestionInfo(_ref) {
                     payload: newData
                   });
                 }
-              case 12:
-                setVisibleModalType('');
               case 13:
+                setVisibleModalType('');
+              case 14:
               case "end":
                 return _context10.stop();
             }
diff --git a/p__Paperlibrary__Random__PreviewEdit__index.async.js b/p__Paperlibrary__Random__PreviewEdit__index.async.js
index d8c7ab3fbe..eff35cb468 100644
--- a/p__Paperlibrary__Random__PreviewEdit__index.async.js
+++ b/p__Paperlibrary__Random__PreviewEdit__index.async.js
@@ -142,8 +142,6 @@ var StepPreview = __webpack_require__(70021);
 var skeleton = __webpack_require__(59981);
 // EXTERNAL MODULE: ./src/utils/fetch.ts
 var fetch = __webpack_require__(78092);
-// EXTERNAL MODULE: ./node_modules/_lodash@4.17.21@lodash/lodash.js
-var lodash = __webpack_require__(89392);
 // EXTERNAL MODULE: ./src/utils/util.tsx
 var util = __webpack_require__(88123);
 // EXTERNAL MODULE: ./node_modules/_react@17.0.2@react/jsx-runtime.js
@@ -162,7 +160,6 @@ var jsx_runtime = __webpack_require__(37712);
 
 
 
-
 var PaperlibraryPage = function PaperlibraryPage(_ref) {
   var _useLocation, _userInfo$course;
   var paperlibrary = _ref.paperlibrary,
@@ -283,7 +280,7 @@ var PaperlibraryPage = function PaperlibraryPage(_ref) {
   //换一题
   var handleExchange = /*#__PURE__*/function () {
     var _ref3 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2(record, other) {
-      var res, _clonePreviewData$que, clonePreviewData;
+      var res;
       return regeneratorRuntime_default()().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
@@ -297,19 +294,21 @@ var PaperlibraryPage = function PaperlibraryPage(_ref) {
           case 2:
             res = _context2.sent;
             if (res !== null && res !== void 0 && res.question) {
-              clonePreviewData = (0,lodash.cloneDeep)(editData);
-              clonePreviewData.questionList = clonePreviewData === null || clonePreviewData === void 0 || (_clonePreviewData$que = clonePreviewData.questionList) === null || _clonePreviewData$que === void 0 ? void 0 : _clonePreviewData$que.map(function (e) {
-                if (e.type === other.type) {
-                  var new_questions = (0,lodash.cloneDeep)(e === null || e === void 0 ? void 0 : e.questions);
-                  new_questions.splice(other.index, 1, res === null || res === void 0 ? void 0 : res.question);
-                  // console.log(e?.questions, new_questions, other.index, 'new_questions')
-                  return objectSpread2_default()(objectSpread2_default()({}, e), {}, {
-                    questions: new_questions
-                  });
-                }
-                return e;
-              });
-              setEditData(clonePreviewData);
+              getEditData(0);
+              // let clonePreviewData = cloneDeep(editData)
+              // clonePreviewData.questionList = clonePreviewData?.questionList?.map((e: any) => {
+              //   if (e.type === other.type) {
+              //     const new_questions = cloneDeep(e?.questions);
+              //     new_questions.splice(other.index, 1, res?.question);
+              //     // console.log(e?.questions, new_questions, other.index, 'new_questions')
+              //     return {
+              //       ...e, questions: new_questions
+              //     }
+              //   }
+              //   return e
+              // })
+
+              // setEditData(clonePreviewData)
             }
           case 4:
           case "end":
diff --git a/p__Paths__Detail__id.async.js b/p__Paths__Detail__id.async.js
index 26b2cc7c4c..6596b1cb70 100644
--- a/p__Paths__Detail__id.async.js
+++ b/p__Paths__Detail__id.async.js
@@ -2028,8 +2028,8 @@ var message = __webpack_require__(8591);
 var dropdown = __webpack_require__(38854);
 // EXTERNAL MODULE: ./node_modules/_flv.js@1.5.0@flv.js/src/flv.js + 38 modules
 var flv = __webpack_require__(31087);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/authority.ts
 var authority = __webpack_require__(19654);
 // EXTERNAL MODULE: ./node_modules/_react-copy-to-clipboard@5.0.2@react-copy-to-clipboard/lib/index.js
@@ -2520,8 +2520,8 @@ var regex = /(android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini)/i;
     if (((_src4 = src) === null || _src4 === void 0 ? void 0 : _src4.indexOf('.m3u8')) > -1) {
       if (el.current.canPlayType('application/vnd.apple.mpegurl')) {
         el.current.src = src;
-      } else if (dist_hls/* default */.Z.isSupported()) {
-        var hls = new dist_hls/* default */.Z();
+      } else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+        var hls = new dist_hls/* default */.ZP();
         hls.loadSource(src);
         hls.attachMedia(el.current);
       }
@@ -3142,9 +3142,9 @@ var SetPublic = function SetPublic(_ref) {
 
 /***/ }),
 
-/***/ 84078:
+/***/ 67335:
 /*!******************************************************!*\
-  !*** ./src/pages/Paths/Detail/[id].tsx + 59 modules ***!
+  !*** ./src/pages/Paths/Detail/[id].tsx + 62 modules ***!
   \******************************************************/
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
@@ -20029,6 +20029,276 @@ var knowledge_Atlas = function Atlas(_ref) {
     pathsDetail: pathsDetail
   };
 })(knowledge_Atlas));
+;// CONCATENATED MODULE: ./src/pages/Paths/Detail/components/Combination/index.less?modules
+// extracted by mini-css-extract-plugin
+/* harmony default export */ var Combinationmodules = ({"flex_box_center":"flex_box_center___zI_82","flex_space_between":"flex_space_between___c8p6y","flex_box_vertical_center":"flex_box_vertical_center___OQMX2","flex_box_center_end":"flex_box_center_end___TDCTp","flex_box_column":"flex_box_column___TBe9v","bg":"bg___B_tAL","AllButStyle":"AllButStyle___gHlx_","ButStyles":"ButStyles___QnHEw","order":"order___p1oR4","payed":"payed___clmo_","study":"study___xKiY_","studyActive":"studyActive___OL576","Head":"Head___A9J68","Headtitle":"Headtitle___HvFxg","span2":"span2___L0TMM","Headprice":"Headprice___RXYrD","nowPrice":"nowPrice___cv3Ok","initPrice":"initPrice___EXuC3","Swiper":"Swiper___sDGem","BannerListItemDiv":"BannerListItemDiv___asTuk","BannerListItem":"BannerListItem___NwQOT","BannerListItemImg":"BannerListItemImg___mD5FK","bgimg":"bgimg___PFwp4","buyimg":"buyimg___QLVI_","curCourse":"curCourse___ExJPE","BannerListItemInfo":"BannerListItemInfo___Vio14","BannerListItemInfoTitle":"BannerListItemInfoTitle___FiU8N","BannerListItemInfoTeacher":"BannerListItemInfoTeacher___aifjQ","BannerListItemInfoTime":"BannerListItemInfoTime___qez5r","timeprice":"timeprice___dqmp8","span":"span___UhhBA","BannerListItemInfoTime2":"BannerListItemInfoTime2___Zm2lP","span1":"span1___AXdGP","expansion":"expansion___t6EwU"});
+;// CONCATENATED MODULE: ./src/assets/images/IntrainCourse/buyed.png
+var buyed_namespaceObject = "data:image/png;base64,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";
+;// CONCATENATED MODULE: ./src/pages/Paths/Detail/components/Combination/index.tsx
+
+
+
+
+
+var Combination_excluded = ["pathsDetail", "globalSetting", "user", "loading", "dispatch"];
+
+
+
+
+
+
+
+
+
+
+var PathsDetailPage = function PathsDetailPage(_ref) {
+  var pathsDetail = _ref.pathsDetail,
+    globalSetting = _ref.globalSetting,
+    user = _ref.user,
+    loading = _ref.loading,
+    dispatch = _ref.dispatch,
+    props = objectWithoutProperties_default()(_ref, Combination_excluded);
+  var _useState = (0,_react_17_0_2_react.useState)([]),
+    _useState2 = slicedToArray_default()(_useState, 2),
+    BannerList = _useState2[0],
+    setBannerList = _useState2[1];
+  var _useSearchParams = (0,_umi_production_exports.useSearchParams)(),
+    _useSearchParams2 = slicedToArray_default()(_useSearchParams, 1),
+    searchParams = _useSearchParams2[0];
+  var params = (0,_umi_production_exports.useParams)();
+  var _useState3 = (0,_react_17_0_2_react.useState)(false),
+    _useState4 = slicedToArray_default()(_useState3, 2),
+    listLoading = _useState4[0],
+    setListLoading = _useState4[1];
+  var getData = /*#__PURE__*/function () {
+    var _ref2 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee() {
+      var _user$userInfo;
+      var res, _res$data;
+      return regeneratorRuntime_default()().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            setListLoading(true);
+            _context.next = 3;
+            return (0,fetch/* default */.ZP)("/api/paths/".concat(params.pathId, "/packages_list.json"), {
+              method: 'get',
+              params: {
+                identifier: user === null || user === void 0 || (_user$userInfo = user.userInfo) === null || _user$userInfo === void 0 ? void 0 : _user$userInfo.login,
+                id: params.pathId
+              }
+            });
+          case 3:
+            res = _context.sent;
+            setListLoading(false);
+            if (res.status == 0) {
+              setBannerList(res === null || res === void 0 || (_res$data = res.data) === null || _res$data === void 0 ? void 0 : _res$data.map(function (item) {
+                item.isFull = false;
+                return item;
+              }));
+            }
+          case 6:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getData() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  (0,_react_17_0_2_react.useEffect)(function () {
+    getData();
+  }, []);
+  var handleImmediatelyPay = /*#__PURE__*/function () {
+    var _ref3 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2(packId) {
+      var res;
+      return regeneratorRuntime_default()().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            _context2.next = 2;
+            return (0,fetch/* default */.ZP)("/api/payments.json", {
+              method: 'POST',
+              body: {
+                subject_package_id: packId,
+                payment_method: 'wechat_qr'
+              }
+            });
+          case 2:
+            res = _context2.sent;
+            if (res !== null && res !== void 0 && res.num) {
+              window.open(searchParams.get("userid") ? "/order/".concat(params.pathId, "/pay?order_num=").concat(res === null || res === void 0 ? void 0 : res.num, "&userid=").concat(searchParams.get("userid")) : "/order/".concat(params.pathId, "/pay?order_num=").concat(res === null || res === void 0 ? void 0 : res.num));
+            }
+          case 4:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function handleImmediatelyPay(_x) {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  var renderList = function renderList(listItem) {
+    var _ref4, _ref5, _ref6, _ref7, _listItem$subjects, _listItem$subjects2;
+    return /*#__PURE__*/(0,jsx_runtime.jsxs)("section", {
+      style: {
+        marginBottom: '26px',
+        backgroundColor: '#fff'
+      },
+      children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+        className: Combinationmodules.Head,
+        children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          className: Combinationmodules.Headtitle,
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+            children: listItem === null || listItem === void 0 ? void 0 : listItem.package_name
+          }), /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+            className: Combinationmodules.span2,
+            children: ["\uFF08\u5171 ", /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+              style: {
+                color: '#333'
+              },
+              children: listItem === null || listItem === void 0 ? void 0 : listItem.subject_count
+            }), " \u95E8\u8BFE\u7A0B\uFF09"]
+          })]
+        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          style: {
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'flex-end'
+          },
+          children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+            className: Combinationmodules.Headprice,
+            children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+              children: "\u5957\u9910\u4EF7\u683C\uFF1A"
+            }), /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+              className: Combinationmodules.nowPrice,
+              children: ["\uFFE5", parseInt((_ref4 = "".concat(listItem === null || listItem === void 0 ? void 0 : listItem.package_price)) === null || _ref4 === void 0 || (_ref4 = _ref4.split('.')) === null || _ref4 === void 0 ? void 0 : _ref4[1]) > 0 ? listItem === null || listItem === void 0 ? void 0 : listItem.package_price : (_ref5 = "".concat(listItem === null || listItem === void 0 ? void 0 : listItem.package_price)) === null || _ref5 === void 0 || (_ref5 = _ref5.split('.')) === null || _ref5 === void 0 ? void 0 : _ref5[0]]
+            }), /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+              className: Combinationmodules.initPrice,
+              children: ["\uFFE5", parseInt((_ref6 = "".concat(listItem === null || listItem === void 0 ? void 0 : listItem.package_origin_price)) === null || _ref6 === void 0 || (_ref6 = _ref6.split('.')) === null || _ref6 === void 0 ? void 0 : _ref6[1]) > 0 ? listItem === null || listItem === void 0 ? void 0 : listItem.package_origin_price : (_ref7 = "".concat(listItem === null || listItem === void 0 ? void 0 : listItem.package_origin_price)) === null || _ref7 === void 0 || (_ref7 = _ref7.split('.')) === null || _ref7 === void 0 ? void 0 : _ref7[0]]
+            })]
+          }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+            className: Combinationmodules.AllButStyle,
+            children: /*#__PURE__*/(0,jsx_runtime.jsxs)(es_button/* default */.ZP, {
+              className: listItem !== null && listItem !== void 0 && listItem.is_payed ? "".concat(Combinationmodules.payed) : "".concat(Combinationmodules.order),
+              onClick: function onClick() {
+                listItem !== null && listItem !== void 0 && listItem.is_payed ? _umi_production_exports.history.push("/users/".concat(user === null || user === void 0 ? void 0 : user.userInfo.login, "/paths?category=payed")) : handleImmediatelyPay(listItem === null || listItem === void 0 ? void 0 : listItem.id);
+              },
+              children: [listItem !== null && listItem !== void 0 && listItem.is_payed ? '已购买' : '立即购买', " "]
+            })
+          })]
+        })]
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+        className: listItem.isFull ? "".concat(Combinationmodules.Swiper) : "".concat(Combinationmodules.Swiper, " ").concat(Combinationmodules.expansion),
+        children: listItem === null || listItem === void 0 || (_listItem$subjects = listItem.subjects) === null || _listItem$subjects === void 0 ? void 0 : _listItem$subjects.map(function (item, listindex) {
+          var _item$price, _item$price2, _item$origin_price, _item$origin_price2;
+          return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+            style: {
+              width: '232px',
+              marginRight: (1 + listindex) % 3 === 0 ? 0 : 27
+            },
+            className: Combinationmodules.BannerListItemDiv,
+            children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+              className: Combinationmodules.BannerListItem,
+              children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+                onClick: function onClick() {
+                  return window.open("/paths/".concat(item.identifier));
+                },
+                children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+                  className: Combinationmodules.BannerListItemImg,
+                  children: [/*#__PURE__*/(0,jsx_runtime.jsx)("img", {
+                    className: Combinationmodules.bgimg,
+                    src: "".concat(item.image_url)
+                  }), (item === null || item === void 0 ? void 0 : item.user_paid_subject) && /*#__PURE__*/(0,jsx_runtime.jsx)("img", {
+                    className: Combinationmodules.buyimg,
+                    src: buyed_namespaceObject
+                  }), (item === null || item === void 0 ? void 0 : item.is_current_subject) && /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+                    className: Combinationmodules.curCourse,
+                    children: "\u5F53\u524D\u8BFE\u7A0B"
+                  })]
+                }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+                  className: Combinationmodules.BannerListItemInfo,
+                  children: [/*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+                    placement: "topLeft",
+                    title: item.name,
+                    children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+                      className: Combinationmodules.BannerListItemInfoTitle,
+                      children: item.name
+                    })
+                  }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+                    className: Combinationmodules.BannerListItemInfoTeacher,
+                    children: ["\u8BB2\u5E08\uFF1A", item.teacher]
+                  }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+                    className: "".concat(Combinationmodules.BannerListItemInfoTime, " ").concat(Combinationmodules.BannerListItemInfoTime2),
+                    children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+                      className: Combinationmodules.span1,
+                      children: [item.learn_count / 10000 > 1 ? (item.learn_count / 10000).toFixed(1) + 'W' : item.learn_count, "\u4EBA\u6B63\u5728\u5B66"]
+                    }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+                      className: "".concat(Combinationmodules.timeprice),
+                      children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+                        className: Combinationmodules.span,
+                        children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+                          className: Combinationmodules.qianfuhao,
+                          children: "\uFFE5"
+                        }), item.is_discount ? parseInt(item === null || item === void 0 || (_item$price = item.price) === null || _item$price === void 0 ? void 0 : _item$price.split('.')[1]) > 0 ? item === null || item === void 0 ? void 0 : item.price : item === null || item === void 0 || (_item$price2 = item.price) === null || _item$price2 === void 0 ? void 0 : _item$price2.split('.')[0] : parseInt(item === null || item === void 0 || (_item$origin_price = item.origin_price) === null || _item$origin_price === void 0 ? void 0 : _item$origin_price.split('.')[1]) > 0 ? item === null || item === void 0 ? void 0 : item.origin_price : item === null || item === void 0 || (_item$origin_price2 = item.origin_price) === null || _item$origin_price2 === void 0 ? void 0 : _item$origin_price2.split('.')[0]]
+                      })
+                    })]
+                  })]
+                })]
+              })
+            })
+          }, listindex);
+        })
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+        style: {
+          display: 'flex',
+          justifyContent: 'center',
+          alignItems: 'center',
+          color: '#82A8FF',
+          paddingBottom: '20px'
+        },
+        children: (listItem === null || listItem === void 0 || (_listItem$subjects2 = listItem.subjects) === null || _listItem$subjects2 === void 0 ? void 0 : _listItem$subjects2.length) > 3 && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          onClick: function onClick() {
+            listItem.isFull = !listItem.isFull;
+            setBannerList(toConsumableArray_default()(BannerList));
+          },
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+            className: "current",
+            style: {
+              marginRight: '6px'
+            },
+            children: listItem.isFull ? '收起' : '展开'
+          }), /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+            className: "current",
+            children: /*#__PURE__*/(0,jsx_runtime.jsx)("i", {
+              className: listItem.isFull ? 'iconfont icon-shouqi5' : 'iconfont icon-xiala4',
+              style: {
+                fontSize: '8px'
+              }
+            })
+          })]
+        })
+      })]
+    });
+  };
+  return /*#__PURE__*/(0,jsx_runtime.jsx)(spin/* default */.Z, {
+    spinning: listLoading,
+    children: (BannerList === null || BannerList === void 0 ? void 0 : BannerList.length) > 0 ? BannerList === null || BannerList === void 0 ? void 0 : BannerList.map(function (item) {
+      return renderList(item);
+    }) : /*#__PURE__*/(0,jsx_runtime.jsx)(NoData/* default */.Z, {})
+  });
+};
+/* harmony default export */ var Combination = ((0,_umi_production_exports.connect)(function (_ref8) {
+  var pathsDetail = _ref8.pathsDetail,
+    loading = _ref8.loading,
+    globalSetting = _ref8.globalSetting,
+    user = _ref8.user;
+  return {
+    pathsDetail: pathsDetail,
+    globalSetting: globalSetting,
+    loading: loading,
+    user: user
+  };
+})(PathsDetailPage));
 ;// CONCATENATED MODULE: ./src/pages/Paths/Detail/index.less?modules
 // extracted by mini-css-extract-plugin
 /* harmony default export */ var Detailmodules = ({"flex_box_center":"flex_box_center___hEKvu","flex_space_between":"flex_space_between___gtzO_","flex_box_vertical_center":"flex_box_vertical_center___QQWbT","flex_box_center_end":"flex_box_center_end___AyfXQ","flex_box_column":"flex_box_column___q0hJc","bg":"bg___sN_Hy","wrap":"wrap___IaIuZ","content":"content___q5lPL","wrapTabs":"wrapTabs___FivJx","intro":"intro___lW9Kf","introTitle":"introTitle___y5V_M"});
@@ -20060,6 +20330,7 @@ var _id_excluded = ["pathsDetail", "globalSetting", "loading", "dispatch"];
 
 
 
+
 var _id_TabPane = tabs/* default */.Z.TabPane;
 function _id_onPreviewImage(e) {
   var parentIndexOf = function parentIndexOf(node, parent) {
@@ -20088,8 +20359,8 @@ function _id_onPreviewImage(e) {
     }
   }
 }
-var PathsDetailPage = function PathsDetailPage(_ref) {
-  var _pathsDetail$detail6, _pathsDetail$detail7;
+var _id_PathsDetailPage = function PathsDetailPage(_ref) {
+  var _pathsDetail$detail8, _pathsDetail$detail9;
   var pathsDetail = _ref.pathsDetail,
     globalSetting = _ref.globalSetting,
     loading = _ref.loading,
@@ -20123,6 +20394,10 @@ var PathsDetailPage = function PathsDetailPage(_ref) {
   }, {
     name: '知识图谱',
     key: 'knowledge'
+  }, {
+    name: '套餐列表',
+    key: 'Combination',
+    extra: '优惠'
   }].filter(function (item) {
     var _pathsDetail$detail, _pathsDetail$detail2;
     if ((_pathsDetail$detail = pathsDetail.detail) !== null && _pathsDetail$detail !== void 0 && _pathsDetail$detail.excellent || ((_pathsDetail$detail2 = pathsDetail.detail) === null || _pathsDetail$detail2 === void 0 ? void 0 : _pathsDetail$detail2.is_free) === false) {
@@ -20135,6 +20410,12 @@ var PathsDetailPage = function PathsDetailPage(_ref) {
       return true;
     }
     return item.key !== 'atlas';
+  }).filter(function (item) {
+    var _pathsDetail$detail5, _pathsDetail$detail6;
+    if (((_pathsDetail$detail5 = pathsDetail.detail) === null || _pathsDetail$detail5 === void 0 ? void 0 : _pathsDetail$detail5.is_free) === false && (_pathsDetail$detail6 = pathsDetail.detail) !== null && _pathsDetail$detail6 !== void 0 && _pathsDetail$detail6.is_has_package) {
+      return true;
+    }
+    return item.key !== 'Combination';
   });
   (0,_react_17_0_2_react.useEffect)(function () {
     if (contentEl.current) {
@@ -20152,8 +20433,8 @@ var PathsDetailPage = function PathsDetailPage(_ref) {
     getData();
   }, [params.pathId]);
   (0,_react_17_0_2_react.useEffect)(function () {
-    var _pathsDetail$detail5;
-    (0,util/* setDocumentTitle */.Dk)((_pathsDetail$detail5 = pathsDetail.detail) === null || _pathsDetail$detail5 === void 0 ? void 0 : _pathsDetail$detail5.name);
+    var _pathsDetail$detail7;
+    (0,util/* setDocumentTitle */.Dk)((_pathsDetail$detail7 = pathsDetail.detail) === null || _pathsDetail$detail7 === void 0 ? void 0 : _pathsDetail$detail7.name);
   }, [pathsDetail]);
   var handleSearch = function handleSearch(v) {
     var _decodeURIComponent;
@@ -20206,7 +20487,7 @@ var PathsDetailPage = function PathsDetailPage(_ref) {
       className: Detailmodules.bg,
       children: [/*#__PURE__*/(0,jsx_runtime.jsx)(components_Banner, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(image_preview/* default */.Z, {}), /*#__PURE__*/(0,jsx_runtime.jsxs)("section", {
         style: {
-          marginTop: ((_pathsDetail$detail6 = pathsDetail.detail) === null || _pathsDetail$detail6 === void 0 ? void 0 : _pathsDetail$detail6.excellent) && '89px'
+          marginTop: ((_pathsDetail$detail8 = pathsDetail.detail) === null || _pathsDetail$detail8 === void 0 ? void 0 : _pathsDetail$detail8.excellent) && '89px'
         },
         className: "edu-container pb80 ".concat(Detailmodules.wrap),
         children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("aside", {
@@ -20231,7 +20512,7 @@ var PathsDetailPage = function PathsDetailPage(_ref) {
             }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
               ref: contentEl,
               children: /*#__PURE__*/(0,jsx_runtime.jsx)(RenderHtml/* default */.Z, {
-                value: (_pathsDetail$detail7 = pathsDetail.detail) === null || _pathsDetail$detail7 === void 0 ? void 0 : _pathsDetail$detail7.description
+                value: (_pathsDetail$detail9 = pathsDetail.detail) === null || _pathsDetail$detail9 === void 0 ? void 0 : _pathsDetail$detail9.description
               })
             })]
           }), /*#__PURE__*/(0,jsx_runtime.jsx)(tabs/* default */.Z, {
@@ -20254,12 +20535,35 @@ var PathsDetailPage = function PathsDetailPage(_ref) {
             }) : '',
             children: keys.map(function (e) {
               return /*#__PURE__*/(0,jsx_runtime.jsx)(_id_TabPane, {
-                tab: e.name
+                tab: e !== null && e !== void 0 && e.extra ? /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+                  style: {
+                    position: 'relative'
+                  },
+                  children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+                    children: e.name
+                  }), /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+                    style: {
+                      position: 'absolute',
+                      top: '0',
+                      left: '72px',
+                      display: 'inline-block',
+                      width: '32px',
+                      height: '16px',
+                      lineHeight: '16px',
+                      textAlign: 'center',
+                      backgroundColor: '#FF0000',
+                      borderRadius: '8px',
+                      fontSize: '12px',
+                      color: '#fff'
+                    },
+                    children: e.extra
+                  })]
+                }) : e.name
               }, e.key);
             })
           }), activeKey === 'stage' && /*#__PURE__*/(0,jsx_runtime.jsx)(components_Stage, {
             keywords: keywords
-          }), activeKey === 'ranking' && /*#__PURE__*/(0,jsx_runtime.jsx)(StudentItems, {}), activeKey === 'certificate' && /*#__PURE__*/(0,jsx_runtime.jsx)(Stage_Certificate, {}), activeKey === 'atlas' && /*#__PURE__*/(0,jsx_runtime.jsx)(components_Atlas, {}), activeKey === 'knowledge' && /*#__PURE__*/(0,jsx_runtime.jsx)(knowledge, {})]
+          }), activeKey === 'ranking' && /*#__PURE__*/(0,jsx_runtime.jsx)(StudentItems, {}), activeKey === 'certificate' && /*#__PURE__*/(0,jsx_runtime.jsx)(Stage_Certificate, {}), activeKey === 'atlas' && /*#__PURE__*/(0,jsx_runtime.jsx)(components_Atlas, {}), activeKey === 'knowledge' && /*#__PURE__*/(0,jsx_runtime.jsx)(knowledge, {}), activeKey === 'Combination' && /*#__PURE__*/(0,jsx_runtime.jsx)(Combination, {})]
         }), /*#__PURE__*/(0,jsx_runtime.jsx)(components_Right, {})]
       })]
     })
@@ -20274,7 +20578,7 @@ var PathsDetailPage = function PathsDetailPage(_ref) {
     globalSetting: globalSetting,
     loading: loading
   };
-})(PathsDetailPage));
+})(_id_PathsDetailPage));
 
 /***/ }),
 
diff --git a/p__Paths__Detail__id.chunk.css b/p__Paths__Detail__id.chunk.css
index 0fc5f40c93..370b24a523 100644
--- a/p__Paths__Detail__id.chunk.css
+++ b/p__Paths__Detail__id.chunk.css
@@ -4028,6 +4028,221 @@ body {
   max-width: 400px;
 }
 
+/*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/pages/Paths/Detail/components/Combination/index.less?modules ***!
+  \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.flex_box_center___zI_82 {
+  justify-content: center;
+  align-items: center;
+  -webkit-justify-content: center;
+  box-align: center;
+}
+.flex_space_between___c8p6y {
+  justify-content: space-between;
+  -webkit-box-pack: justify;
+}
+.flex_box_vertical_center___OQMX2 {
+  align-items: center;
+  box-align: center;
+}
+.flex_box_center_end___TDCTp {
+  justify-content: flex-end;
+  align-items: center;
+  -webkit-justify-content: flex-end;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -webkit-box-pack: end;
+  box-align: center;
+  box-pack: end;
+}
+.flex_box_column___TBe9v {
+  flex-direction: column;
+  box-orient: block-axis;
+}
+.bg___B_tAL {
+  background-color: #fff;
+}
+.AllButStyle___gHlx_ .ButStyles___QnHEw {
+  font-size: 12px;
+  font-weight: 500;
+  width: 80px;
+  border-radius: 16px;
+  border: none;
+}
+.AllButStyle___gHlx_ .order___p1oR4 {
+  font-size: 12px;
+  font-weight: 500;
+  width: 80px;
+  border-radius: 16px;
+  border: none;
+  background: #F47C18;
+  color: #fff !important;
+}
+.AllButStyle___gHlx_ .payed___clmo_ {
+  font-size: 12px;
+  font-weight: 500;
+  width: 80px;
+  border-radius: 16px;
+  border: none;
+  background-color: #2DBF70;
+  color: #fff !important;
+}
+.AllButStyle___gHlx_ .study___xKiY_ {
+  font-size: 12px;
+  font-weight: 500;
+  width: 80px;
+  border-radius: 16px;
+  border: none;
+  background: rgba(244, 124, 24, 0.28);
+  color: #A4642F;
+}
+.AllButStyle___gHlx_ .studyActive___OL576:hover {
+  color: #FA6400 !important;
+}
+.Head___A9J68 {
+  display: flex;
+  justify-content: space-between;
+  align-items: center;
+  padding: 20px 20px 0px;
+}
+.Headtitle___HvFxg {
+  font-size: 16px;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 600;
+  color: #000000;
+}
+.Headtitle___HvFxg .span2___L0TMM {
+  font-size: 14px;
+  font-weight: 400;
+  color: #666666;
+}
+.Headprice___RXYrD {
+  font-size: 12px;
+  font-family: PingFangSC, PingFang SC;
+  font-weight: 400;
+  color: #999999;
+}
+.Headprice___RXYrD .nowPrice___cv3Ok {
+  font-size: 18px;
+  font-weight: 600;
+  color: #F47B18;
+}
+.Headprice___RXYrD .initPrice___EXuC3 {
+  margin-left: 10px;
+  margin-right: 40px;
+  text-decoration: line-through;
+}
+.Swiper___sDGem {
+  display: flex;
+  justify-content: flex-start;
+  align-items: center;
+  flex-wrap: wrap;
+  padding: 15px 20px;
+}
+.Swiper___sDGem .BannerListItemDiv___asTuk {
+  height: 240px;
+  margin-bottom: 15px;
+}
+.Swiper___sDGem .BannerListItem___NwQOT {
+  border-radius: 8px;
+  background: #FFFFFF;
+  box-shadow: 0px 3px 6px 0px rgba(227, 228, 229, 0.5);
+  cursor: pointer;
+  position: relative;
+  overflow: hidden;
+}
+.Swiper___sDGem .BannerListItemImg___mD5FK {
+  width: 232px;
+  height: 133px;
+  overflow: hidden;
+  position: relative;
+}
+.Swiper___sDGem .BannerListItemImg___mD5FK .bgimg___PFwp4 {
+  position: absolute;
+  top: 0;
+  left: 50%;
+  transform: translateX(-50%);
+  width: 100%;
+  object-fit: cover;
+  transition: 0.3s;
+}
+.Swiper___sDGem .BannerListItemImg___mD5FK .buyimg___QLVI_ {
+  position: absolute;
+  top: 6px;
+  right: 6px;
+  width: 42px;
+}
+.Swiper___sDGem .BannerListItemImg___mD5FK .curCourse___ExJPE {
+  display: inline-block;
+  position: absolute;
+  left: 0;
+  bottom: 0;
+  width: 64px;
+  height: 20px;
+  line-height: 20px;
+  text-align: center;
+  font-weight: 500;
+  color: #FFFFFF;
+  font-size: 12px;
+  background: #F47C18;
+  border-radius: 0px 6px 0px 0px;
+}
+.Swiper___sDGem .BannerListItemInfo___Vio14 {
+  padding: 15px 20px;
+}
+.Swiper___sDGem .BannerListItemInfoTitle___FiU8N {
+  width: 100%;
+  font-size: 16px;
+  font-weight: 600;
+  color: #333;
+  line-height: 20px;
+  overflow: hidden;
+  white-space: nowrap;
+  text-overflow: ellipsis;
+}
+.Swiper___sDGem .BannerListItemInfoTeacher___aifjQ {
+  margin-top: 10px;
+  font-size: 12px;
+  font-weight: 400;
+  color: #6B758B;
+  line-height: 12px;
+}
+.Swiper___sDGem .BannerListItemInfoTime___qez5r {
+  margin-top: 15px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-weight: 400;
+  color: #999999;
+  line-height: 16px;
+}
+.Swiper___sDGem .BannerListItemInfoTime___qez5r .timeprice___dqmp8 {
+  white-space: nowrap;
+}
+.Swiper___sDGem .BannerListItemInfoTime___qez5r .timeprice___dqmp8 .span___UhhBA {
+  font-size: 18px;
+  font-weight: 600;
+  color: #F47B18;
+  display: inline;
+  line-height: 18px;
+  letter-spacing: -1px;
+}
+.Swiper___sDGem .BannerListItemInfoTime2___Zm2lP {
+  justify-content: space-between;
+}
+.Swiper___sDGem .BannerListItemInfoTime2___Zm2lP .span1___AXdGP {
+  font-size: 14px;
+  font-weight: 400;
+  color: #12A278;
+}
+.Swiper___sDGem .BannerListItem___NwQOT:hover .BannerListItemImg___mD5FK .bgimg___PFwp4 {
+  width: 110%;
+}
+.expansion___t6EwU {
+  max-height: 270px;
+  overflow: hidden;
+}
+
 /*!*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/pages/Paths/Detail/index.less?modules ***!
   \*************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
diff --git a/p__Paths__New__index.async.js b/p__Paths__New__index.async.js
index 0c470d6fe8..8e2a1ee406 100644
--- a/p__Paths__New__index.async.js
+++ b/p__Paths__New__index.async.js
@@ -877,8 +877,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1165,8 +1165,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__Problems__OjForm__NewEdit__index.async.js b/p__Problems__OjForm__NewEdit__index.async.js
index ea2002c0c3..62d1f48d97 100644
--- a/p__Problems__OjForm__NewEdit__index.async.js
+++ b/p__Problems__OjForm__NewEdit__index.async.js
@@ -1047,8 +1047,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1335,8 +1335,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__Problems__OjForm__index.async.js b/p__Problems__OjForm__index.async.js
index 1d202d6a87..154f605cb9 100644
--- a/p__Problems__OjForm__index.async.js
+++ b/p__Problems__OjForm__index.async.js
@@ -1122,8 +1122,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1410,8 +1410,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__Problemset__NewItem__index.async.js b/p__Problemset__NewItem__index.async.js
index 38b5cc1675..1a40ec3d7d 100644
--- a/p__Problemset__NewItem__index.async.js
+++ b/p__Problemset__NewItem__index.async.js
@@ -2771,6 +2771,26 @@ var CompletionQuestionEditor = function CompletionQuestionEditor(_ref3) {
           })]
         });
       }
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, {
+      align: "middle",
+      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .Z.Item, {
+        name: "downcase",
+        valuePropName: "checked",
+        children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z, {})
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z, {
+        className: "ml10",
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u5B57\u6BCD\u5927\u5C0F\u5199"
+      })]
+    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, {
+      align: "middle",
+      children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_17__/* ["default"] */ .Z.Item, {
+        name: "no_space",
+        valuePropName: "checked",
+        children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_16__/* ["default"] */ .Z, {})
+      }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsx)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z, {
+        className: "ml10",
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u7A7A\u683C"
+      })]
     }), (standardAnswersValue === null || standardAnswersValue === void 0 ? void 0 : standardAnswersValue.length) > 1 && /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_9__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, {
       align: "middle",
       className: (standardAnswersValue === null || standardAnswersValue === void 0 ? void 0 : standardAnswersValue.length) > 1 ? 'mb30' : "".concat(_index_less_modules__WEBPACK_IMPORTED_MODULE_8__/* ["default"] */ .Z.hide),
@@ -3543,6 +3563,7 @@ var CombinationCompletionQuestionEditor_CompletionQuestionEditor = function Comp
   var _form$getFieldValue;
   var questionTitlePlaceholder = _ref3.questionTitlePlaceholder,
     form = _ref3.form,
+    name = _ref3.name,
     _ref3$scoreByBlank = _ref3.scoreByBlank,
     scoreByBlank = _ref3$scoreByBlank === void 0 ? false : _ref3$scoreByBlank,
     answerKey = _ref3.answerKey,
@@ -3623,6 +3644,9 @@ var CombinationCompletionQuestionEditor_CompletionQuestionEditor = function Comp
   };
   // const standardAnswersValue = Form.useWatch(answerKey, form)
   var standardAnswersValue = (_form$getFieldValue = form.getFieldValue('sub_item_banks')) === null || _form$getFieldValue === void 0 || (_form$getFieldValue = _form$getFieldValue[answerKey === null || answerKey === void 0 ? void 0 : answerKey[0]]) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue[answerKey === null || answerKey === void 0 ? void 0 : answerKey[1]];
+  (0,_react_17_0_2_react.useEffect)(function () {
+    console.log("========", form.getFieldsValue());
+  }, [form]);
   return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
     className: QuestionEditormodules/* default */.Z.wrap,
     children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", {
@@ -3745,6 +3769,26 @@ var CombinationCompletionQuestionEditor_CompletionQuestionEditor = function Comp
           })]
         });
       }
+    }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+      align: "middle",
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+        name: [name, "downcase"],
+        valuePropName: "checked",
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_switch/* default */.Z, {})
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+        className: "ml10",
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u5B57\u6BCD\u5927\u5C0F\u5199"
+      })]
+    }), /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
+      align: "middle",
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+        name: [name, "no_space"],
+        valuePropName: "checked",
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_switch/* default */.Z, {})
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+        className: "ml10",
+        children: "\u5224\u5206\u65F6\u5FFD\u7565\u7B54\u6848\u4E2D\u7684\u7A7A\u683C"
+      })]
     }), (standardAnswersValue === null || standardAnswersValue === void 0 ? void 0 : standardAnswersValue.length) > 1 && /*#__PURE__*/(0,jsx_runtime.jsxs)(row/* default */.Z, {
       align: "middle",
       className: (standardAnswersValue === null || standardAnswersValue === void 0 ? void 0 : standardAnswersValue.length) > 1 ? 'mb30' : "".concat(QuestionEditormodules/* default */.Z.hide),
@@ -4405,6 +4449,7 @@ var CombinationQuestionEditor = function CombinationQuestionEditor(_ref) {
                     form: form,
                     questionTitlePlaceholder: "\u8BF7\u7F16\u8F91\u9898\u5E72\u5E76\u8BBE\u7F6E\u586B\u7A7A\u9879",
                     scoreByBlank: false,
+                    name: name,
                     titleKey: [name, 'name'],
                     analysisKey: [name, 'analysis'],
                     isOrdered: [name, 'is_ordered'],
@@ -4505,7 +4550,9 @@ var CombinationQuestionEditor = function CombinationQuestionEditor(_ref) {
                       analysis: '',
                       is_ordered: true,
                       standard_answers: [],
-                      item_type: 'COMPLETION'
+                      item_type: 'COMPLETION',
+                      downcase: true,
+                      no_space: true
                     });
                     setActiveKey([fields === null || fields === void 0 ? void 0 : fields.length].concat(toConsumableArray_default()(activeKey)));
                   },
@@ -4762,8 +4809,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -5050,8 +5097,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
@@ -9743,7 +9790,9 @@ var NewItem = function NewItem(_ref2) {
         break;
       case 'COMPLETION':
         form.setFieldsValue({
-          standard_answers: []
+          standard_answers: [],
+          downcase: true,
+          no_space: true
         });
         break;
       case 'SUBJECTIVE':
diff --git a/p__Problemset__index.async.js b/p__Problemset__index.async.js
index c5b2f9d907..ab9cf410a4 100644
--- a/p__Problemset__index.async.js
+++ b/p__Problemset__index.async.js
@@ -1694,8 +1694,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1982,8 +1982,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__Question__AddOrEdit__index.async.js b/p__Question__AddOrEdit__index.async.js
index 85d772678d..4609144937 100644
--- a/p__Question__AddOrEdit__index.async.js
+++ b/p__Question__AddOrEdit__index.async.js
@@ -550,8 +550,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -838,8 +838,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__Question__OjProblem__index.async.js b/p__Question__OjProblem__index.async.js
index 2e3f5195c6..077537af88 100644
--- a/p__Question__OjProblem__index.async.js
+++ b/p__Question__OjProblem__index.async.js
@@ -1053,8 +1053,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1341,8 +1341,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
@@ -1613,8 +1613,8 @@ var message = __webpack_require__(8591);
 var dropdown = __webpack_require__(38854);
 // EXTERNAL MODULE: ./node_modules/_flv.js@1.5.0@flv.js/src/flv.js + 38 modules
 var flv = __webpack_require__(31087);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/authority.ts
 var authority = __webpack_require__(19654);
 // EXTERNAL MODULE: ./node_modules/_react-copy-to-clipboard@5.0.2@react-copy-to-clipboard/lib/index.js
@@ -2105,8 +2105,8 @@ var regex = /(android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini)/i;
     if (((_src4 = src) === null || _src4 === void 0 ? void 0 : _src4.indexOf('.m3u8')) > -1) {
       if (el.current.canPlayType('application/vnd.apple.mpegurl')) {
         el.current.src = src;
-      } else if (dist_hls/* default */.Z.isSupported()) {
-        var hls = new dist_hls/* default */.Z();
+      } else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+        var hls = new dist_hls/* default */.ZP();
         hls.loadSource(src);
         hls.attachMedia(el.current);
       }
diff --git a/p__Shixuns__Detail__Collaborators__index.async.js b/p__Shixuns__Detail__Collaborators__index.async.js
index 82a8c314f4..87a7a88157 100644
--- a/p__Shixuns__Detail__Collaborators__index.async.js
+++ b/p__Shixuns__Detail__Collaborators__index.async.js
@@ -345,8 +345,8 @@ var TabPane = tabs/* default */.Z.TabPane;
 /* harmony default export */ var Collaboratorsmodules = ({"bg":"bg___sOdPb","wrap":"wrap___HoeSx","modal":"modal___t4bFU","content":"content___VMlwP","head":"head___eFHNj","headCount":"headCount___q7_8n","button":"button___OaGYh","itemWrap":"itemWrap___EgP_Y","imgWrap":"imgWrap___VcWR7","img":"img___PgTvY","manager":"manager___vGc7D","itemContent":"itemContent___JJG1i","nameWrap":"nameWrap___h4JTB","name":"name___yhHE5","actionGroup":"actionGroup___LDeZm","deleteIcon":"deleteIcon___Mmc7F","schoolWrap":"schoolWrap___Ru_DY","school":"school___zbcZj","countWrap":"countWrap___Mrp5n"});
 // EXTERNAL MODULE: ./node_modules/_@ant-design_icons@5.2.6@@ant-design/icons/es/icons/DownOutlined.js + 1 modules
 var DownOutlined = __webpack_require__(42884);
-// EXTERNAL MODULE: ./src/components/Header/index.tsx + 12 modules
-var Header = __webpack_require__(40847);
+// EXTERNAL MODULE: ./src/components/Header/index.tsx + 14 modules
+var Header = __webpack_require__(68337);
 ;// CONCATENATED MODULE: ./src/pages/Shixuns/Detail/Collaborators/index.tsx
 
 
diff --git a/p__Shixuns__Detail__Collaborators__index.chunk.css b/p__Shixuns__Detail__Collaborators__index.chunk.css
index 85f4a34903..de2cd1f49a 100644
--- a/p__Shixuns__Detail__Collaborators__index.chunk.css
+++ b/p__Shixuns__Detail__Collaborators__index.chunk.css
@@ -843,6 +843,40 @@
   font-size: 16px;
 }
 
+/*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/layouts/ShixunDetail/components/LateTip.less?modules ***!
+  \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.bottom___z0ujX {
+  width: 100%;
+  text-align: center;
+  margin-bottom: 15px;
+}
+.bottom___z0ujX .yes___hodnN {
+  width: 88px;
+  height: 32px;
+  background: #3061D0;
+  box-shadow: 0px 2px 4px 0px #E0DFE1, inset 0px 1px 3px 0px rgba(255, 255, 255, 0.5);
+  border-radius: 2px;
+  font-weight: 400;
+  color: #FFFFFF !important;
+  border: 0px;
+}
+.bottom___z0ujX .yes___hodnN:hover {
+  background: #5784de;
+}
+.bottom___z0ujX .no___hiPz5 {
+  margin-right: 20px;
+  width: 60px;
+  height: 32px;
+  background: #F8F9FC;
+  border-radius: 2px;
+  opacity: 0.5;
+  border: 1px solid #C3CFE0;
+  font-weight: 400;
+  color: #464F66 !important;
+  line-height: 14px;
+}
+
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/components/Header/components/Join/index.less?modules ***!
   \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -1031,3 +1065,16 @@
   color: #979797;
 }
 
+/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/components/Header/components/DelayTip/index.less?modules ***!
+  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.tip___a6MfI {
+  width: 1200px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 12px;
+  margin: 0 auto;
+}
+
diff --git a/p__Shixuns__Detail__Discuss__index.async.js b/p__Shixuns__Detail__Discuss__index.async.js
index a52b221f11..aba673ea7d 100644
--- a/p__Shixuns__Detail__Discuss__index.async.js
+++ b/p__Shixuns__Detail__Discuss__index.async.js
@@ -1086,8 +1086,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1374,8 +1374,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__Shixuns__Detail__Settings__index.async.js b/p__Shixuns__Detail__Settings__index.async.js
index 7c4eff1e28..b55b98ccc2 100644
--- a/p__Shixuns__Detail__Settings__index.async.js
+++ b/p__Shixuns__Detail__Settings__index.async.js
@@ -957,8 +957,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1245,8 +1245,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__Shixuns__Edit__index.async.js b/p__Shixuns__Edit__index.async.js
index 4d5105f2d8..ed80c354a8 100644
--- a/p__Shixuns__Edit__index.async.js
+++ b/p__Shixuns__Edit__index.async.js
@@ -282,8 +282,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -570,8 +570,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
@@ -4521,7 +4521,9 @@ var Information = function Information(_ref) {
           onClick: function onClick() {
             if (isup) {
               setcover_image_id('');
+              setcover_image('');
             } else {
+              setcover_image_id('');
               setcover_image('');
             }
           },
@@ -5472,8 +5474,8 @@ var TabPane = es_tabs/* default */.Z.TabPane;
 /* harmony default export */ var Collaboratemodules = ({"bg":"bg___GzXpp","wrap":"wrap___A40jS","modal":"modal___Zz7dC","content":"content___H5ZN2","head":"head___o5t32","headCount":"headCount___eBMPN","button":"button___YSSGm","itemWrap":"itemWrap___iPWUC","imgWrap":"imgWrap___T70Es","img":"img___oumA5","manager":"manager___VdXG8","itemContent":"itemContent____npAh","nameWrap":"nameWrap___nazId","name":"name___Z48aE","actionGroup":"actionGroup___eScAq","deleteIcon":"deleteIcon___FK_OA","schoolWrap":"schoolWrap___jJuIm","school":"school___kSMwT","countWrap":"countWrap___p7epV","deletetitle":"deletetitle___uVCHi","yseTitle":"yseTitle___L6JF9"});
 // EXTERNAL MODULE: ./node_modules/_@ant-design_icons@5.2.6@@ant-design/icons/es/icons/DownOutlined.js + 1 modules
 var DownOutlined = __webpack_require__(42884);
-// EXTERNAL MODULE: ./src/components/Header/index.tsx + 12 modules
-var components_Header = __webpack_require__(40847);
+// EXTERNAL MODULE: ./src/components/Header/index.tsx + 14 modules
+var components_Header = __webpack_require__(68337);
 ;// CONCATENATED MODULE: ./src/pages/Shixuns/Edit/body/Collaborate/index.tsx
 
 
diff --git a/p__Shixuns__Edit__index.chunk.css b/p__Shixuns__Edit__index.chunk.css
index 950e1eacad..358ffce9b4 100644
--- a/p__Shixuns__Edit__index.chunk.css
+++ b/p__Shixuns__Edit__index.chunk.css
@@ -2005,6 +2005,40 @@ ul.menu___E01hA [class~='ant-dropdown-menu-item-active'] {
   font-size: 16px;
 }
 
+/*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/layouts/ShixunDetail/components/LateTip.less?modules ***!
+  \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.bottom___z0ujX {
+  width: 100%;
+  text-align: center;
+  margin-bottom: 15px;
+}
+.bottom___z0ujX .yes___hodnN {
+  width: 88px;
+  height: 32px;
+  background: #3061D0;
+  box-shadow: 0px 2px 4px 0px #E0DFE1, inset 0px 1px 3px 0px rgba(255, 255, 255, 0.5);
+  border-radius: 2px;
+  font-weight: 400;
+  color: #FFFFFF !important;
+  border: 0px;
+}
+.bottom___z0ujX .yes___hodnN:hover {
+  background: #5784de;
+}
+.bottom___z0ujX .no___hiPz5 {
+  margin-right: 20px;
+  width: 60px;
+  height: 32px;
+  background: #F8F9FC;
+  border-radius: 2px;
+  opacity: 0.5;
+  border: 1px solid #C3CFE0;
+  font-weight: 400;
+  color: #464F66 !important;
+  line-height: 14px;
+}
+
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/components/Header/components/Join/index.less?modules ***!
   \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -2193,6 +2227,19 @@ ul.menu___E01hA [class~='ant-dropdown-menu-item-active'] {
   color: #979797;
 }
 
+/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/components/Header/components/DelayTip/index.less?modules ***!
+  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.tip___a6MfI {
+  width: 1200px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 12px;
+  margin: 0 auto;
+}
+
 /*!**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/pages/Shixuns/Edit/body/Setting/index.less?modules ***!
   \**************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
diff --git a/p__Shixuns__New__ImagePreview__index.async.js b/p__Shixuns__New__ImagePreview__index.async.js
index 8766597060..efaa1a738f 100644
--- a/p__Shixuns__New__ImagePreview__index.async.js
+++ b/p__Shixuns__New__ImagePreview__index.async.js
@@ -1071,6 +1071,10 @@ var HorizontalTabs = function HorizontalTabs(_ref) {
   var scrollbarContent = (0,_react_17_0_2_react.useRef)();
   var init = (0,_react_17_0_2_react.useRef)(false);
   var params = (0,_umi_production_exports.useParams)();
+  var userInfo = (0,_umi_production_exports.useSelector)(function (state) {
+    var _state$user;
+    return state === null || state === void 0 || (_state$user = state.user) === null || _state$user === void 0 ? void 0 : _state$user.userInfo;
+  });
   (0,_react_17_0_2_react.useEffect)(function () {
     var unSub = mediator/* default */.Z.subscribe('send-tabs-result-data', function (data) {
       var cloneTabs = (0,lodash.cloneDeep)(tabs);
@@ -1134,7 +1138,7 @@ var HorizontalTabs = function HorizontalTabs(_ref) {
       var fitem = Tpilist === null || Tpilist === void 0 || (_Tpilist$filter = Tpilist.filter(function (item) {
         return item.id === params.taskId;
       })) === null || _Tpilist$filter === void 0 ? void 0 : _Tpilist$filter[0];
-      var iscorrect = (fitem === null || fitem === void 0 ? void 0 : fitem.id) === params.taskId && (new Date().getTime() - new Date(fitem === null || fitem === void 0 ? void 0 : fitem.time).getTime()) / 1000 / 3600 > 24;
+      var iscorrect = (userInfo === null || userInfo === void 0 ? void 0 : userInfo.user_status) === 2 || (fitem === null || fitem === void 0 ? void 0 : fitem.id) === params.taskId && (new Date().getTime() - new Date(fitem === null || fitem === void 0 ? void 0 : fitem.time).getTime()) / 1000 / 3600 > 24;
 
       //判断分支
       var newTabs = initTabs.map(function (e, i) {
@@ -1327,6 +1331,9 @@ var HorizontalTabs = function HorizontalTabs(_ref) {
         return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
           onClick: function onClick() {
             if (index_tab === value.index_tab) return; //激活标签不允许重复点击
+            if ((userInfo === null || userInfo === void 0 ? void 0 : userInfo.user_status) === 2) {
+              return;
+            }
             var cloneItem = objectSpread2_default()(objectSpread2_default()({}, e), {}, {
               active: true
             });
diff --git a/p__Shixuns__New__index.async.js b/p__Shixuns__New__index.async.js
index e0b43f22c1..ae6e0849f0 100644
--- a/p__Shixuns__New__index.async.js
+++ b/p__Shixuns__New__index.async.js
@@ -877,8 +877,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1165,8 +1165,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__User__Detail__Classrooms__index.async.js b/p__User__Detail__Classrooms__index.async.js
index dcf664a2e0..2ef33c50b2 100644
--- a/p__User__Detail__Classrooms__index.async.js
+++ b/p__User__Detail__Classrooms__index.async.js
@@ -117,28 +117,139 @@ var AuthModal = function AuthModal(_ref) {
 
 /***/ }),
 
-/***/ 26646:
-/*!**********************************************************************!*\
-  !*** ./src/components/Header/components/Join/JoinClassroomModal.tsx ***!
-  \**********************************************************************/
+/***/ 83163:
+/*!**********************************************************************************!*\
+  !*** ./src/components/Header/components/Join/JoinClassroomModal.tsx + 2 modules ***!
+  \**********************************************************************************/
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
-/* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/regeneratorRuntime.js */ 7557);
-/* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0__);
-/* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/asyncToGenerator.js */ 41498);
-/* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1___default = /*#__PURE__*/__webpack_require__.n(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1__);
-/* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/slicedToArray.js */ 79800);
-/* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2___default = /*#__PURE__*/__webpack_require__.n(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2__);
-/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! react */ 59301);
-/* harmony import */ var umi__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! umi */ 58308);
-/* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_9__ = __webpack_require__(/*! antd */ 43418);
-/* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_10__ = __webpack_require__(/*! antd */ 8591);
-/* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_11__ = __webpack_require__(/*! antd */ 1056);
-/* harmony import */ var antd__WEBPACK_IMPORTED_MODULE_12__ = __webpack_require__(/*! antd */ 24905);
-/* harmony import */ var _service_home__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! @/service/home */ 92414);
-/* harmony import */ var _components_AuthModal__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! @/components/AuthModal */ 25447);
-/* harmony import */ var _utils_util__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! @/utils/util */ 88123);
-/* harmony import */ var react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__ = __webpack_require__(/*! react/jsx-runtime */ 37712);
+
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, {
+  Z: function() { return /* binding */ Join_JoinClassroomModal; }
+});
+
+// EXTERNAL MODULE: ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/regeneratorRuntime.js
+var regeneratorRuntime = __webpack_require__(7557);
+var regeneratorRuntime_default = /*#__PURE__*/__webpack_require__.n(regeneratorRuntime);
+// EXTERNAL MODULE: ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/asyncToGenerator.js
+var asyncToGenerator = __webpack_require__(41498);
+var asyncToGenerator_default = /*#__PURE__*/__webpack_require__.n(asyncToGenerator);
+// EXTERNAL MODULE: ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/slicedToArray.js
+var slicedToArray = __webpack_require__(79800);
+var slicedToArray_default = /*#__PURE__*/__webpack_require__.n(slicedToArray);
+// EXTERNAL MODULE: ./node_modules/_react@17.0.2@react/index.js
+var _react_17_0_2_react = __webpack_require__(59301);
+// EXTERNAL MODULE: ./src/.umi-production/exports.ts + 15 modules
+var _umi_production_exports = __webpack_require__(58308);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/modal/index.js + 16 modules
+var modal = __webpack_require__(43418);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/message/index.js + 4 modules
+var message = __webpack_require__(8591);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/input/index.js + 5 modules
+var input = __webpack_require__(1056);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/checkbox/index.js + 3 modules
+var es_checkbox = __webpack_require__(24905);
+// EXTERNAL MODULE: ./src/service/home.ts
+var home = __webpack_require__(92414);
+// EXTERNAL MODULE: ./src/components/AuthModal/index.tsx + 3 modules
+var AuthModal = __webpack_require__(25447);
+// EXTERNAL MODULE: ./src/utils/util.tsx
+var util = __webpack_require__(88123);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/button/index.js
+var es_button = __webpack_require__(3113);
+// EXTERNAL MODULE: ./node_modules/_@ant-design_icons@5.2.6@@ant-design/icons/es/icons/ExclamationCircleOutlined.js + 1 modules
+var ExclamationCircleOutlined = __webpack_require__(80045);
+;// CONCATENATED MODULE: ./src/layouts/ShixunDetail/components/LateTip.less?modules
+// extracted by mini-css-extract-plugin
+/* harmony default export */ var LateTipmodules = ({"bottom":"bottom___z0ujX","yes":"yes___hodnN","no":"no___hiPz5"});
+// EXTERNAL MODULE: ./src/assets/images/AssistantCode3.jpeg
+var AssistantCode3 = __webpack_require__(32637);
+// EXTERNAL MODULE: ./node_modules/_react@17.0.2@react/jsx-runtime.js
+var jsx_runtime = __webpack_require__(37712);
+;// CONCATENATED MODULE: ./src/layouts/ShixunDetail/components/LateTip.tsx
+
+
+
+
+
+
+
+var LateTip = function LateTip(_ref) {
+  var classroomList = _ref.classroomList,
+    dispatch = _ref.dispatch,
+    user = _ref.user;
+  return /*#__PURE__*/(0,jsx_runtime.jsxs)(modal/* default */.Z, {
+    open: classroomList.actionTabs.key === "到期提示",
+    width: 464,
+    centered: true,
+    title: /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)(ExclamationCircleOutlined/* default */.Z, {
+        style: {
+          color: '#faad14',
+          fontSize: '18px'
+        }
+      }), " \u63D0\u793A"]
+    }),
+    onCancel: function onCancel() {
+      dispatch({
+        type: 'classroomList/setActionTabs',
+        payload: {
+          key: ""
+        }
+      });
+    },
+    footer: null,
+    children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+      style: {
+        textAlign: 'center',
+        marginBottom: 30
+      },
+      children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+        style: {
+          marginBottom: 20,
+          textAlign: 'left'
+        },
+        children: ["\u8BE5\u6559\u5B66\u8BFE\u5802\u7684\u8BD5\u7528\u5DF2\u5230\u671F\uFF0C\u76EE\u524D\u65E0\u6CD5\u652F\u6301", /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          style: {
+            color: '#FF9D18'
+          },
+          children: "\u8D85\u8FC750"
+        }), "\u4EBA\u7684\u6559\u5B66\u6D3B\u52A8\u3002\u5982\u6709\u4EFB\u4F55\u7591\u95EE\uFF0C\u8BF7\u968F\u65F6\u8054\u7CFB\u6211\u4EEC\u3002\u611F\u8C22\u60A8\u7684\u7406\u89E3\u4E0E\u652F\u6301\uFF01"]
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)("img", {
+        style: {
+          width: 130,
+          height: 130
+        },
+        src: AssistantCode3
+      })]
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+      className: LateTipmodules.bottom,
+      children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, {
+        className: LateTipmodules.yes,
+        onClick: function onClick() {
+          dispatch({
+            type: 'classroomList/setActionTabs',
+            payload: {
+              key: ""
+            }
+          });
+        },
+        children: "\u6211\u77E5\u9053\u4E86"
+      })
+    })]
+  });
+};
+/* harmony default export */ var components_LateTip = ((0,_umi_production_exports.connect)(function (_ref2) {
+  var classroomList = _ref2.classroomList,
+    user = _ref2.user;
+  return {
+    classroomList: classroomList,
+    user: user
+  };
+})(LateTip));
+;// CONCATENATED MODULE: ./src/components/Header/components/Join/JoinClassroomModal.tsx
+
 
 
 
@@ -161,28 +272,29 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
   var visible = _ref.visible,
     user = _ref.user,
     _ref$onCancel = _ref.onCancel,
-    onCancel = _ref$onCancel === void 0 ? function () {} : _ref$onCancel;
-  var _useState = (0,react__WEBPACK_IMPORTED_MODULE_3__.useState)(),
-    _useState2 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2___default()(_useState, 2),
+    onCancel = _ref$onCancel === void 0 ? function () {} : _ref$onCancel,
+    dispatch = _ref.dispatch;
+  var _useState = (0,_react_17_0_2_react.useState)(),
+    _useState2 = slicedToArray_default()(_useState, 2),
     inputValue = _useState2[0],
     setInputValue = _useState2[1];
-  var _useState3 = (0,react__WEBPACK_IMPORTED_MODULE_3__.useState)([]),
-    _useState4 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2___default()(_useState3, 2),
+  var _useState3 = (0,_react_17_0_2_react.useState)([]),
+    _useState4 = slicedToArray_default()(_useState3, 2),
     checkedList = _useState4[0],
     setCheckedList = _useState4[1];
-  var _useState5 = (0,react__WEBPACK_IMPORTED_MODULE_3__.useState)(false),
-    _useState6 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2___default()(_useState5, 2),
+  var _useState5 = (0,_react_17_0_2_react.useState)(false),
+    _useState6 = slicedToArray_default()(_useState5, 2),
     isLoading = _useState6[0],
     setIsLoading = _useState6[1];
-  var _useState7 = (0,react__WEBPACK_IMPORTED_MODULE_3__.useState)(false),
-    _useState8 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2___default()(_useState7, 2),
+  var _useState7 = (0,_react_17_0_2_react.useState)(false),
+    _useState8 = slicedToArray_default()(_useState7, 2),
     visibleAuth = _useState8[0],
     setVisibleAuth = _useState8[1];
-  var _useState9 = (0,react__WEBPACK_IMPORTED_MODULE_3__.useState)(),
-    _useState10 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_slicedToArray_js__WEBPACK_IMPORTED_MODULE_2___default()(_useState9, 2),
+  var _useState9 = (0,_react_17_0_2_react.useState)(),
+    _useState10 = slicedToArray_default()(_useState9, 2),
     occupationValue = _useState10[0],
     setOccupationValue = _useState10[1];
-  (0,react__WEBPACK_IMPORTED_MODULE_3__.useEffect)(function () {
+  (0,_react_17_0_2_react.useEffect)(function () {
     var _user$userInfo;
     if (user !== null && user !== void 0 && (_user$userInfo = user.userInfo) !== null && _user$userInfo !== void 0 && _user$userInfo.identity) {
       var _user$userInfo2;
@@ -191,12 +303,12 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
   }, [user]);
   var handlePrompt = function handlePrompt(course_id, message) {
     if (checkedList.includes(Type.Professor)) {
-      antd__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z.confirm({
+      modal/* default */.Z.confirm({
         centered: true,
         okText: '确定',
         cancelText: '取消',
         title: '提示',
-        content: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("div", {
+        content: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
           className: "tc",
           children: message || "申请已提交，请等待审核"
         }),
@@ -209,21 +321,21 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
     window.location.href = "/classrooms/".concat(course_id, "/students");
   };
   var handleOk = /*#__PURE__*/function () {
-    var _ref2 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().mark(function _callee() {
+    var _ref2 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee() {
       var res;
-      return _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().wrap(function _callee$(_context) {
+      return regeneratorRuntime_default()().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             if (inputValue) {
               _context.next = 3;
               break;
             }
-            antd__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .ZP.info('邀请码不能为空');
+            message/* default */.ZP.info('邀请码不能为空');
             return _context.abrupt("return");
           case 3:
             setIsLoading(true);
             _context.next = 6;
-            return (0,_service_home__WEBPACK_IMPORTED_MODULE_5__/* .applyToJoinCourse */ .cR)({
+            return (0,home/* applyToJoinCourse */.cR)({
               invite_code: inputValue,
               professor: checkedList.includes(Type.Professor) ? 1 : null,
               assistant_professor: checkedList.includes(Type.AssistantProfessor) ? 1 : null,
@@ -232,48 +344,57 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
           case 6:
             res = _context.sent;
             setIsLoading(false);
+            if ((res === null || res === void 0 ? void 0 : res.status) === -1) {
+              onCancel();
+              dispatch({
+                type: 'classroomList/setActionTabs',
+                payload: {
+                  key: '到期提示'
+                }
+              });
+            }
             if (!((res === null || res === void 0 ? void 0 : res.status) === -2)) {
-              _context.next = 22;
+              _context.next = 23;
               break;
             }
             handleCancel();
             if (!(res.message === "该课堂要求成员完成实名认证")) {
-              _context.next = 14;
+              _context.next = 15;
               break;
             }
             setVisibleAuth(true);
             setOccupationValue(1);
             return _context.abrupt("return");
-          case 14:
+          case 15:
             if (!(res.message === "该课堂要求成员完成职业认证")) {
-              _context.next = 18;
+              _context.next = 19;
               break;
             }
             setVisibleAuth(true);
             setOccupationValue(2);
             return _context.abrupt("return");
-          case 18:
+          case 19:
             if (!(res.message === "该课堂要求成员完成实名和职业认证")) {
-              _context.next = 22;
+              _context.next = 23;
               break;
             }
             setVisibleAuth(true);
             setOccupationValue(3);
             return _context.abrupt("return");
-          case 22:
+          case 23:
             if (!((res === null || res === void 0 ? void 0 : res.status) === 0)) {
-              _context.next = 27;
+              _context.next = 28;
               break;
             }
-            (0,_utils_util__WEBPACK_IMPORTED_MODULE_7__/* .trackEvent */ .L9)(['教学课堂', '首页', '加入课堂']);
+            (0,util/* trackEvent */.L9)(['教学课堂', '首页', '加入课堂']);
             handleCancel();
             if (res !== null && res !== void 0 && res.course_id) {
               handlePrompt(res.course_id, res.message);
             } else {
-              antd__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .ZP.success(res.message);
+              message/* default */.ZP.success(res.message);
             }
             return _context.abrupt("return");
-          case 27:
+          case 28:
           case "end":
             return _context.stop();
         }
@@ -284,8 +405,8 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
     };
   }();
   var handleCancel = /*#__PURE__*/function () {
-    var _ref3 = _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_asyncToGenerator_js__WEBPACK_IMPORTED_MODULE_1___default()( /*#__PURE__*/_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().mark(function _callee2() {
-      return _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_regeneratorRuntime_js__WEBPACK_IMPORTED_MODULE_0___default()().wrap(function _callee2$(_context2) {
+    var _ref3 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2() {
+      return regeneratorRuntime_default()().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
             onCancel();
@@ -299,8 +420,8 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
       return _ref3.apply(this, arguments);
     };
   }();
-  return /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)(react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.Fragment, {
-    children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(antd__WEBPACK_IMPORTED_MODULE_9__/* ["default"] */ .Z, {
+  return /*#__PURE__*/(0,jsx_runtime.jsxs)(jsx_runtime.Fragment, {
+    children: [/*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, {
       centered: true,
       keyboard: false,
       closable: false,
@@ -309,12 +430,12 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
       confirmLoading: isLoading,
       onOk: handleOk,
       onCancel: handleCancel,
-      children: /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)("div", {
+      children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
         className: "tc",
-        children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)("div", {
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("span", {
+        children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
             children: "\u8BFE\u5802\u9080\u8BF7\u7801\uFF1A"
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(antd__WEBPACK_IMPORTED_MODULE_11__/* ["default"] */ .Z, {
+          }), /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z, {
             placeholder: "\u8BF7\u8F93\u51655\u4F4D\u8BFE\u5802\u9080\u8BF7\u7801\u62166\u4F4D\u5206\u73ED\u9080\u8BF7\u7801",
             style: {
               width: 270
@@ -322,37 +443,37 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
             value: inputValue,
             onChange: function onChange(e) {
               if (e.target.value.length >= 7) {
-                antd__WEBPACK_IMPORTED_MODULE_10__/* ["default"] */ .ZP.info('请输入5位课堂邀请码或6位分班邀请码！');
+                message/* default */.ZP.info('请输入5位课堂邀请码或6位分班邀请码！');
                 return;
               }
               setInputValue(e.target.value);
             }
           })]
-        }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)("div", {
+        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
           className: "mt10 font14",
-          children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)("span", {
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
             children: "\u8EAB\u4EFD\uFF1A"
-          }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsxs)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z.Group, {
+          }), /*#__PURE__*/(0,jsx_runtime.jsxs)(es_checkbox/* default */.Z.Group, {
             value: checkedList,
             onChange: function onChange(value) {
               return setCheckedList(value);
             },
-            children: [/*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z, {
+            children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
               value: Type.Professor,
               disabled: checkedList.includes(2),
               children: "\u6559\u5E08"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z, {
+            }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
               value: Type.AssistantProfessor,
               disabled: checkedList.includes(1),
               children: "\u52A9\u6559"
-            }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(antd__WEBPACK_IMPORTED_MODULE_12__/* ["default"] */ .Z, {
+            }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
               value: Type.Student,
               children: "\u5B66\u751F/\u53C2\u8D5B\u8005"
             })]
           })]
         })]
       })
-    }), /*#__PURE__*/(0,react_jsx_runtime__WEBPACK_IMPORTED_MODULE_8__.jsx)(_components_AuthModal__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z, {
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)(components_LateTip, {}), /*#__PURE__*/(0,jsx_runtime.jsx)(AuthModal/* default */.Z, {
       visible: visibleAuth,
       onCancel: function onCancel() {
         return setVisibleAuth(false);
@@ -361,7 +482,7 @@ var JoinClassroomModal = function JoinClassroomModal(_ref) {
     })]
   });
 };
-/* harmony default export */ __webpack_exports__.Z = ((0,umi__WEBPACK_IMPORTED_MODULE_4__.connect)(function (_ref4) {
+/* harmony default export */ var Join_JoinClassroomModal = ((0,_umi_production_exports.connect)(function (_ref4) {
   var user = _ref4.user;
   return {
     user: user
@@ -677,8 +798,8 @@ var Items = function Items(_ref) {
 /* harmony default export */ var Items_table = (Items);
 // EXTERNAL MODULE: ./src/components/ImagesIcon/index.ts + 33 modules
 var ImagesIcon = __webpack_require__(20379);
-// EXTERNAL MODULE: ./src/components/Header/components/Join/JoinClassroomModal.tsx
-var JoinClassroomModal = __webpack_require__(26646);
+// EXTERNAL MODULE: ./src/components/Header/components/Join/JoinClassroomModal.tsx + 2 modules
+var JoinClassroomModal = __webpack_require__(83163);
 // EXTERNAL MODULE: ./src/utils/verifyLogin.tsx + 2 modules
 var verifyLogin = __webpack_require__(35588);
 ;// CONCATENATED MODULE: ./src/pages/User/Detail/Classrooms/index.tsx
@@ -1119,6 +1240,16 @@ var Classrooms = function Classrooms(_ref) {
   };
 })(Classrooms));
 
+/***/ }),
+
+/***/ 32637:
+/*!***********************************************!*\
+  !*** ./src/assets/images/AssistantCode3.jpeg ***!
+  \***********************************************/
+/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
+
+module.exports = __webpack_require__.p + "static/AssistantCode3.a8740efb.jpeg";
+
 /***/ })
 
 }]);
\ No newline at end of file
diff --git a/p__User__Detail__Classrooms__index.chunk.css b/p__User__Detail__Classrooms__index.chunk.css
index 4a8977e443..67ac1183ec 100644
--- a/p__User__Detail__Classrooms__index.chunk.css
+++ b/p__User__Detail__Classrooms__index.chunk.css
@@ -459,3 +459,37 @@
   font-size: 16px;
 }
 
+/*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/layouts/ShixunDetail/components/LateTip.less?modules ***!
+  \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.bottom___z0ujX {
+  width: 100%;
+  text-align: center;
+  margin-bottom: 15px;
+}
+.bottom___z0ujX .yes___hodnN {
+  width: 88px;
+  height: 32px;
+  background: #3061D0;
+  box-shadow: 0px 2px 4px 0px #E0DFE1, inset 0px 1px 3px 0px rgba(255, 255, 255, 0.5);
+  border-radius: 2px;
+  font-weight: 400;
+  color: #FFFFFF !important;
+  border: 0px;
+}
+.bottom___z0ujX .yes___hodnN:hover {
+  background: #5784de;
+}
+.bottom___z0ujX .no___hiPz5 {
+  margin-right: 20px;
+  width: 60px;
+  height: 32px;
+  background: #F8F9FC;
+  border-radius: 2px;
+  opacity: 0.5;
+  border: 1px solid #C3CFE0;
+  font-weight: 400;
+  color: #464F66 !important;
+  line-height: 14px;
+}
+
diff --git a/p__User__Detail__Order__index.async.js b/p__User__Detail__Order__index.async.js
index 1e1741d62c..bb5651276a 100644
--- a/p__User__Detail__Order__index.async.js
+++ b/p__User__Detail__Order__index.async.js
@@ -432,7 +432,7 @@ var Paths = function Paths(_ref) {
                 },
                 children: item.created_at
               })]
-            }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+            }), !item.is_package && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
               className: Ordermodules.d3,
               children: ["\u8BFE\u7A0B\u6709\u6548\u671F\uFF1A", (item === null || item === void 0 ? void 0 : item.expiration) === '1' && '永久有效', (item === null || item === void 0 ? void 0 : item.expiration) === '2' && "\u8D2D\u4E70\u540E".concat(item === null || item === void 0 ? void 0 : item.days, "\u5929\u6709\u6548"), (item === null || item === void 0 ? void 0 : item.expiration) === '3' && "".concat(item === null || item === void 0 ? void 0 : item.start_at, "\u5230").concat(item === null || item === void 0 ? void 0 : item.end_at)]
             })]
diff --git a/p__User__Detail__Order__pages__orderPay__index.async.js b/p__User__Detail__Order__pages__orderPay__index.async.js
index 4b4303b117..28f03c5c8b 100644
--- a/p__User__Detail__Order__pages__orderPay__index.async.js
+++ b/p__User__Detail__Order__pages__orderPay__index.async.js
@@ -1,9 +1,9 @@
 "use strict";
 (self["webpackChunk"] = self["webpackChunk"] || []).push([[30264],{
 
-/***/ 88962:
+/***/ 51099:
 /*!**************************************************************************!*\
-  !*** ./src/pages/User/Detail/Order/pages/orderPay/index.tsx + 5 modules ***!
+  !*** ./src/pages/User/Detail/Order/pages/orderPay/index.tsx + 6 modules ***!
   \**************************************************************************/
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
@@ -28,7 +28,7 @@ var slicedToArray_default = /*#__PURE__*/__webpack_require__.n(slicedToArray);
 var _react_17_0_2_react = __webpack_require__(59301);
 ;// CONCATENATED MODULE: ./src/pages/User/Detail/Order/pages/orderPay/index.less?modules
 // extracted by mini-css-extract-plugin
-/* harmony default export */ var orderPaymodules = ({"flex_box_center":"flex_box_center___zxztT","flex_space_between":"flex_space_between___y71tM","flex_box_vertical_center":"flex_box_vertical_center___qgl0C","flex_box_center_end":"flex_box_center_end___BVplh","flex_box_column":"flex_box_column___s9siT","pay":"pay___d2pfO","bg":"bg___hTChZ","content":"content___XPfA4","header":"header___rQd0I","title":"title___ab7Wv","des":"des___Wd06l","main":"main___pFrDe","info":"info___w5uFB","payPrice":"payPrice___HQ1sH","d1":"d1___jEuEI","d2":"d2___XekEv","d3":"d3___NJJnZ","subject":"subject___IzrrR","typeTitle":"typeTitle___EYTrW","type":"type___vwq2x","w":"w___IynUr","z":"z___NJN17","active":"active___XGOUh","footer":"footer___ZLo91","wModal":"wModal___D5oNy","wModalPrice":"wModalPrice___KW0qS","code":"code___PUDcT","codeWrap":"codeWrap___URlgd","text":"text___GVawJ"});
+/* harmony default export */ var orderPaymodules = ({"flex_box_center":"flex_box_center___zxztT","flex_space_between":"flex_space_between___y71tM","flex_box_vertical_center":"flex_box_vertical_center___qgl0C","flex_box_center_end":"flex_box_center_end___BVplh","flex_box_column":"flex_box_column___s9siT","pay":"pay___d2pfO","bg":"bg___hTChZ","content":"content___XPfA4","header":"header___rQd0I","title":"title___ab7Wv","des":"des___Wd06l","main":"main___pFrDe","info":"info___w5uFB","payPrice":"payPrice___HQ1sH","d1":"d1___jEuEI","d2":"d2___XekEv","countDown":"countDown___glxHp","d3":"d3___NJJnZ","subject":"subject___IzrrR","typeTitle":"typeTitle___EYTrW","type":"type___vwq2x","w":"w___IynUr","z":"z___NJN17","active":"active___XGOUh","footer":"footer___ZLo91","wModal":"wModal___D5oNy","wModalPrice":"wModalPrice___KW0qS","code":"code___PUDcT","codeWrap":"codeWrap___URlgd","text":"text___GVawJ"});
 ;// CONCATENATED MODULE: ./src/assets/images/order/w.png
 var w_namespaceObject = "data:image/png;base64,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";
 ;// CONCATENATED MODULE: ./src/assets/images/order/z.png
@@ -37,6 +37,10 @@ var z_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAHUAAAA+C
 var gou_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAADYAAAAuCAYAAABjwOorAAAAAXNSR0IArs4c6QAABEFJREFUaAXdmVtsDFEYx/9tFxFtSRDdbd0fkCZ4IQQJwoNLeMGDe0LcQvDCg0Ti9uCBdJcSxK14IeLSSuOuQVRD3J7ENREaCUUf2m4ve/zPXDbTdrozszPdzvY87Jw55+yZ7zffd875zzlAN0r5ETEvLyzmSqTM7sIVDIutLTHczMxEjmQKpDvY9Ici8P4tjgiBDUaWtAYbcUL0JdQVQs02Qsl82oINOSZG1NejTABj2kLJ+7QcY6GwmNrUiOcdQaUlGCeJFQy9+4QaYOYpvSxtPCaEyAgWiX2EKiFUTx2go2tajLGCy6J3MIzzhFjcEUjbct+DDSsWeQ3VuEHDJ7Y1PtG9r8EKisTYaBPKCDA4EYRZnW/HWH6RmN+cgaccT46hJKgvwYIRsa0FDD+BbDNv2CnzVSgq8ugNjooY1tsxPlEb34ANOyv6KfIImJXIYLt1vgCT8ihai1tco0bbNdyqXZePsbg88hBKQncpmF15ZOUds/ouAVPkUVjstyuPzAy3Kkv5GEtGHllBmNWnFEzKo2g1btKQCWbGeFmWMjBdHiWrJJxCp2SMuZVHbaHyuV1zYQHQO4FbOh3MC3lkBMvll9ilhVzFhwPH5xhrWucTMLdu6PTOS3mkP7sH3XBmPjCqv1ry4Kte0/7aKWBeyyPd7MOzgCma1j/6Aih5p9e0v3oONjgiRlIelXkpj6TZOycDi7T9qOvvgQNP28MYSzwdYxxP05pjqLSCmhQymmCdX1oIbNO+nyu/A1vvWv/HM7C8iFiJGO5Z7R7NGQlcXQRst/mhP2MocHCmCvKhBlhdCjTyY80quQbT5RGhzhPKcvdozTgK1AxghwwtCy1fyA22UzxiCNDKX3XAMu58/ItaIan1rsCkPApFcJmht8ve44D15cDXv2prZTIoMP9niN/OFzmt9+GrqmsCVlCvfKs1b2tWmjSYlEct1aggFAPLfvpdDyzlm6/htUdW6+lb7yVHW6vyCBdjGGzky3j9U6+1d00KjOdQ47h7VEWopDTfF3psFcdKQzOQ20tdcAf1UQ2WYXd6HjCaYSjTrkfAnS9K1tGPYzApj1oEnvBFaiuKo+fFG7+oBjbfVj0iJZJUE9n01CGuVdOGqM2OvwTOvY3/xVHGERi3mLdzQnK1e2S07tZHYM9jtaRwIFCxHFiirVWlH4C9T4ytneVtLdDa4VoxQ2+ds+6tW598RdfnAmvHAyHlLBKo+gFsoTfdJEuPafKovDOgdMN3VwDln9S7z3/UtSrK0HCTEoJp8ugZoRj5nZc4XrGJM9+dz+qM+afB/bM6DEVFHglcI5Smpd0/LFEPDfSQnCm9SqYei8ujFEF5BWPspxWYIo8i4oBdeWTsyG/5eChq8qiEoedISfgNSLdHARt6QgQbebhGqKSUhN6Zn64BKY8a61HqVkn4CUraEqCXckSW+2Mbv4D1zASX/G6c/gPfyHKV+B0RowAAAABJRU5ErkJggg==";
 ;// CONCATENATED MODULE: ./src/assets/images/order/wIcon.png
 var wIcon_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAACgAAAAoCAYAAACM/rhtAAAEeUlEQVRYR+2Ya2gcVRTH/+fO7jw26QsVjYjWUsQHFoOoVYm4yU7xhQpqrfipakEQUfLB1FTQYkmtL3yUqqhBJIIW+sFHq3Y3WQzRWhVpRf2glhChRVAJTc3O3MnOPTKrCZvNzszuZiMFcz/uPef8f5xz7pl7l3CSLzrJ+bAION8K/Q8ymEerzvo5YkqcwhobxOQoUhPepDeKW3Div8/gp2gxNf1WYlwP0JUgnAuu2ssM4BhAI8TIJS13z/EOjNcLXHOJzax5NhE/APAmMK2oVwiABHiPr6HP6/R+qNU/HvA1JM1Vei+BegHotQaOsFNM6HcN+QhqyGgkoJ7TL9SY3gFwSRPAKkMchSZuczqdg1GxQwGt/dbVIP8jgJYvANx0SEkCdxS65IdhGlUBW3L6Gp8xTKBlCwgXhFYAPnDG5Z1YD6+a1lzAESyxHONbAKsXCo7BJ0jQW4qxU2bkTyWdxyGwtQQ8a80BtHLGc2B0LxDcEQA7nSWyH2sxEWhYeessFP0+JvLcjLwvEjA1nGpj6Y8CMJoIyAQMQuClwrDcO5OlPFrNotkDqG4CpQD4inGBXCd/LteelUFzUN9CiraFwAXpF7WCM3gSRAOqyC9715XNvd3QzOXmRhL8JBhnVMTb4dhycyigldMPgunyEIhuJjpE4H4wVkaAjoF4l254r1d+OVpyhq0YzwJYU82fge9dW15cHTCPhFU0/ooo74hjyw7sw9JU0nyBwRtniTCGkRAvOn8472M9/PK9YJ4KpmcIuCGmAspJyGVII+AorZkSpz5JtbHmH4sKwPA7XLs4EtikhoybWeEhZhzRWO2aXDd1qNK3dRin+VNGcDY3AUjU0h5KYLXsksFhmg1Y+taCx6IBsc+15Y2xQnmYZlF/GIxHiWhprH2ZgU98kZfxfpwDiDxaLd+YCLmZTNuz0FT7ZOfU4RBRsvbrGyCoL6ZPQ5lFQrZNpvHbXMBgJuWM0djAxO86Ge+uSgVr0LoKvv88iK6oJ2OzbflPx/ZOrX5IAJg5/U1iuidGwFcJnC/T8pfAzsgaqwTwFIDby3u6MUh6z7HdDRGAZpqYh+KCM+NjoanHWIkgkw82a7ATcFPBlntDAYMNK6sfAGhtHGTT9wmHnS7ZDkJwE59Zc77FqaHkpeyLL2sdC00C9TlB17pptzTCIgGDTTOrbybQ9iaJx4Zh8BOu7W2tZhh6YU1ljVcYuD82+jwNiPBGISODQV51RV75ray5HeCe+Z/OqtoM0A4n4/ZW9l1sicsNzJx+NzENzDNRle6jTHSvm3HzcXHjX3XfIGmNly4RzXjR/U7MrxaS3tPlF4IoyFhAc9C8hhR/VnbugzFwFMDpYCTjMgCgCOAAMb1dSLoDSMOtwSd8zFQ6p7LmNgZv+ff3zyFUt9M19RW+gGU5iXb42mUQOJMZK/55ZCkJpuAfhDFF+C4F+fW4jeP1QNXVg1bWyIOwEoJ7nE5vd6NCjfrFltjIGedJTf5ab2kaBar0iwVsllCjcRYBG83ctN9iBuebwb8B4teNOMXdn3kAAAAASUVORK5CYII=";
+;// CONCATENATED MODULE: ./src/assets/images/order/outtime.png
+var outtime_namespaceObject = "data:image/png;base64,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";
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/statistic/index.js + 5 modules
+var statistic = __webpack_require__(31797);
 // EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/skeleton/index.js + 12 modules
 var skeleton = __webpack_require__(59981);
 // EXTERNAL MODULE: ./node_modules/_qrcode.react@1.0.0@qrcode.react/lib/index.js
@@ -46,8 +50,9 @@ var lib_default = /*#__PURE__*/__webpack_require__.n(lib);
 var fetch = __webpack_require__(78092);
 // EXTERNAL MODULE: ./src/.umi-production/exports.ts + 15 modules
 var _umi_production_exports = __webpack_require__(58308);
-// EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
-var env = __webpack_require__(80548);
+// EXTERNAL MODULE: ./node_modules/_dayjs@1.11.10@dayjs/dayjs.min.js
+var dayjs_min = __webpack_require__(9498);
+var dayjs_min_default = /*#__PURE__*/__webpack_require__.n(dayjs_min);
 // EXTERNAL MODULE: ./node_modules/_react@17.0.2@react/jsx-runtime.js
 var jsx_runtime = __webpack_require__(37712);
 ;// CONCATENATED MODULE: ./src/pages/User/Detail/Order/pages/orderPay/index.tsx
@@ -65,9 +70,9 @@ var jsx_runtime = __webpack_require__(37712);
 
 
 
-
-
 var Code = (lib_default());
+var Countdown = statistic/* default */.Z.Countdown;
+
 
 // const test: any = {
 //   detail: {
@@ -82,7 +87,10 @@ var Code = (lib_default());
 //     end_at: "" // 固定日期的结束日期
 //   }
 // }
+
+
 var Pay = function Pay() {
+  var _data$subject_order_d;
   var _useSearchParams = (0,_umi_production_exports.useSearchParams)(),
     _useSearchParams2 = slicedToArray_default()(_useSearchParams, 1),
     searchParams = _useSearchParams2[0];
@@ -113,6 +121,14 @@ var Pay = function Pay() {
     data = _useState12[0],
     setData = _useState12[1];
   var timer = (0,_react_17_0_2_react.useRef)(null);
+  var _useState13 = (0,_react_17_0_2_react.useState)(''),
+    _useState14 = slicedToArray_default()(_useState13, 2),
+    paytimer = _useState14[0],
+    setPayTimer = _useState14[1];
+  var _useState15 = (0,_react_17_0_2_react.useState)(false),
+    _useState16 = slicedToArray_default()(_useState15, 2),
+    isOuttime = _useState16[0],
+    setIsOuttime = _useState16[1];
   (0,_react_17_0_2_react.useEffect)(function () {
     getData();
     return function () {
@@ -121,14 +137,31 @@ var Pay = function Pay() {
   }, [params.courseId]);
   var getData = /*#__PURE__*/function () {
     var _ref = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee() {
-      var _resDetail$order, _res;
-      var res, resDetail, _res2;
+      var _resDetail$order, _resDetail$order2, _resDetail$order4, _res;
+      var res, resDetail, _resDetail$order3, _resDetail$order5, _resDetail$order6, _res2;
       return regeneratorRuntime_default()().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
             setLoading(true);
             res = {};
             _context.next = 4;
+            return (0,fetch/* default */.ZP)("/api/payments/".concat(searchParams.get("order_num"), "/detail.json"), {
+              method: 'get'
+            });
+          case 4:
+            resDetail = _context.sent;
+            if (!(resDetail !== null && resDetail !== void 0 && (_resDetail$order = resDetail.order) !== null && _resDetail$order !== void 0 && _resDetail$order.state && dayjs_min_default()(resDetail === null || resDetail === void 0 || (_resDetail$order2 = resDetail.order) === null || _resDetail$order2 === void 0 ? void 0 : _resDetail$order2.expired_at).diff(dayjs_min_default()(), 'second') <= 0)) {
+              _context.next = 12;
+              break;
+            }
+            setData(resDetail === null || resDetail === void 0 ? void 0 : resDetail.order);
+            setPayTimer(resDetail === null || resDetail === void 0 || (_resDetail$order3 = resDetail.order) === null || _resDetail$order3 === void 0 ? void 0 : _resDetail$order3.expired_at);
+            setLoading(false);
+            setIsOuttime(true);
+            clearInterval(timer.current);
+            return _context.abrupt("return");
+          case 12:
+            _context.next = 14;
             return (0,fetch/* default */.ZP)("/api/payments/qrcode.json", {
               method: 'get',
               params: {
@@ -137,21 +170,26 @@ var Pay = function Pay() {
                 // timestamp: Date.now()
               }
             });
-          case 4:
+          case 14:
             res = _context.sent;
-            _context.next = 7;
-            return (0,fetch/* default */.ZP)("/api/payments/".concat(searchParams.get("order_num"), "/detail.json"), {
-              method: 'get'
-            });
-          case 7:
-            resDetail = _context.sent;
-            if (resDetail !== null && resDetail !== void 0 && (_resDetail$order = resDetail.order) !== null && _resDetail$order !== void 0 && _resDetail$order.state && (_res = res) !== null && _res !== void 0 && _res.origin_pay_url) {
-              setData(resDetail === null || resDetail === void 0 ? void 0 : resDetail.order);
-              setCodeValue((_res2 = res) === null || _res2 === void 0 ? void 0 : _res2.origin_pay_url);
-              setLoading(false);
-              weiXinPayCb(resDetail === null || resDetail === void 0 ? void 0 : resDetail.order);
+            if (!(resDetail !== null && resDetail !== void 0 && (_resDetail$order4 = resDetail.order) !== null && _resDetail$order4 !== void 0 && _resDetail$order4.state && (_res = res) !== null && _res !== void 0 && _res.origin_pay_url)) {
+              _context.next = 25;
+              break;
+            }
+            setData(resDetail === null || resDetail === void 0 ? void 0 : resDetail.order);
+            setPayTimer(resDetail === null || resDetail === void 0 || (_resDetail$order5 = resDetail.order) === null || _resDetail$order5 === void 0 ? void 0 : _resDetail$order5.expired_at);
+            if (!(dayjs_min_default()(resDetail === null || resDetail === void 0 || (_resDetail$order6 = resDetail.order) === null || _resDetail$order6 === void 0 ? void 0 : _resDetail$order6.expired_at).diff(dayjs_min_default()(), 'second') <= 0)) {
+              _context.next = 22;
+              break;
             }
-          case 9:
+            setIsOuttime(true);
+            clearInterval(timer.current);
+            return _context.abrupt("return");
+          case 22:
+            setCodeValue((_res2 = res) === null || _res2 === void 0 ? void 0 : _res2.origin_pay_url);
+            setLoading(false);
+            weiXinPayCb(resDetail === null || resDetail === void 0 ? void 0 : resDetail.order);
+          case 25:
           case "end":
             return _context.stop();
         }
@@ -180,11 +218,24 @@ var Pay = function Pay() {
                     });
                   case 2:
                     result = _context2.sent;
+                    if (!((result === null || result === void 0 ? void 0 : result.status) == 0)) {
+                      _context2.next = 9;
+                      break;
+                    }
+                    setPayTimer(result === null || result === void 0 ? void 0 : result.expired_at);
+                    if (!(dayjs_min_default()(result === null || result === void 0 ? void 0 : result.expired_at).diff(dayjs_min_default()(), 'second') <= 0)) {
+                      _context2.next = 9;
+                      break;
+                    }
+                    setIsOuttime(true);
+                    clearInterval(timer.current);
+                    return _context2.abrupt("return");
+                  case 9:
                     if (result !== null && result !== void 0 && result.is_payed) {
                       clearInterval(timer.current);
                       _umi_production_exports.history.push("/order/".concat(param === null || param === void 0 ? void 0 : param.num, "/result?userid=").concat(searchParams.get("userid")));
                     }
-                  case 4:
+                  case 10:
                   case "end":
                     return _context2.stop();
                 }
@@ -293,6 +344,9 @@ var Pay = function Pay() {
       return _ref6.apply(this, arguments);
     };
   }();
+  var timeFormatter = function timeFormatter() {
+    return dayjs_min_default()(paytimer).diff(dayjs_min_default()(), 'minute') >= 10 ? 'mm' : dayjs_min_default()(paytimer).diff(dayjs_min_default()(), 'minute') < 10 && dayjs_min_default()(paytimer).diff(dayjs_min_default()(), 'minute') >= 1 ? 'm' : dayjs_min_default()(paytimer).diff(dayjs_min_default()(), 'second') >= 10 ? 'ss' : 's';
+  };
   return /*#__PURE__*/(0,jsx_runtime.jsxs)("section", {
     className: orderPaymodules.pay,
     children: [/*#__PURE__*/(0,jsx_runtime.jsx)("aside", {
@@ -315,9 +369,9 @@ var Pay = function Pay() {
           }), "\u8FD4\u56DE"]
         }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
           className: orderPaymodules.title,
-          children: "\u8BA2\u5355\u652F\u4ED8"
+          children: !isOuttime ? '订单支付' : '订单已失效'
         })]
-      }), /*#__PURE__*/(0,jsx_runtime.jsxs)(skeleton/* default */.Z, {
+      }), !isOuttime ? /*#__PURE__*/(0,jsx_runtime.jsxs)(skeleton/* default */.Z, {
         loading: loading,
         active: true,
         paragraph: {
@@ -344,6 +398,33 @@ var Pay = function Pay() {
                   children: "\uFFE5"
                 }), data === null || data === void 0 ? void 0 : data.price]
               })]
+            })]
+          }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+            className: orderPaymodules.payPrice,
+            children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+              style: {
+                color: '#666',
+                fontSize: '14px'
+              },
+              children: ["(\u8BF7\u5728\xA0", /*#__PURE__*/(0,jsx_runtime.jsx)(Countdown, {
+                value: paytimer,
+                onFinish: function onFinish() {
+                  setIsOuttime(true);
+                  clearInterval(timer.current);
+                },
+                format: timeFormatter(),
+                valueStyle: {
+                  color: '#FF782C',
+                  fontSize: '14px'
+                },
+                className: orderPaymodules.countDown
+              }), /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+                style: {
+                  color: '#FF782C',
+                  fontSize: '14px'
+                },
+                children: "\u5206\u949F"
+              }), "\xA0\u5185\u5B8C\u6210\u652F\u4ED8\uFF01\u8D85\u51FA\u65F6\u6548\u53EF\u80FD\u5BFC\u81F4\u8D2D\u4E70\u5931\u8D25\uFF0C\u9700\u91CD\u65B0\u4E0B\u5355)"]
             }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
               className: orderPaymodules.d3,
               children: ["\u63D0\u4EA4\u8BA2\u5355\u5219\u8868\u793A\u60A8\u540C\u610F", /*#__PURE__*/(0,jsx_runtime.jsx)("a", {
@@ -351,24 +432,32 @@ var Pay = function Pay() {
                 children: "\u300A\u5934\u6B4CEduCoder\u670D\u52A1\u534F\u8BAE\u300B"
               })]
             })]
-          }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
-            className: orderPaymodules.subject,
-            children: [/*#__PURE__*/(0,jsx_runtime.jsx)("img", {
-              src: "".concat(env/* default */.Z.IMG_SERVER, "/images/avatars/Subject/").concat(data === null || data === void 0 ? void 0 : data.subject_id),
-              alt: "",
-              width: 160,
-              height: 102
-            }), /*#__PURE__*/(0,jsx_runtime.jsxs)("ul", {
-              children: [/*#__PURE__*/(0,jsx_runtime.jsx)("li", {
-                children: data === null || data === void 0 ? void 0 : data.name
-              }), /*#__PURE__*/(0,jsx_runtime.jsxs)("li", {
-                children: ["\u8BFE\u7A0B\u6709\u6548\u671F\uFF1A", (data === null || data === void 0 ? void 0 : data.expiration) === '1' && '永久有效', (data === null || data === void 0 ? void 0 : data.expiration) === '2' && "\u8D2D\u4E70\u540E".concat(data === null || data === void 0 ? void 0 : data.days, "\u5929\u6709\u6548"), (data === null || data === void 0 ? void 0 : data.expiration) === '3' && "".concat(data === null || data === void 0 ? void 0 : data.start_at, "\u5230").concat(data === null || data === void 0 ? void 0 : data.end_at)]
+          }), data === null || data === void 0 || (_data$subject_order_d = data.subject_order_details) === null || _data$subject_order_d === void 0 ? void 0 : _data$subject_order_d.map(function (item) {
+            return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+              className: orderPaymodules.subject,
+              style: {
+                marginTop: '10px'
+              },
+              children: [/*#__PURE__*/(0,jsx_runtime.jsx)("img", {
+                src: "".concat(item === null || item === void 0 ? void 0 : item.image_url),
+                alt: "",
+                width: 160,
+                height: 102
+              }), /*#__PURE__*/(0,jsx_runtime.jsxs)("ul", {
+                style: {
+                  marginBottom: 0
+                },
+                children: [/*#__PURE__*/(0,jsx_runtime.jsx)("li", {
+                  children: item === null || item === void 0 ? void 0 : item.name
+                }), /*#__PURE__*/(0,jsx_runtime.jsxs)("li", {
+                  children: ["\u8BFE\u7A0B\u6709\u6548\u671F\uFF1A", (item === null || item === void 0 ? void 0 : item.expiration) === '1' && '永久有效', (item === null || item === void 0 ? void 0 : item.expiration) === '2' && "\u8D2D\u4E70\u540E".concat(item === null || item === void 0 ? void 0 : item.days, "\u5929\u6709\u6548"), (item === null || item === void 0 ? void 0 : item.expiration) === '3' && "".concat(item === null || item === void 0 ? void 0 : item.start_at, "\u5230").concat(item === null || item === void 0 ? void 0 : item.end_at)]
+                })]
+              }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+                children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+                  children: "\uFFE5"
+                }), item === null || item === void 0 ? void 0 : item.price]
               })]
-            }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
-              children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
-                children: "\uFFE5"
-              }), data === null || data === void 0 ? void 0 : data.price]
-            })]
+            });
           }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
             className: orderPaymodules.typeTitle,
             children: "\u652F\u4ED8\u65B9\u5F0F"
@@ -440,12 +529,386 @@ var Pay = function Pay() {
             })]
           })
         })]
+      }) : /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+        style: {
+          display: 'flex',
+          flexDirection: "column",
+          justifyContent: 'center',
+          alignItems: 'center'
+        },
+        children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+          style: {
+            fontSize: '24px',
+            fontWeight: 500,
+            color: '#191919',
+            marginTop: '100px'
+          },
+          children: "\u62B1\u6B49\uFF0C\u60A8\u7684\u8BA2\u5355\u4EA4\u6613\u56E0\u8D85\u65F6\u5DF2\u5931\u6548\uFF0C\u8BF7\u91CD\u65B0\u4E0B\u5355\u3002"
+        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          style: {
+            fontSize: '16px',
+            color: '#333',
+            marginTop: '17px',
+            marginBottom: '45px'
+          },
+          children: ["\u60A8\u8BA2\u5355\u7684\u6700\u665A\u4ED8\u6B3E\u65F6\u95F4\u4E3A\uFF1A", /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+            style: {
+              color: '#FB6A10'
+            },
+            children: dayjs_min_default()(paytimer).format('YYYY-MM-DD HH:mm:ss')
+          }), "\xA0,\u76EE\u524D\u5DF2\u8FC7\u671F\uFF0C\u4EA4\u6613\u5173\u95ED\u3002"]
+        }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+          style: {
+            width: '267px',
+            marginBottom: '200px'
+          },
+          children: /*#__PURE__*/(0,jsx_runtime.jsx)("img", {
+            src: outtime_namespaceObject,
+            style: {
+              width: '100%'
+            }
+          })
+        })]
       })]
     })]
   });
 };
 /* harmony default export */ var orderPay = (Pay);
 
+/***/ }),
+
+/***/ 56762:
+/*!************************************************************************!*\
+  !*** ./node_modules/_antd@5.9.0@antd/es/_util/hooks/useForceUpdate.js ***!
+  \************************************************************************/
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+/* harmony export */ __webpack_require__.d(__webpack_exports__, {
+/* harmony export */   Z: function() { return /* binding */ useForceUpdate; }
+/* harmony export */ });
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! react */ 59301);
+
+function useForceUpdate() {
+  const [, forceUpdate] = react__WEBPACK_IMPORTED_MODULE_0__.useReducer(x => x + 1, 0);
+  return forceUpdate;
+}
+
+/***/ }),
+
+/***/ 31797:
+/*!*************************************************************************!*\
+  !*** ./node_modules/_antd@5.9.0@antd/es/statistic/index.js + 5 modules ***!
+  \*************************************************************************/
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+
+// EXPORTS
+__webpack_require__.d(__webpack_exports__, {
+  Z: function() { return /* binding */ es_statistic; }
+});
+
+// EXTERNAL MODULE: ./node_modules/_react@17.0.2@react/index.js
+var _react_17_0_2_react = __webpack_require__(59301);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/_util/hooks/useForceUpdate.js
+var useForceUpdate = __webpack_require__(56762);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/_util/reactNode.js
+var reactNode = __webpack_require__(92343);
+// EXTERNAL MODULE: ./node_modules/_classnames@2.5.1@classnames/index.js
+var _classnames_2_5_1_classnames = __webpack_require__(92310);
+var _classnames_2_5_1_classnames_default = /*#__PURE__*/__webpack_require__.n(_classnames_2_5_1_classnames);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/config-provider/context.js
+var context = __webpack_require__(36355);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/skeleton/index.js + 12 modules
+var skeleton = __webpack_require__(59981);
+;// CONCATENATED MODULE: ./node_modules/_antd@5.9.0@antd/es/statistic/Number.js
+"use client";
+
+
+const StatisticNumber = props => {
+  const {
+    value,
+    formatter,
+    precision,
+    decimalSeparator,
+    groupSeparator = '',
+    prefixCls
+  } = props;
+  let valueNode;
+  if (typeof formatter === 'function') {
+    // Customize formatter
+    valueNode = formatter(value);
+  } else {
+    // Internal formatter
+    const val = String(value);
+    const cells = val.match(/^(-?)(\d*)(\.(\d+))?$/);
+    // Process if illegal number
+    if (!cells || val === '-') {
+      valueNode = val;
+    } else {
+      const negative = cells[1];
+      let int = cells[2] || '0';
+      let decimal = cells[4] || '';
+      int = int.replace(/\B(?=(\d{3})+(?!\d))/g, groupSeparator);
+      if (typeof precision === 'number') {
+        decimal = decimal.padEnd(precision, '0').slice(0, precision > 0 ? precision : 0);
+      }
+      if (decimal) {
+        decimal = `${decimalSeparator}${decimal}`;
+      }
+      valueNode = [/*#__PURE__*/_react_17_0_2_react.createElement("span", {
+        key: "int",
+        className: `${prefixCls}-content-value-int`
+      }, negative, int), decimal && /*#__PURE__*/_react_17_0_2_react.createElement("span", {
+        key: "decimal",
+        className: `${prefixCls}-content-value-decimal`
+      }, decimal)];
+    }
+  }
+  return /*#__PURE__*/_react_17_0_2_react.createElement("span", {
+    className: `${prefixCls}-content-value`
+  }, valueNode);
+};
+/* harmony default export */ var statistic_Number = (StatisticNumber);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/style/index.js
+var style = __webpack_require__(17313);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/theme/util/genComponentStyleHook.js
+var genComponentStyleHook = __webpack_require__(83116);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/theme/util/statistic.js
+var statistic = __webpack_require__(37613);
+;// CONCATENATED MODULE: ./node_modules/_antd@5.9.0@antd/es/statistic/style/index.js
+"use client";
+
+
+
+const genStatisticStyle = token => {
+  const {
+    componentCls,
+    marginXXS,
+    padding,
+    colorTextDescription,
+    titleFontSize,
+    colorTextHeading,
+    contentFontSize,
+    fontFamily
+  } = token;
+  return {
+    [`${componentCls}`]: Object.assign(Object.assign({}, (0,style/* resetComponent */.Wf)(token)), {
+      [`${componentCls}-title`]: {
+        marginBottom: marginXXS,
+        color: colorTextDescription,
+        fontSize: titleFontSize
+      },
+      [`${componentCls}-skeleton`]: {
+        paddingTop: padding
+      },
+      [`${componentCls}-content`]: {
+        color: colorTextHeading,
+        fontSize: contentFontSize,
+        fontFamily,
+        [`${componentCls}-content-value`]: {
+          display: 'inline-block',
+          direction: 'ltr'
+        },
+        [`${componentCls}-content-prefix, ${componentCls}-content-suffix`]: {
+          display: 'inline-block'
+        },
+        [`${componentCls}-content-prefix`]: {
+          marginInlineEnd: marginXXS
+        },
+        [`${componentCls}-content-suffix`]: {
+          marginInlineStart: marginXXS
+        }
+      }
+    })
+  };
+};
+// ============================== Export ==============================
+/* harmony default export */ var statistic_style = ((0,genComponentStyleHook/* default */.Z)('Statistic', token => {
+  const statisticToken = (0,statistic/* merge */.TS)(token, {});
+  return [genStatisticStyle(statisticToken)];
+}, token => {
+  const {
+    fontSizeHeading3,
+    fontSize
+  } = token;
+  return {
+    titleFontSize: fontSize,
+    contentFontSize: fontSizeHeading3
+  };
+}));
+;// CONCATENATED MODULE: ./node_modules/_antd@5.9.0@antd/es/statistic/Statistic.js
+"use client";
+
+
+
+
+
+
+
+const Statistic = props => {
+  const {
+    prefixCls: customizePrefixCls,
+    className,
+    rootClassName,
+    style,
+    valueStyle,
+    value = 0,
+    title,
+    valueRender,
+    prefix,
+    suffix,
+    loading = false,
+    onMouseEnter,
+    onMouseLeave,
+    decimalSeparator = '.',
+    groupSeparator = ','
+  } = props;
+  const {
+    getPrefixCls,
+    direction,
+    statistic
+  } = _react_17_0_2_react.useContext(context/* ConfigContext */.E_);
+  const prefixCls = getPrefixCls('statistic', customizePrefixCls);
+  const [wrapSSR, hashId] = statistic_style(prefixCls);
+  const valueNode = /*#__PURE__*/_react_17_0_2_react.createElement(statistic_Number, Object.assign({
+    decimalSeparator: decimalSeparator,
+    groupSeparator: groupSeparator,
+    prefixCls: prefixCls
+  }, props, {
+    value: value
+  }));
+  const cls = _classnames_2_5_1_classnames_default()(prefixCls, {
+    [`${prefixCls}-rtl`]: direction === 'rtl'
+  }, statistic === null || statistic === void 0 ? void 0 : statistic.className, className, rootClassName, hashId);
+  return wrapSSR( /*#__PURE__*/_react_17_0_2_react.createElement("div", {
+    className: cls,
+    style: Object.assign(Object.assign({}, statistic === null || statistic === void 0 ? void 0 : statistic.style), style),
+    onMouseEnter: onMouseEnter,
+    onMouseLeave: onMouseLeave
+  }, title && /*#__PURE__*/_react_17_0_2_react.createElement("div", {
+    className: `${prefixCls}-title`
+  }, title), /*#__PURE__*/_react_17_0_2_react.createElement(skeleton/* default */.Z, {
+    paragraph: false,
+    loading: loading,
+    className: `${prefixCls}-skeleton`
+  }, /*#__PURE__*/_react_17_0_2_react.createElement("div", {
+    style: valueStyle,
+    className: `${prefixCls}-content`
+  }, prefix && /*#__PURE__*/_react_17_0_2_react.createElement("span", {
+    className: `${prefixCls}-content-prefix`
+  }, prefix), valueRender ? valueRender(valueNode) : valueNode, suffix && /*#__PURE__*/_react_17_0_2_react.createElement("span", {
+    className: `${prefixCls}-content-suffix`
+  }, suffix)))));
+};
+if (false) {}
+/* harmony default export */ var statistic_Statistic = (Statistic);
+;// CONCATENATED MODULE: ./node_modules/_antd@5.9.0@antd/es/statistic/utils.js
+// Countdown
+const timeUnits = [['Y', 1000 * 60 * 60 * 24 * 365], ['M', 1000 * 60 * 60 * 24 * 30], ['D', 1000 * 60 * 60 * 24], ['H', 1000 * 60 * 60], ['m', 1000 * 60], ['s', 1000], ['S', 1] // million seconds
+];
+
+function formatTimeStr(duration, format) {
+  let leftDuration = duration;
+  const escapeRegex = /\[[^\]]*]/g;
+  const keepList = (format.match(escapeRegex) || []).map(str => str.slice(1, -1));
+  const templateText = format.replace(escapeRegex, '[]');
+  const replacedText = timeUnits.reduce((current, _ref) => {
+    let [name, unit] = _ref;
+    if (current.includes(name)) {
+      const value = Math.floor(leftDuration / unit);
+      leftDuration -= value * unit;
+      return current.replace(new RegExp(`${name}+`, 'g'), match => {
+        const len = match.length;
+        return value.toString().padStart(len, '0');
+      });
+    }
+    return current;
+  }, templateText);
+  let index = 0;
+  return replacedText.replace(escapeRegex, () => {
+    const match = keepList[index];
+    index += 1;
+    return match;
+  });
+}
+function formatCountdown(value, config) {
+  const {
+    format = ''
+  } = config;
+  const target = new Date(value).getTime();
+  const current = Date.now();
+  const diff = Math.max(target - current, 0);
+  return formatTimeStr(diff, format);
+}
+;// CONCATENATED MODULE: ./node_modules/_antd@5.9.0@antd/es/statistic/Countdown.js
+"use client";
+
+
+
+
+
+
+const REFRESH_INTERVAL = 1000 / 30;
+function getTime(value) {
+  return new Date(value).getTime();
+}
+const Countdown = props => {
+  const {
+    value,
+    format = 'HH:mm:ss',
+    onChange,
+    onFinish
+  } = props;
+  const forceUpdate = (0,useForceUpdate/* default */.Z)();
+  const countdown = _react_17_0_2_react.useRef(null);
+  const stopTimer = () => {
+    onFinish === null || onFinish === void 0 ? void 0 : onFinish();
+    if (countdown.current) {
+      clearInterval(countdown.current);
+      countdown.current = null;
+    }
+  };
+  const syncTimer = () => {
+    const timestamp = getTime(value);
+    if (timestamp >= Date.now()) {
+      countdown.current = setInterval(() => {
+        forceUpdate();
+        onChange === null || onChange === void 0 ? void 0 : onChange(timestamp - Date.now());
+        if (timestamp < Date.now()) {
+          stopTimer();
+        }
+      }, REFRESH_INTERVAL);
+    }
+  };
+  _react_17_0_2_react.useEffect(() => {
+    syncTimer();
+    return () => {
+      if (countdown.current) {
+        clearInterval(countdown.current);
+        countdown.current = null;
+      }
+    };
+  }, [value]);
+  const formatter = (formatValue, config) => formatCountdown(formatValue, Object.assign(Object.assign({}, config), {
+    format
+  }));
+  const valueRender = node => (0,reactNode/* cloneElement */.Tm)(node, {
+    title: undefined
+  });
+  return /*#__PURE__*/_react_17_0_2_react.createElement(statistic_Statistic, Object.assign({}, props, {
+    valueRender: valueRender,
+    formatter: formatter
+  }));
+};
+/* harmony default export */ var statistic_Countdown = (/*#__PURE__*/_react_17_0_2_react.memo(Countdown));
+;// CONCATENATED MODULE: ./node_modules/_antd@5.9.0@antd/es/statistic/index.js
+"use client";
+
+
+
+statistic_Statistic.Countdown = statistic_Countdown;
+/* harmony default export */ var es_statistic = (statistic_Statistic);
+
 /***/ })
 
 }]);
\ No newline at end of file
diff --git a/p__User__Detail__Order__pages__orderPay__index.chunk.css b/p__User__Detail__Order__pages__orderPay__index.chunk.css
index e2296b17fc..8385d49ce0 100644
--- a/p__User__Detail__Order__pages__orderPay__index.chunk.css
+++ b/p__User__Detail__Order__pages__orderPay__index.chunk.css
@@ -103,6 +103,10 @@
 .pay___d2pfO .content___XPfA4 .main___pFrDe .payPrice___HQ1sH .d2___XekEv b span {
   font-size: 12px;
 }
+.pay___d2pfO .content___XPfA4 .main___pFrDe .payPrice___HQ1sH .countDown___glxHp {
+  display: inline-block;
+  font-size: 14px;
+}
 .pay___d2pfO .content___XPfA4 .main___pFrDe .payPrice___HQ1sH .d3___NJJnZ {
   margin-left: auto;
   font-size: 14px;
diff --git a/p__User__Detail__Order__pages__result__index.async.js b/p__User__Detail__Order__pages__result__index.async.js
index 0cffa7eeba..7e555e9f9d 100644
--- a/p__User__Detail__Order__pages__result__index.async.js
+++ b/p__User__Detail__Order__pages__result__index.async.js
@@ -150,7 +150,8 @@ var Result = function Result() {
               children: "\u6211\u8D2D\u4E70\u7684\u8BFE\u7A0B"
             }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, {
               onClick: function onClick() {
-                return _umi_production_exports.history.push("/paths/".concat(data === null || data === void 0 ? void 0 : data.subject_id));
+                var _data$subject_order_d;
+                return _umi_production_exports.history.push("/paths/".concat(data === null || data === void 0 || (_data$subject_order_d = data.subject_order_details) === null || _data$subject_order_d === void 0 || (_data$subject_order_d = _data$subject_order_d[0]) === null || _data$subject_order_d === void 0 ? void 0 : _data$subject_order_d.subject_id));
               },
               type: "primary",
               children: "\u5F00\u59CB\u5B66\u4E60"
diff --git a/p__User__Detail__ResourceAllocation__index.async.js b/p__User__Detail__ResourceAllocation__index.async.js
index 0675849ce6..ca472478d6 100644
--- a/p__User__Detail__ResourceAllocation__index.async.js
+++ b/p__User__Detail__ResourceAllocation__index.async.js
@@ -1,4 +1,3 @@
-"use strict";
 (self["webpackChunk"] = self["webpackChunk"] || []).push([[1343],{
 
 /***/ 22042:
@@ -7,6 +6,7 @@
   \**********************************************/
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
 /* harmony export */ __webpack_require__.d(__webpack_exports__, {
 /* harmony export */   Z: function() { return /* binding */ AsyncButton; }
 /* harmony export */ });
@@ -81,6 +81,7 @@ var AsyncButton = function AsyncButton(_ref) {
   \*****************************************/
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
 /* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_objectSpread2_js__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/objectSpread2.js */ 82242);
 /* harmony import */ var _root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_objectSpread2_js__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(_root_workspace_ppte5yg23_SJ5m_develop_node_modules_babel_runtime_7_23_6_babel_runtime_helpers_objectSpread2_js__WEBPACK_IMPORTED_MODULE_0__);
 /* harmony import */ var react__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! react */ 59301);
@@ -135,12 +136,13 @@ var noData = function noData(_ref) {
 
 /***/ }),
 
-/***/ 5815:
+/***/ 36233:
 /*!************************************************************************!*\
-  !*** ./src/pages/User/Detail/ResourceAllocation/index.tsx + 4 modules ***!
+  !*** ./src/pages/User/Detail/ResourceAllocation/index.tsx + 7 modules ***!
   \************************************************************************/
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
+"use strict";
 // ESM COMPAT FLAG
 __webpack_require__.r(__webpack_exports__);
 
@@ -199,7 +201,7 @@ var input = __webpack_require__(1056);
 var fetch = __webpack_require__(78092);
 ;// CONCATENATED MODULE: ./src/pages/User/Detail/ResourceAllocation/CustomLimit/index.less?modules
 // extracted by mini-css-extract-plugin
-/* harmony default export */ var CustomLimitmodules = ({"flex_box_center":"flex_box_center___y5ps_","flex_space_between":"flex_space_between___fpOHW","flex_box_vertical_center":"flex_box_vertical_center___xbHpf","flex_box_center_end":"flex_box_center_end___PY24I","flex_box_column":"flex_box_column___KA5XQ","wrap":"wrap___yixzN","real_name":"real_name___s2R4p","operationBtn":"operationBtn___UqS0S","reject":"reject___etB4g","approve":"approve___emYHF","rejectBtn":"rejectBtn___iLRty","approveBtn":"approveBtn___kX8_G","user_model":"user_model___hYuKq","zybzForm":"zybzForm___NLuB8","dataPicker":"dataPicker___vz5Fw","graaytitle":"graaytitle___RQG8g","must":"must___xJhkN","ActvieE3":"ActvieE3___OfRAG","allbox":"allbox___Qnoae","customModal":"customModal___cIPxO"});
+/* harmony default export */ var CustomLimitmodules = ({"flex_box_center":"flex_box_center___y5ps_","flex_space_between":"flex_space_between___fpOHW","flex_box_vertical_center":"flex_box_vertical_center___xbHpf","flex_box_center_end":"flex_box_center_end___PY24I","flex_box_column":"flex_box_column___KA5XQ","wrap":"wrap___yixzN","real_name":"real_name___s2R4p","operationBtn":"operationBtn___UqS0S","reject":"reject___etB4g","approve":"approve___emYHF","rejectBtn":"rejectBtn___iLRty","approveBtn":"approveBtn___kX8_G","user_model":"user_model___hYuKq","zybzForm":"zybzForm___NLuB8","dataPicker":"dataPicker___vz5Fw","graaytitle":"graaytitle___RQG8g","must":"must___xJhkN","ActvieE3":"ActvieE3___OfRAG","allbox":"allbox___Qnoae","customModal":"customModal___cIPxO","shezhi":"shezhi___TaKHQ"});
 // EXTERNAL MODULE: ./node_modules/_dayjs@1.11.10@dayjs/dayjs.min.js
 var dayjs_min = __webpack_require__(9498);
 var dayjs_min_default = /*#__PURE__*/__webpack_require__.n(dayjs_min);
@@ -260,37 +262,48 @@ var CustomLimit = function CustomLimit(_ref) {
     _useState12 = slicedToArray_default()(_useState11, 2),
     isCreate = _useState12[0],
     setIsCreate = _useState12[1];
-  var _useState13 = (0,_react_17_0_2_react.useState)([]),
+  var _useState13 = (0,_react_17_0_2_react.useState)(false),
     _useState14 = slicedToArray_default()(_useState13, 2),
-    schoolList = _useState14[0],
-    setSchoolList = _useState14[1];
-  var _useState15 = (0,_react_17_0_2_react.useState)([]),
+    settingModal = _useState14[0],
+    setSettingModal = _useState14[1];
+  var _useState15 = (0,_react_17_0_2_react.useState)(0),
     _useState16 = slicedToArray_default()(_useState15, 2),
-    departmentList = _useState16[0],
-    setDepartmentList = _useState16[1];
-  var _useState17 = (0,_react_17_0_2_react.useState)(false),
+    tipRange = _useState16[0],
+    setTipRange = _useState16[1];
+  var _useState17 = (0,_react_17_0_2_react.useState)([]),
     _useState18 = slicedToArray_default()(_useState17, 2),
-    selectAll = _useState18[0],
-    setSelectAll = _useState18[1]; //控制下拉框中的列表项是否全部选中
+    schoolList = _useState18[0],
+    setSchoolList = _useState18[1];
+  var _useState19 = (0,_react_17_0_2_react.useState)([]),
+    _useState20 = slicedToArray_default()(_useState19, 2),
+    departmentList = _useState20[0],
+    setDepartmentList = _useState20[1];
+  var _useState21 = (0,_react_17_0_2_react.useState)(false),
+    _useState22 = slicedToArray_default()(_useState21, 2),
+    selectAll = _useState22[0],
+    setSelectAll = _useState22[1]; //控制下拉框中的列表项是否全部选中
   var _Form$useForm = es_form/* default */.Z.useForm(),
     _Form$useForm2 = slicedToArray_default()(_Form$useForm, 1),
     form = _Form$useForm2[0];
-  var _useState19 = (0,_react_17_0_2_react.useState)({}),
-    _useState20 = slicedToArray_default()(_useState19, 2),
-    formValue = _useState20[0],
-    setFormValue = _useState20[1];
-  var _useState21 = (0,_react_17_0_2_react.useState)({}),
-    _useState22 = slicedToArray_default()(_useState21, 2),
-    selectedRow = _useState22[0],
-    setSelectedRow = _useState22[1];
-  var _useState23 = (0,_react_17_0_2_react.useState)(false),
+  var _Form$useForm3 = es_form/* default */.Z.useForm(),
+    _Form$useForm4 = slicedToArray_default()(_Form$useForm3, 1),
+    form1 = _Form$useForm4[0];
+  var _useState23 = (0,_react_17_0_2_react.useState)({}),
     _useState24 = slicedToArray_default()(_useState23, 2),
-    btnLoading = _useState24[0],
-    setBtnLoading = _useState24[1];
-  var _useState25 = (0,_react_17_0_2_react.useState)(false),
+    formValue = _useState24[0],
+    setFormValue = _useState24[1];
+  var _useState25 = (0,_react_17_0_2_react.useState)({}),
     _useState26 = slicedToArray_default()(_useState25, 2),
-    allSchool = _useState26[0],
-    setAllSchool = _useState26[1]; // 是否全部学院
+    selectedRow = _useState26[0],
+    setSelectedRow = _useState26[1];
+  var _useState27 = (0,_react_17_0_2_react.useState)(false),
+    _useState28 = slicedToArray_default()(_useState27, 2),
+    btnLoading = _useState28[0],
+    setBtnLoading = _useState28[1];
+  var _useState29 = (0,_react_17_0_2_react.useState)(false),
+    _useState30 = slicedToArray_default()(_useState29, 2),
+    allSchool = _useState30[0],
+    setAllSchool = _useState30[1]; // 是否全部学院
 
   var columns = [{
     title: '序号',
@@ -544,49 +557,53 @@ var CustomLimit = function CustomLimit(_ref) {
     setParams(objectSpread2_default()({}, params));
     getList();
   }, [keyVal]);
+  (0,_react_17_0_2_react.useEffect)(function () {
+    getSetting();
+  }, []);
   function getList() {
     return _getList.apply(this, arguments);
   }
   function _getList() {
-    _getList = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee10() {
+    _getList = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee13() {
       var res;
-      return regeneratorRuntime_default()().wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
+      return regeneratorRuntime_default()().wrap(function _callee13$(_context13) {
+        while (1) switch (_context13.prev = _context13.next) {
           case 0:
             setTableLoading(true);
-            _context10.next = 3;
+            _context13.next = 3;
             return (0,fetch/* default */.ZP)("/api/resource_allocations/limit_list.json", {
               method: 'get',
               params: params
             });
           case 3:
-            res = _context10.sent;
+            res = _context13.sent;
             if (res.status == 0) {
               setResult(res.data);
             }
             setTableLoading(false);
           case 6:
           case "end":
-            return _context10.stop();
+            return _context13.stop();
         }
-      }, _callee10);
+      }, _callee13);
     }));
     return _getList.apply(this, arguments);
   }
-  var getSchoolList = /*#__PURE__*/function () {
+  var getSetting = /*#__PURE__*/function () {
     var _ref3 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee3() {
       var res;
       return regeneratorRuntime_default()().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
             _context3.next = 2;
-            return (0,fetch/* default */.ZP)("/api/schools/for_option.json", {
+            return (0,fetch/* default */.ZP)("/api/business_contacts/show_settings.json", {
               method: 'get'
             });
           case 2:
             res = _context3.sent;
             if (res.status == 0) {
-              setSchoolList(res === null || res === void 0 ? void 0 : res.schools);
+              setTipRange(res === null || res === void 0 ? void 0 : res.value);
+              // form1.setFieldValue("value",res?.value)
             }
           case 4:
           case "end":
@@ -594,17 +611,42 @@ var CustomLimit = function CustomLimit(_ref) {
         }
       }, _callee3);
     }));
-    return function getSchoolList() {
+    return function getSetting() {
       return _ref3.apply(this, arguments);
     };
   }();
-  var getDepartmentList = /*#__PURE__*/function () {
-    var _ref4 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee4(schoolId, record) {
-      var res, _res$departments, _res$departments2, _record$department_in2, _res$departments3;
+  var getSchoolList = /*#__PURE__*/function () {
+    var _ref4 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee4() {
+      var res;
       return regeneratorRuntime_default()().wrap(function _callee4$(_context4) {
         while (1) switch (_context4.prev = _context4.next) {
           case 0:
             _context4.next = 2;
+            return (0,fetch/* default */.ZP)("/api/schools/for_option.json", {
+              method: 'get'
+            });
+          case 2:
+            res = _context4.sent;
+            if (res.status == 0) {
+              setSchoolList(res === null || res === void 0 ? void 0 : res.schools);
+            }
+          case 4:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    }));
+    return function getSchoolList() {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  var getDepartmentList = /*#__PURE__*/function () {
+    var _ref5 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee5(schoolId, record) {
+      var res, _res$departments, _res$departments2, _record$department_in2, _res$departments3;
+      return regeneratorRuntime_default()().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            _context5.next = 2;
             return (0,fetch/* default */.ZP)("/api/schools/".concat(schoolId, "/departments/for_option.json"), {
               method: 'get',
               params: {
@@ -612,7 +654,7 @@ var CustomLimit = function CustomLimit(_ref) {
               }
             });
           case 2:
-            res = _context4.sent;
+            res = _context5.sent;
             if (res.status == 0) {
               if (isCreate) {
                 // 新建资源限制客户 学院不可重复设置，要去除掉已经限制过的学院
@@ -637,64 +679,64 @@ var CustomLimit = function CustomLimit(_ref) {
             }
           case 4:
           case "end":
-            return _context4.stop();
+            return _context5.stop();
         }
-      }, _callee4);
+      }, _callee5);
     }));
     return function getDepartmentList(_x, _x2) {
-      return _ref4.apply(this, arguments);
+      return _ref5.apply(this, arguments);
     };
   }();
   var handleFormData = /*#__PURE__*/function () {
-    var _ref5 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee5(record) {
+    var _ref6 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee6(record) {
       var _record$school_info3;
-      return regeneratorRuntime_default()().wrap(function _callee5$(_context5) {
-        while (1) switch (_context5.prev = _context5.next) {
+      return regeneratorRuntime_default()().wrap(function _callee6$(_context6) {
+        while (1) switch (_context6.prev = _context6.next) {
           case 0:
-            _context5.next = 2;
+            _context6.next = 2;
             return getSchoolList();
           case 2:
             if (!(record !== null && record !== void 0 && record.id)) {
-              _context5.next = 5;
+              _context6.next = 5;
               break;
             }
-            _context5.next = 5;
+            _context6.next = 5;
             return getDepartmentList(record === null || record === void 0 || (_record$school_info3 = record.school_info) === null || _record$school_info3 === void 0 ? void 0 : _record$school_info3.id, record);
           case 5:
             setCustomModal(true);
           case 6:
           case "end":
-            return _context5.stop();
+            return _context6.stop();
         }
-      }, _callee5);
+      }, _callee6);
     }));
     return function handleFormData(_x3) {
-      return _ref5.apply(this, arguments);
+      return _ref6.apply(this, arguments);
     };
   }();
   var handleFinish = /*#__PURE__*/function () {
-    var _ref6 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee6(values) {
+    var _ref7 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee7(values) {
       var res;
-      return regeneratorRuntime_default()().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return regeneratorRuntime_default()().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
             setBtnLoading(true);
             if (!isCreate) {
-              _context6.next = 8;
+              _context7.next = 8;
               break;
             }
             console.log("allSchool", allSchool);
-            _context6.next = 5;
+            _context7.next = 5;
             return (0,fetch/* default */.ZP)("/api/resource_allocations/add_limit.json", {
               method: 'post',
               body: objectSpread2_default()({}, values)
             });
           case 5:
-            res = _context6.sent;
-            _context6.next = 11;
+            res = _context7.sent;
+            _context7.next = 11;
             break;
           case 8:
-            _context6.next = 10;
+            _context7.next = 10;
             return (0,fetch/* default */.ZP)("/api/resource_allocations/update_limit.json", {
               method: 'put',
               body: objectSpread2_default()(objectSpread2_default()({}, values), {}, {
@@ -703,10 +745,10 @@ var CustomLimit = function CustomLimit(_ref) {
               })
             });
           case 10:
-            res = _context6.sent;
+            res = _context7.sent;
           case 11:
             if (!(res.status == 0)) {
-              _context6.next = 21;
+              _context7.next = 21;
               break;
             }
             message/* default */.ZP.success(isCreate ? "创建成功" : "更新成功");
@@ -716,19 +758,19 @@ var CustomLimit = function CustomLimit(_ref) {
             setSchoolList([]);
             setDepartmentList([]);
             setIsCreate(false);
-            _context6.next = 21;
+            _context7.next = 21;
             return getList();
           case 21:
             setBtnLoading(false);
             setCustomModal(false);
           case 23:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6);
+      }, _callee7);
     }));
     return function handleFinish(_x4) {
-      return _ref6.apply(this, arguments);
+      return _ref7.apply(this, arguments);
     };
   }();
   return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
@@ -765,25 +807,39 @@ var CustomLimit = function CustomLimit(_ref) {
               flex: 1
             }
           })
-        }), /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
-          children: /*#__PURE__*/(0,jsx_runtime.jsx)(ui_customization/* CustomButton */.op, {
+        }), /*#__PURE__*/(0,jsx_runtime.jsxs)(col/* default */.Z, {
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)("i", {
+            className: "iconfont icon-shezhi ".concat(CustomLimitmodules.shezhi),
+            onClick: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee8() {
+              return regeneratorRuntime_default()().wrap(function _callee8$(_context8) {
+                while (1) switch (_context8.prev = _context8.next) {
+                  case 0:
+                    setSettingModal(true);
+                    // form.setFieldValue("limit_type",1)
+                  case 1:
+                  case "end":
+                    return _context8.stop();
+                }
+              }, _callee8);
+            }))
+          }), /*#__PURE__*/(0,jsx_runtime.jsx)(ui_customization/* CustomButton */.op, {
             openLoading: true,
-            onClick: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee7() {
-              return regeneratorRuntime_default()().wrap(function _callee7$(_context7) {
-                while (1) switch (_context7.prev = _context7.next) {
+            onClick: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee9() {
+              return regeneratorRuntime_default()().wrap(function _callee9$(_context9) {
+                while (1) switch (_context9.prev = _context9.next) {
                   case 0:
                     setIsCreate(true);
                     form.setFieldValue("limit_type", 1);
-                    _context7.next = 4;
+                    _context9.next = 4;
                     return handleFormData();
                   case 4:
                   case "end":
-                    return _context7.stop();
+                    return _context9.stop();
                 }
-              }, _callee7);
+              }, _callee9);
             })),
             children: "\u65B0\u5EFA"
-          })
+          })]
         })]
       })
     }), /*#__PURE__*/(0,jsx_runtime.jsx)(ui_customization/* CustomTable */.Gi, {
@@ -860,19 +916,19 @@ var CustomLimit = function CustomLimit(_ref) {
           setFormValue(objectSpread2_default()(objectSpread2_default()({}, formValue), changedValues));
         },
         onFinish: ( /*#__PURE__*/function () {
-          var _ref8 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee8(values) {
-            return regeneratorRuntime_default()().wrap(function _callee8$(_context8) {
-              while (1) switch (_context8.prev = _context8.next) {
+          var _ref10 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee10(values) {
+            return regeneratorRuntime_default()().wrap(function _callee10$(_context10) {
+              while (1) switch (_context10.prev = _context10.next) {
                 case 0:
                   handleFinish(values);
                 case 1:
                 case "end":
-                  return _context8.stop();
+                  return _context10.stop();
               }
-            }, _callee8);
+            }, _callee10);
           }));
           return function (_x5) {
-            return _ref8.apply(this, arguments);
+            return _ref10.apply(this, arguments);
           };
         }()),
         children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
@@ -895,22 +951,22 @@ var CustomLimit = function CustomLimit(_ref) {
             optionFilterProp: "children",
             placeholder: "\u8BF7\u9009\u62E9\u6240\u5C5E\u5355\u4F4D",
             onSelect: ( /*#__PURE__*/function () {
-              var _ref9 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee9(value, option) {
-                return regeneratorRuntime_default()().wrap(function _callee9$(_context9) {
-                  while (1) switch (_context9.prev = _context9.next) {
+              var _ref11 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee11(value, option) {
+                return regeneratorRuntime_default()().wrap(function _callee11$(_context11) {
+                  while (1) switch (_context11.prev = _context11.next) {
                     case 0:
-                      _context9.next = 2;
+                      _context11.next = 2;
                       return getDepartmentList(value);
                     case 2:
                       form.setFieldValue("department_ids", []);
                     case 3:
                     case "end":
-                      return _context9.stop();
+                      return _context11.stop();
                   }
-                }, _callee9);
+                }, _callee11);
               }));
               return function (_x6, _x7) {
-                return _ref9.apply(this, arguments);
+                return _ref11.apply(this, arguments);
               };
             }()),
             children: schoolList === null || schoolList === void 0 ? void 0 : schoolList.map(function (item, index) {
@@ -1058,12 +1114,74 @@ var CustomLimit = function CustomLimit(_ref) {
           })
         })]
       })
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_modal/* default */.Z, {
+      centered: true,
+      width: 400,
+      title: "\u8BBE\u7F6E",
+      open: settingModal,
+      okText: "\u786E\u5B9A",
+      cancelText: "\u53D6\u6D88",
+      maskClosable: false,
+      onOk: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee12() {
+        var formValue, res;
+        return regeneratorRuntime_default()().wrap(function _callee12$(_context12) {
+          while (1) switch (_context12.prev = _context12.next) {
+            case 0:
+              formValue = form1.getFieldsValue();
+              _context12.next = 3;
+              return (0,fetch/* default */.ZP)("/api/business_contacts/settings.json", {
+                method: 'put',
+                body: objectSpread2_default()({}, formValue)
+              });
+            case 3:
+              res = _context12.sent;
+              if ((res === null || res === void 0 ? void 0 : res.status) !== -1) {
+                message/* default */.ZP.info('设置成功');
+                setSettingModal(false);
+                getSetting();
+                getList();
+              }
+            case 5:
+            case "end":
+              return _context12.stop();
+          }
+        }, _callee12);
+      })),
+      onCancel: function onCancel() {
+        setSettingModal(false);
+        form1.resetFields();
+      },
+      children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z, {
+        form: form1,
+        layout: "vertical",
+        initialValues: {
+          value: tipRange
+        }
+        // className={`${styles.FormDiv}`}
+        ,
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+          label: "\u6536\u8D39\u63D0\u793A\u8303\u56F4",
+          name: "value",
+          required: true,
+          children: /*#__PURE__*/(0,jsx_runtime.jsxs)(es_radio/* default.Group */.ZP.Group, {
+            children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_radio/* default */.ZP, {
+              value: 0,
+              className: "ml15",
+              children: "\u5168\u90E8\u5B66\u9662"
+            }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_radio/* default */.ZP, {
+              value: 1,
+              className: "ml50",
+              children: "\u53D7\u9650\u5B66\u9662"
+            })]
+          })
+        })
+      })
     })]
   });
 };
-/* harmony default export */ var ResourceAllocation_CustomLimit = ((0,_umi_production_exports.connect)(function (_ref10) {
-  var globalSetting = _ref10.globalSetting,
-    user = _ref10.user;
+/* harmony default export */ var ResourceAllocation_CustomLimit = ((0,_umi_production_exports.connect)(function (_ref13) {
+  var globalSetting = _ref13.globalSetting,
+    user = _ref13.user;
   return {
     globalSetting: globalSetting,
     user: user
@@ -1395,7 +1513,24 @@ var CustomAllocate = function CustomAllocate(_ref) {
     user: user
   };
 })(CustomAllocate));
-;// CONCATENATED MODULE: ./src/pages/User/Detail/ResourceAllocation/index.tsx
+// EXTERNAL MODULE: ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/toConsumableArray.js
+var toConsumableArray = __webpack_require__(37205);
+var toConsumableArray_default = /*#__PURE__*/__webpack_require__.n(toConsumableArray);
+;// CONCATENATED MODULE: ./src/pages/User/Detail/ResourceAllocation/BusinessContact/index.less?modules
+// extracted by mini-css-extract-plugin
+/* harmony default export */ var BusinessContactmodules = ({"flex_box_center":"flex_box_center___FfWRq","flex_space_between":"flex_space_between___fvv7j","flex_box_vertical_center":"flex_box_vertical_center___kqC9r","flex_box_center_end":"flex_box_center_end___lIoU5","flex_box_column":"flex_box_column___LbSUa","wrap":"wrap___jDAui","real_name":"real_name___S6qbO","operationBtn":"operationBtn___BCmW0","reject":"reject___BGUoY","approve":"approve___YzRm9","rejectBtn":"rejectBtn___J9fWg","approveBtn":"approveBtn___WJo_j","user_model":"user_model___AAO5L","zybzForm":"zybzForm___wXOC_","dataPicker":"dataPicker___kp0Fa","graaytitle":"graaytitle___oz6Mk","must":"must___UwXkJ","ActvieE3":"ActvieE3___lMVJr","allbox":"allbox___i1YQn","customModal":"customModal___HQqjh","shezhi":"shezhi___fKg49","operator":"operator___Yv6gN","tag":"tag___K_qOD"});
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/auto-complete/index.js
+var auto_complete = __webpack_require__(88522);
+// EXTERNAL MODULE: ./node_modules/_antd@5.9.0@antd/es/button/index.js
+var es_button = __webpack_require__(3113);
+// EXTERNAL MODULE: ./node_modules/_react-infinite-scroller@1.2.4@react-infinite-scroller/index.js
+var _react_infinite_scroller_1_2_4_react_infinite_scroller = __webpack_require__(26724);
+var _react_infinite_scroller_1_2_4_react_infinite_scroller_default = /*#__PURE__*/__webpack_require__.n(_react_infinite_scroller_1_2_4_react_infinite_scroller);
+// EXTERNAL MODULE: ./src/service/classrooms.ts
+var classrooms = __webpack_require__(90742);
+// EXTERNAL MODULE: ./src/components/ImagesIcon/index.ts + 33 modules
+var ImagesIcon = __webpack_require__(20379);
+;// CONCATENATED MODULE: ./src/pages/User/Detail/ResourceAllocation/components/AddTeacher.tsx
 
 
 
@@ -1405,74 +1540,1674 @@ var CustomAllocate = function CustomAllocate(_ref) {
 
 
 
-var ResourceAllocation = function ResourceAllocation(_ref) {
-  var globalSetting = _ref.globalSetting,
+
+
+
+
+
+var AddTeacher = function AddTeacher(_ref) {
+  var _actionTabs$selectArr, _actionTabs$selectArr2;
+  var classroomList = _ref.classroomList,
+    loading = _ref.loading,
     dispatch = _ref.dispatch,
-    user = _ref.user;
-  var _useState = (0,_react_17_0_2_react.useState)(null),
+    onTags = _ref.onTags;
+  var params = (0,_umi_production_exports.useParams)();
+  var actionTabs = classroomList.actionTabs;
+  var _useState = (0,_react_17_0_2_react.useState)([]),
     _useState2 = slicedToArray_default()(_useState, 2),
-    activeTab = _useState2[0],
-    setActiveTab = _useState2[1];
-  var _useState3 = (0,_react_17_0_2_react.useState)(''),
+    options = _useState2[0],
+    setOptions = _useState2[1];
+  var _useState3 = (0,_react_17_0_2_react.useState)(true),
     _useState4 = slicedToArray_default()(_useState3, 2),
-    keyVal = _useState4[0],
-    setKeyVal = _useState4[1];
-  var _useState5 = (0,_react_17_0_2_react.useState)([]),
+    hasMore = _useState4[0],
+    setHasmore = _useState4[1];
+  var _useState5 = (0,_react_17_0_2_react.useState)(false),
     _useState6 = slicedToArray_default()(_useState5, 2),
-    dataSource = _useState6[0],
-    setDataSource = _useState6[1];
-  var handleSearch = function handleSearch(value) {
-    setKeyVal(value);
-  };
+    isLoading = _useState6[0],
+    setIsLoading = _useState6[1];
+  var _Form$useForm = es_form/* default */.Z.useForm(),
+    _Form$useForm2 = slicedToArray_default()(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var _useState7 = (0,_react_17_0_2_react.useState)([]),
+    _useState8 = slicedToArray_default()(_useState7, 2),
+    tableData = _useState8[0],
+    setTableData = _useState8[1];
+  var _useState9 = (0,_react_17_0_2_react.useState)(0),
+    _useState10 = slicedToArray_default()(_useState9, 2),
+    page = _useState10[0],
+    setPage = _useState10[1];
+  var _useState11 = (0,_react_17_0_2_react.useState)([]),
+    _useState12 = slicedToArray_default()(_useState11, 2),
+    selectArrs = _useState12[0],
+    setSelectArrs = _useState12[1];
+  var _useState13 = (0,_react_17_0_2_react.useState)([]),
+    _useState14 = slicedToArray_default()(_useState13, 2),
+    selectRows = _useState14[0],
+    setSelectRows = _useState14[1];
+  var _useState15 = (0,_react_17_0_2_react.useState)(true),
+    _useState16 = slicedToArray_default()(_useState15, 2),
+    notSearch = _useState16[0],
+    setNotSearch = _useState16[1];
+  var autoCompleteRef = (0,_react_17_0_2_react.useRef)();
   (0,_react_17_0_2_react.useEffect)(function () {
-    if (user.userInfo.role == 1) {
-      setDataSource([{
-        id: '1',
-        name: '资源保障客户'
-      }, {
-        id: '2',
-        name: '资源限制客户'
-      }]);
-      setActiveTab('1');
-    } else if (user.userInfo.role == 2) {
-      setDataSource([{
-        id: '1',
-        name: '资源保障客户'
-      }]);
-      setActiveTab('1');
+    if (classroomList.actionTabs.key === '添加对接人') {
+      setNotSearch(true);
+      getData();
     }
-  }, [user.userInfo.role]);
-  return /*#__PURE__*/(0,jsx_runtime.jsxs)("section", {
-    className: ResourceAllocationmodules.wrap,
-    children: [/*#__PURE__*/(0,jsx_runtime.jsx)(ui_customization/* CustomTabs */.YG, {
-      value: activeTab,
-      onChange: function onChange(e) {
-        setActiveTab(e);
-      },
-      tabBarExtraContent: /*#__PURE__*/(0,jsx_runtime.jsx)(ui_customization/* CustomInput */.t7, {
-        style: {
-          width: 303
-        },
-        placeholder: "\u641C\u7D22\u5355\u4F4D/\u5B66\u9662/\u521B\u5EFA\u4EBA",
-        value: keyVal,
-        onChange: handleSearch
-      }),
-      dataSource: dataSource
-    }), user.userInfo.role == 1 && activeTab == '2' && /*#__PURE__*/(0,jsx_runtime.jsx)(ResourceAllocation_CustomLimit, {
-      keyVal: keyVal
-    }), [1, 2].includes(user.userInfo.role) && activeTab == '1' && /*#__PURE__*/(0,jsx_runtime.jsx)(ResourceAllocation_CustomAllocate, {
-      keyVal: keyVal
-    })]
-  });
-};
-/* harmony default export */ var Detail_ResourceAllocation = ((0,_umi_production_exports.connect)(function (_ref2) {
-  var globalSetting = _ref2.globalSetting,
-    user = _ref2.user;
-  return {
-    globalSetting: globalSetting,
-    user: user
+  }, [classroomList.actionTabs.key]);
+  var getData = /*#__PURE__*/function () {
+    var _ref2 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee() {
+      var res;
+      return regeneratorRuntime_default()().wrap(function _callee$(_context) {
+        while (1) switch (_context.prev = _context.next) {
+          case 0:
+            _context.next = 2;
+            return dispatch({
+              type: 'classroomList/getSchoolList',
+              payload: {}
+            });
+          case 2:
+            res = _context.sent;
+            setOptions(res.map(function (item) {
+              return {
+                value: item
+              };
+            }));
+          case 4:
+          case "end":
+            return _context.stop();
+        }
+      }, _callee);
+    }));
+    return function getData() {
+      return _ref2.apply(this, arguments);
+    };
+  }();
+  var onFinish = function onFinish() {
+    var _form$getFieldValue;
+    if (((_form$getFieldValue = form.getFieldValue()) === null || _form$getFieldValue === void 0 ? void 0 : _form$getFieldValue.keyword) === '') {
+      setTableData([]);
+      message/* default */.ZP.error("请输入搜索内容");
+      return;
+    }
+    ;
+    setNotSearch(false);
+    setHasmore(true);
+    setIsLoading(false);
+    setSelectArrs([]);
+    setTimeout(function () {
+      handleInfiniteOnLoad(true);
+    }, 200);
   };
-})(ResourceAllocation));
+  var saveSelect = function saveSelect(id, record) {
+    id = String(id);
+    var key = selectArrs.indexOf(id);
+    if (key < 0) {
+      selectArrs.push(id);
+      selectRows.push({
+        user_id: record === null || record === void 0 ? void 0 : record.numid,
+        name: record === null || record === void 0 ? void 0 : record.username
+      });
+    } else {
+      selectArrs.splice(key, 1);
+      selectRows.splice(key, 1);
+    }
+    setSelectArrs(toConsumableArray_default()(selectArrs));
+    setSelectRows(toConsumableArray_default()(selectRows));
+  };
+  var handleInfiniteOnLoad = /*#__PURE__*/function () {
+    var _ref3 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2() {
+      var reload,
+        _res$users,
+        formValue,
+        res,
+        _args2 = arguments;
+      return regeneratorRuntime_default()().wrap(function _callee2$(_context2) {
+        while (1) switch (_context2.prev = _context2.next) {
+          case 0:
+            reload = _args2.length > 0 && _args2[0] !== undefined ? _args2[0] : false;
+            if (!((reload || hasMore) && !isLoading)) {
+              _context2.next = 11;
+              break;
+            }
+            formValue = form.getFieldValue();
+            setIsLoading(true);
+            setPage(reload ? 1 : page + 1);
+            _context2.next = 7;
+            return (0,classrooms/* searchSchoolTeacherList */.nQ)(objectSpread2_default()({
+              page: reload ? 1 : page + 1,
+              container_id: params.coursesId,
+              container_type: 1,
+              school_name: formValue === null || formValue === void 0 ? void 0 : formValue.school_name,
+              keyword: formValue === null || formValue === void 0 ? void 0 : formValue.keyword
+            }, formValue));
+          case 7:
+            res = _context2.sent;
+            reload ? setTableData(toConsumableArray_default()(res.users)) : setTableData([].concat(toConsumableArray_default()(tableData), toConsumableArray_default()(res.users)));
+            setIsLoading(false);
+            if (((_res$users = res.users) === null || _res$users === void 0 ? void 0 : _res$users.length) < 10) setHasmore(false);
+          case 11:
+          case "end":
+            return _context2.stop();
+        }
+      }, _callee2);
+    }));
+    return function handleInfiniteOnLoad() {
+      return _ref3.apply(this, arguments);
+    };
+  }();
+  var onOK = /*#__PURE__*/function () {
+    var _ref4 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee3() {
+      return regeneratorRuntime_default()().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            if (selectArrs == '') {
+              message/* default */.ZP.error('请选择人数');
+            } else {
+              onTags(selectRows);
+              dispatch({
+                type: 'classroomList/setActionTabs',
+                payload: {}
+              });
+            }
+          case 1:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function onOK() {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  var columns = [{
+    title: "",
+    dataIndex: "added",
+    width: 40,
+    ellipsis: true,
+    render: function render(add, record) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)(es_checkbox/* default */.Z, {
+        value: record.numid,
+        checked: selectArrs.includes(String(record.numid)),
+        disabled: !!add
+      });
+    }
+  }, {
+    title: "姓名",
+    width: 100,
+    ellipsis: true,
+    dataIndex: "username",
+    render: function render(text, record) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+        placement: "bottom",
+        title: text,
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(_umi_production_exports.Link, {
+          className: "bold c-black",
+          to: "/users/".concat(record.login),
+          target: "_blank",
+          children: text || '--'
+        })
+      });
+    }
+  }, {
+    title: "手机",
+    width: 100,
+    dataIndex: "phone",
+    ellipsis: true,
+    render: function render(text) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+        placement: "bottom",
+        title: text,
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          children: text || '--'
+        })
+      });
+    }
+  }, {
+    title: "邮箱",
+    dataIndex: "email",
+    width: 100,
+    ellipsis: true,
+    render: function render(text) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+        placement: "bottom",
+        title: text,
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          children: text || '--'
+        })
+      });
+    }
+  }, {
+    title: "学号/工号",
+    width: 100,
+    dataIndex: "student_number",
+    ellipsis: true,
+    render: function render(text) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+        placement: "bottom",
+        title: text,
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          children: text || '--'
+        })
+      });
+    }
+  }, {
+    title: "学校/单位",
+    width: 150,
+    dataIndex: "school_name",
+    ellipsis: true,
+    render: function render(text) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+        placement: "bottom",
+        title: text,
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          children: text || '--'
+        })
+      });
+    }
+  }, {
+    title: "院系/部门",
+    dataIndex: "depart_name",
+    width: 130,
+    ellipsis: true,
+    render: function render(text) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+        placement: "bottom",
+        title: text,
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          children: text || '--'
+        })
+      });
+    }
+  }, {
+    title: "实名认证",
+    dataIndex: "school_name",
+    width: 100,
+    render: function render(text) {
+      return text ? '是' : "否";
+    }
+  }, {
+    title: "最后登录时间",
+    dataIndex: "last_login_on",
+    width: 140,
+    ellipsis: true,
+    render: function render(text) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+        placement: "bottom",
+        title: text,
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          children: dayjs_min_default()(text).format("YYYY-MM-DD HH:mm")
+        })
+      });
+    }
+  }, {
+    title: "状态",
+    dataIndex: "added",
+    width: 80,
+    render: function render(text) {
+      if (text === 1) {
+        return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+          className: "c-green",
+          children: "\u5DF2\u6DFB\u52A0"
+        });
+      }
+    }
+  }];
+  return /*#__PURE__*/(0,jsx_runtime.jsxs)(es_modal/* default */.Z, {
+    centered: true,
+    title: "\u6DFB\u52A0\u5BF9\u63A5\u4EBA",
+    open: classroomList.actionTabs.key === '添加对接人' ? true : false,
+    okText: "\u786E\u5B9A",
+    cancelText: "\u53D6\u6D88",
+    width: 1100,
+    zIndex: 1000,
+    bodyStyle: {
+      minHeight: 200
+    },
+    onOk: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee4() {
+      return regeneratorRuntime_default()().wrap(function _callee4$(_context4) {
+        while (1) switch (_context4.prev = _context4.next) {
+          case 0:
+            onOK();
+          case 1:
+          case "end":
+            return _context4.stop();
+        }
+      }, _callee4);
+    })),
+    onCancel: function onCancel() {
+      setSelectArrs([]);
+      dispatch({
+        type: 'classroomList/setActionTabs',
+        payload: {}
+      });
+    },
+    children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(es_form/* default */.Z, {
+      layout: "inline",
+      form: form,
+      initialValues: {
+        school_name: "",
+        keyword: "",
+        search_type: '1'
+      },
+      className: "mt10"
+      // onFinish={onFinish}
+      ,
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+        name: "search_type",
+        label: "\u641C\u7D22\u7C7B\u578B",
+        children: /*#__PURE__*/(0,jsx_runtime.jsxs)(es_select["default"], {
+          style: {
+            width: 90
+          },
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_select["default"].Option, {
+            value: "1",
+            children: "\u59D3\u540D"
+          }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_select["default"].Option, {
+            value: "2",
+            children: "\u624B\u673A\u53F7"
+          }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_select["default"].Option, {
+            value: "3",
+            children: "\u90AE\u7BB1"
+          })]
+        })
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+        name: "keyword",
+        label: "\u641C\u7D22\u5185\u5BB9\uFF1A",
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z, {
+          allowClear: true,
+          style: {
+            width: 250
+          },
+          size: 'middle',
+          defaultValue: ((_actionTabs$selectArr = actionTabs.selectArrs) === null || _actionTabs$selectArr === void 0 ? void 0 : _actionTabs$selectArr.category_name) || ((_actionTabs$selectArr2 = actionTabs.selectArrs) === null || _actionTabs$selectArr2 === void 0 ? void 0 : _actionTabs$selectArr2.name)
+        })
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+        name: "school_name",
+        label: "\u5355\u4F4D\uFF1A",
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(auto_complete/* default */.Z, {
+          options: options,
+          style: {
+            width: 390
+          },
+          size: 'middle',
+          placeholder: "\u8BF7\u8F93\u5165\u5355\u4F4D\u540D\u79F0"
+          // getPopupContainer={() => autoCompleteRef.current}
+          ,
+          filterOption: function filterOption(inputValue, option) {
+            return option.value.toUpperCase().indexOf(inputValue.toUpperCase()) !== -1;
+          }
+        })
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, {
+          htmlType: "submit",
+          type: "primary",
+          size: 'middle',
+          onClick: function onClick() {
+            return onFinish();
+          },
+          children: "\u641C\u7D22"
+        })
+      })]
+    }), notSearch && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+      className: "tc font16 c-light-black mt40 pb30",
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)("img", {
+        src: ImagesIcon/* searchIcon */.RL,
+        width: "100",
+        alt: ""
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)("br", {}), /*#__PURE__*/(0,jsx_runtime.jsx)("p", {
+        className: "mt20",
+        children: "\u8BF7\u641C\u7D22\u8981\u6DFB\u52A0\u7684\u4EBA\u5458"
+      })]
+    }), !notSearch && tableData == '' && !isLoading && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+      className: "tc font16 c-light-black mt40 pb30",
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)("img", {
+        src: ImagesIcon/* noDataIcon */.z3,
+        width: "100",
+        alt: ""
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)("br", {}), /*#__PURE__*/(0,jsx_runtime.jsx)("p", {
+        className: "mt20",
+        children: "\u6682\u65F6\u8FD8\u6CA1\u6709\u76F8\u5173\u6570\u636E\u54E6!"
+      })]
+    }), (!notSearch && tableData != '' || isLoading) && /*#__PURE__*/(0,jsx_runtime.jsxs)("section", {
+      children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+        className: "flexd-table-header mt20",
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(table/* default */.Z, {
+          pagination: false,
+          dataSource: [],
+          columns: columns
+        })
+      }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+        style: {
+          maxHeight: 260,
+          overflow: 'auto'
+        },
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)((_react_infinite_scroller_1_2_4_react_infinite_scroller_default()), {
+          initialLoad: false,
+          pageStart: 1,
+          threshold: 20,
+          loadMore: function loadMore(page) {
+            handleInfiniteOnLoad();
+          },
+          hasMore: hasMore,
+          useWindow: false,
+          children: /*#__PURE__*/(0,jsx_runtime.jsx)(table/* default */.Z, {
+            loading: isLoading,
+            showHeader: false,
+            pagination: false,
+            dataSource: tableData,
+            columns: columns,
+            onRow: function onRow(record) {
+              return {
+                onClick: function onClick(event) {
+                  console.log(record);
+                  console.log(event.currentTarget.querySelector("input"));
+                  if (!event.currentTarget.querySelector("input").disabled) saveSelect(event.currentTarget.querySelector("input").value, record);
+                }
+              };
+            }
+          })
+        })
+      })]
+    })]
+  });
+};
+/* harmony default export */ var components_AddTeacher = ((0,_umi_production_exports.connect)(function (_ref6) {
+  var classroomList = _ref6.classroomList,
+    loading = _ref6.loading;
+  return {
+    classroomList: classroomList,
+    loading: loading
+  };
+})(AddTeacher));
+;// CONCATENATED MODULE: ./src/pages/User/Detail/ResourceAllocation/BusinessContact/index.tsx
+
+
+
+
+
+
+var BusinessContact_excluded = ["globalSetting", "user", "dispatch", "keyVal"];
+
+
+
+
+
+
+
+
+
+
+
+var BusinessContact = function BusinessContact(_ref) {
+  var globalSetting = _ref.globalSetting,
+    user = _ref.user,
+    dispatch = _ref.dispatch,
+    keyVal = _ref.keyVal,
+    props = objectWithoutProperties_default()(_ref, BusinessContact_excluded);
+  var _useState = (0,_react_17_0_2_react.useState)(0),
+    _useState2 = slicedToArray_default()(_useState, 2),
+    activeStatus = _useState2[0],
+    setActiveStatus = _useState2[1];
+  var _useState3 = (0,_react_17_0_2_react.useState)({
+      page: 1,
+      limit: 10,
+      keywords: null,
+      status: 0
+    }),
+    _useState4 = slicedToArray_default()(_useState3, 2),
+    params = _useState4[0],
+    setParams = _useState4[1];
+  var _useState5 = (0,_react_17_0_2_react.useState)(),
+    _useState6 = slicedToArray_default()(_useState5, 2),
+    result = _useState6[0],
+    setResult = _useState6[1];
+  var _useState7 = (0,_react_17_0_2_react.useState)(true),
+    _useState8 = slicedToArray_default()(_useState7, 2),
+    tableLoading = _useState8[0],
+    setTableLoading = _useState8[1];
+  var _useState9 = (0,_react_17_0_2_react.useState)(false),
+    _useState10 = slicedToArray_default()(_useState9, 2),
+    customModal = _useState10[0],
+    setCustomModal = _useState10[1];
+  var _useState11 = (0,_react_17_0_2_react.useState)(false),
+    _useState12 = slicedToArray_default()(_useState11, 2),
+    isCreate = _useState12[0],
+    setIsCreate = _useState12[1];
+  var _Form$useForm = es_form/* default */.Z.useForm(),
+    _Form$useForm2 = slicedToArray_default()(_Form$useForm, 1),
+    form = _Form$useForm2[0];
+  var _Form$useForm3 = es_form/* default */.Z.useForm(),
+    _Form$useForm4 = slicedToArray_default()(_Form$useForm3, 1),
+    form1 = _Form$useForm4[0];
+  var _useState13 = (0,_react_17_0_2_react.useState)({}),
+    _useState14 = slicedToArray_default()(_useState13, 2),
+    selectedRow = _useState14[0],
+    setSelectedRow = _useState14[1];
+  var _useState15 = (0,_react_17_0_2_react.useState)(false),
+    _useState16 = slicedToArray_default()(_useState15, 2),
+    btnLoading = _useState16[0],
+    setBtnLoading = _useState16[1];
+  var _useState17 = (0,_react_17_0_2_react.useState)([]),
+    _useState18 = slicedToArray_default()(_useState17, 2),
+    tags = _useState18[0],
+    setTags = _useState18[1];
+  var columns = [{
+    title: '序号',
+    dataIndex: 'id',
+    key: 'id',
+    ellipsis: true,
+    fixed: 'left',
+    width: 60,
+    render: function render(text, record, index) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        style: {
+          color: "#333"
+        },
+        children: params.limit * (params.page - 1) + index + 1
+      });
+    }
+  }, {
+    title: '发起人',
+    dataIndex: 'user',
+    key: 'user',
+    width: 90,
+    ellipsis: true,
+    render: function render(text, record, index) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        style: {
+          color: "#333"
+        },
+        children: text.name
+      });
+    }
+  }, {
+    title: '所属单位',
+    dataIndex: 'school',
+    key: 'school',
+    width: 100,
+    ellipsis: true,
+    render: function render(text, record, index) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        style: {
+          color: "#333"
+        },
+        children: text.name
+      });
+    }
+  }, {
+    title: '学院名称',
+    dataIndex: 'department',
+    key: 'department',
+    width: 150,
+    ellipsis: true,
+    render: function render(text, record) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        style: {
+          color: "#333"
+        },
+        children: text.name
+      });
+    }
+  }, {
+    title: '联系电话',
+    width: 120,
+    dataIndex: 'phone',
+    render: function render(text, record) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        className: "c-black",
+        children: text || '--'
+      });
+    }
+  }, {
+    title: '电子邮箱',
+    width: 180,
+    dataIndex: 'email',
+    ellipsis: true,
+    render: function render(text, record) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        className: "c-black",
+        children: text || '--'
+      });
+    }
+  }, {
+    title: '发起时间',
+    dataIndex: 'start_time',
+    key: 'start_time',
+    ellipsis: true,
+    render: function render(text, record, index) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        style: {
+          color: "#666"
+        },
+        children: text ? dayjs_min_default()(text).format('YYYY-MM-DD HH:mm') : '--'
+      });
+    }
+  }, {
+    title: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+      children: "\u64CD\u4F5C"
+    }),
+    align: "right",
+    width: 60,
+    render: function render(text, record) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)(jsx_runtime.Fragment, {
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)("a", {
+          type: "link",
+          style: {
+            whiteSpace: "nowrap",
+            padding: 0,
+            color: "#165DFF"
+          },
+          onClick: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee() {
+            return regeneratorRuntime_default()().wrap(function _callee$(_context) {
+              while (1) switch (_context.prev = _context.next) {
+                case 0:
+                  setIsCreate(true);
+                  setSelectedRow(record);
+                  setCustomModal(true);
+                  // setTags(record?.operator)
+                case 3:
+                case "end":
+                  return _context.stop();
+              }
+            }, _callee);
+          })),
+          children: "\u53BB\u5904\u7406"
+        })
+      });
+    }
+  }];
+  var columns1 = [{
+    title: '序号',
+    dataIndex: 'id',
+    key: 'id',
+    ellipsis: true,
+    fixed: 'left',
+    width: 60,
+    render: function render(text, record, index) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        style: {
+          color: "#333"
+        },
+        children: params.limit * (params.page - 1) + index + 1
+      });
+    }
+  }, {
+    title: '发起人',
+    dataIndex: 'user',
+    key: 'user',
+    width: 90,
+    fixed: 'left',
+    ellipsis: true,
+    render: function render(text, record, index) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        style: {
+          color: "#333"
+        },
+        children: text.name
+      });
+    }
+  }, {
+    title: '所属单位',
+    dataIndex: 'school',
+    key: 'school',
+    width: 100,
+    fixed: 'left',
+    ellipsis: true,
+    render: function render(text, record, index) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        style: {
+          color: "#333"
+        },
+        children: text.name
+      });
+    }
+  }, {
+    title: '学院名称',
+    dataIndex: 'department',
+    key: 'department',
+    width: 100,
+    ellipsis: true,
+    fixed: 'left',
+    render: function render(text, record) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        style: {
+          color: "#333"
+        },
+        children: text.name
+      });
+    }
+  }, {
+    title: '联系电话',
+    width: 100,
+    dataIndex: 'phone',
+    render: function render(text, record) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        style: {
+          color: "#333"
+        },
+        children: text || '--'
+      });
+    }
+  }, {
+    title: '电子邮箱',
+    width: 120,
+    dataIndex: 'email',
+    ellipsis: true,
+    render: function render(text, record) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        style: {
+          color: "#333"
+        },
+        children: text || '--'
+      });
+    }
+  }, {
+    title: '发起时间',
+    dataIndex: 'start_time',
+    key: 'start_time',
+    ellipsis: true,
+    width: 120,
+    render: function render(text, record, index) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        style: {
+          color: "#666"
+        },
+        children: text ? dayjs_min_default()(text).format('YYYY-MM-DD HH:mm') : '--'
+      });
+    }
+  }, {
+    title: '对接人',
+    dataIndex: 'operator_name',
+    key: 'operator_name',
+    width: 90,
+    ellipsis: true,
+    render: function render(text, record, index) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        style: {
+          color: "#333"
+        },
+        children: text || '--'
+      });
+    }
+  }, {
+    title: '处理时间',
+    dataIndex: 'handle_time',
+    key: 'handle_time',
+    ellipsis: true,
+    width: 120,
+    render: function render(text, record, index) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        style: {
+          color: "#666"
+        },
+        children: text ? dayjs_min_default()(text).format('YYYY-MM-DD HH:mm') : '--'
+      });
+    }
+  }, {
+    title: '备注',
+    dataIndex: 'notes',
+    key: 'notes',
+    width: 90,
+    ellipsis: true,
+    render: function render(text, record, index) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+        style: {
+          color: "#666"
+        },
+        children: text || '--'
+      });
+    }
+  }, {
+    title: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+      children: "\u64CD\u4F5C"
+    }),
+    align: "right",
+    width: 60,
+    fixed: 'right',
+    render: function render(text, record) {
+      return /*#__PURE__*/(0,jsx_runtime.jsx)(jsx_runtime.Fragment, {
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)("a", {
+          type: "link",
+          style: {
+            whiteSpace: "nowrap",
+            padding: 0,
+            color: "#165DFF"
+          },
+          onClick: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2() {
+            var detailData;
+            return regeneratorRuntime_default()().wrap(function _callee2$(_context2) {
+              while (1) switch (_context2.prev = _context2.next) {
+                case 0:
+                  setIsCreate(false);
+                  detailData = {
+                    operator_name: record === null || record === void 0 ? void 0 : record.operator_name,
+                    notes: record === null || record === void 0 ? void 0 : record.notes
+                  };
+                  form.setFieldsValue(detailData);
+                  setSelectedRow(record);
+                  setCustomModal(true);
+                  setTags(record === null || record === void 0 ? void 0 : record.operator);
+                  // setSelectAll(record?.is_all_department)
+
+                  // await handleFormData(record)
+                case 6:
+                case "end":
+                  return _context2.stop();
+              }
+            }, _callee2);
+          })),
+          children: "\u7F16\u8F91"
+        })
+      });
+    }
+  }];
+  (0,_react_17_0_2_react.useEffect)(function () {
+    params.keywords = keyVal;
+    params.page = 1;
+    setParams(objectSpread2_default()({}, params));
+    getList();
+  }, [keyVal]);
+  function getList() {
+    return _getList.apply(this, arguments);
+  }
+  function _getList() {
+    _getList = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee5() {
+      var res;
+      return regeneratorRuntime_default()().wrap(function _callee5$(_context5) {
+        while (1) switch (_context5.prev = _context5.next) {
+          case 0:
+            setTableLoading(true);
+            _context5.next = 3;
+            return (0,fetch/* default */.ZP)("/api/business_contacts.json", {
+              method: 'get',
+              params: params
+            });
+          case 3:
+            res = _context5.sent;
+            if (res.status == 0) {
+              setResult(res.data);
+            }
+            setTableLoading(false);
+          case 6:
+          case "end":
+            return _context5.stop();
+        }
+      }, _callee5);
+    }));
+    return _getList.apply(this, arguments);
+  }
+  var handleFinish = /*#__PURE__*/function () {
+    var _ref4 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee3(values) {
+      var res;
+      return regeneratorRuntime_default()().wrap(function _callee3$(_context3) {
+        while (1) switch (_context3.prev = _context3.next) {
+          case 0:
+            setBtnLoading(true);
+            // console.log(tags.map(item=>item.user_id));
+
+            // if(tags.length===0){
+            //   message.warning('请至少选择一位对接人')
+            //   return
+            // }
+            _context3.next = 3;
+            return (0,fetch/* default */.ZP)("/api/business_contacts/".concat(selectedRow === null || selectedRow === void 0 ? void 0 : selectedRow.id, ".json"), {
+              method: 'put',
+              body: objectSpread2_default()({}, values)
+            });
+          case 3:
+            res = _context3.sent;
+            if (!(res.status == 0)) {
+              _context3.next = 11;
+              break;
+            }
+            message/* default */.ZP.success(isCreate ? "创建成功" : "更新成功");
+            form.resetFields();
+            setCustomModal(false);
+            setIsCreate(false);
+            _context3.next = 11;
+            return getList();
+          case 11:
+            setBtnLoading(false);
+            setCustomModal(false);
+          case 13:
+          case "end":
+            return _context3.stop();
+        }
+      }, _callee3);
+    }));
+    return function handleFinish(_x) {
+      return _ref4.apply(this, arguments);
+    };
+  }();
+  var handleClose = function handleClose(removedTag) {
+    var newTags = tags.filter(function (tag) {
+      return tag.user_id !== removedTag;
+    });
+    console.log(newTags);
+    setTags(newTags);
+  };
+  var handleTags = function handleTags(ids) {
+    var data = [].concat(toConsumableArray_default()(tags), toConsumableArray_default()(ids));
+    var uniqueData = Array.from(data.reduce(function (map, item) {
+      return map.set(item.user_id, item);
+    }, new Map()).values());
+    console.log(uniqueData);
+    setTags(uniqueData);
+  };
+  return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+    className: BusinessContactmodules.wrap,
+    children: [/*#__PURE__*/(0,jsx_runtime.jsx)(_react_17_0_2_react.Fragment, {
+      children: /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, {
+        justify: "space-between",
+        style: {
+          marginTop: 25
+        },
+        children: /*#__PURE__*/(0,jsx_runtime.jsx)(col/* default */.Z, {
+          children: /*#__PURE__*/(0,jsx_runtime.jsx)(ui_customization/* CustomTags */.qp, {
+            title: "\u7C7B\u578B",
+            value: activeStatus,
+            onChange: function onChange(e) {
+              setActiveStatus(e);
+              params.status = e;
+              params.page = 1;
+              setParams(objectSpread2_default()({}, params));
+              getList();
+            },
+            dataSource: [{
+              name: '未处理',
+              id: 0
+            }, {
+              name: '已处理',
+              id: 1
+            }],
+            titleWidth: 28,
+            style: {
+              flex: 1
+            }
+          })
+        })
+      })
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)(ui_customization/* CustomTable */.Gi, {
+      children: activeStatus === 0 ? /*#__PURE__*/(0,jsx_runtime.jsx)(table/* default */.Z, {
+        columns: columns,
+        loading: tableLoading,
+        dataSource: result === null || result === void 0 ? void 0 : result.list,
+        pagination: {
+          size: 'default',
+          showQuickJumper: true,
+          showSizeChanger: true,
+          pageSizeOptions: ['10', '15', '50', '100', '200'],
+          hideOnSinglePage: true,
+          pageSize: params.limit,
+          current: params.page,
+          position: ["bottomRight"],
+          onChange: function onChange(page, pagesize) {
+            params.page = page;
+            params.limit = pagesize;
+            setParams(objectSpread2_default()({}, params));
+            getList();
+          },
+          total: result === null || result === void 0 ? void 0 : result.count,
+          showTotal: function showTotal(total, range) {
+            return /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+              children: ["\u5171", /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+                style: {
+                  color: '#165DFF'
+                },
+                children: [" ", total, " "]
+              }), "\u6761\u6570\u636E"]
+            });
+          }
+        }
+      }) : /*#__PURE__*/(0,jsx_runtime.jsx)(table/* default */.Z, {
+        columns: columns1,
+        loading: tableLoading,
+        dataSource: result === null || result === void 0 ? void 0 : result.list,
+        scroll: {
+          x: 1200
+        },
+        pagination: {
+          size: 'default',
+          showQuickJumper: true,
+          showSizeChanger: true,
+          pageSizeOptions: ['10', '15', '50', '100', '200'],
+          hideOnSinglePage: true,
+          pageSize: params.limit,
+          current: params.page,
+          position: ["bottomRight"],
+          onChange: function onChange(page, pagesize) {
+            params.page = page;
+            params.limit = pagesize;
+            setParams(objectSpread2_default()({}, params));
+            getList();
+          },
+          total: result === null || result === void 0 ? void 0 : result.count,
+          showTotal: function showTotal(total, range) {
+            return /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+              children: ["\u5171", /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+                style: {
+                  color: '#165DFF'
+                },
+                children: [" ", total, " "]
+              }), "\u6761\u6570\u636E"]
+            });
+          }
+        }
+      })
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_modal/* default */.Z, {
+      centered: true,
+      width: 515,
+      title: "".concat(isCreate ? '完成商务对接' : '编辑商务对接'),
+      open: customModal,
+      okText: "\u786E\u5B9A",
+      cancelText: "\u53D6\u6D88",
+      maskClosable: false,
+      onOk: function onOk() {
+        form.submit();
+      },
+      okButtonProps: {
+        loading: btnLoading
+      },
+      className: "".concat(BusinessContactmodules.customModal, " ant-form-modal-body"),
+      afterClose: function afterClose() {
+        form.resetFields();
+        setTags([]);
+      },
+      onCancel: function onCancel() {
+        form.resetFields();
+        setCustomModal(false);
+        setIsCreate(false);
+      },
+      children: /*#__PURE__*/(0,jsx_runtime.jsxs)(es_form/* default */.Z, {
+        form: form,
+        layout: "vertical",
+        scrollToFirstError: true,
+        className: "".concat(BusinessContactmodules.FormDiv),
+        onFinish: ( /*#__PURE__*/function () {
+          var _ref5 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee4(values) {
+            return regeneratorRuntime_default()().wrap(function _callee4$(_context4) {
+              while (1) switch (_context4.prev = _context4.next) {
+                case 0:
+                  handleFinish(values);
+                case 1:
+                case "end":
+                  return _context4.stop();
+              }
+            }, _callee4);
+          }));
+          return function (_x2) {
+            return _ref5.apply(this, arguments);
+          };
+        }()),
+        children: [/*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+          htmlFor: null,
+          label: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+            style: {
+              color: "#5F6368"
+            },
+            children: "\u5BF9\u63A5\u4EBA"
+          }),
+          name: "operator_name",
+          rules: [{
+            required: true,
+            message: '请填写对接人'
+          }],
+          children: /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z, {})
+        }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_form/* default */.Z.Item, {
+          htmlFor: null,
+          label: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+            style: {
+              color: "#5F6368"
+            },
+            children: "\u5907\u6CE8"
+          }),
+          name: "notes",
+          rules: [{
+            type: "string",
+            max: 200,
+            message: '输入超限，请缩减字符数'
+          }],
+          children: /*#__PURE__*/(0,jsx_runtime.jsx)(input/* default */.Z.TextArea, {
+            showCount: true,
+            value: form.getFieldValue("notes"),
+            maxLength: 200,
+            style: {
+              height: 120,
+              resize: 'none',
+              marginBottom: 20
+            },
+            placeholder: "\u8BF7\u586B\u5199\u5907\u6CE8",
+            rows: 5
+          })
+        })]
+      })
+    }), /*#__PURE__*/(0,jsx_runtime.jsx)(components_AddTeacher, {
+      onTags: handleTags
+    })]
+  });
+};
+/* harmony default export */ var ResourceAllocation_BusinessContact = ((0,_umi_production_exports.connect)(function (_ref6) {
+  var globalSetting = _ref6.globalSetting,
+    user = _ref6.user;
+  return {
+    globalSetting: globalSetting,
+    user: user
+  };
+})(BusinessContact));
+;// CONCATENATED MODULE: ./src/pages/User/Detail/ResourceAllocation/index.tsx
+
+
+
+
+
+
+
+
+
+
+var ResourceAllocation = function ResourceAllocation(_ref) {
+  var globalSetting = _ref.globalSetting,
+    dispatch = _ref.dispatch,
+    user = _ref.user;
+  var _useState = (0,_react_17_0_2_react.useState)(null),
+    _useState2 = slicedToArray_default()(_useState, 2),
+    activeTab = _useState2[0],
+    setActiveTab = _useState2[1];
+  var _useState3 = (0,_react_17_0_2_react.useState)(''),
+    _useState4 = slicedToArray_default()(_useState3, 2),
+    keyVal = _useState4[0],
+    setKeyVal = _useState4[1];
+  var _useState5 = (0,_react_17_0_2_react.useState)([]),
+    _useState6 = slicedToArray_default()(_useState5, 2),
+    dataSource = _useState6[0],
+    setDataSource = _useState6[1];
+  var handleSearch = function handleSearch(value) {
+    setKeyVal(value);
+  };
+  (0,_react_17_0_2_react.useEffect)(function () {
+    if (user.userInfo.role == 1) {
+      setDataSource([{
+        id: '1',
+        name: '资源保障客户'
+      }, {
+        id: '2',
+        name: '资源限制客户'
+      }, {
+        id: '3',
+        name: '商务联系'
+      }]);
+      setActiveTab('1');
+    } else if (user.userInfo.role == 2) {
+      setDataSource([{
+        id: '1',
+        name: '资源保障客户'
+      }, {
+        id: '3',
+        name: '商务联系'
+      }]);
+      setActiveTab('1');
+    }
+  }, [user.userInfo.role]);
+  return /*#__PURE__*/(0,jsx_runtime.jsxs)("section", {
+    className: ResourceAllocationmodules.wrap,
+    children: [/*#__PURE__*/(0,jsx_runtime.jsx)(ui_customization/* CustomTabs */.YG, {
+      value: activeTab,
+      onChange: function onChange(e) {
+        setActiveTab(e);
+      },
+      tabBarExtraContent: /*#__PURE__*/(0,jsx_runtime.jsx)(ui_customization/* CustomInput */.t7, {
+        style: {
+          width: 270
+        },
+        placeholder: activeTab == '3' ? '搜索单位/学院/发起人/对接人' : '搜索单位/学院/创建人',
+        value: keyVal,
+        onChange: handleSearch
+      }),
+      dataSource: dataSource
+    }), user.userInfo.role == 1 && activeTab == '2' && /*#__PURE__*/(0,jsx_runtime.jsx)(ResourceAllocation_CustomLimit, {
+      keyVal: keyVal
+    }), [1, 2].includes(user.userInfo.role) && activeTab == '1' && /*#__PURE__*/(0,jsx_runtime.jsx)(ResourceAllocation_CustomAllocate, {
+      keyVal: keyVal
+    }), [1, 2].includes(user.userInfo.role) && activeTab == '3' && /*#__PURE__*/(0,jsx_runtime.jsx)(ResourceAllocation_BusinessContact, {
+      keyVal: keyVal
+    })]
+  });
+};
+/* harmony default export */ var Detail_ResourceAllocation = ((0,_umi_production_exports.connect)(function (_ref2) {
+  var globalSetting = _ref2.globalSetting,
+    user = _ref2.user;
+  return {
+    globalSetting: globalSetting,
+    user: user
+  };
+})(ResourceAllocation));
+
+/***/ }),
+
+/***/ 88522:
+/*!*****************************************************************!*\
+  !*** ./node_modules/_antd@5.9.0@antd/es/auto-complete/index.js ***!
+  \*****************************************************************/
+/***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
+
+"use strict";
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_0__ = __webpack_require__(/*! classnames */ 92310);
+/* harmony import */ var classnames__WEBPACK_IMPORTED_MODULE_0___default = /*#__PURE__*/__webpack_require__.n(classnames__WEBPACK_IMPORTED_MODULE_0__);
+/* harmony import */ var rc_util_es_Children_toArray__WEBPACK_IMPORTED_MODULE_1__ = __webpack_require__(/*! rc-util/es/Children/toArray */ 45659);
+/* harmony import */ var rc_util_es_omit__WEBPACK_IMPORTED_MODULE_6__ = __webpack_require__(/*! rc-util/es/omit */ 99468);
+/* harmony import */ var react__WEBPACK_IMPORTED_MODULE_2__ = __webpack_require__(/*! react */ 59301);
+/* harmony import */ var _util_PurePanel__WEBPACK_IMPORTED_MODULE_7__ = __webpack_require__(/*! ../_util/PurePanel */ 53487);
+/* harmony import */ var _util_reactNode__WEBPACK_IMPORTED_MODULE_4__ = __webpack_require__(/*! ../_util/reactNode */ 92343);
+/* harmony import */ var _config_provider__WEBPACK_IMPORTED_MODULE_5__ = __webpack_require__(/*! ../config-provider */ 36355);
+/* harmony import */ var _select__WEBPACK_IMPORTED_MODULE_3__ = __webpack_require__(/*! ../select */ 57809);
+"use client";
+
+
+
+
+
+
+
+
+
+
+const {
+  Option
+} = _select__WEBPACK_IMPORTED_MODULE_3__["default"];
+function isSelectOptionOrSelectOptGroup(child) {
+  return child && child.type && (child.type.isSelectOption || child.type.isSelectOptGroup);
+}
+const AutoComplete = (props, ref) => {
+  const {
+    prefixCls: customizePrefixCls,
+    className,
+    popupClassName,
+    dropdownClassName,
+    children,
+    dataSource
+  } = props;
+  const childNodes = (0,rc_util_es_Children_toArray__WEBPACK_IMPORTED_MODULE_1__/* ["default"] */ .Z)(children);
+  // ============================= Input =============================
+  let customizeInput;
+  if (childNodes.length === 1 && (0,_util_reactNode__WEBPACK_IMPORTED_MODULE_4__/* .isValidElement */ .l$)(childNodes[0]) && !isSelectOptionOrSelectOptGroup(childNodes[0])) {
+    [customizeInput] = childNodes;
+  }
+  const getInputElement = customizeInput ? () => customizeInput : undefined;
+  // ============================ Options ============================
+  let optionChildren;
+  // [Legacy] convert `children` or `dataSource` into option children
+  if (childNodes.length && isSelectOptionOrSelectOptGroup(childNodes[0])) {
+    optionChildren = children;
+  } else {
+    optionChildren = dataSource ? dataSource.map(item => {
+      if ((0,_util_reactNode__WEBPACK_IMPORTED_MODULE_4__/* .isValidElement */ .l$)(item)) {
+        return item;
+      }
+      switch (typeof item) {
+        case 'string':
+          return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2__.createElement(Option, {
+            key: item,
+            value: item
+          }, item);
+        case 'object':
+          {
+            const {
+              value: optionValue
+            } = item;
+            return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2__.createElement(Option, {
+              key: optionValue,
+              value: optionValue
+            }, item.text);
+          }
+        default:
+           false ? 0 : void 0;
+          return undefined;
+      }
+    }) : [];
+  }
+  if (false) {}
+  const {
+    getPrefixCls
+  } = react__WEBPACK_IMPORTED_MODULE_2__.useContext(_config_provider__WEBPACK_IMPORTED_MODULE_5__/* .ConfigContext */ .E_);
+  const prefixCls = getPrefixCls('select', customizePrefixCls);
+  return /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2__.createElement(_select__WEBPACK_IMPORTED_MODULE_3__["default"], Object.assign({
+    ref: ref,
+    suffixIcon: null
+  }, (0,rc_util_es_omit__WEBPACK_IMPORTED_MODULE_6__/* ["default"] */ .Z)(props, ['dataSource', 'dropdownClassName']), {
+    prefixCls: prefixCls,
+    popupClassName: popupClassName || dropdownClassName,
+    className: classnames__WEBPACK_IMPORTED_MODULE_0___default()(`${prefixCls}-auto-complete`, className),
+    mode: _select__WEBPACK_IMPORTED_MODULE_3__["default"].SECRET_COMBOBOX_MODE_DO_NOT_USE
+  }, {
+    // Internal api
+    getInputElement
+  }), optionChildren);
+};
+const RefAutoComplete = /*#__PURE__*/react__WEBPACK_IMPORTED_MODULE_2__.forwardRef(AutoComplete);
+// We don't care debug panel
+/* istanbul ignore next */
+const PurePanel = (0,_util_PurePanel__WEBPACK_IMPORTED_MODULE_7__/* ["default"] */ .Z)(RefAutoComplete);
+RefAutoComplete.Option = Option;
+RefAutoComplete._InternalPanelDoNotUseOrYouWillBeFired = PurePanel;
+if (false) {}
+/* harmony default export */ __webpack_exports__.Z = (RefAutoComplete);
+
+/***/ }),
+
+/***/ 51581:
+/*!****************************************************************************************************!*\
+  !*** ./node_modules/_react-infinite-scroller@1.2.4@react-infinite-scroller/dist/InfiniteScroll.js ***!
+  \****************************************************************************************************/
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", ({
+  value: true
+}));
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _react = __webpack_require__(/*! react */ 59301);
+
+var _react2 = _interopRequireDefault(_react);
+
+var _propTypes = __webpack_require__(/*! prop-types */ 12708);
+
+var _propTypes2 = _interopRequireDefault(_propTypes);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _objectWithoutProperties(obj, keys) { var target = {}; for (var i in obj) { if (keys.indexOf(i) >= 0) continue; if (!Object.prototype.hasOwnProperty.call(obj, i)) continue; target[i] = obj[i]; } return target; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var InfiniteScroll = function (_Component) {
+  _inherits(InfiniteScroll, _Component);
+
+  function InfiniteScroll(props) {
+    _classCallCheck(this, InfiniteScroll);
+
+    var _this = _possibleConstructorReturn(this, (InfiniteScroll.__proto__ || Object.getPrototypeOf(InfiniteScroll)).call(this, props));
+
+    _this.scrollListener = _this.scrollListener.bind(_this);
+    _this.eventListenerOptions = _this.eventListenerOptions.bind(_this);
+    _this.mousewheelListener = _this.mousewheelListener.bind(_this);
+    return _this;
+  }
+
+  _createClass(InfiniteScroll, [{
+    key: 'componentDidMount',
+    value: function componentDidMount() {
+      this.pageLoaded = this.props.pageStart;
+      this.options = this.eventListenerOptions();
+      this.attachScrollListener();
+    }
+  }, {
+    key: 'componentDidUpdate',
+    value: function componentDidUpdate() {
+      if (this.props.isReverse && this.loadMore) {
+        var parentElement = this.getParentElement(this.scrollComponent);
+        parentElement.scrollTop = parentElement.scrollHeight - this.beforeScrollHeight + this.beforeScrollTop;
+        this.loadMore = false;
+      }
+      this.attachScrollListener();
+    }
+  }, {
+    key: 'componentWillUnmount',
+    value: function componentWillUnmount() {
+      this.detachScrollListener();
+      this.detachMousewheelListener();
+    }
+  }, {
+    key: 'isPassiveSupported',
+    value: function isPassiveSupported() {
+      var passive = false;
+
+      var testOptions = {
+        get passive() {
+          passive = true;
+        }
+      };
+
+      try {
+        document.addEventListener('test', null, testOptions);
+        document.removeEventListener('test', null, testOptions);
+      } catch (e) {
+        // ignore
+      }
+      return passive;
+    }
+  }, {
+    key: 'eventListenerOptions',
+    value: function eventListenerOptions() {
+      var options = this.props.useCapture;
+
+      if (this.isPassiveSupported()) {
+        options = {
+          useCapture: this.props.useCapture,
+          passive: true
+        };
+      }
+      return options;
+    }
+
+    // Set a defaut loader for all your `InfiniteScroll` components
+
+  }, {
+    key: 'setDefaultLoader',
+    value: function setDefaultLoader(loader) {
+      this.defaultLoader = loader;
+    }
+  }, {
+    key: 'detachMousewheelListener',
+    value: function detachMousewheelListener() {
+      var scrollEl = window;
+      if (this.props.useWindow === false) {
+        scrollEl = this.scrollComponent.parentNode;
+      }
+
+      scrollEl.removeEventListener('mousewheel', this.mousewheelListener, this.options ? this.options : this.props.useCapture);
+    }
+  }, {
+    key: 'detachScrollListener',
+    value: function detachScrollListener() {
+      var scrollEl = window;
+      if (this.props.useWindow === false) {
+        scrollEl = this.getParentElement(this.scrollComponent);
+      }
+
+      scrollEl.removeEventListener('scroll', this.scrollListener, this.options ? this.options : this.props.useCapture);
+      scrollEl.removeEventListener('resize', this.scrollListener, this.options ? this.options : this.props.useCapture);
+    }
+  }, {
+    key: 'getParentElement',
+    value: function getParentElement(el) {
+      var scrollParent = this.props.getScrollParent && this.props.getScrollParent();
+      if (scrollParent != null) {
+        return scrollParent;
+      }
+      return el && el.parentNode;
+    }
+  }, {
+    key: 'filterProps',
+    value: function filterProps(props) {
+      return props;
+    }
+  }, {
+    key: 'attachScrollListener',
+    value: function attachScrollListener() {
+      var parentElement = this.getParentElement(this.scrollComponent);
+
+      if (!this.props.hasMore || !parentElement) {
+        return;
+      }
+
+      var scrollEl = window;
+      if (this.props.useWindow === false) {
+        scrollEl = parentElement;
+      }
+
+      scrollEl.addEventListener('mousewheel', this.mousewheelListener, this.options ? this.options : this.props.useCapture);
+      scrollEl.addEventListener('scroll', this.scrollListener, this.options ? this.options : this.props.useCapture);
+      scrollEl.addEventListener('resize', this.scrollListener, this.options ? this.options : this.props.useCapture);
+
+      if (this.props.initialLoad) {
+        this.scrollListener();
+      }
+    }
+  }, {
+    key: 'mousewheelListener',
+    value: function mousewheelListener(e) {
+      // Prevents Chrome hangups
+      // See: https://stackoverflow.com/questions/47524205/random-high-content-download-time-in-chrome/47684257#47684257
+      if (e.deltaY === 1 && !this.isPassiveSupported()) {
+        e.preventDefault();
+      }
+    }
+  }, {
+    key: 'scrollListener',
+    value: function scrollListener() {
+      var el = this.scrollComponent;
+      var scrollEl = window;
+      var parentNode = this.getParentElement(el);
+
+      var offset = void 0;
+      if (this.props.useWindow) {
+        var doc = document.documentElement || document.body.parentNode || document.body;
+        var scrollTop = scrollEl.pageYOffset !== undefined ? scrollEl.pageYOffset : doc.scrollTop;
+        if (this.props.isReverse) {
+          offset = scrollTop;
+        } else {
+          offset = this.calculateOffset(el, scrollTop);
+        }
+      } else if (this.props.isReverse) {
+        offset = parentNode.scrollTop;
+      } else {
+        offset = el.scrollHeight - parentNode.scrollTop - parentNode.clientHeight;
+      }
+
+      // Here we make sure the element is visible as well as checking the offset
+      if (offset < Number(this.props.threshold) && el && el.offsetParent !== null) {
+        this.detachScrollListener();
+        this.beforeScrollHeight = parentNode.scrollHeight;
+        this.beforeScrollTop = parentNode.scrollTop;
+        // Call loadMore after detachScrollListener to allow for non-async loadMore functions
+        if (typeof this.props.loadMore === 'function') {
+          this.props.loadMore(this.pageLoaded += 1);
+          this.loadMore = true;
+        }
+      }
+    }
+  }, {
+    key: 'calculateOffset',
+    value: function calculateOffset(el, scrollTop) {
+      if (!el) {
+        return 0;
+      }
+
+      return this.calculateTopPosition(el) + (el.offsetHeight - scrollTop - window.innerHeight);
+    }
+  }, {
+    key: 'calculateTopPosition',
+    value: function calculateTopPosition(el) {
+      if (!el) {
+        return 0;
+      }
+      return el.offsetTop + this.calculateTopPosition(el.offsetParent);
+    }
+  }, {
+    key: 'render',
+    value: function render() {
+      var _this2 = this;
+
+      var renderProps = this.filterProps(this.props);
+
+      var children = renderProps.children,
+          element = renderProps.element,
+          hasMore = renderProps.hasMore,
+          initialLoad = renderProps.initialLoad,
+          isReverse = renderProps.isReverse,
+          loader = renderProps.loader,
+          loadMore = renderProps.loadMore,
+          pageStart = renderProps.pageStart,
+          ref = renderProps.ref,
+          threshold = renderProps.threshold,
+          useCapture = renderProps.useCapture,
+          useWindow = renderProps.useWindow,
+          getScrollParent = renderProps.getScrollParent,
+          props = _objectWithoutProperties(renderProps, ['children', 'element', 'hasMore', 'initialLoad', 'isReverse', 'loader', 'loadMore', 'pageStart', 'ref', 'threshold', 'useCapture', 'useWindow', 'getScrollParent']);
+
+      props.ref = function (node) {
+        _this2.scrollComponent = node;
+        if (ref) {
+          ref(node);
+        }
+      };
+
+      var childrenArray = [children];
+      if (hasMore) {
+        if (loader) {
+          isReverse ? childrenArray.unshift(loader) : childrenArray.push(loader);
+        } else if (this.defaultLoader) {
+          isReverse ? childrenArray.unshift(this.defaultLoader) : childrenArray.push(this.defaultLoader);
+        }
+      }
+      return _react2.default.createElement(element, props, childrenArray);
+    }
+  }]);
+
+  return InfiniteScroll;
+}(_react.Component);
+
+InfiniteScroll.propTypes = {
+  children: _propTypes2.default.node.isRequired,
+  element: _propTypes2.default.node,
+  hasMore: _propTypes2.default.bool,
+  initialLoad: _propTypes2.default.bool,
+  isReverse: _propTypes2.default.bool,
+  loader: _propTypes2.default.node,
+  loadMore: _propTypes2.default.func.isRequired,
+  pageStart: _propTypes2.default.number,
+  ref: _propTypes2.default.func,
+  getScrollParent: _propTypes2.default.func,
+  threshold: _propTypes2.default.number,
+  useCapture: _propTypes2.default.bool,
+  useWindow: _propTypes2.default.bool
+};
+InfiniteScroll.defaultProps = {
+  element: 'div',
+  hasMore: false,
+  initialLoad: true,
+  pageStart: 0,
+  ref: null,
+  threshold: 250,
+  useWindow: true,
+  isReverse: false,
+  useCapture: false,
+  loader: null,
+  getScrollParent: null
+};
+exports["default"] = InfiniteScroll;
+module.exports = exports['default'];
+
+
+/***/ }),
+
+/***/ 26724:
+/*!**************************************************************************************!*\
+  !*** ./node_modules/_react-infinite-scroller@1.2.4@react-infinite-scroller/index.js ***!
+  \**************************************************************************************/
+/***/ (function(module, __unused_webpack_exports, __webpack_require__) {
+
+module.exports = __webpack_require__(/*! ./dist/InfiniteScroll */ 51581)
+
 
 /***/ })
 
diff --git a/p__User__Detail__ResourceAllocation__index.chunk.css b/p__User__Detail__ResourceAllocation__index.chunk.css
index 01b9e0d2bc..278cce7d54 100644
--- a/p__User__Detail__ResourceAllocation__index.chunk.css
+++ b/p__User__Detail__ResourceAllocation__index.chunk.css
@@ -184,4 +184,186 @@ div[class~='ant-select-item-option-selected'] {
 div[class~='ant-select-item-option-selected']:hover {
   background-color: rgba(0, 0, 0, 0.04) !important;
 }
+.shezhi___TaKHQ {
+  color: #999;
+  margin-right: 20px;
+}
+.shezhi___TaKHQ:hover {
+  color: #165DFF;
+  cursor: pointer;
+}
+
+/*!***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/pages/User/Detail/ResourceAllocation/BusinessContact/index.less?modules ***!
+  \***********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.flex_box_center___FfWRq {
+  justify-content: center;
+  align-items: center;
+  -webkit-justify-content: center;
+  box-align: center;
+}
+.flex_space_between___fvv7j {
+  justify-content: space-between;
+  -webkit-box-pack: justify;
+}
+.flex_box_vertical_center___kqC9r {
+  align-items: center;
+  box-align: center;
+}
+.flex_box_center_end___lIoU5 {
+  justify-content: flex-end;
+  align-items: center;
+  -webkit-justify-content: flex-end;
+  -webkit-align-items: center;
+  -webkit-box-align: center;
+  -webkit-box-pack: end;
+  box-align: center;
+  box-pack: end;
+}
+.flex_box_column___LbSUa {
+  flex-direction: column;
+  box-orient: block-axis;
+}
+.wrap___jDAui .real_name___S6qbO {
+  cursor: pointer;
+}
+.wrap___jDAui .real_name___S6qbO:hover {
+  color: #165DFF;
+}
+.wrap___jDAui .operationBtn___BCmW0 {
+  cursor: pointer;
+  margin-right: 10px;
+}
+.wrap___jDAui .operationBtn___BCmW0.reject___BGUoY {
+  color: #666666;
+}
+.wrap___jDAui .operationBtn___BCmW0.reject___BGUoY:hover {
+  color: #ff0000;
+}
+.wrap___jDAui .operationBtn___BCmW0.approve___YzRm9 {
+  color: #0152d9;
+  margin-left: 6px;
+}
+.wrap___jDAui .rejectBtn___J9fWg {
+  margin-left: 15px;
+}
+.wrap___jDAui .approveBtn___WJo_j {
+  color: #0152d9;
+  margin-left: 15px;
+}
+.wrap___jDAui .user_model___AAO5L [class~='ant-modal-title'] {
+  font-size: 16px;
+  font-weight: 600 !important;
+}
+.wrap___jDAui .user_model___AAO5L [class~='ant-modal-body'] {
+  padding: 25px !important;
+}
+.zybzForm___wXOC_ div[class~='ant-form-item'] {
+  margin-bottom: 0;
+}
+.zybzForm___wXOC_ div[class~='ant-form-item-explain-error'] {
+  position: absolute;
+  bottom: -25px;
+}
+.zybzForm___wXOC_ .ant-input-number {
+  height: 50px;
+  width: 100%;
+  background-color: #f5f5f5;
+  border: 0;
+  padding-top: 10px;
+  font-size: 16px;
+}
+.dataPicker___kp0Fa {
+  width: 400px;
+}
+.graaytitle___oz6Mk {
+  height: 50px;
+  background: #f5f5f5;
+  border-radius: 4px;
+  display: flex;
+  justify-content: left;
+  align-items: center;
+}
+.graaytitle___oz6Mk div[class~='ant-form-item-explain-error'] {
+  position: absolute;
+  bottom: -35px;
+}
+.must___UwXkJ {
+  color: #E53333;
+  font-family: SimSun, sans-serif;
+  margin-top: -2px;
+  margin-right: 2px;
+}
+.ActvieE3___lMVJr {
+  color: #165DFF !important;
+}
+.ActvieE3___lMVJr:hover {
+  color: #E30000 !important;
+}
+.allbox___i1YQn {
+  width: 100%;
+}
+.customModal___HQqjh div[class~="ant-form-item"] {
+  margin-bottom: 20px !important;
+}
+.customModal___HQqjh div[class~="ant-form-item"] div[class~="ant-form-item-label"] {
+  padding-bottom: 10px;
+}
+.customModal___HQqjh div[class~="ant-modal-footer"] {
+  margin-top: 0 !important;
+}
+div[class~='ant-select-item-option-selected'] {
+  background-color: #fff !important;
+}
+div[class~='ant-select-item-option-selected']:hover {
+  background-color: rgba(0, 0, 0, 0.04) !important;
+}
+.shezhi___fKg49 {
+  color: #999;
+}
+.shezhi___fKg49:hover {
+  color: #165DFF;
+  cursor: pointer;
+}
+.operator___Yv6gN {
+  width: 463px;
+  min-height: 48px;
+  border-radius: 2px;
+  border: 1px solid #DCDCDC;
+  display: flex;
+  flex-wrap: wrap;
+  align-items: center;
+  padding: 5px 4px;
+}
+.operator___Yv6gN:hover {
+  border-color: #5784de;
+  box-shadow: 0 0 0 2px rgba(5, 122, 255, 0.06);
+  cursor: text;
+}
+.operator___Yv6gN .tag___K_qOD {
+  position: relative;
+  display: flex;
+  flex: none;
+  box-sizing: border-box;
+  max-width: 100%;
+  height: 32px;
+  margin-top: 2px;
+  margin-bottom: 2px;
+  line-height: 30px;
+  background: rgba(0, 0, 0, 0.06);
+  border: 1px solid transparent;
+  border-radius: 2px;
+  cursor: default;
+  transition: font-size 0.3s, line-height 0.3s, height 0.3s;
+  -webkit-user-select: none;
+     -moz-user-select: none;
+      -ms-user-select: none;
+          user-select: none;
+  -webkit-margin-end: 4px;
+          margin-inline-end: 4px;
+  -webkit-padding-start: 8px;
+          padding-inline-start: 8px;
+  -webkit-padding-end: 4px;
+          padding-inline-end: 4px;
+}
 
diff --git a/p__User__Detail__Topics__Exercise__Detail__index.async.js b/p__User__Detail__Topics__Exercise__Detail__index.async.js
index dab0130afc..e151f18d65 100644
--- a/p__User__Detail__Topics__Exercise__Detail__index.async.js
+++ b/p__User__Detail__Topics__Exercise__Detail__index.async.js
@@ -1172,8 +1172,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1460,8 +1460,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
diff --git a/p__User__Detail__id.async.js b/p__User__Detail__id.async.js
index 4df0105afe..05686ce729 100644
--- a/p__User__Detail__id.async.js
+++ b/p__User__Detail__id.async.js
@@ -422,7 +422,7 @@ var Banner = function Banner(_ref) {
 })(Banner));
 ;// CONCATENATED MODULE: ./src/pages/User/Detail/index.less?modules
 // extracted by mini-css-extract-plugin
-/* harmony default export */ var Detailmodules = ({"flex_box_center":"flex_box_center___fbdiq","flex_space_between":"flex_space_between___BQn7e","flex_box_vertical_center":"flex_box_vertical_center___Oa32s","flex_box_center_end":"flex_box_center_end___O1PRd","flex_box_column":"flex_box_column___tbM4u","content":"content___CfMWZ","leftBox":"leftBox___xeHyR","leftWrap":"leftWrap___OLOk_","rightBox":"rightBox___MjarR","rightWrap":"rightWrap___VCOtb","hiddenBar":"hiddenBar___v2ORW"});
+/* harmony default export */ var Detailmodules = ({"flex_box_center":"flex_box_center___fbdiq","flex_space_between":"flex_space_between___BQn7e","flex_box_vertical_center":"flex_box_vertical_center___Oa32s","flex_box_center_end":"flex_box_center_end___O1PRd","flex_box_column":"flex_box_column___tbM4u","content":"content___CfMWZ","leftBox":"leftBox___xeHyR","leftWrap":"leftWrap___OLOk_","rightBox":"rightBox___MjarR","rightWrap":"rightWrap___VCOtb","hiddenBar":"hiddenBar___v2ORW","tip":"tip___rX3uN"});
 ;// CONCATENATED MODULE: ./src/pages/User/Detail/[id].tsx
 
 
@@ -433,6 +433,7 @@ var Banner = function Banner(_ref) {
 
 var UserDetailPage = function UserDetailPage(_ref) {
   var userDetail = _ref.userDetail,
+    user = _ref.user,
     globalSetting = _ref.globalSetting,
     loading = _ref.loading,
     dispatch = _ref.dispatch;
@@ -442,6 +443,18 @@ var UserDetailPage = function UserDetailPage(_ref) {
     _useState2 = slicedToArray_default()(_useState, 2),
     overflow = _useState2[0],
     setOverflow = _useState2[1];
+  (0,_react_17_0_2_react.useEffect)(function () {
+    dispatch({
+      type: 'globalSetting/delayTipToggle',
+      payload: true
+    });
+    return function () {
+      dispatch({
+        type: 'globalSetting/delayTipToggle',
+        payload: false
+      });
+    };
+  }, []);
   (0,_react_17_0_2_react.useEffect)(function () {
     username.current = params.username;
     dispatch({
@@ -490,9 +503,11 @@ var UserDetailPage = function UserDetailPage(_ref) {
 };
 /* harmony default export */ var _id_ = ((0,_umi_production_exports.connect)(function (_ref2) {
   var userDetail = _ref2.userDetail,
+    user = _ref2.user,
     loading = _ref2.loading,
     globalSetting = _ref2.globalSetting;
   return {
+    user: user,
     userDetail: userDetail,
     globalSetting: globalSetting,
     loading: loading.models.index
diff --git a/p__User__Detail__id.chunk.css b/p__User__Detail__id.chunk.css
index afd4364bc4..bd0fd2789d 100644
--- a/p__User__Detail__id.chunk.css
+++ b/p__User__Detail__id.chunk.css
@@ -240,4 +240,12 @@
 .hiddenBar___v2ORW::-webkit-scrollbar-track {
   background-color: #ffffff !important;
 }
+.tip___rX3uN {
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 12px;
+  margin-top: 15px;
+}
 
diff --git a/p__index.async.js b/p__index.async.js
index e56ba7a75f..e8aa3ce3bb 100644
--- a/p__index.async.js
+++ b/p__index.async.js
@@ -347,8 +347,8 @@ var message = __webpack_require__(8591);
 var dropdown = __webpack_require__(38854);
 // EXTERNAL MODULE: ./node_modules/_flv.js@1.5.0@flv.js/src/flv.js + 38 modules
 var flv = __webpack_require__(31087);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/authority.ts
 var authority = __webpack_require__(19654);
 // EXTERNAL MODULE: ./node_modules/_react-copy-to-clipboard@5.0.2@react-copy-to-clipboard/lib/index.js
@@ -839,8 +839,8 @@ var regex = /(android|webos|iphone|ipad|ipod|blackberry|iemobile|opera mini)/i;
     if (((_src4 = src) === null || _src4 === void 0 ? void 0 : _src4.indexOf('.m3u8')) > -1) {
       if (el.current.canPlayType('application/vnd.apple.mpegurl')) {
         el.current.src = src;
-      } else if (dist_hls/* default */.Z.isSupported()) {
-        var hls = new dist_hls/* default */.Z();
+      } else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+        var hls = new dist_hls/* default */.ZP();
         hls.loadSource(src);
         hls.attachMedia(el.current);
       }
@@ -1899,8 +1899,8 @@ var config_provider = __webpack_require__(92736);
 var zh_CN = __webpack_require__(81863);
 // EXTERNAL MODULE: ./src/.umi-production/exports.ts + 15 modules
 var _umi_production_exports = __webpack_require__(58308);
-// EXTERNAL MODULE: ./src/components/Header/index.tsx + 12 modules
-var Header = __webpack_require__(40847);
+// EXTERNAL MODULE: ./src/components/Header/index.tsx + 14 modules
+var Header = __webpack_require__(68337);
 // EXTERNAL MODULE: ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/regeneratorRuntime.js
 var regeneratorRuntime = __webpack_require__(7557);
 var regeneratorRuntime_default = /*#__PURE__*/__webpack_require__.n(regeneratorRuntime);
@@ -2512,8 +2512,8 @@ var modelimg_namespaceObject = __webpack_require__.p + "static/modelimg.27d66267
 var es_form = __webpack_require__(78241);
 // EXTERNAL MODULE: ./src/utils/verifyLogin.tsx + 2 modules
 var verifyLogin = __webpack_require__(35588);
-// EXTERNAL MODULE: ./src/components/Header/components/Join/JoinClassroomModal.tsx
-var JoinClassroomModal = __webpack_require__(26646);
+// EXTERNAL MODULE: ./src/components/Header/components/Join/JoinClassroomModal.tsx + 2 modules
+var JoinClassroomModal = __webpack_require__(83163);
 // EXTERNAL MODULE: ./node_modules/_lodash@4.17.21@lodash/lodash.js
 var lodash = __webpack_require__(89392);
 ;// CONCATENATED MODULE: ./src/components/MainSite/Advertisement.css
diff --git a/p__index.chunk.css b/p__index.chunk.css
index 91776b8988..0cf9bc3d42 100644
--- a/p__index.chunk.css
+++ b/p__index.chunk.css
@@ -332,6 +332,40 @@
   font-size: 16px;
 }
 
+/*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/layouts/ShixunDetail/components/LateTip.less?modules ***!
+  \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.bottom___z0ujX {
+  width: 100%;
+  text-align: center;
+  margin-bottom: 15px;
+}
+.bottom___z0ujX .yes___hodnN {
+  width: 88px;
+  height: 32px;
+  background: #3061D0;
+  box-shadow: 0px 2px 4px 0px #E0DFE1, inset 0px 1px 3px 0px rgba(255, 255, 255, 0.5);
+  border-radius: 2px;
+  font-weight: 400;
+  color: #FFFFFF !important;
+  border: 0px;
+}
+.bottom___z0ujX .yes___hodnN:hover {
+  background: #5784de;
+}
+.bottom___z0ujX .no___hiPz5 {
+  margin-right: 20px;
+  width: 60px;
+  height: 32px;
+  background: #F8F9FC;
+  border-radius: 2px;
+  opacity: 0.5;
+  border: 1px solid #C3CFE0;
+  font-weight: 400;
+  color: #464F66 !important;
+  line-height: 14px;
+}
+
 /*!****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/components/Header/components/Join/index.less?modules ***!
   \****************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
@@ -520,6 +554,19 @@
   color: #979797;
 }
 
+/*!********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
+  !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/components/Header/components/DelayTip/index.less?modules ***!
+  \********************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
+.tip___a6MfI {
+  width: 1200px;
+  height: 40px;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  font-size: 12px;
+  margin: 0 auto;
+}
+
 /*!************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************!*\
   !*** css ./node_modules/_css-loader@6.7.1@css-loader/dist/cjs.js??ruleSet[1].rules[5].oneOf[0].use[1]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/postcss-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[2]!./node_modules/_@umijs_bundler-webpack@4.1.0@@umijs/bundler-webpack/compiled/less-loader/index.js??ruleSet[1].rules[5].oneOf[0].use[3]!./src/components/EcListItems/Shixun/index.less?modules ***!
   \************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************************/
diff --git a/p__tasks__Jupyter__index.async.js b/p__tasks__Jupyter__index.async.js
index d20875e51d..b52e2daa6e 100644
--- a/p__tasks__Jupyter__index.async.js
+++ b/p__tasks__Jupyter__index.async.js
@@ -1081,7 +1081,7 @@ var Jupyter_initialState = {
   showDragMask: false
 };
 var TaskJupyterPage = function TaskJupyterPage(_ref) {
-  var _url$, _user$userInfo, _jupyterData$user, _user$userInfo2, _jupyterData$user2, _jupyterData$user3, _jupyterData$user4, _url$active;
+  var _url$, _user$userInfo2, _jupyterData$user, _user$userInfo3, _jupyterData$user2, _user$userInfo5, _jupyterData$user3, _jupyterData$user4, _url$active, _user$userInfo6;
   var globalSetting = _ref.globalSetting,
     loading = _ref.loading,
     dispatch = _ref.dispatch,
@@ -1169,6 +1169,21 @@ var TaskJupyterPage = function TaskJupyterPage(_ref) {
     showTool = _useState32[0],
     setShowTool = _useState32[1];
   var exerciseDataRef = (0,_react_17_0_2_react.useRef)();
+
+  //是否展示头部提示
+  var _useState33 = (0,_react_17_0_2_react.useState)(false),
+    _useState34 = slicedToArray_default()(_useState33, 2),
+    isshowhearde = _useState34[0],
+    setisshowheader = _useState34[1];
+  (0,_react_17_0_2_react.useEffect)(function () {
+    var _user$userInfo;
+    // debugger
+    if ((user === null || user === void 0 || (_user$userInfo = user.userInfo) === null || _user$userInfo === void 0 ? void 0 : _user$userInfo.user_status) !== 0 && (new Date().getTime() > parseFloat(localStorage.getItem('task_ignore')) || parseFloat(localStorage.getItem('task_ignore') || 0) === 0)) {
+      setisshowheader(true);
+    } else {
+      setisshowheader(false);
+    }
+  }, [localStorage.getItem('task_ignore'), user === null || user === void 0 ? void 0 : user.userInfo]);
   (0,_react_17_0_2_react.useEffect)(function () {
     dispatch({
       type: 'globalSetting/headerFooterToggle',
@@ -1867,10 +1882,10 @@ var TaskJupyterPage = function TaskJupyterPage(_ref) {
       payload: status
     });
   };
-  var _useState33 = (0,_react_17_0_2_react.useState)(),
-    _useState34 = slicedToArray_default()(_useState33, 2),
-    answerData = _useState34[0],
-    setAnswerData = _useState34[1];
+  var _useState35 = (0,_react_17_0_2_react.useState)(),
+    _useState36 = slicedToArray_default()(_useState35, 2),
+    answerData = _useState36[0],
+    setAnswerData = _useState36[1];
   var getAnswerData = /*#__PURE__*/function () {
     var _ref11 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee12(identifier) {
       var res;
@@ -1957,17 +1972,17 @@ var TaskJupyterPage = function TaskJupyterPage(_ref) {
     return _onResetGitCode.apply(this, arguments);
   }
   function _onResetGitCode() {
-    _onResetGitCode = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee13() {
+    _onResetGitCode = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee14() {
       var response;
-      return regeneratorRuntime_default()().wrap(function _callee13$(_context13) {
-        while (1) switch (_context13.prev = _context13.next) {
+      return regeneratorRuntime_default()().wrap(function _callee14$(_context14) {
+        while (1) switch (_context14.prev = _context14.next) {
           case 0:
-            _context13.next = 2;
+            _context14.next = 2;
             return (0,service/* resetGitCode */.Tf)(jupyterData === null || jupyterData === void 0 ? void 0 : jupyterData.myshixun_identifier, {});
           case 2:
-            response = _context13.sent;
+            response = _context14.sent;
             if (!((response === null || response === void 0 ? void 0 : response.status) === -5)) {
-              _context13.next = 6;
+              _context14.next = 6;
               break;
             }
             modal/* default */.Z.info({
@@ -1983,14 +1998,14 @@ var TaskJupyterPage = function TaskJupyterPage(_ref) {
                 }), "\uFF09\u4E2D\u88AB\u4F7F\u7528\uFF0C\u7528\u6237\u8BD5\u5377\u5DF2\u4EA4\u5377\uFF0C\u7981\u6B62\u518D\u4F5C\u7B54\uFF01"]
               })
             });
-            return _context13.abrupt("return");
+            return _context14.abrupt("return");
           case 6:
-            return _context13.abrupt("return", response);
+            return _context14.abrupt("return", response);
           case 7:
           case "end":
-            return _context13.stop();
+            return _context14.stop();
         }
-      }, _callee13);
+      }, _callee14);
     }));
     return _onResetGitCode.apply(this, arguments);
   }
@@ -2015,8 +2030,8 @@ var TaskJupyterPage = function TaskJupyterPage(_ref) {
     port: url === null || url === void 0 || (_url$ = url[0]) === null || _url$ === void 0 ? void 0 : _url$.port,
     token: token.current
   };
-  var showReleaseResource = (user === null || user === void 0 || (_user$userInfo = user.userInfo) === null || _user$userInfo === void 0 ? void 0 : _user$userInfo.user_id) === (jupyterData === null || jupyterData === void 0 || (_jupyterData$user = jupyterData.user) === null || _jupyterData$user === void 0 ? void 0 : _jupyterData$user.user_id);
-  console.log(showReleaseResource, user === null || user === void 0 || (_user$userInfo2 = user.userInfo) === null || _user$userInfo2 === void 0 ? void 0 : _user$userInfo2.user_id, jupyterData === null || jupyterData === void 0 || (_jupyterData$user2 = jupyterData.user) === null || _jupyterData$user2 === void 0 ? void 0 : _jupyterData$user2.user_id, 333);
+  var showReleaseResource = (user === null || user === void 0 || (_user$userInfo2 = user.userInfo) === null || _user$userInfo2 === void 0 ? void 0 : _user$userInfo2.user_id) === (jupyterData === null || jupyterData === void 0 || (_jupyterData$user = jupyterData.user) === null || _jupyterData$user === void 0 ? void 0 : _jupyterData$user.user_id);
+  console.log(showReleaseResource, user === null || user === void 0 || (_user$userInfo3 = user.userInfo) === null || _user$userInfo3 === void 0 ? void 0 : _user$userInfo3.user_id, jupyterData === null || jupyterData === void 0 || (_jupyterData$user2 = jupyterData.user) === null || _jupyterData$user2 === void 0 ? void 0 : _jupyterData$user2.user_id, 333);
   var toShixun = function toShixun() {
     dispatch({
       type: 'user/getUserInfo',
@@ -2031,9 +2046,9 @@ var TaskJupyterPage = function TaskJupyterPage(_ref) {
     _umi_production_exports.history.push("/shixuns/".concat(jupyterData.identifier, "/challenges"));
   };
   function onCancelShixun() {
-    var _user$userInfo3;
+    var _user$userInfo4;
     console.log(showReleaseResource, 777);
-    var checkboxData = !(user !== null && user !== void 0 && (_user$userInfo3 = user.userInfo) !== null && _user$userInfo3 !== void 0 && (_user$userInfo3 = _user$userInfo3.shixun) !== null && _user$userInfo3 !== void 0 && _user$userInfo3.editable);
+    var checkboxData = !(user !== null && user !== void 0 && (_user$userInfo4 = user.userInfo) !== null && _user$userInfo4 !== void 0 && (_user$userInfo4 = _user$userInfo4.shixun) !== null && _user$userInfo4 !== void 0 && _user$userInfo4.editable);
     modal/* default */.Z.confirm({
       title: '退出实训',
       icon: /*#__PURE__*/(0,jsx_runtime.jsx)(ExclamationCircleOutlined/* default */.Z, {}),
@@ -2081,6 +2096,73 @@ var TaskJupyterPage = function TaskJupyterPage(_ref) {
       },
       children: [state.showDragMask && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         className: Jupytermodules.dragingMask
+      }), isshowhearde && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+        style: {
+          minHeight: 40,
+          height: 40,
+          background: '#FCD8D8',
+          color: '#E30000',
+          display: 'flex',
+          alignItems: 'center',
+          justifyContent: 'space-between',
+          padding: '0px 30px'
+        },
+        children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          style: {
+            display: 'flex',
+            alignItems: 'center'
+          },
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)("i", {
+            className: "iconfont icon-tishi9 font14 ml10 mr10",
+            style: {
+              color: '#E30000'
+            }
+          }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+            children: (_user$userInfo5 = user.userInfo) === null || _user$userInfo5 === void 0 ? void 0 : _user$userInfo5.user_message
+          })]
+        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+            style: {
+              cursor: 'pointer',
+              color: '#666666'
+            },
+            onClick: function onClick() {
+              var hour_ms = 24 * (60 * 60 * 1000) - 1;
+              var start_time = new Date(new Date().toLocaleDateString()).getTime();
+              var edittime = hour_ms + start_time;
+              localStorage.setItem('task_ignore', edittime);
+              setisshowheader(false);
+            },
+            children: "\u5FFD\u7565"
+          }), /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+            style: {
+              cursor: 'pointer',
+              marginLeft: 20,
+              color: '#165DFF'
+            },
+            onClick: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee13() {
+              var res;
+              return regeneratorRuntime_default()().wrap(function _callee13$(_context13) {
+                while (1) switch (_context13.prev = _context13.next) {
+                  case 0:
+                    _context13.next = 2;
+                    return (0,fetch/* default */.ZP)("/api/business_contacts.json", {
+                      method: 'post'
+                    });
+                  case 2:
+                    res = _context13.sent;
+                    if ((res === null || res === void 0 ? void 0 : res.status) === 0) {
+                      message/* default */.ZP.info('申请成功');
+                    }
+                  case 4:
+                  case "end":
+                    return _context13.stop();
+                }
+              }, _callee13);
+            })),
+            children: "\u7533\u8BF7\u5EF6\u671F"
+          })]
+        })]
       }), /*#__PURE__*/(0,jsx_runtime.jsxs)("header", {
         className: Jupytermodules.header,
         children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
@@ -2314,7 +2396,7 @@ var TaskJupyterPage = function TaskJupyterPage(_ref) {
             children: caseVisible ? '隐藏测试结果' : '查看测试结果'
           }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, {
             className: Jupytermodules.disabled,
-            disabled: btnTime !== 0,
+            disabled: btnTime !== 0 || (user === null || user === void 0 || (_user$userInfo6 = user.userInfo) === null || _user$userInfo6 === void 0 ? void 0 : _user$userInfo6.user_status) === 2,
             loading: btnLoading,
             onClick: evaluating,
             style: {
@@ -2361,10 +2443,10 @@ var TaskJupyterPage = function TaskJupyterPage(_ref) {
     })]
   });
 };
-/* harmony default export */ var Jupyter = ((0,_umi_production_exports.connect)(function (_ref12) {
-  var loading = _ref12.loading,
-    globalSetting = _ref12.globalSetting,
-    user = _ref12.user;
+/* harmony default export */ var Jupyter = ((0,_umi_production_exports.connect)(function (_ref13) {
+  var loading = _ref13.loading,
+    globalSetting = _ref13.globalSetting,
+    user = _ref13.user;
   return {
     globalSetting: globalSetting,
     loading: loading,
diff --git a/p__tasks__index.async.js b/p__tasks__index.async.js
index 280695b177..83eee97640 100644
--- a/p__tasks__index.async.js
+++ b/p__tasks__index.async.js
@@ -6630,6 +6630,10 @@ var HorizontalTabs = function HorizontalTabs(_ref) {
   var scrollbarContent = (0,_react_17_0_2_react.useRef)();
   var init = (0,_react_17_0_2_react.useRef)(false);
   var params = (0,_umi_production_exports.useParams)();
+  var userInfo = (0,_umi_production_exports.useSelector)(function (state) {
+    var _state$user;
+    return state === null || state === void 0 || (_state$user = state.user) === null || _state$user === void 0 ? void 0 : _state$user.userInfo;
+  });
   (0,_react_17_0_2_react.useEffect)(function () {
     var unSub = mediator/* default */.Z.subscribe('send-tabs-result-data', function (data) {
       var cloneTabs = (0,lodash.cloneDeep)(tabs);
@@ -6693,7 +6697,7 @@ var HorizontalTabs = function HorizontalTabs(_ref) {
       var fitem = Tpilist === null || Tpilist === void 0 || (_Tpilist$filter = Tpilist.filter(function (item) {
         return item.id === params.taskId;
       })) === null || _Tpilist$filter === void 0 ? void 0 : _Tpilist$filter[0];
-      var iscorrect = (fitem === null || fitem === void 0 ? void 0 : fitem.id) === params.taskId && (new Date().getTime() - new Date(fitem === null || fitem === void 0 ? void 0 : fitem.time).getTime()) / 1000 / 3600 > 24;
+      var iscorrect = (userInfo === null || userInfo === void 0 ? void 0 : userInfo.user_status) === 2 || (fitem === null || fitem === void 0 ? void 0 : fitem.id) === params.taskId && (new Date().getTime() - new Date(fitem === null || fitem === void 0 ? void 0 : fitem.time).getTime()) / 1000 / 3600 > 24;
 
       //判断分支
       var newTabs = initTabs.map(function (e, i) {
@@ -6886,6 +6890,9 @@ var HorizontalTabs = function HorizontalTabs(_ref) {
         return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
           onClick: function onClick() {
             if (index_tab === value.index_tab) return; //激活标签不允许重复点击
+            if ((userInfo === null || userInfo === void 0 ? void 0 : userInfo.user_status) === 2) {
+              return;
+            }
             var cloneItem = objectSpread2_default()(objectSpread2_default()({}, e), {}, {
               active: true
             });
@@ -7009,10 +7016,10 @@ var HorizontalTabs = function HorizontalTabs(_ref) {
 
 /***/ }),
 
-/***/ 68157:
-/*!*************************************************!*\
-  !*** ./src/pages/tasks/index.jsx + 100 modules ***!
-  \*************************************************/
+/***/ 78105:
+/*!************************************************!*\
+  !*** ./src/pages/tasks/index.jsx + 98 modules ***!
+  \************************************************/
 /***/ (function(__unused_webpack_module, __webpack_exports__, __webpack_require__) {
 
 "use strict";
@@ -11411,6 +11418,10 @@ var dayjs = __webpack_require__(/*! dayjs */ 9498);
   var params = (0,_umi_production_exports.useParams)();
   var hasNextGame = !is_last_game && !loading && (shixun.status > 0 || (user === null || user === void 0 ? void 0 : user.identity) < 5);
   var runTextEnum = ['自测运行', '正在启动', '停止运行', '正在停止'];
+  var userInfo = (0,_umi_production_exports.useSelector)(function (state) {
+    var _state$user;
+    return state === null || state === void 0 || (_state$user = state.user) === null || _state$user === void 0 ? void 0 : _state$user.userInfo;
+  });
   var _useState = (0,_react_17_0_2_react.useState)(0),
     _useState2 = slicedToArray_default()(_useState, 2),
     count = _useState2[0],
@@ -11441,6 +11452,7 @@ var dayjs = __webpack_require__(/*! dayjs */ 9498);
   var location = (0,_umi_production_exports.useLocation)();
   var shixun_environment_id = tabActiveParams.shixun_environment_id,
     tab_type = tabActiveParams.tab_type;
+  console.log('--dibu-', userInfo);
   var isWorkTime = function isWorkTime() {
     var currentTime = dayjs();
     if (currentTime.day() >= 1 && currentTime.day() <= 5) {
@@ -11691,12 +11703,19 @@ var dayjs = __webpack_require__(/*! dayjs */ 9498);
           return regeneratorRuntime_default()().wrap(function _callee4$(_context4) {
             while (1) switch (_context4.prev = _context4.next) {
               case 0:
+                if (!((userInfo === null || userInfo === void 0 ? void 0 : userInfo.user_status) === 2)) {
+                  _context4.next = 3;
+                  break;
+                }
+                message/* default */.ZP.info(userInfo === null || userInfo === void 0 ? void 0 : userInfo.user_message);
+                return _context4.abrupt("return");
+              case 3:
                 if (!(st === 1)) {
-                  _context4.next = 4;
+                  _context4.next = 7;
                   break;
                 }
                 if (!((chooses === null || chooses === void 0 ? void 0 : chooses.length) <= 0)) {
-                  _context4.next = 4;
+                  _context4.next = 7;
                   break;
                 }
                 es_modal/* default */.Z.confirm({
@@ -11712,11 +11731,11 @@ var dayjs = __webpack_require__(/*! dayjs */ 9498);
                   cancelText: '取消'
                 });
                 return _context4.abrupt("return");
-              case 4:
+              case 7:
                 setShowPrevResult(false);
-                _context4.next = 7;
+                _context4.next = 10;
                 return onRun();
-              case 7:
+              case 10:
               case "end":
                 return _context4.stop();
             }
@@ -12260,107 +12279,6 @@ function choose_repository_reducer(state, action) {
     })]
   });
 });
-;// CONCATENATED MODULE: ./src/assets/images/massage.png
-var massage_namespaceObject = "data:image/png;base64,iVBORw0KGgoAAAANSUhEUgAAAGwAAABsCAYAAACPZlfNAAAAAXNSR0IArs4c6QAAIB1JREFUeAHtXXuMZXV9/507M8vu7Mx2BXnrYoB2q7XU+AoWQ8PDF0VrGw0mjcbVdlH/aAvRpEXEFRA1EGjSROs2UaONFUkTFYq1wNogRaprfDQpLmWRlwoLC+vOzA67s3NPP5/v43d+59xz7px757GD8ts95/f9fd+P3+93z71z7j1ZeBa1PM+zN3x89gXdvLs5D/nmvBs2hyw/LeRhY5Zlk6BPZlmYDHk2KWFl+VSehynQ0OdTIQv7QNuddcKuLGS7Olln17c+vO5R0PNnSxqy1ezo1s/mYw8+Mfuqbnf+XGT03BDyV6MA65fSZxR4JoTse0jEjk5nZMeLjl33/e0XZ3NLaWMpda26gr3h+vzo+Znpi7Ai3oLivBbBTixlwC10TaOId+Uh+/rYxMRXv3Vp9lQLmRVjWRUF40p64LGpC7pZ9i5sThdiu1uzYhnoYwjb5qE8C7d08vyLp54weetqWHlHtGBvumbq2ENz2SUh627FajqmT+6OOAmrbm/IO9vXjOU3fPOyySeOlENHpGDnXn3g5E53/oMo0laspvEjFfwwdrHqDqB427udket2XD7+82F0LEZmRQv2+munjuvOho+hUO9ZLdvesMnjdonCfa6zLnz0Pz40uWdYPYPKrUjBtuV5566rpy/udvNr4ODGQZ1c5fz7Op3sstdePvHZbVnWXW5fl71g510586qQz38al+WvXO5gjqR+JHJnZ2Tk/bddvn7ncvqxbAXjld/9j09dk+XZpdj+OssZxGrRjW2ym2f59acfP3nZcl1RLkvBzv/k7Kb84NyNWFVnrpZkrqQfSOo92VFjF93+t+seXmq7Sz7zX3fVzFu6h+Z+9JtaLBaIsTMHzMWqLth5V059fL47/3V4/LyldvRZpw85YC6Yk6X0fUm2xG3fzkfvvHNqOxzbspTO/Rrp+vzZZ09u3XZOdnixMS26YG+/Pl/31PTUjXhv9ebFOvPrLI/3bDcfPTF50U2XZrOLiXNRBXvrDfnG/VPTt4Q8P2sxTvzGyGbZf22YnLjwa5dk+4aNeeiCcWXtnZ6+7bliDZh6FO2YiYnXDbvShrpK5GsWt8HnijVgsciO3Yi5e/tX85EhpMNQBeMFxnOvWcOkW2WYu733Tv3TMBoGLphdpj53NThMtssyW4a55B/oNYxvBOV9Vtnwc6NFZGCkM/Int31k/TfaqmhdsAuunj3lme7cD597U9w2tS35svB0Z83Yy9p+jNVqS+QHuQfn575yRIqFz3n4Wc+KHS3zvGRs+ESEn7syx210tioYP3Vf0s8G6wrQ4C0+6V/Rfw1u1E+YRubBCMwtc9xGasEtUf+e1b1nUX8iYYG8JRZxZ5Rje/qELaE18ydMQ4C91vpZwn2MhY2UMUEXDO0g/mkmZJ0z77hi/ff7SfRdYdvwl2L94+OQf89iMDwYCA5ZKygSC8XD0OgJg5EFtEN4VQKorh2FrOtYmt70u72KL+6f+5vaTILQWBnvEA2RSa63Med9Wt83b6OjH3wf8veXfeTrSe60F4pFsKYoLZagiTB6OnGdX/tCvoxf3hH94RHdF18VRxCrgqWNTVae8QiS8GDtpEe+M/f4A9/+RONfrRtV8oaZwwfyXbDX/h4M9960ciZ6UxRXCDAcACglw0J3Ebl72sUrXjqP6x62L00Qt0VlsIe7wkVtwVOMNQYyafEoUBJ3IUeqaFs3942OZ5ubbuxpXH7zB8KVsLDoYtFXhuPbiBaCkRS4EHjvio7ZS/gWrMh1C16ZBMzYEhzuU9rDEbpgJTCfpELcNgsfaZ+xOI4+e12IkxYROmx53sg7y5p4XWWJzvsGs/n5B+BOuztwzT967M6qYgYE1Rho0WhGcf79A9LJK3ICKA/P2sBfgAL5BHb0sL3nVRyAEvVZz6oTsPnE7U5CMTJXoPqhvZSLsQhdealDtkkPwGRVd/MZGg/lIyOn1t33OFonxps8MZ/aFcsVwJmeYgkN3sp/K5SnH7gN41k4/4yjwuaTR8PG8U4Y7fuK6oZWvp/HBvDUdDfc++jhcPtPDoaZZ1gBj6vsDwunq02LxpyUilZmrx0hU2tYAxAvqTL01Fxvnw4PQqjdHbn03bSIc2JBVwVd1lmsAcbVBPzLTx0Lb3vNeFiLt4ttV4zIy8SohqFj6nEeYhxmz1alK7b5XCc/NZuHm+6eDf/z8JyUxmPXJBSrTVOiRZOC0UySq2arSoGmA2vGwouqt4X3vIbxXvfWxUqsNhVLVh0il6RJ3w2vOG0svOuPxsM41nAHkTG4Nofzsq87qMN5Uth5UxzhhQ7XlcpvWJeF9543Hl66aQwxYR+S11co0wB1knCiAsUK0YbkQMbtT6yBfO+gIlIqmHw8gi8mVHiahzZjCofUUV9ZUsT4XTky52ESAb/tzHGZ7Zzxz9bjHWetC+uPknJIXJokTkwenAyaC8bMJjlydmVe+IxaVD+yKhVs956pP4axob5FojNJPBOH6ahfmouzmI2YjuH1L1sXxo9SX1kstqaiOU2YjM9xTTIrhZfX35ethTsoCIskPWPRicmiCR69hUnXB2qsBb+GlQqVCoYrn3emxL4wHYInUgxhTD0DTI+lw4mX7RbUS144Fkawx/BgIN4Trh5Oa8tfle+gesSxT+Eq37DjM05Zg7B0InIy6sSEQa0WADQqZyJ4Jp5jHQpuoRO/M5fyxILxm4/8Ml1KbAuLD+ILPdGjOBfFYiDHTEgEotpfjNnXHWRynhSu463DpTIpXMc7DE5isYnoRbK1BnOaAX95KKKmJ+0ba8LauEQsmHxNddBLedfiRYKPnEQ8IpAExNk4OsLisBC9B9UR783hOt6VwNEP9yGF3fbYKMohK8zLVCTA8yC5sPx4XIP00LyGtXGZWDAs18FuK0ZiucSZXzqlgXGsOGCFzl4YGBi2Rr/yopwE7j0QQrPe+bwXfvL2O0AUOvsUbpJJeVLY+N02+xTGMPqh273uInFbtBwwF4yfvkiOOHIAcNuW1kYKxisR6OEXwNs1+hEbq2U1YW2A53yLEEFiYMCdlWQyajTCsTnMHofQrHeZtE95BKYi8msXYUdU9Qk7mb05bAp6+IF3nNjB2OPSnoo8A5YFDFkj8UFoZkzyYvACHWvjV4vySQd/WgEyw39bXzziTKJ3GoT6IAOguLoU5kz15qD3jk/7NrSUpw6uw9GG471P7Tqc0hz2XngYu1wZcpWBIkScgOfrotLACTattmseqJ+wGt0tK4y/gzGQOJhltUhf9kPxvqKotfjQlPu9xAAs44ow4+KR4lK4ie56mvpUZwo38Q+BZ0y+yjRWz43tKNDJxvhkXgP23Amh5clrJAVD8QcuGO3ABznRET+IUscwwwCIc5xddmlPGSmOCCtMKhvx3rcqIPhdV13vulQrzqZfZ4bZ66ODfOIT5RLYbYkeCZarSwvBmDnQHGguCMuYOqIzgwFQITXCT1BwHeevHkw84TbPuB2qM+zpNBpw/McA1GNuE5oE9vJCbn0KpzyLgVOdhHGBKjbZ86Bu7+vsVOXJ4ziH09hk+5PtkYXRuCECO5YPryJzM3DjrwDl2Sh/uwl6Bvs5IHohPpgjOtDVBFhJnGVaRPw2lBRMtkQ6Snk2MkZdgimfnNbEX6WXpXtHsMdEm7sRFhy5q/44bx/7clkvQWC7x93XjJ7FyqFUeuYgGk0Uus5eL2sxrBFr1eEPbdVytER6sFAoydcOZwJ0XAgc60F++iqHw+wN6T0ZiPI+hVW4hm56KcYmMtYTjrYxEDuGQyctxaVwE130e1ylWGmbpUMDk6SAoAi4tsF71moUaocumDviPT2kTxKDuEuXbcbZmFuKBFLjr8fjPVnq4DocefmCTN3ywpzAy2UPJsyKxqnWWSiM/Q+cJMHhmCOKpAFw3LKxVqPYrYYqGG2midAxHVUsZxi+Ui+ueAGFBJRv6T1+ulIV6yGLQefppUoiRLfJO9zaniW3FFhqx227fx6uGRIyYu64QQYMWDfHQpGLF5h2EGs1ihfE0y3HLaXAVrHo77+ogDHzYPM9XAYwwrGIVuSFbqfH9s2Hh584iLq7FiNgOL52JPzuC9eGsZq/TD9OuT3PYJJU5CA+ftRoeDHk6v6ifeBQHnY9+kw4dJjvFYvGD5xPPXFtOHrC16vRUt8BMybdUmgX8aFAFqUIOLteePjIdFGkgjJKbcda8Y1z+xttqmpoTP0sUaRQIMjWQAZLolyEJA7ayzJ8VuR3/nc6/P2Xfxy6Xby3oZy9FRBQLOThxaceG676i5fiU/7C5Pfvmwmf+sLOcHh+vkBWoNM3PT984n1nlIr9q5lu+OA/7AxP7puBCfNCXmgAdzphzdho+Oh7X45iN98tEWNijFIsatKj5ALDYZhJ/CV6u8FGhJ0N/AlHefbTE9aEvR11oBVNPhWX5KjnXizq+OZ3fx718P2MvqchhQ0lBO7e3XvCzx47hJkMSTu++d1HwzyKxVzLAW7Pjfe7H34y3IeVRHsu971d+1GsafFaVorZEc9ga25uPtz+gz2R3+ViL1Y0dg/ZUyC96SvyRS5tBc4xbfpsgu/D9OdW2/A38UiEWi4D40zShPn8ZW9JBRATbPCm4yd8MeI1W9eYBq7FIv/oaCcc+1ujqoe6cJxyAn41lr7FrBWgoyh3wvPGSgXddNw6YfRiuQ5aVrk8nPT8dSVbtBcPAuCUSSA9x2iC1050JjihD3lirfAaFvBbucNoqAjRSaCIZbLl40NR63xKTK8STcTjC1veeGJYu6YTHvzFftUjjolGKeTaNaPhjWeeHI6Z1BcxUqjjz88/KYxgj7z/EfykL9/zVdq6tWvCBa85ORy3sXyT2O9tWhsufeerwp0//GU4iNXElePZxg9+hc2nPC/86R8eI2+WqdLtsS83x1iPLu8Qpr6i0wHPCa1ALgixVqPILlaYGVpQpMJQrbSrEX9wAp0sclC06j/GrK3jx1Gs977pRAjgYCN/QhdccnLZtWNZePfrIZNR1uTI5zB7tqo+4M/5gw3hnDM2NNKjDMVNXnqVkLOo5wmHXFzQMY6r9sjNZFQVEN+moVblKddGqIaHPsRmcMTROQuA+3aPrwzKm8PeE5/Czue907yv8jve+6WmQ1+MiTFacLEmzIXZjjj6sIiGFwP8PPiQN96U7CZFo9+xYCWmGFMFWz9krEnMPUxOS0z38KSIqr6F5AflL9miMJrU0A0pavgzajWKxE5Bw1B3SlUt9yuU89ok9OGCvcVdy+c072uZKsiU12HvK6wyTGkOe1/Hv5w41goXHfIj/Mtpp6R7JYP1CeSTxLelptVfcrTlwHW3ZF8UG2uFFYYtcQXbSgbIsFJ7Dnu/gmEviSnWim9ocC28JPpaKxk2YdUVQj2Oo3GHfQVV6Qs5uFj5hfQvmo5a8bJ+t760L1pdKwV8H+YFqyZoIQUu5z35UxifJknR2LNRv+MU0//sutJerhdsHx/U3/7WhqCiVqN8cEzNe80htC0swkR4MsjtsPcLa1iYI9XlsPcLS/dypLIOe1/iZmWloiXskg5YK9wKme3SD2KWVHejstpgG7lXF6G6wlY6FtZqlI9k6hafIy1PhpLXSNtdau0wAZ6UOgansV+KVrW3kH7fXtMtdyn8aKuDtero87P4SKbFt8ZEJlVikuKn3RikMD3guKk5LZUZDHbbvh3TvlilZbNd9inVn/IUcOJtje+NOUnE2oBQPcNa4Usd8pnK99oINfGIn0me+zmpCdCEUa58aALTJJVh8jtPVbbN2GW9KIvVl2QkiZ/YUg4szoR7CBDPOEOt5HoK+nYMoaFexByXIpKDnie3CpDcdMgVJOjsU3i5+N2O97TjdlO4iU6eUmFsEGMnwxI1qJIaScH4ZLrB9UJF9Myk3UH2UiSd0aQSxdUxc1A/AKZo9RA+1yH8xPTyuZzThMn4HOc8ae8056/25GVzGYcFaXjHkUdjQYxEIl6Vx4ixC5JCJCZNmKrIhN4Aeo2kYHyMIPimG3jboe1CgK7g8R2Jo2kgAfdrHI4J8cSs1l5WG0KJK8xg9/ehPXjyosSdxMhsMXwW0DO3+IukaauR3hHG54TAibtc/0I9V0rRACfFMv8jjmP5O7O8VIZwx4/2SyDUsNDh25MnrNpT3nlS2PlSXAq3pTNG8npzkD2P2xALZ5/+hdr/bg0CgwaDdRigxcTosJxDxTWdWRt/lot9JkC7WetfxaxTrA54KOAwsMAodPN39+hPJmDIuvc7aIf0puY010E+x6XwUtFdD3v+7MOt9+iD+hg73RRXIyAeCHaQ4lCq2jDhv+64WLCR9RM3wuwhJ7TqZdaAUzwtJGRFASlheJRCJmMePvWVh+SHSpzU1MvqgYiviGpPOedp0rEYvOt2u27vqaluuParD0sssRhmyEunOShyEnPkOUtI/UDWhA9PdZ5YMD5NFdvuLU5o7K04qV1+n8LHJIvv6L1wOu1BIQGeP/bUwbDl2p9iezzQWAwmic17wiJuPeGehBq/WjG64TzpaU8+0UGdCew8qQ3C5Nnxk9mw5bqfhl88iTuw8FmRxChEUpkHK5nxAym5ke+ccIDmuRKFimo8sybpk25LtwjgFqov4haWP2uUriHQ1+LSVh0mQhzHbzbSUSmnMDIKjICbmp0PV33pvvAvO9aHM19ydDgOdzStwZ1NKmlBIbLfecHa8NsnFr+uSjV1bRZXn3fdOxMOzcV01LG1womr4NTUB9xkmofHn54L/33v0+H+n09LobKMqVNnyBchvFbnuDTgS7Z+IaJwWPQO6B5rkjpdKhgffbv78am9yHerv0B78rx3X9z5vEuIWPY4hFD0nKH3Pzod/u+RX6GImCrdefTkB4wxoev/6tVh80laMNfEno3qntjfDTfd+UT41zvuD9OzB9UE8Lq6yYVGk5gkDrP3SRZfe90tXocxIBz0T+jZSNITx4MsyicDKsVQLu+xREkSk8ZCMpvgFVzwDN69px4/eWvKWCoYr0TO+9g0nlLU/buUqR/sgTO7Os90lUlSYZH/5B57esqI8F5dPlwBQ85HRhoPNif8JxIzFGiyrsFH0684jT9eoo0a2Ng/8Pjh8OU7fhn+/e6fhcO8zRpI2aJoWHSS0xuI3PzFKfTCyzET67sBtXKsveggjOIQZk/9MpaiUqEdhmes5NXJwpH+E7sgMVeiHpKtGh5D7FeHzl8qGJF8TjF+4+ivEUbzj4N54OIghCRJOBlegmbijS6BYsRfR/UECYkftKBIeZeBs0qgs8enq9w2X/mS43CfItBJ+8H9B8M/3/5IuPtHv1AsEqFJZM//+Ecc7RGBJmNOdw4VJXiFO3gdk027IMqnu+SHX6B5oXRFEUdx0kmWQRwTSUyBV5Ix+8ByhmFDgxb8OFh+Q5XcUzD+etj5V8qjOv6mytxvrC+qqBiDR7E0DsIWkASus08+EePMtjqlwWmS8eU4FO6s3z9W9HBm3vHjA+GL33ow7Hpwr7iR8cqAjfqpx1tMINDiCwiaQemczeZWTCzTLKJyokKMxYauLC+W9FZQKWSExYjoowrqJ6/YgY+i1o236MG/vfpLbhTrKRiRfKg0fuDyA0hpZX6Tqk2cYSbxPzoj3qnjcXUxmx28NnEVoUgsltwZLKsNujw4gJThk3X5esNC//ThmfDl/8zDjTseCo89OUNW8JdddttiWuSpqHBK6MYk8m6HutBgUXwQyJWpEKgsFun0HTALyN7GAosSK7DgbVKKZrNIMRySLoE5oGB9g0+HWIM6KiTrG1bZZ/DVnffVUmlMHGCKUVZ6Io1XhQBw0q/HcqywXETwxSmfx7dTwITeceTViw5uiwU/VYpu6sA/sUWkNXeeFDbJM1ecEwpAEi++8fJNmpRKhIiXwogOTb6ycAJxbMXyXoqG28VhUIunFyWEdVV5UUmnJupQGzopgaQb0U8hxxN2hn+8/YrJ90dEApSna0LgE8C7B8I7gOr9OlLJEAYcazbgIBOuzsl2JTTyEODB4MHA3xnEiCdihc4ZLFccHPN1jD8TAQbRrbzCYmNd5RSlJisAGNQ++aFPlAMmXfOmNuGP+6muqQ7VQzkK0lfK4mTFEByRoGuBTKkqUTsCmwp3INKpDy36pcPkvI+5T8YlsFkMbOdfNfV+rIZPlyR8wDziHxXoCmPAbMkq4wWErB74hxXFH1jhD0IKjpWSy3hdhVqoAo46yS4Fcv3e05a5j47lEjaDIaXkWDQtaCEtjKbB9HDEQlC1waKZsyQtGnmkgCwWZYoVpfJeUOqxgoJPV59oFDFSqw1fwvjA7R+Z/EwV72PX5uNSz8e1w52dJWQyiA4wHptV4g5jkMBJ4FUY6TSlgcTZykA73E7YM2jCOASHO/AEVh78eUHxpd5o4AvkHRmBLeULHcrjYG+w4KI8/TK5iKMsfazYsjG/0aKFAl3iYaDk54HwWBQrjKZDkEBTTqYQesORvdJA2cmcV9ClYbO0sTU+yoNTlU5gWlNJugoi7CuDq4wzHmN5rZJVCBjftJTXJfLJSrTXMK5C4+eFiuoTK+qV2ZZBXEHy6hATR3FxTE8Kg1cSRxqbJY9Jph0TkF4SK3SVEZoUhn4Qx56TTIsVCyi6Uh6wGb9YEAcERUJs0IhkLPwoD2pesJ175f5rkQD+ynPRLGgpBLCSeO+tUNJ54pOiaXG8EL5tUiEOKarDxLAQPJNWmI8QI/BCMFlocsaJ9sszWumRyeR0TAEKK4/m1QsDXCwQ9ZMHhZKtg9IsHHHKpypU1qYRVJPussoqCD9l4bodV2z4kA+belhduJ1+/ORlMHdPiVPtJwnRMLRIJOrYg2DAgmE0mJW6BRJOtiXHc4uSbUj5ZIuqblO+jRletzEmTrczXv53Rnxb9a0RNOIM38GXALn9gtF8oqzhuJ1SFw7x14sCH3PidJ9XWk2xQJAJo5NMkxUnjw5jOjG8hzmOiD5ARbSZ8/xPzm7i49rhQPEUdJvxMvshSmVxOxRVYOCKSWBOY9kWiRSaX8qTiauNdF1VxKg+QmxmUAc4J+4zaZRjZ3il4qwk0BQTxUvyVI8pRV5qJivGBEQOsH6YSyLRPtdJRxFdRnRSmE1l3WuMHK29sgz0wDfXXCjoA9U+UlE8RWxIltpnwgm5m+iBUBTPWhClO68WSvk03SKhQlSGJoPYCQre01a5EElSki3PtcaasRhs7KhahoqjPkF5kYw1LYAkn8WkYEIvBqAAHyePDgoybaMt2yMVVX0IfNAmilMsX8sjne5bNLguyYUi5ePKMtgKKr8a4BcZZCZdUwf1bkjQpVO5GJIlS4xmUs4sgqtQtHyiUiSbtiT9qhs8ZHOc9KoIBC0U1UUep4l0Q7FIEz5h4kS75o4rJj+so3bnRLydALnO/dj+z6HbEiWSRBRFs2LERJPJGNEpX4HjmEURDE4Kk9HhaK0EaJ6sGBikNwB5si2rKkce00Bb2hxjNCsuF0XBrTxx9YGSFpG8HIu/lFfFuvrjwJDafX7HRze8p4RpMfCNuAVrwXL22ZNb4dPNEaOxRGeJp4+6VYEIZoVpzpgFh7G8FpDOF3O84PMfaCrDiwjw+EWIXADwIkAvBuSCgBcMvCCQ93HsVVYuFMyu6KAeO2hH6dRPXWon8pk+0Ws08Ud0wxxjiLo1Hp8cXlDhYhzeUhC5Yw6dNEifqBlELITaR9snMyldaSyfkOKe5Nujb3hqW0YpD9DRQcMnJlTIkiJkMCt/lLKgbMzOFVB3mtAyifXQRn7A/DBacUogrDYJFLpcveiOA9PFbpGPtlfrib5BwLfekG/cPzV9Czw/K8pVnCwKp0WSyckCCp8zo9f/ooZOiZwARDmfkCsnCyHyFsmrSpaK4FpMXHjtQiTyCU/B0FskMijdPYyTICJEiZ5QrA2TExd+7ZJsX4IdCCy8GUisYOZKe2p66kYU4M0R684SAQtF0YgoCmdVIxLNhdATNM+0sMLQ9xSTXJJVJZEWNTSHnfJG21IpFVa6yrvHpPQUSpAqo/Rw89ETkxfddGk2W2AHh5o9H0DXtm/no3feOYVbC5ILEcp7RGalX+E8UTFJURhqXE+NTy5XkMohOb2kw5GFUOGr4cosvQUiWywSB6mPZRdI/Txfs7adkx3mYDGtV/UitPVc8rsuD8aseeFITlMhSSXCspsmrZRw01tLd6TbpI0YZQRMg3YJawlfHTQWiIz1qlnUgS/dq3bTcYOZlGUwWN5c5/NfwIwrPhFxFWlmzHJv8chcMNYVytWxL4oho0gqNERUBEqJj9gK0KSgbcbwyPqRbOTdt31k/aLuqK541TQvqmyDjS+4evaUg/NzX0HMZzZKpgmpKV6j3AKEnmKkdijbNuEL2OlHhol7jhoZe8etl697qB/fMDS8IVn6RkdPO2HybCTnOlwM60caVTNMnB9MKg55D8Yzls1ARyGZLk616Da8r/qxhGOJFTEz9uUoFl1lGMva9O9p859GPV7Z2lB1VfQTXPYI+hkvaHBjJ97Qf2ChR9MXEsNBKxLuNtyQeNfV0xfjdoNr4GbvPSLD+b5apPbhL9GX8S/F23jL1zK3FSmYx8Cnr9sDvbfg3VjjLXTOv5p7bH+HsHN/jjfMND3VfDn8X9GCeQB8sDefU4wrwK0oXPMdxi6winoU6gAKtZ33DdY9GHu5XT0iBfOg9JnR2SW4LtmK4rX6AobLrnSPIu3Frcrbeft03R25K+XPES2YB8mHmekTbrN34s9hF66W7ZLbHj5evAX3PX7ptOMm/636xQT3fyX7VVGwNGA+oFOex4lHPGLV8amBA/9Me6pvCHgaq+kuvK34Br+Vmn6ZbghdSy6y6gqWRsiVxyfT8WFnuNI/F2+y8EimAZ/ElCqsgVEc/AoQfrQEX67kTyvw2/qrYSXVuCqoVV2wqtP4GCvjI5n4lB9sm5tx59xmbFengw9vFbIJ0CdRAPyIPX8pHA2/kYsCT2G14Ec882kU/WnQduNvkruw3e3ibzfpTzdhI36WtP8Hs4VbjXCO43sAAAAASUVORK5CYII=";
-;// CONCATENATED MODULE: ./src/components/MessageIcon/index.tsx
-
-
-
-
-
-
-var MessageIcon = function MessageIcon(_ref) {
-  var userId = _ref.userId,
-    challengeId = _ref.challengeId;
-  var _useState = useState(true),
-    _useState2 = _slicedToArray(_useState, 2),
-    tooltipOpen = _useState2[0],
-    setTooltipOpen = _useState2[1];
-  var moveElement = useRef();
-  useEffect(function () {
-    if (moveElement.current) {
-      var onMouseDown = function onMouseDown(e) {
-        setTooltipOpen(false);
-        pointerEvents('none');
-        var box = moveElement.current.getBoundingClientRect();
-        startLeft = box.left;
-        startTop = box.top;
-        startPageX = e.pageX;
-        startPageY = e.pageY;
-        dragging = true;
-        click = true;
-        document.onselectstart = function () {
-          return false;
-        };
-      };
-      var onMouseUp = function onMouseUp() {
-        dragging = false;
-        document.onselectstart = null;
-        pointerEvents('auto');
-        if (click) {
-          click = false;
-          openNewWindow("/chatgpt?id=".concat(userId, "&position=").concat(challengeId));
-        }
-      };
-      var onMouseMove = function onMouseMove(e) {
-        if (dragging) {
-          click = false;
-          var spareWidth = e.pageX - startPageX;
-          var spareHeight = e.pageY - startPageY;
-          moveElement.current.style.left = "".concat(startLeft + spareWidth, "px");
-          moveElement.current.style.top = "".concat(startTop + spareHeight, "px");
-        }
-      };
-      console.log(moveElement.current);
-      var startLeft = 0;
-      var startTop = 0;
-      var startPageX = 0;
-      var startPageY = 0;
-      var dragging = false;
-      var click = false;
-      moveElement.current.addEventListener('mousedown', onMouseDown);
-      document.addEventListener('mousemove', onMouseMove);
-      document.addEventListener('mouseup', onMouseUp);
-      return function () {
-        var _moveElement$current;
-        (_moveElement$current = moveElement.current) === null || _moveElement$current === void 0 || _moveElement$current.removeEventListener('mousedown', onMouseDown);
-        document.removeEventListener('mousemove', onMouseMove);
-        document.removeEventListener('mouseup', onMouseUp);
-      };
-    }
-  }, [moveElement.current]);
-  useEffect(function () {
-    setTimeout(function () {
-      setTooltipOpen(false);
-    }, 5000);
-  }, []);
-  return /*#__PURE__*/_jsx(Tooltip, {
-    open: tooltipOpen,
-    placement: "topRight",
-    title: "\u5B66\u4E60\u4E2D\u6709\u7591\u95EE\u53EF\u4EE5\u70B9\u51FB\u8FD9\u91CC\u5411\u6559\u5E08\u8BF7\u6C42\u5E2E\u52A9",
-    children: /*#__PURE__*/_jsx("div", {
-      ref: moveElement,
-      draggable: false,
-      style: {
-        width: 54,
-        height: 54,
-        position: "fixed",
-        zIndex: 1000,
-        bottom: 223,
-        right: 26,
-        borderRadius: '50%',
-        cursor: 'pointer',
-        overflow: 'hidden'
-      },
-      children: /*#__PURE__*/_jsx("img", {
-        draggable: false,
-        src: Massage,
-        width: 54
-      })
-    })
-  });
-};
-/* harmony default export */ var components_MessageIcon = ((/* unused pure expression or super */ null && (MessageIcon)));
 // EXTERNAL MODULE: ./src/pages/Demo/index.tsx + 1 modules
 var Demo = __webpack_require__(96554);
 ;// CONCATENATED MODULE: ./src/pages/tasks/evaluate-result/index.less
@@ -15263,6 +15181,7 @@ function code_repository_reducer(state, action) {
       return regeneratorRuntime_default()().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
+            // console.log('---xxx', item);
             // if (startDebug) {
             //   message.warning('代码正在调试中')
             //   return
@@ -15530,6 +15449,10 @@ function code_repository_reducer(state, action) {
           src: diannao_namespaceObject
         }), /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, {
           onClick: function onClick() {
+            if ((userInfo === null || userInfo === void 0 ? void 0 : userInfo.user_status) === 2) {
+              message/* default */.ZP.warning(userInfo === null || userInfo === void 0 ? void 0 : userInfo.user_message);
+              return;
+            }
             var cloneItem = objectSpread2_default()(objectSpread2_default()({}, tabs === null || tabs === void 0 ? void 0 : tabs[0]), {}, {
               active: true
             });
@@ -16708,7 +16631,6 @@ var tasks_excluded = ["gold", "experience", "next_game", "next_shixun", "subject
 
 
 
-
 
 
 var tasks_DirectoryTree = tree/* default */.Z.DirectoryTree;
@@ -16970,6 +16892,19 @@ function tasks_reducer(state, action) {
     captureVideoVisible = _useState14[0],
     setCaptureVideoVisible = _useState14[1];
 
+  //是否展示头部提示
+  var _useState15 = (0,_react_17_0_2_react.useState)(false),
+    _useState16 = slicedToArray_default()(_useState15, 2),
+    isshowhearde = _useState16[0],
+    setisshowheader = _useState16[1];
+  (0,_react_17_0_2_react.useEffect)(function () {
+    if ((userInfo === null || userInfo === void 0 ? void 0 : userInfo.user_status) !== 0 && (new Date().getTime() > parseFloat(localStorage.getItem('task_ignore')) || parseFloat(localStorage.getItem('task_ignore') || 0) === 0)) {
+      setisshowheader(true);
+    } else {
+      setisshowheader(false);
+    }
+  }, [localStorage.getItem('task_ignore'), userInfo]);
+
   //文件是否存在
   var isEditPath = (0,_react_17_0_2_react.useMemo)(function () {
     if (currentPath && paths) {
@@ -17116,31 +17051,31 @@ function tasks_reducer(state, action) {
     return _init.apply(this, arguments);
   }
   function _init() {
-    _init = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee6() {
+    _init = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee7() {
       var p, response, status, _st, hide_width_rate, path, action_analysis, realMoveX, payload, _paths;
-      return regeneratorRuntime_default()().wrap(function _callee6$(_context6) {
-        while (1) switch (_context6.prev = _context6.next) {
+      return regeneratorRuntime_default()().wrap(function _callee7$(_context7) {
+        while (1) switch (_context7.prev = _context7.next) {
           case 0:
-            _context6.prev = 0;
+            _context7.prev = 0;
             p = {};
             if (_params.courseId && _params.homeworkId) {
               p = {
                 homework_common_id: _params.homeworkId
               };
             }
-            _context6.next = 5;
+            _context7.next = 5;
             return (0,service/* fetchTaskInfo */.XO)(_params.taskId, p);
           case 5:
-            response = _context6.sent;
+            response = _context7.sent;
             status = response.status;
             if (!(status === 401)) {
-              _context6.next = 11;
+              _context7.next = 11;
               break;
             }
-            return _context6.abrupt("return");
+            return _context7.abrupt("return");
           case 11:
             if (!(status === -3)) {
-              _context6.next = 15;
+              _context7.next = 15;
               break;
             }
             (0,util/* bindPhone */.eF)({
@@ -17148,23 +17083,23 @@ function tasks_reducer(state, action) {
                 window.location.href = '/';
               }
             });
-            _context6.next = 30;
+            _context7.next = 30;
             break;
           case 15:
             if (!(status === 403)) {
-              _context6.next = 19;
+              _context7.next = 19;
               break;
             }
             history.replace('/403');
-            _context6.next = 30;
+            _context7.next = 30;
             break;
           case 19:
             if (!(status === 404)) {
-              _context6.next = 24;
+              _context7.next = 24;
               break;
             }
             history.replace('/404');
-            return _context6.abrupt("return");
+            return _context7.abrupt("return");
           case 24:
             _st = response.st, hide_width_rate = response.hide_width_rate, path = response.challenge.path, action_analysis = response.action_analysis;
             realMoveX = hide_width_rate ? Math.ceil(window.innerWidth * hide_width_rate / 100) : 0.01;
@@ -17192,20 +17127,20 @@ function tasks_reducer(state, action) {
             setCaptureVideoVisible(action_analysis);
           case 30:
             sessionStorage.tasksData = JSON.stringify(response);
-            _context6.next = 37;
+            _context7.next = 37;
             break;
           case 33:
-            _context6.prev = 33;
-            _context6.t0 = _context6["catch"](0);
-            console.log(_context6.t0);
+            _context7.prev = 33;
+            _context7.t0 = _context7["catch"](0);
+            console.log(_context7.t0);
             dispatch({
               type: constant/* FETCH_TASK_FAILURE */.Ir
             });
           case 37:
           case "end":
-            return _context6.stop();
+            return _context7.stop();
         }
-      }, _callee6, null, [[0, 33]]);
+      }, _callee7, null, [[0, 33]]);
     }));
     return _init.apply(this, arguments);
   }
@@ -17542,21 +17477,21 @@ function tasks_reducer(state, action) {
     return _onResetCode.apply(this, arguments);
   } //重置代码仓库
   function _onResetCode() {
-    _onResetCode = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee7() {
+    _onResetCode = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee8() {
       var response, content, language;
-      return regeneratorRuntime_default()().wrap(function _callee7$(_context7) {
-        while (1) switch (_context7.prev = _context7.next) {
+      return regeneratorRuntime_default()().wrap(function _callee8$(_context8) {
+        while (1) switch (_context8.prev = _context8.next) {
           case 0:
             setCodeLoading(true);
-            _context7.next = 3;
+            _context8.next = 3;
             return (0,service/* restoreCode */.qK)(taskId, {
               path: currentPath
             });
           case 3:
-            response = _context7.sent;
+            response = _context8.sent;
             content = response.content, language = response.language;
             if (!((response === null || response === void 0 ? void 0 : response.status) === -5)) {
-              _context7.next = 9;
+              _context8.next = 9;
               break;
             }
             es_modal/* default */.Z.info({
@@ -17573,7 +17508,7 @@ function tasks_reducer(state, action) {
               })
             });
             setCodeLoading(false);
-            return _context7.abrupt("return", Promise.reject());
+            return _context8.abrupt("return", Promise.reject());
           case 9:
             dispatch({
               type: constant/* FETCH_REP_CONTENT */.GB,
@@ -17586,9 +17521,9 @@ function tasks_reducer(state, action) {
             setCodeLoading(false);
           case 11:
           case "end":
-            return _context7.stop();
+            return _context8.stop();
         }
-      }, _callee7);
+      }, _callee8);
     }));
     return _onResetCode.apply(this, arguments);
   }
@@ -17596,18 +17531,18 @@ function tasks_reducer(state, action) {
     return _onResetGitCode.apply(this, arguments);
   } //加载上次通过的代码
   function _onResetGitCode() {
-    _onResetGitCode = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee8() {
+    _onResetGitCode = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee9() {
       var _taskData$myshixun;
       var response;
-      return regeneratorRuntime_default()().wrap(function _callee8$(_context8) {
-        while (1) switch (_context8.prev = _context8.next) {
+      return regeneratorRuntime_default()().wrap(function _callee9$(_context9) {
+        while (1) switch (_context9.prev = _context9.next) {
           case 0:
-            _context8.next = 2;
+            _context9.next = 2;
             return (0,service/* resetGitCode */.Tf)(taskData === null || taskData === void 0 || (_taskData$myshixun = taskData.myshixun) === null || _taskData$myshixun === void 0 ? void 0 : _taskData$myshixun.identifier, {});
           case 2:
-            response = _context8.sent;
+            response = _context9.sent;
             if (!((response === null || response === void 0 ? void 0 : response.status) === -5)) {
-              _context8.next = 6;
+              _context9.next = 6;
               break;
             }
             es_modal/* default */.Z.info({
@@ -17623,15 +17558,15 @@ function tasks_reducer(state, action) {
                 }), "\uFF09\u4E2D\u88AB\u4F7F\u7528\uFF0C\u7528\u6237\u8BD5\u5377\u5DF2\u4EA4\u5377\uFF0C\u7981\u6B62\u518D\u4F5C\u7B54\uFF01"]
               })
             });
-            return _context8.abrupt("return", Promise.reject());
+            return _context9.abrupt("return", Promise.reject());
           case 6:
             init();
-            return _context8.abrupt("return", response);
+            return _context9.abrupt("return", response);
           case 8:
           case "end":
-            return _context8.stop();
+            return _context9.stop();
         }
-      }, _callee8);
+      }, _callee9);
     }));
     return _onResetGitCode.apply(this, arguments);
   }
@@ -17639,20 +17574,20 @@ function tasks_reducer(state, action) {
     return _onResetPassedCode.apply(this, arguments);
   }
   function _onResetPassedCode() {
-    _onResetPassedCode = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee9() {
+    _onResetPassedCode = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee10() {
       var response, content, language;
-      return regeneratorRuntime_default()().wrap(function _callee9$(_context9) {
-        while (1) switch (_context9.prev = _context9.next) {
+      return regeneratorRuntime_default()().wrap(function _callee10$(_context10) {
+        while (1) switch (_context10.prev = _context10.next) {
           case 0:
-            _context9.next = 2;
+            _context10.next = 2;
             return (0,service/* resetPassedCode */.hG)(taskId, {
               path: currentPath
             });
           case 2:
-            response = _context9.sent;
+            response = _context10.sent;
             content = response.content, language = response.language;
             if (!((response === null || response === void 0 ? void 0 : response.status) === -5)) {
-              _context9.next = 7;
+              _context10.next = 7;
               break;
             }
             es_modal/* default */.Z.info({
@@ -17668,7 +17603,7 @@ function tasks_reducer(state, action) {
                 }), "\uFF09\u4E2D\u88AB\u4F7F\u7528\uFF0C\u7528\u6237\u8BD5\u5377\u5DF2\u4EA4\u5377\uFF0C\u7981\u6B62\u518D\u4F5C\u7B54\uFF01"]
               })
             });
-            return _context9.abrupt("return");
+            return _context10.abrupt("return");
           case 7:
             dispatch({
               type: constant/* FETCH_REP_CONTENT */.GB,
@@ -17681,9 +17616,9 @@ function tasks_reducer(state, action) {
             });
           case 8:
           case "end":
-            return _context9.stop();
+            return _context10.stop();
         }
-      }, _callee9);
+      }, _callee10);
     }));
     return _onResetPassedCode.apply(this, arguments);
   }
@@ -17691,15 +17626,15 @@ function tasks_reducer(state, action) {
     return _onPlusOrCancelPraise.apply(this, arguments);
   }
   function _onPlusOrCancelPraise() {
-    _onPlusOrCancelPraise = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee10() {
+    _onPlusOrCancelPraise = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee11() {
       var response, praise_count, praise;
-      return regeneratorRuntime_default()().wrap(function _callee10$(_context10) {
-        while (1) switch (_context10.prev = _context10.next) {
+      return regeneratorRuntime_default()().wrap(function _callee11$(_context11) {
+        while (1) switch (_context11.prev = _context11.next) {
           case 0:
-            _context10.next = 2;
+            _context11.next = 2;
             return (0,service/* plusOrCancelPraise */.Y0)(taskId);
           case 2:
-            response = _context10.sent;
+            response = _context11.sent;
             praise_count = response.praise_count, praise = response.praise;
             taskData.praise_count = praise_count;
             taskData['user_praise'] = praise;
@@ -17711,9 +17646,9 @@ function tasks_reducer(state, action) {
             });
           case 7:
           case "end":
-            return _context10.stop();
+            return _context11.stop();
         }
-      }, _callee10);
+      }, _callee11);
     }));
     return _onPlusOrCancelPraise.apply(this, arguments);
   }
@@ -17745,11 +17680,11 @@ function tasks_reducer(state, action) {
     return _onSaveTaskStar.apply(this, arguments);
   }
   function _onSaveTaskStar() {
-    _onSaveTaskStar = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee11(value) {
-      return regeneratorRuntime_default()().wrap(function _callee11$(_context11) {
-        while (1) switch (_context11.prev = _context11.next) {
+    _onSaveTaskStar = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee12(value) {
+      return regeneratorRuntime_default()().wrap(function _callee12$(_context12) {
+        while (1) switch (_context12.prev = _context12.next) {
           case 0:
-            _context11.next = 2;
+            _context12.next = 2;
             return (0,service/* saveTaskStar */.L5)(taskId, shixun.id, value);
           case 2:
             taskData['game']['star'] = value;
@@ -17761,9 +17696,9 @@ function tasks_reducer(state, action) {
             });
           case 4:
           case "end":
-            return _context11.stop();
+            return _context12.stop();
         }
-      }, _callee11);
+      }, _callee12);
     }));
     return _onSaveTaskStar.apply(this, arguments);
   }
@@ -17771,19 +17706,19 @@ function tasks_reducer(state, action) {
     return _onShowDir.apply(this, arguments);
   }
   function _onShowDir() {
-    _onShowDir = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee12() {
+    _onShowDir = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee13() {
       var response, trees;
-      return regeneratorRuntime_default()().wrap(function _callee12$(_context12) {
-        while (1) switch (_context12.prev = _context12.next) {
+      return regeneratorRuntime_default()().wrap(function _callee13$(_context13) {
+        while (1) switch (_context13.prev = _context13.next) {
           case 0:
             if (repos) {
-              _context12.next = 8;
+              _context13.next = 8;
               break;
             }
-            _context12.next = 3;
+            _context13.next = 3;
             return (0,service/* fetchRepos */.pU)(myshixun.identifier);
           case 3:
-            response = _context12.sent;
+            response = _context13.sent;
             trees = response.trees;
             dispatch({
               type: constant/* SET_REPOS */.oP,
@@ -17792,7 +17727,7 @@ function tasks_reducer(state, action) {
                 repos: (0,tasks_util/* getTreeData */.SI)(trees)
               }
             });
-            _context12.next = 9;
+            _context13.next = 9;
             break;
           case 8:
             dispatch({
@@ -17801,9 +17736,9 @@ function tasks_reducer(state, action) {
             });
           case 9:
           case "end":
-            return _context12.stop();
+            return _context13.stop();
         }
-      }, _callee12);
+      }, _callee13);
     }));
     return _onShowDir.apply(this, arguments);
   }
@@ -17811,27 +17746,27 @@ function tasks_reducer(state, action) {
     return _onLoadTreeData.apply(this, arguments);
   }
   function _onLoadTreeData() {
-    _onLoadTreeData = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee14(node) {
+    _onLoadTreeData = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee15(node) {
       var _node$props, children, eventKey;
-      return regeneratorRuntime_default()().wrap(function _callee14$(_context14) {
-        while (1) switch (_context14.prev = _context14.next) {
+      return regeneratorRuntime_default()().wrap(function _callee15$(_context15) {
+        while (1) switch (_context15.prev = _context15.next) {
           case 0:
             _node$props = node.props, children = _node$props.children, eventKey = _node$props.eventKey;
-            return _context14.abrupt("return", new Promise( /*#__PURE__*/function () {
-              var _ref5 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee13(resolve) {
+            return _context15.abrupt("return", new Promise( /*#__PURE__*/function () {
+              var _ref6 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee14(resolve) {
                 var response, trees, newRepos;
-                return regeneratorRuntime_default()().wrap(function _callee13$(_context13) {
-                  while (1) switch (_context13.prev = _context13.next) {
+                return regeneratorRuntime_default()().wrap(function _callee14$(_context14) {
+                  while (1) switch (_context14.prev = _context14.next) {
                     case 0:
                       if (children && children.length > 0) {
                         resolve();
                       }
-                      _context13.next = 3;
+                      _context14.next = 3;
                       return (0,service/* fetchRepos */.pU)(myshixun.identifier, {
                         path: eventKey
                       });
                     case 3:
-                      response = _context13.sent;
+                      response = _context14.sent;
                       trees = response.trees;
                       newRepos = (0,tasks_util/* processTreeData */.Ax)(repos, eventKey, (0,tasks_util/* getTreeData */.SI)(trees, eventKey));
                       dispatch({
@@ -17843,19 +17778,19 @@ function tasks_reducer(state, action) {
                       resolve();
                     case 8:
                     case "end":
-                      return _context13.stop();
+                      return _context14.stop();
                   }
-                }, _callee13);
+                }, _callee14);
               }));
               return function (_x8) {
-                return _ref5.apply(this, arguments);
+                return _ref6.apply(this, arguments);
               };
             }()));
           case 2:
           case "end":
-            return _context14.stop();
+            return _context15.stop();
         }
-      }, _callee14);
+      }, _callee15);
     }));
     return _onLoadTreeData.apply(this, arguments);
   }
@@ -17913,22 +17848,22 @@ function tasks_reducer(state, action) {
     return _onEvalCode.apply(this, arguments);
   }
   function _onEvalCode() {
-    _onEvalCode = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee16() {
+    _onEvalCode = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee17() {
       var _rs$data, response, resubmit, sec_key, content_modified, _exerciseDataRef$curr2, _exerciseDataRef$curr3, params, _taskData$challenge, _response$content, _exerciseDataRef$curr4, _response$content2, _response$content3, rs, _rs$data2, _rs$data3, getGameStatus, count, intervalTime, time_out;
-      return regeneratorRuntime_default()().wrap(function _callee16$(_context16) {
-        while (1) switch (_context16.prev = _context16.next) {
+      return regeneratorRuntime_default()().wrap(function _callee17$(_context17) {
+        while (1) switch (_context17.prev = _context17.next) {
           case 0:
-            _context16.prev = 0;
+            _context17.prev = 0;
             dispatch({
               type: constant/* SHOW_EVALUATE_LOADING */.Ui
             });
-            _context16.next = 4;
+            _context17.next = 4;
             return onUpdateCode(1);
           case 4:
-            response = _context16.sent;
+            response = _context17.sent;
             resubmit = response.resubmit, sec_key = response.sec_key, content_modified = response.content_modified;
             if (!(response.status === -5 && typeof_default()(response === null || response === void 0 ? void 0 : response.message) === "object")) {
-              _context16.next = 9;
+              _context17.next = 9;
               break;
             }
             (0,_umi_production_exports.getDvaApp)()._store.dispatch({
@@ -17942,10 +17877,10 @@ function tasks_reducer(state, action) {
                 })
               }
             });
-            return _context16.abrupt("return");
+            return _context17.abrupt("return");
           case 9:
             if (!(response.status && response.status < 0)) {
-              _context16.next = 13;
+              _context17.next = 13;
               break;
             }
             mediator/* default */.Z.publish('eval-code-finish');
@@ -17955,7 +17890,7 @@ function tasks_reducer(state, action) {
                 evaluateLoading: false
               }
             });
-            return _context16.abrupt("return");
+            return _context17.abrupt("return");
           case 13:
             params = {
               sec_key: sec_key,
@@ -17966,31 +17901,31 @@ function tasks_reducer(state, action) {
               tab_type: tab_type
             }; // 只有试卷考试才需要下面参数
             if (!(searchParams.get("type") === 'exercises')) {
-              _context16.next = 26;
+              _context17.next = 26;
               break;
             }
-            _context16.t0 = searchParams.get("exercisesId");
-            _context16.t1 = searchParams.get("questionId");
-            _context16.t2 = (_taskData$challenge = taskData.challenge) === null || _taskData$challenge === void 0 ? void 0 : _taskData$challenge.id;
-            _context16.t3 = searchParams.get("subject_id") || '';
-            _context16.t4 = response === null || response === void 0 || (_response$content = response.content) === null || _response$content === void 0 ? void 0 : _response$content.commitID;
-            _context16.next = 22;
+            _context17.t0 = searchParams.get("exercisesId");
+            _context17.t1 = searchParams.get("questionId");
+            _context17.t2 = (_taskData$challenge = taskData.challenge) === null || _taskData$challenge === void 0 ? void 0 : _taskData$challenge.id;
+            _context17.t3 = searchParams.get("subject_id") || '';
+            _context17.t4 = response === null || response === void 0 || (_response$content = response.content) === null || _response$content === void 0 ? void 0 : _response$content.commitID;
+            _context17.next = 22;
             return (0,Exercise_ip/* findLocalIp */.y)({
               ip_limit: searchParams.get("ip_limit") || "no",
               ip_bind: searchParams.get("ip_bind") === "true" ? true : false,
               ip_bind_type: (_exerciseDataRef$curr4 = exerciseDataRef.current) === null || _exerciseDataRef$curr4 === void 0 || (_exerciseDataRef$curr4 = _exerciseDataRef$curr4.exercise) === null || _exerciseDataRef$curr4 === void 0 ? void 0 : _exerciseDataRef$curr4.ip_bind_type
             });
           case 22:
-            _context16.t5 = _context16.sent;
+            _context17.t5 = _context17.sent;
             params.extras = {
-              exercise_id: _context16.t0,
-              question_id: _context16.t1,
-              challenge_id: _context16.t2,
-              subject_id: _context16.t3,
-              commitID: _context16.t4,
-              ip: _context16.t5
+              exercise_id: _context17.t0,
+              question_id: _context17.t1,
+              challenge_id: _context17.t2,
+              subject_id: _context17.t3,
+              commitID: _context17.t4,
+              ip: _context17.t5
             };
-            _context16.next = 27;
+            _context17.next = 27;
             break;
           case 26:
             if (searchParams.get("type") === 'competitions') {
@@ -18008,50 +17943,50 @@ function tasks_reducer(state, action) {
               };
             }
           case 27:
-            _context16.next = 29;
+            _context17.next = 29;
             return (0,service/* codeGameBuild */.Xy)(taskId, params);
           case 29:
-            rs = _context16.sent;
+            rs = _context17.sent;
             if (!(rs !== null && rs !== void 0 && (_rs$data = rs.data) !== null && _rs$data !== void 0 && (_rs$data = _rs$data.data_list) !== null && _rs$data !== void 0 && _rs$data.length)) {
-              _context16.next = 33;
+              _context17.next = 33;
               break;
             }
             mediator/* default */.Z.publish('pod-restrict-data', {
               identifier: rs === null || rs === void 0 || (_rs$data2 = rs.data) === null || _rs$data2 === void 0 ? void 0 : _rs$data2.identifier,
               data_list: rs === null || rs === void 0 || (_rs$data3 = rs.data) === null || _rs$data3 === void 0 ? void 0 : _rs$data3.data_list
             });
-            return _context16.abrupt("return");
+            return _context17.abrupt("return");
           case 33:
             if (!(rs.status === -1 && searchParams.get("type") === 'exercises')) {
-              _context16.next = 36;
+              _context17.next = 36;
               break;
             }
             window.parent.location.href = "/classrooms/".concat(searchParams.get("coursesId"), "/exercise/").concat(searchParams.get("exercisesId"), "/detail");
-            return _context16.abrupt("return");
+            return _context17.abrupt("return");
           case 36:
             if (!(rs.status === -2)) {
-              _context16.next = 40;
+              _context17.next = 40;
               break;
             }
             dispatch({
               type: constant/* HIDE_EVALUATE_LOADING */.A0
             });
             mediator/* default */.Z.publish('eval-code-finish');
-            return _context16.abrupt("return");
+            return _context17.abrupt("return");
           case 40:
             if (rs.status === 1) {
               getGameStatus = /*#__PURE__*/function () {
-                var _ref6 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee15(intervalTime, finalTime, count) {
+                var _ref7 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee16(intervalTime, finalTime, count) {
                   var _taskData$challenge2;
                   var excuteTime, source, ds, status, running_code_message, port, web_route, _ds$shixuns, playUrl, isWeb, isOk, isPicture, isShowEvalResult, payload;
-                  return regeneratorRuntime_default()().wrap(function _callee15$(_context15) {
-                    while (1) switch (_context15.prev = _context15.next) {
+                  return regeneratorRuntime_default()().wrap(function _callee16$(_context16) {
+                    while (1) switch (_context16.prev = _context16.next) {
                       case 0:
                         excuteTime = count++ * intervalTime;
                         if (excuteTime / 1000 > finalTime) {
                           time_out = true;
                         }
-                        _context15.next = 4;
+                        _context16.next = 4;
                         return (0,service/* getCodeGameStatus */.Qo)(taskId, {
                           resubmit: resubmit,
                           time_out: time_out,
@@ -18061,7 +17996,7 @@ function tasks_reducer(state, action) {
                           subject_id: searchParams.get("subject_id") || ''
                         });
                       case 4:
-                        source = _context15.sent;
+                        source = _context16.sent;
                         ds = source;
                         status = ds.status, running_code_message = ds.running_code_message, port = ds.port, web_route = ds.web_route;
                         if ((ds === null || ds === void 0 ? void 0 : ds.status) == 0) {
@@ -18151,12 +18086,12 @@ function tasks_reducer(state, action) {
                         }
                       case 10:
                       case "end":
-                        return _context15.stop();
+                        return _context16.stop();
                     }
-                  }, _callee15);
+                  }, _callee16);
                 }));
                 return function getGameStatus(_x9, _x10, _x11) {
-                  return _ref6.apply(this, arguments);
+                  return _ref7.apply(this, arguments);
                 };
               }();
               count = 1;
@@ -18164,16 +18099,16 @@ function tasks_reducer(state, action) {
               time_out = false;
               getGameStatus(intervalTime, challenge.exec_time + 11, count++);
             }
-            return _context16.abrupt("return", res);
+            return _context17.abrupt("return", res);
           case 44:
-            _context16.prev = 44;
-            _context16.t6 = _context16["catch"](0);
-            console.log('-------eval code', _context16.t6);
+            _context17.prev = 44;
+            _context17.t6 = _context17["catch"](0);
+            console.log('-------eval code', _context17.t6);
           case 47:
           case "end":
-            return _context16.stop();
+            return _context17.stop();
         }
-      }, _callee16, null, [[0, 44]]);
+      }, _callee17, null, [[0, 44]]);
     }));
     return _onEvalCode.apply(this, arguments);
   }
@@ -18214,10 +18149,10 @@ function tasks_reducer(state, action) {
     return _onSelectRepo.apply(this, arguments);
   } //切换文件
   function _onSelectRepo() {
-    _onSelectRepo = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee17(selectedKeys, event) {
+    _onSelectRepo = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee18(selectedKeys, event) {
       var node, path;
-      return regeneratorRuntime_default()().wrap(function _callee17$(_context17) {
-        while (1) switch (_context17.prev = _context17.next) {
+      return regeneratorRuntime_default()().wrap(function _callee18$(_context18) {
+        while (1) switch (_context18.prev = _context18.next) {
           case 0:
             node = event.node;
             if (node.isLeaf) {
@@ -18226,9 +18161,9 @@ function tasks_reducer(state, action) {
             }
           case 2:
           case "end":
-            return _context17.stop();
+            return _context18.stop();
         }
-      }, _callee17);
+      }, _callee18);
     }));
     return _onSelectRepo.apply(this, arguments);
   }
@@ -18236,17 +18171,17 @@ function tasks_reducer(state, action) {
     return _onChangePath.apply(this, arguments);
   }
   function _onChangePath() {
-    _onChangePath = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee18(value) {
+    _onChangePath = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee19(value) {
       var res;
-      return regeneratorRuntime_default()().wrap(function _callee18$(_context18) {
-        while (1) switch (_context18.prev = _context18.next) {
+      return regeneratorRuntime_default()().wrap(function _callee19$(_context19) {
+        while (1) switch (_context19.prev = _context19.next) {
           case 0:
             prevCurrentPath.current = currentPath;
             setCodeLoading(true);
-            _context18.next = 4;
+            _context19.next = 4;
             return onUpdateCode();
           case 4:
-            res = _context18.sent;
+            res = _context19.sent;
             if (currentPath === value) {
               dispatch({
                 type: constant/* EDIT_REP_CODE */.N$,
@@ -18273,9 +18208,9 @@ function tasks_reducer(state, action) {
             }
           case 7:
           case "end":
-            return _context18.stop();
+            return _context19.stop();
         }
-      }, _callee18);
+      }, _callee19);
     }));
     return _onChangePath.apply(this, arguments);
   }
@@ -18316,13 +18251,13 @@ function tasks_reducer(state, action) {
     return _onResetAllVnc.apply(this, arguments);
   } //重置环境
   function _onResetAllVnc() {
-    _onResetAllVnc = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee19() {
+    _onResetAllVnc = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee20() {
       var _taskData$myshixun2;
       var res;
-      return regeneratorRuntime_default()().wrap(function _callee19$(_context19) {
-        while (1) switch (_context19.prev = _context19.next) {
+      return regeneratorRuntime_default()().wrap(function _callee20$(_context20) {
+        while (1) switch (_context20.prev = _context20.next) {
           case 0:
-            _context19.next = 2;
+            _context20.next = 2;
             return (0,service/* resetEnvironment */.am)(taskData === null || taskData === void 0 || (_taskData$myshixun2 = taskData.myshixun) === null || _taskData$myshixun2 === void 0 ? void 0 : _taskData$myshixun2.identifier, {
               game_id: taskData === null || taskData === void 0 ? void 0 : taskData.game.id,
               shixun_environment_id: shixun_environment_id,
@@ -18330,19 +18265,19 @@ function tasks_reducer(state, action) {
               all_reset: 1
             });
           case 2:
-            res = _context19.sent;
+            res = _context20.sent;
             if (!((res === null || res === void 0 ? void 0 : res.status) === 0)) {
-              _context19.next = 5;
+              _context20.next = 5;
               break;
             }
-            return _context19.abrupt("return", res);
+            return _context20.abrupt("return", res);
           case 5:
-            return _context19.abrupt("return", Promise.reject());
+            return _context20.abrupt("return", Promise.reject());
           case 6:
           case "end":
-            return _context19.stop();
+            return _context20.stop();
         }
-      }, _callee19);
+      }, _callee20);
     }));
     return _onResetAllVnc.apply(this, arguments);
   }
@@ -18350,75 +18285,75 @@ function tasks_reducer(state, action) {
     return _onResetVnc.apply(this, arguments);
   } //重启云主机
   function _onResetVnc() {
-    _onResetVnc = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee21() {
+    _onResetVnc = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee22() {
       var reset, _res, _res2, _res3, str, cloneTabs, _res4;
-      return regeneratorRuntime_default()().wrap(function _callee21$(_context21) {
-        while (1) switch (_context21.prev = _context21.next) {
+      return regeneratorRuntime_default()().wrap(function _callee22$(_context22) {
+        while (1) switch (_context22.prev = _context22.next) {
           case 0:
             dispatch({
               type: constant/* SET_VNC_LOADING */.RY,
               payload: true //工具栏控制
             });
             reset = /*#__PURE__*/function () {
-              var _ref7 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee20() {
+              var _ref8 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee21() {
                 var _taskData$myshixun3;
                 var result;
-                return regeneratorRuntime_default()().wrap(function _callee20$(_context20) {
-                  while (1) switch (_context20.prev = _context20.next) {
+                return regeneratorRuntime_default()().wrap(function _callee21$(_context21) {
+                  while (1) switch (_context21.prev = _context21.next) {
                     case 0:
-                      _context20.next = 2;
+                      _context21.next = 2;
                       return (0,service/* resetEnvironment */.am)(taskData === null || taskData === void 0 || (_taskData$myshixun3 = taskData.myshixun) === null || _taskData$myshixun3 === void 0 ? void 0 : _taskData$myshixun3.identifier, {
                         game_id: taskData === null || taskData === void 0 ? void 0 : taskData.game.id,
                         shixun_environment_id: shixun_environment_id,
                         tab_type: tab_type
                       });
                     case 2:
-                      result = _context20.sent;
-                      return _context20.abrupt("return", result);
+                      result = _context21.sent;
+                      return _context21.abrupt("return", result);
                     case 4:
                     case "end":
-                      return _context20.stop();
+                      return _context21.stop();
                   }
-                }, _callee20);
+                }, _callee21);
               }));
               return function reset() {
-                return _ref7.apply(this, arguments);
+                return _ref8.apply(this, arguments);
               };
             }();
             if (!(tab_type === 2)) {
-              _context21.next = 8;
+              _context22.next = 8;
               break;
             }
             mediator/* default */.Z.publish('vnc-reseting');
-            _context21.next = 6;
+            _context22.next = 6;
             return reset();
           case 6:
-            _res = _context21.sent;
+            _res = _context22.sent;
             if (_res.status === 0) {
               mediator/* default */.Z.publish('vnc-reseting-done', _res);
             }
           case 8:
             if (!(tab_type === 3)) {
-              _context21.next = 14;
+              _context22.next = 14;
               break;
             }
             mediator/* default */.Z.publish("vnc-reset-".concat(index_tab));
-            _context21.next = 12;
+            _context22.next = 12;
             return reset();
           case 12:
-            _res2 = _context21.sent;
+            _res2 = _context22.sent;
             if (_res2.status === 0) {
               mediator/* default */.Z.publish("reset-linux-windows-vnc-".concat(index_tab));
             }
           case 14:
             if (!(tab_type === 4)) {
-              _context21.next = 19;
+              _context22.next = 19;
               break;
             }
-            _context21.next = 17;
+            _context22.next = 17;
             return reset();
           case 17:
-            _res3 = _context21.sent;
+            _res3 = _context22.sent;
             if (_res3.status === 0) {
               str = index_tab.split('-')[0];
               cloneTabs = tabs.map(function (e) {
@@ -18435,14 +18370,14 @@ function tasks_reducer(state, action) {
             }
           case 19:
             if (!(tab_type === 5)) {
-              _context21.next = 25;
+              _context22.next = 25;
               break;
             }
             mediator/* default */.Z.publish("unity3d-reset", 'start');
-            _context21.next = 23;
+            _context22.next = 23;
             return reset();
           case 23:
-            _res4 = _context21.sent;
+            _res4 = _context22.sent;
             if (_res4.status === 0) {
               mediator/* default */.Z.publish("unity3d-reset", 'done');
             }
@@ -18453,9 +18388,9 @@ function tasks_reducer(state, action) {
             });
           case 26:
           case "end":
-            return _context21.stop();
+            return _context22.stop();
         }
-      }, _callee21);
+      }, _callee22);
     }));
     return _onResetVnc.apply(this, arguments);
   }
@@ -18463,61 +18398,61 @@ function tasks_reducer(state, action) {
     return _onRestartReboot.apply(this, arguments);
   }
   function _onRestartReboot() {
-    _onRestartReboot = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee23() {
+    _onRestartReboot = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee24() {
       var reset, _res5, _res6, str, cloneTabs;
-      return regeneratorRuntime_default()().wrap(function _callee23$(_context23) {
-        while (1) switch (_context23.prev = _context23.next) {
+      return regeneratorRuntime_default()().wrap(function _callee24$(_context24) {
+        while (1) switch (_context24.prev = _context24.next) {
           case 0:
             dispatch({
               type: constant/* SET_VNC_LOADING */.RY,
               payload: true //工具栏控制
             });
             reset = /*#__PURE__*/function () {
-              var _ref8 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee22() {
+              var _ref9 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee23() {
                 var result;
-                return regeneratorRuntime_default()().wrap(function _callee22$(_context22) {
-                  while (1) switch (_context22.prev = _context22.next) {
+                return regeneratorRuntime_default()().wrap(function _callee23$(_context23) {
+                  while (1) switch (_context23.prev = _context23.next) {
                     case 0:
-                      _context22.next = 2;
+                      _context23.next = 2;
                       return (0,service/* rebootEsc */.Jd)(taskData === null || taskData === void 0 ? void 0 : taskData.game.identifier, {
                         shixun_environment_id: shixun_environment_id,
                         tab_type: tab_type
                       });
                     case 2:
-                      result = _context22.sent;
-                      return _context22.abrupt("return", result);
+                      result = _context23.sent;
+                      return _context23.abrupt("return", result);
                     case 4:
                     case "end":
-                      return _context22.stop();
+                      return _context23.stop();
                   }
-                }, _callee22);
+                }, _callee23);
               }));
               return function reset() {
-                return _ref8.apply(this, arguments);
+                return _ref9.apply(this, arguments);
               };
             }();
             if (!(tab_type === 3)) {
-              _context23.next = 9;
+              _context24.next = 9;
               break;
             }
             mediator/* default */.Z.publish("vnc-reset-".concat(index_tab), '重启中');
-            _context23.next = 6;
+            _context24.next = 6;
             return reset();
           case 6:
-            _res5 = _context23.sent;
+            _res5 = _context24.sent;
             if (_res5.status === 0) {
               mediator/* default */.Z.publish("reset-linux-windows-vnc-".concat(index_tab));
             }
             mediator/* default */.Z.publish("vnc-reset-".concat(index_tab), '取消');
           case 9:
             if (!(tab_type === 4)) {
-              _context23.next = 14;
+              _context24.next = 14;
               break;
             }
-            _context23.next = 12;
+            _context24.next = 12;
             return reset();
           case 12:
-            _res6 = _context23.sent;
+            _res6 = _context24.sent;
             if (_res6.status === 0) {
               str = index_tab.split('-')[0];
               cloneTabs = tabs.map(function (e) {
@@ -18539,9 +18474,9 @@ function tasks_reducer(state, action) {
             });
           case 15:
           case "end":
-            return _context23.stop();
+            return _context24.stop();
         }
-      }, _callee23);
+      }, _callee24);
     }));
     return _onRestartReboot.apply(this, arguments);
   }
@@ -18549,14 +18484,14 @@ function tasks_reducer(state, action) {
     return _onGetUnity3dMessage.apply(this, arguments);
   } //延长环境时间
   function _onGetUnity3dMessage() {
-    _onGetUnity3dMessage = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee24(mes) {
+    _onGetUnity3dMessage = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee25(mes) {
       var GameState, Data, challenge, response, status, data, _window;
-      return regeneratorRuntime_default()().wrap(function _callee24$(_context24) {
-        while (1) switch (_context24.prev = _context24.next) {
+      return regeneratorRuntime_default()().wrap(function _callee25$(_context25) {
+        while (1) switch (_context25.prev = _context25.next) {
           case 0:
             GameState = mes.GameState, Data = mes.Data, challenge = mes.challenge;
             if (!(challenge === 'info')) {
-              _context24.next = 5;
+              _context25.next = 5;
               break;
             }
             mediator/* default */.Z.publish('evaluate-unity3d-result', {
@@ -18565,21 +18500,21 @@ function tasks_reducer(state, action) {
                 challenge_info: objectSpread2_default()({}, taskData.challenge)
               }
             });
-            _context24.next = 16;
+            _context25.next = 16;
             break;
           case 5:
             if (!(GameState === 'Success')) {
-              _context24.next = 16;
+              _context25.next = 16;
               break;
             }
             if (!(unity_3d_result || !with_code_file)) {
-              _context24.next = 14;
+              _context25.next = 14;
               break;
             }
-            _context24.next = 9;
+            _context25.next = 9;
             return (0,service/* setUnity3dStatus */.JW)(taskId, base64.Base64.encode(taskId + new Date().getTime()), Data);
           case 9:
-            response = _context24.sent;
+            response = _context25.sent;
             status = response.status, data = response.data;
             if (status == 0) {
               if (game.status !== 2) {
@@ -18611,7 +18546,7 @@ function tasks_reducer(state, action) {
                 }
               });
             }
-            _context24.next = 16;
+            _context25.next = 16;
             break;
           case 14:
             dispatch({
@@ -18622,9 +18557,9 @@ function tasks_reducer(state, action) {
             }, "*");
           case 16:
           case "end":
-            return _context24.stop();
+            return _context25.stop();
         }
-      }, _callee24);
+      }, _callee25);
     }));
     return _onGetUnity3dMessage.apply(this, arguments);
   }
@@ -18632,32 +18567,32 @@ function tasks_reducer(state, action) {
     return _onAddVncTime.apply(this, arguments);
   }
   function _onAddVncTime() {
-    _onAddVncTime = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee25() {
+    _onAddVncTime = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee26() {
       var _taskData$myshixun4, _taskData$game;
       var res;
-      return regeneratorRuntime_default()().wrap(function _callee25$(_context25) {
-        while (1) switch (_context25.prev = _context25.next) {
+      return regeneratorRuntime_default()().wrap(function _callee26$(_context26) {
+        while (1) switch (_context26.prev = _context26.next) {
           case 0:
-            _context25.next = 2;
+            _context26.next = 2;
             return (0,service/* addVncTime */.Kl)(taskData === null || taskData === void 0 || (_taskData$myshixun4 = taskData.myshixun) === null || _taskData$myshixun4 === void 0 ? void 0 : _taskData$myshixun4.identifier, {
               game_id: taskData === null || taskData === void 0 || (_taskData$game = taskData.game) === null || _taskData$game === void 0 ? void 0 : _taskData$game.id,
               shixun_environment_id: shixun_environment_id,
               tab_type: tab_type
             });
           case 2:
-            res = _context25.sent;
+            res = _context26.sent;
             if (!((res === null || res === void 0 ? void 0 : res.status) === 0)) {
-              _context25.next = 5;
+              _context26.next = 5;
               break;
             }
-            return _context25.abrupt("return", res);
+            return _context26.abrupt("return", res);
           case 5:
-            return _context25.abrupt("return", Promise.reject());
+            return _context26.abrupt("return", Promise.reject());
           case 6:
           case "end":
-            return _context25.stop();
+            return _context26.stop();
         }
-      }, _callee25);
+      }, _callee26);
     }));
     return _onAddVncTime.apply(this, arguments);
   }
@@ -18729,6 +18664,73 @@ function tasks_reducer(state, action) {
             cursor: resizeXFlag.current ? 'ew-resize' : resizeYFlag.current ? 'ns-resize' : 'initial'
           },
           className: "dragging-mask"
+        }), isshowhearde && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+          style: {
+            minHeight: 40,
+            height: 40,
+            background: '#FCD8D8',
+            color: '#E30000',
+            display: 'flex',
+            alignItems: 'center',
+            justifyContent: 'space-between',
+            padding: '0px 30px'
+          },
+          children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+            style: {
+              display: 'flex',
+              alignItems: 'center'
+            },
+            children: [/*#__PURE__*/(0,jsx_runtime.jsx)("i", {
+              className: "iconfont icon-tishi9 font14 ml10 mr10",
+              style: {
+                color: '#E30000'
+              }
+            }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+              children: userInfo === null || userInfo === void 0 ? void 0 : userInfo.user_message
+            })]
+          }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+            children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+              style: {
+                cursor: 'pointer',
+                color: '#666666'
+              },
+              onClick: function onClick() {
+                var hour_ms = 24 * (60 * 60 * 1000) - 1;
+                var start_time = new Date(new Date().toLocaleDateString()).getTime();
+                var edittime = hour_ms + start_time;
+                localStorage.setItem('task_ignore', edittime);
+                setisshowheader(false);
+              },
+              children: "\u5FFD\u7565"
+            }), /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+              style: {
+                cursor: 'pointer',
+                marginLeft: 20,
+                color: '#165DFF'
+              },
+              onClick: /*#__PURE__*/asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee6() {
+                var res;
+                return regeneratorRuntime_default()().wrap(function _callee6$(_context6) {
+                  while (1) switch (_context6.prev = _context6.next) {
+                    case 0:
+                      _context6.next = 2;
+                      return (0,utils_fetch/* default */.ZP)("/api/business_contacts.json", {
+                        method: 'post'
+                      });
+                    case 2:
+                      res = _context6.sent;
+                      if ((res === null || res === void 0 ? void 0 : res.status) === 0) {
+                        message/* default */.ZP.info('申请成功');
+                      }
+                    case 4:
+                    case "end":
+                      return _context6.stop();
+                  }
+                }, _callee6);
+              })),
+              children: "\u7533\u8BF7\u5EF6\u671F"
+            })]
+          })]
         }), /*#__PURE__*/(0,jsx_runtime.jsx)(tasks_header, {
           difficulty: challenge === null || challenge === void 0 ? void 0 : challenge.difficulty,
           mirror_description: mirror_description,
@@ -18763,6 +18765,9 @@ function tasks_reducer(state, action) {
           userInfo: userInfo
         }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
           className: "tasks-body",
+          style: {
+            height: "calc(100% - ".concat(isshowhearde ? '94px' : '54px')
+          },
           children: [/*#__PURE__*/(0,jsx_runtime.jsx)("section", {
             id: "task-left-panel",
             className: "left-panel ".concat(taskData !== null && taskData !== void 0 && taskData.hideLeftPanel ? "hide" : "", " "),
@@ -18865,9 +18870,9 @@ function tasks_reducer(state, action) {
     })]
   });
 });
-function UnLockTestTip(_ref9) {
-  var is_teacher = _ref9.is_teacher,
-    score = _ref9.score;
+function UnLockTestTip(_ref10) {
+  var is_teacher = _ref10.is_teacher,
+    score = _ref10.score;
   return /*#__PURE__*/(0,jsx_runtime.jsx)(_react_17_0_2_react.Fragment, {
     children: is_teacher ? /*#__PURE__*/(0,jsx_runtime.jsxs)(_react_17_0_2_react.Fragment, {
       children: [/*#__PURE__*/(0,jsx_runtime.jsx)("div", {
diff --git a/p__virtualSpaces__Lists__Knowledge__index.async.js b/p__virtualSpaces__Lists__Knowledge__index.async.js
index ee40253f34..762621bfd5 100644
--- a/p__virtualSpaces__Lists__Knowledge__index.async.js
+++ b/p__virtualSpaces__Lists__Knowledge__index.async.js
@@ -924,8 +924,8 @@ marked_default().use({
 /* harmony default export */ var utils_marked = ((marked_default()));
 // EXTERNAL MODULE: ./node_modules/_code-prettify@0.1.0@code-prettify/src/prettify.js
 var prettify = __webpack_require__(64018);
-// EXTERNAL MODULE: ./node_modules/_hls.js@1.4.14@hls.js/dist/hls.mjs
-var dist_hls = __webpack_require__(76980);
+// EXTERNAL MODULE: ./node_modules/_hls.js@1.5.1@hls.js/dist/hls.mjs
+var dist_hls = __webpack_require__(27627);
 // EXTERNAL MODULE: ./src/utils/env.ts + 1 modules
 var env = __webpack_require__(80548);
 // EXTERNAL MODULE: ./node_modules/_katex@0.11.1@katex/dist/katex.js
@@ -1212,8 +1212,8 @@ function _unescape(str) {
         return false;
       };
       if (item.src.indexOf('.m3u8') > -1) {
-        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default */.Z.isSupported()) {
-          var hls = new dist_hls/* default */.Z();
+        if (item.canPlayType('application/vnd.apple.mpegurl')) {} else if (dist_hls/* default.isSupported */.ZP.isSupported()) {
+          var hls = new dist_hls/* default */.ZP();
           hls.loadSource(item.src);
           hls.attachMedia(item);
         }
@@ -5967,6 +5967,9 @@ var resetmodules = __webpack_require__(45189);
 var authority = __webpack_require__(19654);
 // EXTERNAL MODULE: ./src/utils/util.tsx
 var util = __webpack_require__(88123);
+// EXTERNAL MODULE: ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/defineProperty.js
+var defineProperty = __webpack_require__(85573);
+var defineProperty_default = /*#__PURE__*/__webpack_require__.n(defineProperty);
 // EXTERNAL MODULE: ./node_modules/_@babel_runtime@7.23.6@@babel/runtime/helpers/toConsumableArray.js
 var toConsumableArray = __webpack_require__(37205);
 var toConsumableArray_default = /*#__PURE__*/__webpack_require__.n(toConsumableArray);
@@ -6059,6 +6062,8 @@ var jsx_runtime = __webpack_require__(37712);
 
 
 
+
+
 
 
 
@@ -6126,9 +6131,10 @@ var types = [{
   type: "Text"
 }];
 var Atlas = function Atlas(_ref) {
-  var _pathsDetail$detail, _pathsDetail$detail2, _pathsDetail$detail3, _pathsDetail$detail4, _pathsDetail$detail5, _pathsDetail$detail6, _pathsDetail$detail7, _items, _items5, _items$descriptions, _pathsDetail$detail8;
-  var user = _ref.user,
-    pathsDetail = _ref.pathsDetail;
+  var _items, _items3, _items4, _items$descriptions;
+  var globalSetting = _ref.globalSetting,
+    dispatch = _ref.dispatch,
+    virtualSpaces = _ref.virtualSpaces;
   var params = (0,_umi_production_exports.useParams)();
   var diagramRef = (0,_react_17_0_2_react.useRef)();
   var _useState = (0,_react_17_0_2_react.useState)(false),
@@ -6243,14 +6249,16 @@ var Atlas = function Atlas(_ref) {
     bounds = _useState48[0],
     setBounds = _useState48[1];
   var draggleRef = (0,_react_17_0_2_react.useRef)(null);
+  var virtualSpacesDetails = virtualSpaces.virtualSpacesDetails;
+  var permission = (virtualSpacesDetails === null || virtualSpacesDetails === void 0 ? void 0 : virtualSpacesDetails.is_member) || (0,authority/* isSuperAdmins */.Ny)();
   var _useState49 = (0,_react_17_0_2_react.useState)(false),
     _useState50 = slicedToArray_default()(_useState49, 2),
-    isedit = _useState50[0],
-    setisedit = _useState50[1];
+    threenodata = _useState50[0],
+    setThreenodata = _useState50[1];
   var _useState51 = (0,_react_17_0_2_react.useState)(false),
     _useState52 = slicedToArray_default()(_useState51, 2),
-    threenodata = _useState52[0],
-    setThreenodata = _useState52[1];
+    isedit = _useState52[0],
+    setisedit = _useState52[1];
   var _useState53 = (0,_react_17_0_2_react.useState)([]),
     _useState54 = slicedToArray_default()(_useState53, 2),
     lishlist = _useState54[0],
@@ -6310,6 +6318,10 @@ var Atlas = function Atlas(_ref) {
       "doubleClick": false
     });
     treeDiagramRef.current = myDiagram;
+    var layout = go_module.GraphObject.make(go_module.TreeLayout);
+    layout.angle = 0;
+    layout.arrangement = go_module.TreeLayout.ArrangementFixedRoots;
+    myDiagram.layout = layout;
     myDiagram.nodeTemplate = $(go_module.Node, "Vertical", {
       selectionObjectName: "TEXT"
     }, $(go_module.TextBlock, {
@@ -6333,13 +6345,13 @@ var Atlas = function Atlas(_ref) {
       return spotConverter(d, false);
     })),
     // remember the locations of each node in the node data
-    // new go.Binding("location", "loc2", go.Point.parse).makeTwoWay(go.Point.stringify),
+    new go_module.Binding("location", "loc", go_module.Point.parse).makeTwoWay(go_module.Point.stringify),
     // make sure text "grows" in the desired direction
     new go_module.Binding("locationSpot", "dir", function (d) {
       return spotConverter(d, false);
     }), {
       click: function click(e, thisObj) {
-        // if (pathsDetail.detail?.allow_add_member) {
+        // if (permission) {
         setisedit(false);
         setitems(thisObj === null || thisObj === void 0 ? void 0 : thisObj.data);
         setBounds({
@@ -6445,11 +6457,10 @@ var Atlas = function Atlas(_ref) {
             _context19.next = 3;
             return (0,fetch/* default */.ZP)(url, {
               method: 'get',
-              params: {
-                identifier: params.virtual_spacesId,
+              params: defineProperty_default()(defineProperty_default()({
                 type: 2,
-                virtual_module_id: window.localStorage.getItem('vtrsModuleId')
-              }
+                identifier: params.virtual_spacesId
+              }, "type", 2), "virtual_module_id", window.localStorage.getItem('vtrsModuleId'))
             });
           case 3:
             res = _context19.sent;
@@ -6465,7 +6476,9 @@ var Atlas = function Atlas(_ref) {
               }));
               if (ismind) {
                 loadTreeChart(ritems);
-                zoomToFit();
+                setTimeout(function () {
+                  zoomToFit();
+                }, 300);
               } else {
                 zoomToFit();
               }
@@ -6583,7 +6596,7 @@ var Atlas = function Atlas(_ref) {
       maxSize: new go_module.Size(100, NaN)
     }, new go_module.Binding('text', 'text')), {
       click: function click(e, thisObj) {
-        // if (pathsDetail.detail?.allow_add_member) {
+        // if (permission) {
         setisedit(false);
         setitems(thisObj === null || thisObj === void 0 ? void 0 : thisObj.data);
         setBounds({
@@ -6657,7 +6670,8 @@ var Atlas = function Atlas(_ref) {
     style: {
       paddingBottom: 20,
       background: "#FFF",
-      position: 'relative'
+      position: 'relative',
+      height: '100vh'
     },
     children: [/*#__PURE__*/(0,jsx_runtime.jsxs)(spin/* default */.Z, {
       spinning: sploading,
@@ -6692,8 +6706,8 @@ var Atlas = function Atlas(_ref) {
         buttonProps: {
           type: 'primary'
         },
-        ButtonText: ((_pathsDetail$detail = pathsDetail.detail) === null || _pathsDetail$detail === void 0 ? void 0 : _pathsDetail$detail.allow_add_member) && '获取课程知识结构',
-        ButtonTwo: ((_pathsDetail$detail2 = pathsDetail.detail) === null || _pathsDetail$detail2 === void 0 ? void 0 : _pathsDetail$detail2.allow_add_member) && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, {
+        ButtonText: permission && '新增节点',
+        ButtonTwo: permission && /*#__PURE__*/(0,jsx_runtime.jsx)(es_button/* default */.ZP, {
           style: {
             marginLeft: 20
           },
@@ -6797,6 +6811,7 @@ var Atlas = function Atlas(_ref) {
                   return (0,fetch/* default */.ZP)("/api/knowledge_graphs.json", {
                     method: 'get',
                     params: {
+                      type: 2,
                       identifier: params.virtual_spacesId
                     }
                   });
@@ -6823,7 +6838,7 @@ var Atlas = function Atlas(_ref) {
           }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
             children: "\u67E5\u627E"
           })]
-        }), ((_pathsDetail$detail3 = pathsDetail.detail) === null || _pathsDetail$detail3 === void 0 ? void 0 : _pathsDetail$detail3.allow_add_member) && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+        }), permission && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
           onClick: function onClick() {
             setexport(true);
           },
@@ -6841,7 +6856,7 @@ var Atlas = function Atlas(_ref) {
             textAlign: 'end',
             lineHeight: '60px'
           },
-          children: [((_pathsDetail$detail4 = pathsDetail.detail) === null || _pathsDetail$detail4 === void 0 ? void 0 : _pathsDetail$detail4.allow_add_member) && /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+          children: [permission && /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
             title: "\u5386\u53F2\u8BB0\u5F55",
             children: /*#__PURE__*/(0,jsx_runtime.jsx)("i", {
               className: "iconfont icon-lishijilu ".concat(knowledgemodules.ehover),
@@ -6856,6 +6871,7 @@ var Atlas = function Atlas(_ref) {
                         params: {
                           identifier: params.virtual_spacesId,
                           limit: 10,
+                          type: 2,
                           page: page
                         }
                       });
@@ -6876,7 +6892,7 @@ var Atlas = function Atlas(_ref) {
                 marginRight: 30
               }
             })
-          }), ((_pathsDetail$detail5 = pathsDetail.detail) === null || _pathsDetail$detail5 === void 0 ? void 0 : _pathsDetail$detail5.allow_add_member) && /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+          }), permission && /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
             title: "\u6E05\u7A7A\u6240\u6709\u6570\u636E",
             getPopupContainer: function getPopupContainer() {
               return containerRef.current;
@@ -6927,7 +6943,7 @@ var Atlas = function Atlas(_ref) {
               },
               className: "iconfont icon-shanchu14 ".concat(knowledgemodules.dhover)
             })
-          }), ((_pathsDetail$detail6 = pathsDetail.detail) === null || _pathsDetail$detail6 === void 0 ? void 0 : _pathsDetail$detail6.allow_add_member) && /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
+          }), permission && /*#__PURE__*/(0,jsx_runtime.jsx)(tooltip/* default */.Z, {
             title: "\u540C\u6B65\u8BFE\u7A0B\u77E5\u8BC6\u7ED3\u6784",
             getPopupContainer: function getPopupContainer() {
               return containerRef.current;
@@ -6953,7 +6969,8 @@ var Atlas = function Atlas(_ref) {
                             return (0,fetch/* default */.ZP)("/api/knowledge_graphs/sync.json", {
                               method: 'post',
                               body: {
-                                identifier: params.virtual_spacesId
+                                identifier: params.pathId,
+                                type: 2
                               }
                             });
                           case 3:
@@ -6980,7 +6997,7 @@ var Atlas = function Atlas(_ref) {
               },
               className: "iconfont icon-jiazai_shuaxin_o ".concat(knowledgemodules.ehover)
             })
-          }), ((_pathsDetail$detail7 = pathsDetail.detail) === null || _pathsDetail$detail7 === void 0 ? void 0 : _pathsDetail$detail7.allow_add_member) && /*#__PURE__*/(0,jsx_runtime.jsx)(dropdown/* default */.Z, {
+          }), permission && /*#__PURE__*/(0,jsx_runtime.jsx)(dropdown/* default */.Z, {
             getPopupContainer: function getPopupContainer() {
               return containerRef.current;
             },
@@ -6991,13 +7008,13 @@ var Atlas = function Atlas(_ref) {
                   width: 100
                 },
                 label: /*#__PURE__*/(0,jsx_runtime.jsx)("a", {
-                  href: "".concat(env/* default */.Z.API_SERVER, "/api/knowledge_graphs/export.xlsx?identifier=").concat(params.virtual_spacesId),
+                  href: "".concat(env/* default */.Z.API_SERVER, "/api/knowledge_graphs/export.xlsx?identifier=").concat(params.virtual_spacesId, "&type=2"),
                   children: "\u5BFC\u51FAExcel"
                 })
               }, {
                 key: '2',
                 label: /*#__PURE__*/(0,jsx_runtime.jsx)("a", {
-                  href: "".concat(env/* default */.Z.API_SERVER, "/api/knowledge_graphs/export.json?identifier=").concat(params.virtual_spacesId),
+                  href: "".concat(env/* default */.Z.API_SERVER, "/api/knowledge_graphs/export.json?identifier=").concat(params.virtual_spacesId, "&type=2"),
                   children: "\u5BFC\u51FAWord"
                 })
               }]
@@ -7072,7 +7089,7 @@ var Atlas = function Atlas(_ref) {
       })]
     }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
       style: {
-        zIndex: 10
+        zIndex: 1000
       },
       children: /*#__PURE__*/(0,jsx_runtime.jsx)((cjs_default()), {
         disabled: disabled,
@@ -7083,11 +7100,11 @@ var Atlas = function Atlas(_ref) {
         children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
           ref: draggleRef,
           style: {
-            position: 'absolute',
+            position: 'fixed',
             cursor: 'move',
-            right: IsFulls ? 0 : -500,
-            top: 60,
-            zIndex: 10
+            right: IsFulls ? 0 : 0,
+            top: IsFulls ? 60 : 260,
+            zIndex: 12
           },
           children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
             onMouseOver: function onMouseOver() {
@@ -7160,7 +7177,7 @@ var Atlas = function Atlas(_ref) {
                     children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
                       className: knowledgemodules.button,
                       onClick: function onClick() {
-                        if (items.unit_type === 4 || items.unit_type === 0) {
+                        if (items.unit_type >= 4 || items.unit_type === 0) {
                           if (items.unit_type === 0) {
                             message/* default */.ZP.info('根节点暂不支持插入知识点');
                           } else {
@@ -7182,7 +7199,7 @@ var Atlas = function Atlas(_ref) {
                     }), /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
                       className: knowledgemodules.button,
                       onClick: function onClick() {
-                        if (items.unit_type === 4) {
+                        if (items.unit_type >= 4) {
                           message/* default */.ZP.info('知识点为最小单位暂不支持插入知识单元');
                           return;
                         }
@@ -7259,7 +7276,8 @@ var Atlas = function Atlas(_ref) {
                               return (0,fetch/* default */.ZP)("/api/knowledge_graphs.json", {
                                 method: 'get',
                                 params: {
-                                  identifier: params.virtual_spacesId
+                                  identifier: params.pathId,
+                                  type: 2
                                 }
                               });
                             case 3:
@@ -7550,62 +7568,40 @@ var Atlas = function Atlas(_ref) {
                       children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
                         className: knowledgemodules.line
                       }), "\u5B66\u4E60\u8D44\u6E90"]
-                    }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-                      style: {
-                        maxHeight: 200,
-                        overflow: 'auto'
-                      },
-                      children: types === null || types === void 0 ? void 0 : types.map(function (val, index) {
-                        var _items3, _items4;
-                        return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+                    }), (_items3 = items) === null || _items3 === void 0 || (_items3 = _items3.sub_knowledge_graphs) === null || _items3 === void 0 ? void 0 : _items3.map(function (item, index) {
+                      var _types$filter;
+                      return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+                        className: knowledgemodules.a,
+                        onClick: function onClick() {
+                          window.open(item === null || item === void 0 ? void 0 : item.url);
+                        },
+                        style: {
+                          display: 'flex',
+                          paddingLeft: 8,
+                          alignItems: 'center',
+                          cursor: 'pointer'
+                        },
+                        children: [/*#__PURE__*/(0,jsx_runtime.jsx)("i", {
+                          className: "iconfont icon-lianjie2",
+                          style: {
+                            marginRight: 10,
+                            fontSize: 12
+                          }
+                        }), /*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
+                          className: "".concat(knowledgemodules.multi_ellipsis1, " ").concat(knowledgemodules.a),
                           style: {
-                            padding: '10px 12px',
-                            background: '#F6F7F9',
-                            marginBottom: 10,
-                            display: ((_items3 = items) === null || _items3 === void 0 || (_items3 = _items3.sub_knowledge_graphs) === null || _items3 === void 0 || (_items3 = _items3.filter(function (item) {
-                              return item.type === val.type;
-                            })) === null || _items3 === void 0 ? void 0 : _items3.length) <= 0 && 'none'
+                            fontWeight: 600,
+                            marginTop: 0,
+                            width: '90%',
+                            display: 'inline-flex'
                           },
-                          children: [/*#__PURE__*/(0,jsx_runtime.jsx)("p", {
-                            style: {
-                              color: '#3061D0',
-                              fontSize: 12,
-                              marginBottom: 4
-                            },
-                            children: val.name
-                          }), (_items4 = items) === null || _items4 === void 0 || (_items4 = _items4.sub_knowledge_graphs) === null || _items4 === void 0 || (_items4 = _items4.filter(function (item) {
+                          children: [" \u3010", (types === null || types === void 0 || (_types$filter = types.filter(function (val) {
                             return item.type === val.type;
-                          })) === null || _items4 === void 0 ? void 0 : _items4.map(function (item) {
-                            return /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
-                              onClick: function onClick() {
-                                window.open(item === null || item === void 0 ? void 0 : item.url);
-                              },
-                              style: {
-                                display: 'flex',
-                                paddingLeft: 8,
-                                alignItems: 'center',
-                                cursor: 'pointer',
-                                justifyContent: 'space-between'
-                              },
-                              children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
-                                className: "".concat(knowledgemodules.multi_ellipsis1, " ").concat(knowledgemodules.a),
-                                style: {
-                                  color: '#5F6368',
-                                  marginTop: 0,
-                                  width: '90%',
-                                  display: 'inline-flex'
-                                },
-                                children: [" ", item.name, " "]
-                              }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-                                style: {
-                                  color: '#3061D0'
-                                },
-                                children: "\u67E5\u770B"
-                              })]
-                            });
-                          })]
-                        });
-                      })
+                          })) === null || _types$filter === void 0 || (_types$filter = _types$filter[0]) === null || _types$filter === void 0 ? void 0 : _types$filter.name) || '文本', "\u3011 ", item.name, " "]
+                        }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+                          children: "\u67E5\u770B"
+                        })]
+                      });
                     })]
                   }), !isedit && /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
                     style: {
@@ -7616,44 +7612,38 @@ var Atlas = function Atlas(_ref) {
                       children: [/*#__PURE__*/(0,jsx_runtime.jsx)("span", {
                         className: knowledgemodules.line
                       }), "\u5B58\u5728\u5173\u7CFB\u7684\u77E5\u8BC6\u8282\u70B9"]
-                    }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-                      style: {
-                        maxHeight: 200,
-                        overflow: 'auto'
-                      },
-                      children: (_items5 = items) === null || _items5 === void 0 || (_items5 = _items5.relations) === null || _items5 === void 0 ? void 0 : _items5.map(function (item, index) {
-                        return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-                          className: knowledgemodules.a,
-                          onClick: function onClick() {
-                            var _treeDiagramRef$curre10, _relationshipDiagramR10, _relationshipDiagramR11, _relationshipDiagramR12, _treeDiagramRef$curre11, _treeDiagramRef$curre12, _treeDiagramRef$curre13, _relationshipDiagramR13, _datas$nodeData;
-                            (_treeDiagramRef$curre10 = treeDiagramRef.current) === null || _treeDiagramRef$curre10 === void 0 || _treeDiagramRef$curre10.clearSelection();
-                            (_relationshipDiagramR10 = relationshipDiagramRef.current) === null || _relationshipDiagramR10 === void 0 || _relationshipDiagramR10.clearSelection();
-                            var node = (_relationshipDiagramR11 = relationshipDiagramRef.current) === null || _relationshipDiagramR11 === void 0 || (_relationshipDiagramR12 = _relationshipDiagramR11.findNodeForKey) === null || _relationshipDiagramR12 === void 0 ? void 0 : _relationshipDiagramR12.call(_relationshipDiagramR11, item === null || item === void 0 ? void 0 : item.relation_id);
-                            var node2 = (_treeDiagramRef$curre11 = treeDiagramRef.current) === null || _treeDiagramRef$curre11 === void 0 || (_treeDiagramRef$curre12 = _treeDiagramRef$curre11.findNodeForKey) === null || _treeDiagramRef$curre12 === void 0 ? void 0 : _treeDiagramRef$curre12.call(_treeDiagramRef$curre11, item === null || item === void 0 ? void 0 : item.relation_id);
-                            (_treeDiagramRef$curre13 = treeDiagramRef.current) === null || _treeDiagramRef$curre13 === void 0 || (_treeDiagramRef$curre13 = _treeDiagramRef$curre13.commandHandler) === null || _treeDiagramRef$curre13 === void 0 || _treeDiagramRef$curre13.scrollToPart(node2);
-                            (_relationshipDiagramR13 = relationshipDiagramRef.current) === null || _relationshipDiagramR13 === void 0 || (_relationshipDiagramR13 = _relationshipDiagramR13.commandHandler) === null || _relationshipDiagramR13 === void 0 || _relationshipDiagramR13.scrollToPart(node);
-                            if (node) {
-                              node.isSelected = true;
-                            }
-                            if (node2) {
-                              node2.isSelected = true;
-                            }
-                            var listitems = datas === null || datas === void 0 || (_datas$nodeData = datas.nodeData) === null || _datas$nodeData === void 0 || (_datas$nodeData = _datas$nodeData.filter(function (val) {
-                              return (val === null || val === void 0 ? void 0 : val.id) === (item === null || item === void 0 ? void 0 : item.relation_id);
-                            })) === null || _datas$nodeData === void 0 ? void 0 : _datas$nodeData[0];
-                            setitems(objectSpread2_default()({}, listitems));
-                          },
-                          style: {
-                            display: 'flex',
-                            paddingLeft: 8,
-                            cursor: 'pointer'
-                          },
-                          children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
-                            className: "".concat(knowledgemodules.multi_ellipsis1, " ").concat(knowledgemodules.a),
-                            children: ["\u3010", item.relation, "\u3011", item.name]
-                          })
-                        });
-                      })
+                    }), (_items4 = items) === null || _items4 === void 0 || (_items4 = _items4.relations) === null || _items4 === void 0 ? void 0 : _items4.map(function (item, index) {
+                      return /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+                        className: knowledgemodules.a,
+                        onClick: function onClick() {
+                          var _treeDiagramRef$curre10, _relationshipDiagramR10, _relationshipDiagramR11, _relationshipDiagramR12, _treeDiagramRef$curre11, _treeDiagramRef$curre12, _treeDiagramRef$curre13, _relationshipDiagramR13, _datas$nodeData;
+                          (_treeDiagramRef$curre10 = treeDiagramRef.current) === null || _treeDiagramRef$curre10 === void 0 || _treeDiagramRef$curre10.clearSelection();
+                          (_relationshipDiagramR10 = relationshipDiagramRef.current) === null || _relationshipDiagramR10 === void 0 || _relationshipDiagramR10.clearSelection();
+                          var node = (_relationshipDiagramR11 = relationshipDiagramRef.current) === null || _relationshipDiagramR11 === void 0 || (_relationshipDiagramR12 = _relationshipDiagramR11.findNodeForKey) === null || _relationshipDiagramR12 === void 0 ? void 0 : _relationshipDiagramR12.call(_relationshipDiagramR11, item === null || item === void 0 ? void 0 : item.relation_id);
+                          var node2 = (_treeDiagramRef$curre11 = treeDiagramRef.current) === null || _treeDiagramRef$curre11 === void 0 || (_treeDiagramRef$curre12 = _treeDiagramRef$curre11.findNodeForKey) === null || _treeDiagramRef$curre12 === void 0 ? void 0 : _treeDiagramRef$curre12.call(_treeDiagramRef$curre11, item === null || item === void 0 ? void 0 : item.relation_id);
+                          (_treeDiagramRef$curre13 = treeDiagramRef.current) === null || _treeDiagramRef$curre13 === void 0 || (_treeDiagramRef$curre13 = _treeDiagramRef$curre13.commandHandler) === null || _treeDiagramRef$curre13 === void 0 || _treeDiagramRef$curre13.scrollToPart(node2);
+                          (_relationshipDiagramR13 = relationshipDiagramRef.current) === null || _relationshipDiagramR13 === void 0 || (_relationshipDiagramR13 = _relationshipDiagramR13.commandHandler) === null || _relationshipDiagramR13 === void 0 || _relationshipDiagramR13.scrollToPart(node);
+                          if (node) {
+                            node.isSelected = true;
+                          }
+                          if (node2) {
+                            node2.isSelected = true;
+                          }
+                          var listitems = datas === null || datas === void 0 || (_datas$nodeData = datas.nodeData) === null || _datas$nodeData === void 0 || (_datas$nodeData = _datas$nodeData.filter(function (val) {
+                            return (val === null || val === void 0 ? void 0 : val.id) === (item === null || item === void 0 ? void 0 : item.relation_id);
+                          })) === null || _datas$nodeData === void 0 ? void 0 : _datas$nodeData[0];
+                          setitems(objectSpread2_default()({}, listitems));
+                        },
+                        style: {
+                          display: 'flex',
+                          paddingLeft: 8,
+                          cursor: 'pointer'
+                        },
+                        children: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
+                          className: knowledgemodules.multi_ellipsis1,
+                          children: ["\u3010", item.relation, "\u3011", item.name]
+                        })
+                      });
                     })]
                   }), /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
                     style: {
@@ -7689,7 +7679,7 @@ var Atlas = function Atlas(_ref) {
                       })]
                     }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
                       style: {
-                        maxHeight: 200,
+                        height: 200,
                         overflow: 'auto'
                       },
                       children: (_items$descriptions = items.descriptions) === null || _items$descriptions === void 0 ? void 0 : _items$descriptions.map(function (item, index) {
@@ -7774,7 +7764,7 @@ var Atlas = function Atlas(_ref) {
                           })]
                         });
                       })
-                    }), !isedit && ((_pathsDetail$detail8 = pathsDetail.detail) === null || _pathsDetail$detail8 === void 0 ? void 0 : _pathsDetail$detail8.allow_add_member) && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+                    }), !isedit && permission && /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
                       style: {
                         textAlign: 'center',
                         marginTop: 10
@@ -7827,6 +7817,7 @@ var Atlas = function Atlas(_ref) {
                   return (0,fetch/* default */.ZP)("/api/knowledge_graphs/".concat(items.id, ".json"), {
                     method: 'put',
                     body: {
+                      type: 2,
                       name: values.name
                     }
                   });
@@ -7970,9 +7961,9 @@ var Atlas = function Atlas(_ref) {
                   return (0,fetch/* default */.ZP)("/api/knowledge_graphs.json", {
                     method: 'post',
                     body: objectSpread2_default()(objectSpread2_default()({}, value), {}, {
+                      type: 2,
                       identifier: params.virtual_spacesId,
                       parent_id: items.id,
-                      type: 2,
                       virtual_module_id: window.localStorage.getItem('vtrsModuleId')
                     })
                   });
@@ -8149,6 +8140,7 @@ var Atlas = function Atlas(_ref) {
                   return (0,fetch/* default */.ZP)("/api/knowledge_graphs/".concat(items.id, ".json"), {
                     method: 'put',
                     body: {
+                      type: 2,
                       descriptions: items.descriptions
                     }
                   });
@@ -8192,10 +8184,10 @@ var Atlas = function Atlas(_ref) {
     }), /*#__PURE__*/(0,jsx_runtime.jsxs)(modal/* default */.Z, {
       title: "\u6587\u4EF6\u5BFC\u5165",
       open: exportshow,
+      centered: true,
       getContainer: function getContainer() {
         return containerRef.current;
       },
-      centered: true,
       okButtonProps: {
         loading: buttonloading
       },
@@ -8223,12 +8215,14 @@ var Atlas = function Atlas(_ref) {
               setbuttonloading(true);
               formData.append('ec_year_id', params.ec_year_id);
               formData.append('identifier', params.virtual_spacesId);
-              _context16.next = 12;
+              formData.append('type', '2');
+              formData.append('virtual_module_id', window.localStorage.getItem('vtrsModuleId'));
+              _context16.next = 14;
               return (0,fetch/* default */.ZP)("/api/knowledge_graphs/import.json", {
                 method: 'post',
                 body: formData
               }, true);
-            case 12:
+            case 14:
               res = _context16.sent;
               setbuttonloading(false);
               if ((res === null || res === void 0 ? void 0 : res.status) === 0) {
@@ -8254,7 +8248,7 @@ var Atlas = function Atlas(_ref) {
                 getdatas();
                 setexport(false);
               }
-            case 15:
+            case 17:
             case "end":
               return _context16.stop();
           }
@@ -8293,7 +8287,6 @@ var Atlas = function Atlas(_ref) {
           })]
         })
       }), /*#__PURE__*/(0,jsx_runtime.jsx)(row/* default */.Z, {
-        className: knowledgemodules.upitem,
         style: {
           marginTop: 10,
           marginLeft: 50
@@ -8355,6 +8348,7 @@ var Atlas = function Atlas(_ref) {
                   return (0,fetch/* default */.ZP)("/api/knowledge_graphs/".concat(items.id, "/relation.json"), {
                     method: 'post',
                     body: objectSpread2_default()({
+                      type: 2,
                       parent_id: AddModal
                     }, values)
                   });
@@ -8362,13 +8356,13 @@ var Atlas = function Atlas(_ref) {
                   res = _context17.sent;
                   setbuttonloading(false);
                   if (res.status === 0) {
-                    form.setFieldsValue({
-                      relation: null
-                    });
                     message/* default */.ZP.info('关联成功');
                     getdatas();
                     setAddModal('');
                     setshowadd(false);
+                    form.setFieldsValue({
+                      relation: null
+                    });
                   }
                 case 6:
                 case "end":
@@ -8423,9 +8417,8 @@ var Atlas = function Atlas(_ref) {
         (_treeDiagramRef$curre17 = treeDiagramRef.current) === null || _treeDiagramRef$curre17 === void 0 || (_treeDiagramRef$curre17 = _treeDiagramRef$curre17.commandHandler) === null || _treeDiagramRef$curre17 === void 0 || _treeDiagramRef$curre17.scrollToPart(node2);
         (_relationshipDiagramR17 = relationshipDiagramRef.current) === null || _relationshipDiagramR17 === void 0 || (_relationshipDiagramR17 = _relationshipDiagramR17.commandHandler) === null || _relationshipDiagramR17 === void 0 || _relationshipDiagramR17.scrollToPart(node);
         if (node) {
-          var _pathsDetail$detail9;
           node.isSelected = true;
-          if ((_pathsDetail$detail9 = pathsDetail.detail) !== null && _pathsDetail$detail9 !== void 0 && _pathsDetail$detail9.allow_add_member) {
+          if (permission) {
             setBounds({
               left: 0,
               top: 0,
@@ -8436,9 +8429,8 @@ var Atlas = function Atlas(_ref) {
           }
         }
         if (node2) {
-          var _pathsDetail$detail10;
           node2.isSelected = true;
-          if ((_pathsDetail$detail10 = pathsDetail.detail) !== null && _pathsDetail$detail10 !== void 0 && _pathsDetail$detail10.allow_add_member) {
+          if (permission) {
             setBounds({
               left: 0,
               top: 0,
@@ -8493,16 +8485,13 @@ var Atlas = function Atlas(_ref) {
     }), /*#__PURE__*/(0,jsx_runtime.jsx)(modal/* default */.Z, {
       title: "\u5386\u53F2\u8BB0\u5F55",
       open: isshowlish,
-      getContainer: function getContainer() {
-        return containerRef.current;
-      },
       onCancel: function onCancel() {
         return setisshowlish(false);
       },
       footer: false,
       children: /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
         style: {
-          maxHeight: 300,
+          maxHeight: 200,
           overflow: 'auto',
           padding: 10
         },
@@ -8542,28 +8531,18 @@ var Atlas = function Atlas(_ref) {
           children: /*#__PURE__*/(0,jsx_runtime.jsx)(list/* default */.Z, {
             dataSource: lishlist,
             renderItem: function renderItem(item) {
-              return /*#__PURE__*/(0,jsx_runtime.jsx)(list/* default */.Z.Item, {
-                children: /*#__PURE__*/(0,jsx_runtime.jsx)(list/* default */.Z.Item.Meta, {
+              return /*#__PURE__*/(0,jsx_runtime.jsxs)(list/* default */.Z.Item, {
+                children: [/*#__PURE__*/(0,jsx_runtime.jsx)(list/* default */.Z.Item.Meta, {
                   avatar: /*#__PURE__*/(0,jsx_runtime.jsx)(avatar/* default */.C, {
                     src: env/* default */.Z.IMG_SERVER + '/images/' + item.avatar_url
                   }),
-                  title: /*#__PURE__*/(0,jsx_runtime.jsxs)("div", {
-                    style: {
-                      display: 'inline-flex',
-                      width: '100%'
-                    },
-                    children: [/*#__PURE__*/(0,jsx_runtime.jsxs)("span", {
-                      style: {
-                        flex: 1,
-                        display: 'inline-flex'
-                      },
-                      children: [" ", item.real_name]
-                    }), " ", /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
-                      children: item.created_at
-                    })]
+                  title: /*#__PURE__*/(0,jsx_runtime.jsx)("span", {
+                    children: item.real_name
                   }),
                   description: item.content
-                })
+                }), /*#__PURE__*/(0,jsx_runtime.jsx)("div", {
+                  children: item.created_at
+                })]
               }, item.id);
             }
           })
@@ -8573,11 +8552,11 @@ var Atlas = function Atlas(_ref) {
   });
 };
 /* harmony default export */ var knowledge = ((0,_umi_production_exports.connect)(function (_ref15) {
-  var user = _ref15.user,
-    pathsDetail = _ref15.pathsDetail;
+  var virtualSpaces = _ref15.virtualSpaces,
+    globalSetting = _ref15.globalSetting;
   return {
-    user: user,
-    pathsDetail: pathsDetail
+    globalSetting: globalSetting,
+    virtualSpaces: virtualSpaces
   };
 })(Atlas));
 ;// CONCATENATED MODULE: ./src/pages/virtualSpaces/Lists/Knowledge/index.tsx
diff --git a/umi.js b/umi.js
index 850cb4b015..587d374ad1 100644
--- a/umi.js
+++ b/umi.js
@@ -20381,6 +20381,7 @@ var GlobalSettingModel = {
     // isIlearning:true,
     showFooter: true,
     showHeader: true,
+    showTip: false,
     showHeaderFooter: true,
     showHeaderFixed: false,
     onlyShowBackTop: true,
@@ -20506,8 +20507,8 @@ var GlobalSettingModel = {
         }, _callee4);
       })();
     },
-    // 显示隐藏头部  true显示 hide隐藏
-    headerToggle: function headerToggle(_ref9, _ref10) {
+    // 显示隐藏过期提示  true显示 hide隐藏
+    delayTipToggle: function delayTipToggle(_ref9, _ref10) {
       var payload = _ref9.payload;
       var call = _ref10.call,
         put = _ref10.put;
@@ -20519,7 +20520,7 @@ var GlobalSettingModel = {
               return put({
                 type: 'save',
                 payload: {
-                  showHeader: payload
+                  showTip: payload
                 }
               });
             case 2:
@@ -20529,8 +20530,8 @@ var GlobalSettingModel = {
         }, _callee5);
       })();
     },
-    // 显示隐藏尾部  true显示 hide隐藏
-    footerToggle: function footerToggle(_ref11, _ref12) {
+    // 显示隐藏头部  true显示 hide隐藏
+    headerToggle: function headerToggle(_ref11, _ref12) {
       var payload = _ref11.payload;
       var call = _ref12.call,
         put = _ref12.put;
@@ -20542,7 +20543,7 @@ var GlobalSettingModel = {
               return put({
                 type: 'save',
                 payload: {
-                  showFooter: payload
+                  showHeader: payload
                 }
               });
             case 2:
@@ -20552,8 +20553,8 @@ var GlobalSettingModel = {
         }, _callee6);
       })();
     },
-    // 显示隐藏头部尾部  true显示 hide隐藏
-    headerFooterToggle: function headerFooterToggle(_ref13, _ref14) {
+    // 显示隐藏尾部  true显示 hide隐藏
+    footerToggle: function footerToggle(_ref13, _ref14) {
       var payload = _ref13.payload;
       var call = _ref14.call,
         put = _ref14.put;
@@ -20565,7 +20566,7 @@ var GlobalSettingModel = {
               return put({
                 type: 'save',
                 payload: {
-                  showHeaderFooter: payload
+                  showFooter: payload
                 }
               });
             case 2:
@@ -20575,8 +20576,8 @@ var GlobalSettingModel = {
         }, _callee7);
       })();
     },
-    // 显示隐藏头部 Fixed 布局  true显示 hide隐藏
-    headerFixedToggle: function headerFixedToggle(_ref15, _ref16) {
+    // 显示隐藏头部尾部  true显示 hide隐藏
+    headerFooterToggle: function headerFooterToggle(_ref15, _ref16) {
       var payload = _ref15.payload;
       var call = _ref16.call,
         put = _ref16.put;
@@ -20588,7 +20589,7 @@ var GlobalSettingModel = {
               return put({
                 type: 'save',
                 payload: {
-                  showHeaderFixed: payload
+                  showHeaderFooter: payload
                 }
               });
             case 2:
@@ -20598,8 +20599,8 @@ var GlobalSettingModel = {
         }, _callee8);
       })();
     },
-    // 只显示隐藏侧边返回顶部操作  true显示 hide隐藏
-    onlyShowBackTopToggle: function onlyShowBackTopToggle(_ref17, _ref18) {
+    // 显示隐藏头部 Fixed 布局  true显示 hide隐藏
+    headerFixedToggle: function headerFixedToggle(_ref17, _ref18) {
       var payload = _ref17.payload;
       var call = _ref18.call,
         put = _ref18.put;
@@ -20611,7 +20612,7 @@ var GlobalSettingModel = {
               return put({
                 type: 'save',
                 payload: {
-                  onlyShowBackTop: payload
+                  showHeaderFixed: payload
                 }
               });
             case 2:
@@ -20621,8 +20622,8 @@ var GlobalSettingModel = {
         }, _callee9);
       })();
     },
-    // 只显示隐藏侧边返回顶部操作  true显示 false隐藏
-    onlyShowBackTopIconToggle: function onlyShowBackTopIconToggle(_ref19, _ref20) {
+    // 只显示隐藏侧边返回顶部操作  true显示 hide隐藏
+    onlyShowBackTopToggle: function onlyShowBackTopToggle(_ref19, _ref20) {
       var payload = _ref19.payload;
       var call = _ref20.call,
         put = _ref20.put;
@@ -20634,7 +20635,7 @@ var GlobalSettingModel = {
               return put({
                 type: 'save',
                 payload: {
-                  onlyShowBackTopIcons: payload
+                  onlyShowBackTop: payload
                 }
               });
             case 2:
@@ -20644,8 +20645,8 @@ var GlobalSettingModel = {
         }, _callee10);
       })();
     },
-    // 运营弹框  true显示 false隐藏
-    setOperateModel: function setOperateModel(_ref21, _ref22) {
+    // 只显示隐藏侧边返回顶部操作  true显示 false隐藏
+    onlyShowBackTopIconToggle: function onlyShowBackTopIconToggle(_ref21, _ref22) {
       var payload = _ref21.payload;
       var call = _ref22.call,
         put = _ref22.put;
@@ -20657,7 +20658,7 @@ var GlobalSettingModel = {
               return put({
                 type: 'save',
                 payload: {
-                  operateModel: payload
+                  onlyShowBackTopIcons: payload
                 }
               });
             case 2:
@@ -20667,8 +20668,8 @@ var GlobalSettingModel = {
         }, _callee11);
       })();
     },
-    // 运营弹框地址
-    setOperateModelPath: function setOperateModelPath(_ref23, _ref24) {
+    // 运营弹框  true显示 false隐藏
+    setOperateModel: function setOperateModel(_ref23, _ref24) {
       var payload = _ref23.payload;
       var call = _ref24.call,
         put = _ref24.put;
@@ -20680,7 +20681,7 @@ var GlobalSettingModel = {
               return put({
                 type: 'save',
                 payload: {
-                  operateModelPath: payload
+                  operateModel: payload
                 }
               });
             case 2:
@@ -20690,8 +20691,8 @@ var GlobalSettingModel = {
         }, _callee12);
       })();
     },
-    // 刷题
-    setShowQuestionBackTop: function setShowQuestionBackTop(_ref25, _ref26) {
+    // 运营弹框地址
+    setOperateModelPath: function setOperateModelPath(_ref25, _ref26) {
       var payload = _ref25.payload;
       var call = _ref26.call,
         put = _ref26.put;
@@ -20703,7 +20704,7 @@ var GlobalSettingModel = {
               return put({
                 type: 'save',
                 payload: {
-                  showQuestionBackTop: payload
+                  operateModelPath: payload
                 }
               });
             case 2:
@@ -20712,6 +20713,29 @@ var GlobalSettingModel = {
           }
         }, _callee13);
       })();
+    },
+    // 刷题
+    setShowQuestionBackTop: function setShowQuestionBackTop(_ref27, _ref28) {
+      var payload = _ref27.payload;
+      var call = _ref28.call,
+        put = _ref28.put;
+      return /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee14() {
+        return regeneratorRuntime_default()().wrap(function _callee14$(_context14) {
+          while (1) switch (_context14.prev = _context14.next) {
+            case 0:
+              _context14.next = 2;
+              return put({
+                type: 'save',
+                payload: {
+                  showQuestionBackTop: payload
+                }
+              });
+            case 2:
+            case "end":
+              return _context14.stop();
+          }
+        }, _callee14);
+      })();
     }
   },
   reducers: {
@@ -20721,12 +20745,12 @@ var GlobalSettingModel = {
     }
   },
   subscriptions: {
-    setup: function setup(_ref27) {
-      var dispatch = _ref27.dispatch,
-        history = _ref27.history;
+    setup: function setup(_ref29) {
+      var dispatch = _ref29.dispatch,
+        history = _ref29.history;
       // console.log("subscriptions:", dispatch, history)
-      return history.listen(function (_ref28) {
-        var pathname = _ref28.pathname;
+      return history.listen(function (_ref30) {
+        var pathname = _ref30.pathname;
         if (pathname === '/') {}
       });
     }
@@ -21299,12 +21323,12 @@ var intraincourse_getBannerList = /*#__PURE__*/function () {
   };
 }(); // 顶部轮播图和底部广告图
 
-var intraincourse_getCateHotDiscount = /*#__PURE__*/function () {
+var intraincourse_getTopCategoryList = /*#__PURE__*/function () {
   var _ref2 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2(params) {
     return regeneratorRuntime_default()().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
-          return _context2.abrupt("return", (0,fetch/* default */.ZP)('/api/paid_subjects/cate_hot_discount.json', {
+          return _context2.abrupt("return", (0,fetch/* default */.ZP)('/api/paid_subjects/top_category.json', {
             method: 'get',
             params: objectSpread2_default()({}, params)
           }));
@@ -21314,19 +21338,19 @@ var intraincourse_getCateHotDiscount = /*#__PURE__*/function () {
       }
     }, _callee2);
   }));
-  return function getCateHotDiscount(_x2) {
+  return function getTopCategoryList(_x2) {
     return _ref2.apply(this, arguments);
   };
-}(); // 顶部分类-热门推荐-限时低价
+}(); //顶部分类
 
-var intraincourse_getPaidSubjects = /*#__PURE__*/function () {
+var intraincourse_getHotList = /*#__PURE__*/function () {
   var _ref3 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee3(params) {
     return regeneratorRuntime_default()().wrap(function _callee3$(_context3) {
       while (1) switch (_context3.prev = _context3.next) {
         case 0:
-          return _context3.abrupt("return", (0,fetch/* default */.ZP)('/api/paid_subjects.json', {
-            method: 'post',
-            body: objectSpread2_default()({}, params)
+          return _context3.abrupt("return", (0,fetch/* default */.ZP)('/api/paid_subjects/hot_recommend_subjects.json', {
+            method: 'get',
+            params: objectSpread2_default()({}, params)
           }));
         case 1:
         case "end":
@@ -21334,17 +21358,17 @@ var intraincourse_getPaidSubjects = /*#__PURE__*/function () {
       }
     }, _callee3);
   }));
-  return function getPaidSubjects(_x3) {
+  return function getHotList(_x3) {
     return _ref3.apply(this, arguments);
   };
-}(); // 所有课程
+}(); // 顶部热门推荐
 
-var intraincourse_getTags = /*#__PURE__*/function () {
+var intraincourse_getDiscountList = /*#__PURE__*/function () {
   var _ref4 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee4(params) {
     return regeneratorRuntime_default()().wrap(function _callee4$(_context4) {
       while (1) switch (_context4.prev = _context4.next) {
         case 0:
-          return _context4.abrupt("return", (0,fetch/* default */.ZP)('/api/paid_subjects/all_tags.json', {
+          return _context4.abrupt("return", (0,fetch/* default */.ZP)('/api/paid_subjects/time_discount_subjects.json', {
             method: 'get',
             params: objectSpread2_default()({}, params)
           }));
@@ -21354,19 +21378,26 @@ var intraincourse_getTags = /*#__PURE__*/function () {
       }
     }, _callee4);
   }));
-  return function getTags(_x4) {
+  return function getDiscountList(_x4) {
     return _ref4.apply(this, arguments);
   };
-}(); // 获取父tag
+}(); // 顶部限时低价
 
-var intraincourse_getUserComments = /*#__PURE__*/function () {
+// export const getCateHotDiscount = async (params: any) => {
+//   return Fetch('/api/paid_subjects/cate_hot_discount.json', {
+//     method: 'get',
+//     params: { ...params },
+//   });
+// } // 顶部分类-热门推荐-限时低价
+
+var intraincourse_getPaidSubjects = /*#__PURE__*/function () {
   var _ref5 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee5(params) {
     return regeneratorRuntime_default()().wrap(function _callee5$(_context5) {
       while (1) switch (_context5.prev = _context5.next) {
         case 0:
-          return _context5.abrupt("return", (0,fetch/* default */.ZP)('/api/paid_subjects/user_comments.json', {
-            method: 'get',
-            params: objectSpread2_default()({}, params)
+          return _context5.abrupt("return", (0,fetch/* default */.ZP)('/api/paid_subjects.json', {
+            method: 'post',
+            body: objectSpread2_default()({}, params)
           }));
         case 1:
         case "end":
@@ -21374,17 +21405,17 @@ var intraincourse_getUserComments = /*#__PURE__*/function () {
       }
     }, _callee5);
   }));
-  return function getUserComments(_x5) {
+  return function getPaidSubjects(_x5) {
     return _ref5.apply(this, arguments);
   };
-}(); // 获取用户评价
+}(); // 所有课程
 
-var intraincourse_getInfoShow = /*#__PURE__*/function () {
+var intraincourse_getTags = /*#__PURE__*/function () {
   var _ref6 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee6(params) {
     return regeneratorRuntime_default()().wrap(function _callee6$(_context6) {
       while (1) switch (_context6.prev = _context6.next) {
         case 0:
-          return _context6.abrupt("return", (0,fetch/* default */.ZP)('/api/paid_subjects/info_show.json', {
+          return _context6.abrupt("return", (0,fetch/* default */.ZP)('/api/paid_subjects/all_tags.json', {
             method: 'get',
             params: objectSpread2_default()({}, params)
           }));
@@ -21394,9 +21425,49 @@ var intraincourse_getInfoShow = /*#__PURE__*/function () {
       }
     }, _callee6);
   }));
-  return function getInfoShow(_x6) {
+  return function getTags(_x6) {
     return _ref6.apply(this, arguments);
   };
+}(); // 获取父tag
+
+var intraincourse_getUserComments = /*#__PURE__*/function () {
+  var _ref7 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee7(params) {
+    return regeneratorRuntime_default()().wrap(function _callee7$(_context7) {
+      while (1) switch (_context7.prev = _context7.next) {
+        case 0:
+          return _context7.abrupt("return", (0,fetch/* default */.ZP)('/api/paid_subjects/user_comments.json', {
+            method: 'get',
+            params: objectSpread2_default()({}, params)
+          }));
+        case 1:
+        case "end":
+          return _context7.stop();
+      }
+    }, _callee7);
+  }));
+  return function getUserComments(_x7) {
+    return _ref7.apply(this, arguments);
+  };
+}(); // 获取用户评价
+
+var intraincourse_getInfoShow = /*#__PURE__*/function () {
+  var _ref8 = asyncToGenerator_default()( /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee8(params) {
+    return regeneratorRuntime_default()().wrap(function _callee8$(_context8) {
+      while (1) switch (_context8.prev = _context8.next) {
+        case 0:
+          return _context8.abrupt("return", (0,fetch/* default */.ZP)('/api/paid_subjects/info_show.json', {
+            method: 'get',
+            params: objectSpread2_default()({}, params)
+          }));
+        case 1:
+        case "end":
+          return _context8.stop();
+      }
+    }, _callee8);
+  }));
+  return function getInfoShow(_x8) {
+    return _ref8.apply(this, arguments);
+  };
 }(); // 获取用户的信息
 ;// CONCATENATED MODULE: ./src/models/intraincourse/index.ts
 
@@ -21450,62 +21521,57 @@ var InTrainCourseModel = {
       })();
     },
     // 顶部轮播图和底部广告图
-    getCateHotDiscount: function getCateHotDiscount(_ref3, _ref4) {
+    getTopCategoryList: function getTopCategoryList(_ref3, _ref4) {
       var payload = _ref3.payload;
       var call = _ref4.call,
         put = _ref4.put;
       return /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee2() {
-        var _yield$call2, _yield$call2$data, top_category_list, hot_list, discount_list;
+        var _yield$call2, top_category_list;
         return regeneratorRuntime_default()().wrap(function _callee2$(_context2) {
           while (1) switch (_context2.prev = _context2.next) {
             case 0:
               _context2.next = 2;
-              return call(intraincourse_getCateHotDiscount, payload);
+              return call(intraincourse_getTopCategoryList, payload);
             case 2:
               _yield$call2 = _context2.sent;
-              _yield$call2$data = _yield$call2.data;
-              top_category_list = _yield$call2$data.top_category_list;
-              hot_list = _yield$call2$data.hot_list;
-              discount_list = _yield$call2$data.discount_list;
-              _context2.next = 9;
+              top_category_list = _yield$call2.data.top_category_list;
+              _context2.next = 6;
               return put({
                 type: 'save',
                 payload: {
                   TopCategoryList: [{
                     id: -1,
                     name: '全部'
-                  }].concat(toConsumableArray_default()(top_category_list)),
-                  HotList: hot_list,
-                  DiscountList: discount_list
+                  }].concat(toConsumableArray_default()(top_category_list))
                 }
               });
-            case 9:
+            case 6:
             case "end":
               return _context2.stop();
           }
         }, _callee2);
       })();
     },
-    // 顶部分类-热门推荐-限时低价
-    getPaidSubjects: function getPaidSubjects(_ref5, _ref6) {
+    // 顶部分类
+    getHotList: function getHotList(_ref5, _ref6) {
       var payload = _ref5.payload;
       var call = _ref6.call,
         put = _ref6.put;
       return /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee3() {
-        var _yield$call3, data;
+        var _yield$call3, hot_list;
         return regeneratorRuntime_default()().wrap(function _callee3$(_context3) {
           while (1) switch (_context3.prev = _context3.next) {
             case 0:
               _context3.next = 2;
-              return call(intraincourse_getPaidSubjects, payload);
+              return call(intraincourse_getHotList, payload);
             case 2:
               _yield$call3 = _context3.sent;
-              data = _yield$call3.data;
+              hot_list = _yield$call3.data.hot_list;
               _context3.next = 6;
               return put({
                 type: 'save',
                 payload: {
-                  SubjectList: data
+                  HotList: hot_list
                 }
               });
             case 6:
@@ -21515,26 +21581,26 @@ var InTrainCourseModel = {
         }, _callee3);
       })();
     },
-    // 顶部分类-热门推荐-限时低价 getPaidSubjects
-    getTags: function getTags(_ref7, _ref8) {
+    // 顶部热门推荐
+    getDiscountList: function getDiscountList(_ref7, _ref8) {
       var payload = _ref7.payload;
       var call = _ref8.call,
         put = _ref8.put;
       return /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee4() {
-        var _yield$call4, list;
+        var _yield$call4, discount_list;
         return regeneratorRuntime_default()().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               _context4.next = 2;
-              return call(intraincourse_getTags, payload);
+              return call(intraincourse_getDiscountList, payload);
             case 2:
               _yield$call4 = _context4.sent;
-              list = _yield$call4.data.list;
+              discount_list = _yield$call4.data.discount_list;
               _context4.next = 6;
               return put({
                 type: 'save',
                 payload: {
-                  Tags: list
+                  DiscountList: discount_list
                 }
               });
             case 6:
@@ -21544,26 +21610,37 @@ var InTrainCourseModel = {
         }, _callee4);
       })();
     },
-    // 获取tags
-    getUserComments: function getUserComments(_ref9, _ref10) {
+    // 顶部限时低价
+    // *getCateHotDiscount({ payload }, { call, put }) {
+    //   const {data:{top_category_list,hot_list,discount_list}} = yield call(getCateHotDiscount,payload);
+    //   yield put({
+    //     type: 'save',
+    //     payload: {
+    //       TopCategoryList: [{id:-1,name:'全部'},...top_category_list],
+    //       HotList: hot_list,
+    //       DiscountList: discount_list,
+    //     },
+    //   });
+    // }, // 顶部分类-热门推荐-限时低价
+    getPaidSubjects: function getPaidSubjects(_ref9, _ref10) {
       var payload = _ref9.payload;
       var call = _ref10.call,
         put = _ref10.put;
       return /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee5() {
-        var _yield$call5, list;
+        var _yield$call5, data;
         return regeneratorRuntime_default()().wrap(function _callee5$(_context5) {
           while (1) switch (_context5.prev = _context5.next) {
             case 0:
               _context5.next = 2;
-              return call(intraincourse_getUserComments, payload);
+              return call(intraincourse_getPaidSubjects, payload);
             case 2:
               _yield$call5 = _context5.sent;
-              list = _yield$call5.data.list;
+              data = _yield$call5.data;
               _context5.next = 6;
               return put({
                 type: 'save',
                 payload: {
-                  UserComments: list
+                  SubjectList: data
                 }
               });
             case 6:
@@ -21573,26 +21650,26 @@ var InTrainCourseModel = {
         }, _callee5);
       })();
     },
-    // 获取用户评价
-    getInfoShow: function getInfoShow(_ref11, _ref12) {
+    // 顶部分类-热门推荐-限时低价 getPaidSubjects
+    getTags: function getTags(_ref11, _ref12) {
       var payload = _ref11.payload;
       var call = _ref12.call,
         put = _ref12.put;
       return /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee6() {
-        var _yield$call6, data;
+        var _yield$call6, list;
         return regeneratorRuntime_default()().wrap(function _callee6$(_context6) {
           while (1) switch (_context6.prev = _context6.next) {
             case 0:
               _context6.next = 2;
-              return call(intraincourse_getInfoShow, payload);
+              return call(intraincourse_getTags, payload);
             case 2:
               _yield$call6 = _context6.sent;
-              data = _yield$call6.data;
+              list = _yield$call6.data.list;
               _context6.next = 6;
               return put({
                 type: 'save',
                 payload: {
-                  InfoShow: data
+                  Tags: list
                 }
               });
             case 6:
@@ -21601,6 +21678,64 @@ var InTrainCourseModel = {
           }
         }, _callee6);
       })();
+    },
+    // 获取tags
+    getUserComments: function getUserComments(_ref13, _ref14) {
+      var payload = _ref13.payload;
+      var call = _ref14.call,
+        put = _ref14.put;
+      return /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee7() {
+        var _yield$call7, list;
+        return regeneratorRuntime_default()().wrap(function _callee7$(_context7) {
+          while (1) switch (_context7.prev = _context7.next) {
+            case 0:
+              _context7.next = 2;
+              return call(intraincourse_getUserComments, payload);
+            case 2:
+              _yield$call7 = _context7.sent;
+              list = _yield$call7.data.list;
+              _context7.next = 6;
+              return put({
+                type: 'save',
+                payload: {
+                  UserComments: list
+                }
+              });
+            case 6:
+            case "end":
+              return _context7.stop();
+          }
+        }, _callee7);
+      })();
+    },
+    // 获取用户评价
+    getInfoShow: function getInfoShow(_ref15, _ref16) {
+      var payload = _ref15.payload;
+      var call = _ref16.call,
+        put = _ref16.put;
+      return /*#__PURE__*/regeneratorRuntime_default()().mark(function _callee8() {
+        var _yield$call8, data;
+        return regeneratorRuntime_default()().wrap(function _callee8$(_context8) {
+          while (1) switch (_context8.prev = _context8.next) {
+            case 0:
+              _context8.next = 2;
+              return call(intraincourse_getInfoShow, payload);
+            case 2:
+              _yield$call8 = _context8.sent;
+              data = _yield$call8.data;
+              _context8.next = 6;
+              return put({
+                type: 'save',
+                payload: {
+                  InfoShow: data
+                }
+              });
+            case 6:
+            case "end":
+              return _context8.stop();
+          }
+        }, _callee8);
+      })();
     } // 获取用户的信息
   },
   reducers: {
@@ -53970,7 +54105,7 @@ var exerciseTips = function exerciseTips(v, appraise_label) {
         backgroundColor: '#FC2D6B'
       },
       className: "tag-style ml5",
-      children: "\u5DF2\u7ED3\u675F"
+      children: "\u5DF2\u622A\u6B62"
     });
   }
 };
@@ -137883,28 +138018,28 @@ function _getRoutes() {
                 return __webpack_require__.e(/*! import() */ 68761).then(__webpack_require__.bind(__webpack_require__, /*! ./EmptyRoute */ 68761));
               }),
               '2': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '3': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Paperlibrary__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(85731), __webpack_require__.e(99313), __webpack_require__.e(4977), __webpack_require__.e(19403), __webpack_require__.e(80399), __webpack_require__.e(50251), __webpack_require__.e(14000), __webpack_require__.e(97120), __webpack_require__.e(54862)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paperlibrary/index.tsx */ 23912));
               }),
               '4': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Paperlibrary__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(19842), __webpack_require__.e(56156), __webpack_require__.e(30335), __webpack_require__.e(47758), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(93260)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paperlibrary/Add/index.tsx */ 42088));
+                return Promise.all(/*! import() | p__Paperlibrary__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(19842), __webpack_require__.e(56156), __webpack_require__.e(30335), __webpack_require__.e(47758), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(93260)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paperlibrary/Add/index.tsx */ 42088));
               }),
               '5': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Paperlibrary__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(19842), __webpack_require__.e(56156), __webpack_require__.e(30335), __webpack_require__.e(47758), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(93260)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paperlibrary/Add/index.tsx */ 42088));
+                return Promise.all(/*! import() | p__Paperlibrary__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(19842), __webpack_require__.e(56156), __webpack_require__.e(30335), __webpack_require__.e(47758), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(93260)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paperlibrary/Add/index.tsx */ 42088));
               }),
               '6': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Paperlibrary__See__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(19208), __webpack_require__.e(44425), __webpack_require__.e(86129), __webpack_require__.e(88699), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(14000), __webpack_require__.e(49616), __webpack_require__.e(53247)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paperlibrary/See/index.tsx */ 76256));
+                return Promise.all(/*! import() | p__Paperlibrary__See__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(19208), __webpack_require__.e(44425), __webpack_require__.e(86129), __webpack_require__.e(88699), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(14000), __webpack_require__.e(49616), __webpack_require__.e(53247)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paperlibrary/See/index.tsx */ 76256));
               }),
               '7': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Problemset__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(61314), __webpack_require__.e(68998), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(14599)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/index.tsx */ 93826));
+                return Promise.all(/*! import() | p__Problemset__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(61314), __webpack_require__.e(68998), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(14599)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/index.tsx */ 93826));
               }),
               '8': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Paperlibrary__Random__ExchangeFromProblemSet__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(61314), __webpack_require__.e(68998), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(14599), __webpack_require__.e(11545)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paperlibrary/Random/ExchangeFromProblemSet/index.tsx */ 62267));
+                return Promise.all(/*! import() | p__Paperlibrary__Random__ExchangeFromProblemSet__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(61314), __webpack_require__.e(68998), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(14599), __webpack_require__.e(11545)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paperlibrary/Random/ExchangeFromProblemSet/index.tsx */ 62267));
               }),
               '9': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '10': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Paths__Index__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(37825), __webpack_require__.e(9951), __webpack_require__.e(42291), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(19403), __webpack_require__.e(86052)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paths/Index/index.tsx */ 34039));
@@ -137913,22 +138048,22 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Paths__HigherVocationalEducation__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(26588), __webpack_require__.e(59981), __webpack_require__.e(62945), __webpack_require__.e(4977), __webpack_require__.e(5572)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paths/HigherVocationalEducation/index.tsx */ 67063));
               }),
               '12': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Paths__New__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(19842), __webpack_require__.e(98228), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(28982)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paths/New/index.tsx */ 50342));
+                return Promise.all(/*! import() | p__Paths__New__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(19842), __webpack_require__.e(98228), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(28982)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paths/New/index.tsx */ 50342));
               }),
               '13': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Guidance__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(50869)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Guidance/index.tsx */ 40623));
+                return Promise.all(/*! import() | p__Guidance__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(50869)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Guidance/index.tsx */ 40623));
               }),
               '14': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Paths__Detail__id */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(42441), __webpack_require__.e(19842), __webpack_require__.e(89536), __webpack_require__.e(44425), __webpack_require__.e(31087), __webpack_require__.e(12911), __webpack_require__.e(93125), __webpack_require__.e(37200), __webpack_require__.e(20970), __webpack_require__.e(13566), __webpack_require__.e(35870), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(19011), __webpack_require__.e(34310), __webpack_require__.e(23332)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paths/Detail/[id].tsx */ 84078));
+                return Promise.all(/*! import() | p__Paths__Detail__id */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(42441), __webpack_require__.e(19842), __webpack_require__.e(89536), __webpack_require__.e(44425), __webpack_require__.e(31087), __webpack_require__.e(12911), __webpack_require__.e(93125), __webpack_require__.e(37200), __webpack_require__.e(20970), __webpack_require__.e(13566), __webpack_require__.e(35870), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(19011), __webpack_require__.e(34310), __webpack_require__.e(23332)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paths/Detail/[id].tsx */ 67335));
               }),
               '15': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Paths__Detail__Statistics__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(42441), __webpack_require__.e(59376), __webpack_require__.e(4977), __webpack_require__.e(34601)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paths/Detail/Statistics/index.tsx */ 61234));
               }),
               '16': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Paths__New__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(19842), __webpack_require__.e(98228), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(28982)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paths/New/index.tsx */ 50342));
+                return Promise.all(/*! import() | p__Paths__New__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(19842), __webpack_require__.e(98228), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(28982)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paths/New/index.tsx */ 50342));
               }),
               '17': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '18': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Classrooms__Index__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(37825), __webpack_require__.e(94439), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(19403), __webpack_require__.e(26685)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Index/index.tsx */ 70543));
@@ -137964,76 +138099,76 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Classrooms__Lists__ProgramHomework__Detail__components__CodeReview__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(85731), __webpack_require__.e(44888), __webpack_require__.e(3391)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ProgramHomework/Detail/components/CodeReview/Detail/index.tsx */ 50950));
               }),
               '29': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__ShixunHomeworks__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(42441), __webpack_require__.e(46034), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(86637), __webpack_require__.e(13581)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ShixunHomeworks/Detail/index.tsx */ 9846));
+                return Promise.all(/*! import() | p__Classrooms__Lists__ShixunHomeworks__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(42441), __webpack_require__.e(46034), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(86637), __webpack_require__.e(13581)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ShixunHomeworks/Detail/index.tsx */ 9846));
               }),
               '30': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__ShixunHomeworks__Comment__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(42441), __webpack_require__.e(19208), __webpack_require__.e(44425), __webpack_require__.e(86129), __webpack_require__.e(12911), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(30342)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ShixunHomeworks/Comment/index.tsx */ 85753));
+                return Promise.all(/*! import() | p__Classrooms__Lists__ShixunHomeworks__Comment__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(42441), __webpack_require__.e(19208), __webpack_require__.e(44425), __webpack_require__.e(86129), __webpack_require__.e(12911), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(30342)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ShixunHomeworks/Comment/index.tsx */ 85753));
               }),
               '31': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__CommonHomework__Comment__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(19208), __webpack_require__.e(44425), __webpack_require__.e(86129), __webpack_require__.e(27809), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(12303)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/CommonHomework/Comment/index.tsx */ 89843));
+                return Promise.all(/*! import() | p__Classrooms__Lists__CommonHomework__Comment__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(19208), __webpack_require__.e(44425), __webpack_require__.e(86129), __webpack_require__.e(27809), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(12303)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/CommonHomework/Comment/index.tsx */ 89843));
               }),
               '32': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__ShixunHomeworks__Commitsummary__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(61999), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(71450)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ShixunHomeworks/Commitsummary/index.tsx */ 41797));
+                return Promise.all(/*! import() | p__Classrooms__Lists__ShixunHomeworks__Commitsummary__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(61999), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(71450)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ShixunHomeworks/Commitsummary/index.tsx */ 41797));
               }),
               '33': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__GroupHomework__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(19208), __webpack_require__.e(86129), __webpack_require__.e(47071), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(10195)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/GroupHomework/Detail/index.tsx */ 10793));
+                return Promise.all(/*! import() | p__Classrooms__Lists__GroupHomework__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(19208), __webpack_require__.e(86129), __webpack_require__.e(47071), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(10195)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/GroupHomework/Detail/index.tsx */ 10793));
               }),
               '34': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__CommonHomework__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(19208), __webpack_require__.e(86129), __webpack_require__.e(47071), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(86637), __webpack_require__.e(75015), __webpack_require__.e(93668)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/CommonHomework/Detail/index.tsx */ 5368));
+                return Promise.all(/*! import() | p__Classrooms__Lists__CommonHomework__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(19208), __webpack_require__.e(86129), __webpack_require__.e(47071), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(86637), __webpack_require__.e(75015), __webpack_require__.e(93668)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/CommonHomework/Detail/index.tsx */ 5368));
               }),
               '35': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__CommonHomework__Review__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(89536), __webpack_require__.e(49391), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(52338)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/CommonHomework/Review/index.tsx */ 79795));
+                return Promise.all(/*! import() | p__Classrooms__Lists__CommonHomework__Review__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(89536), __webpack_require__.e(49391), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(52338)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/CommonHomework/Review/index.tsx */ 79795));
               }),
               '36': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__GroupHomework__Review__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(89536), __webpack_require__.e(9877), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(14662)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/GroupHomework/Review/index.tsx */ 58843));
+                return Promise.all(/*! import() | p__Classrooms__Lists__GroupHomework__Review__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(89536), __webpack_require__.e(9877), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(14662)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/GroupHomework/Review/index.tsx */ 58843));
               }),
               '37': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__GroupHomework__SubmitWork__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(80580), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(28072)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/GroupHomework/SubmitWork/index.tsx */ 73919));
+                return Promise.all(/*! import() | p__Classrooms__Lists__GroupHomework__SubmitWork__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(80580), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(28072)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/GroupHomework/SubmitWork/index.tsx */ 73919));
               }),
               '38': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__GroupHomework__EditWork__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(24721), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(60479)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/GroupHomework/EditWork/index.tsx */ 34017));
+                return Promise.all(/*! import() | p__Classrooms__Lists__GroupHomework__EditWork__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(24721), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(60479)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/GroupHomework/EditWork/index.tsx */ 34017));
               }),
               '39': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__Detail__components__DuplicateChecking__CheckDetail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(85731), __webpack_require__.e(44888), __webpack_require__.e(85297)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/Detail/components/DuplicateChecking/CheckDetail/index.tsx */ 54223));
               }),
               '40': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(42441), __webpack_require__.e(89536), __webpack_require__.e(56156), __webpack_require__.e(30335), __webpack_require__.e(31087), __webpack_require__.e(47758), __webpack_require__.e(2604), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(86637), __webpack_require__.e(53210), __webpack_require__.e(22394), __webpack_require__.e(37646), __webpack_require__.e(54164)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/Detail/index.tsx */ 740));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(42441), __webpack_require__.e(89536), __webpack_require__.e(56156), __webpack_require__.e(30335), __webpack_require__.e(31087), __webpack_require__.e(47758), __webpack_require__.e(2604), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(86637), __webpack_require__.e(53210), __webpack_require__.e(22394), __webpack_require__.e(37646), __webpack_require__.e(54164)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/Detail/index.tsx */ 740));
               }),
               '41': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Problemset__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(61314), __webpack_require__.e(68998), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(14599)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/index.tsx */ 93826));
+                return Promise.all(/*! import() | p__Problemset__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(61314), __webpack_require__.e(68998), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(14599)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/index.tsx */ 93826));
               }),
               '42': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__ImitateAnswer__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(56156), __webpack_require__.e(79817), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(51315), __webpack_require__.e(14889)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/ImitateAnswer/index.tsx */ 32165));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__ImitateAnswer__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(56156), __webpack_require__.e(79817), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(51315), __webpack_require__.e(14889)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/ImitateAnswer/index.tsx */ 32165));
               }),
               '43': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__Answer__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(56156), __webpack_require__.e(80457), __webpack_require__.e(12911), __webpack_require__.e(47319), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(51315), __webpack_require__.e(14105)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/Answer/index.tsx */ 90704));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__Answer__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(56156), __webpack_require__.e(80457), __webpack_require__.e(12911), __webpack_require__.e(47319), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(51315), __webpack_require__.e(14105)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/Answer/index.tsx */ 90704));
               }),
               '44': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__Notice__index */[__webpack_require__.e(59981), __webpack_require__.e(17482)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/Notice/index.tsx */ 82589));
               }),
               '45': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Paperlibrary__Random__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(19842), __webpack_require__.e(56156), __webpack_require__.e(30335), __webpack_require__.e(47758), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(53210), __webpack_require__.e(75816)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paperlibrary/Random/Edit/index.tsx */ 81974));
+                return Promise.all(/*! import() | p__Paperlibrary__Random__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(19842), __webpack_require__.e(56156), __webpack_require__.e(30335), __webpack_require__.e(47758), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(53210), __webpack_require__.e(75816)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paperlibrary/Random/Edit/index.tsx */ 81974));
               }),
               '46': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Paperlibrary__Random__PreviewEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(56156), __webpack_require__.e(47758), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(53210), __webpack_require__.e(90337)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paperlibrary/Random/PreviewEdit/index.tsx */ 12833));
+                return Promise.all(/*! import() | p__Paperlibrary__Random__PreviewEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(56156), __webpack_require__.e(47758), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(53210), __webpack_require__.e(90337)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paperlibrary/Random/PreviewEdit/index.tsx */ 12833));
               }),
               '47': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(19842), __webpack_require__.e(56156), __webpack_require__.e(30335), __webpack_require__.e(47758), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(292)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/Add/index.tsx */ 61056));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(19842), __webpack_require__.e(56156), __webpack_require__.e(30335), __webpack_require__.e(47758), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(292)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/Add/index.tsx */ 61056));
               }),
               '48': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(19842), __webpack_require__.e(56156), __webpack_require__.e(30335), __webpack_require__.e(47758), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(292)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/Add/index.tsx */ 61056));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(19842), __webpack_require__.e(56156), __webpack_require__.e(30335), __webpack_require__.e(47758), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(292)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/Add/index.tsx */ 61056));
               }),
               '49': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__ReviewGroup__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(79817), __webpack_require__.e(66174), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(45992)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/ReviewGroup/index.tsx */ 74857));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__ReviewGroup__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(79817), __webpack_require__.e(66174), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(45992)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/ReviewGroup/index.tsx */ 74857));
               }),
               '50': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__Review__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(42441), __webpack_require__.e(89536), __webpack_require__.e(44425), __webpack_require__.e(8104), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(22394), __webpack_require__.e(38059), __webpack_require__.e(78085)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/Review/index.tsx */ 80549));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__Review__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(42441), __webpack_require__.e(89536), __webpack_require__.e(44425), __webpack_require__.e(8104), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(22394), __webpack_require__.e(38059), __webpack_require__.e(78085)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/Review/index.tsx */ 80549));
               }),
               '51': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__Review__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(42441), __webpack_require__.e(89536), __webpack_require__.e(44425), __webpack_require__.e(8104), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(22394), __webpack_require__.e(38059), __webpack_require__.e(78085)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/Review/index.tsx */ 80549));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__Review__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(42441), __webpack_require__.e(89536), __webpack_require__.e(44425), __webpack_require__.e(8104), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(22394), __webpack_require__.e(38059), __webpack_require__.e(78085)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/Review/index.tsx */ 80549));
               }),
               '52': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__Export__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(89536), __webpack_require__.e(19208), __webpack_require__.e(44425), __webpack_require__.e(86129), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(22394), __webpack_require__.e(38059), __webpack_require__.e(48431)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/Export/index.tsx */ 11332));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__Export__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(89536), __webpack_require__.e(19208), __webpack_require__.e(44425), __webpack_require__.e(86129), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(22394), __webpack_require__.e(38059), __webpack_require__.e(48431)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/Export/index.tsx */ 11332));
               }),
               '53': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__DetailedAnalysis__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(99313), __webpack_require__.e(95125)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/DetailedAnalysis/index.tsx */ 63500));
@@ -138048,73 +138183,73 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__CodeDetails__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(44888), __webpack_require__.e(10921)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/CodeDetails/index.tsx */ 8190));
               }),
               '57': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Graduation__Topics__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(21578)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Graduation/Topics/Detail/index.tsx */ 84116));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Graduation__Topics__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(21578)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Graduation/Topics/Detail/index.tsx */ 84116));
               }),
               '58': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Graduation__Topics__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(19842), __webpack_require__.e(45874), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(3317)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Graduation/Topics/Add/index.tsx */ 40718));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Graduation__Topics__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(19842), __webpack_require__.e(45874), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(3317)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Graduation/Topics/Add/index.tsx */ 40718));
               }),
               '59': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Graduation__Topics__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(19842), __webpack_require__.e(75464), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(1482)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Graduation/Topics/Edit/index.tsx */ 71278));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Graduation__Topics__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(19842), __webpack_require__.e(75464), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(1482)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Graduation/Topics/Edit/index.tsx */ 71278));
               }),
               '60': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Graduation__Tasks__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(63143), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(74795)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Graduation/Tasks/Add/index.tsx */ 9403));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Graduation__Tasks__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(63143), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(74795)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Graduation/Tasks/Add/index.tsx */ 9403));
               }),
               '61': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Graduation__Tasks__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(27049), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(20026)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Graduation/Tasks/Edit/index.tsx */ 25076));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Graduation__Tasks__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(27049), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(20026)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Graduation/Tasks/Edit/index.tsx */ 25076));
               }),
               '62': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Graduation__Tasks__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(68882)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Graduation/Tasks/Detail/index.tsx */ 53362));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Graduation__Tasks__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(68882)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Graduation/Tasks/Detail/index.tsx */ 53362));
               }),
               '63': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__CommonHomework__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(98940), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(85888)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/CommonHomework/Add/index.tsx */ 40211));
+                return Promise.all(/*! import() | p__Classrooms__Lists__CommonHomework__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(98940), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(85888)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/CommonHomework/Add/index.tsx */ 40211));
               }),
               '64': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__CommonHomework__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(80350), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(19715)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/CommonHomework/Edit/index.tsx */ 35029));
+                return Promise.all(/*! import() | p__Classrooms__Lists__CommonHomework__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(80350), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(19715)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/CommonHomework/Edit/index.tsx */ 35029));
               }),
               '65': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__CommonHomework__SubmitWork__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(77095), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(57045)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/CommonHomework/SubmitWork/index.tsx */ 11896));
+                return Promise.all(/*! import() | p__Classrooms__Lists__CommonHomework__SubmitWork__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(77095), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(57045)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/CommonHomework/SubmitWork/index.tsx */ 11896));
               }),
               '66': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__CommonHomework__EditWork__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(95149), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(31211)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/CommonHomework/EditWork/index.tsx */ 88867));
+                return Promise.all(/*! import() | p__Classrooms__Lists__CommonHomework__EditWork__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(95149), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(31211)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/CommonHomework/EditWork/index.tsx */ 88867));
               }),
               '67': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__GroupHomework__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(46235), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(51582)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/GroupHomework/Add/index.tsx */ 50077));
+                return Promise.all(/*! import() | p__Classrooms__Lists__GroupHomework__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(46235), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(51582)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/GroupHomework/Add/index.tsx */ 50077));
               }),
               '68': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__GroupHomework__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(12285), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(16729)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/GroupHomework/Edit/index.tsx */ 43656));
+                return Promise.all(/*! import() | p__Classrooms__Lists__GroupHomework__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(12285), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(16729)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/GroupHomework/Edit/index.tsx */ 43656));
               }),
               '69': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Polls__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(16337), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(72773), __webpack_require__.e(39695)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Polls/Add/index.tsx */ 15146));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Polls__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(16337), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(72773), __webpack_require__.e(39695)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Polls/Add/index.tsx */ 15146));
               }),
               '70': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Polls__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(16337), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(72773), __webpack_require__.e(28723)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Polls/Edit/index.tsx */ 72773));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Polls__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(16337), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(72773), __webpack_require__.e(28723)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Polls/Edit/index.tsx */ 72773));
               }),
               '71': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Polls__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(42441), __webpack_require__.e(19208), __webpack_require__.e(44425), __webpack_require__.e(86129), __webpack_require__.e(93813), __webpack_require__.e(44888), __webpack_require__.e(49616), __webpack_require__.e(17622)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Polls/Detail/index.tsx */ 52317));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Polls__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(42441), __webpack_require__.e(19208), __webpack_require__.e(44425), __webpack_require__.e(86129), __webpack_require__.e(93813), __webpack_require__.e(44888), __webpack_require__.e(49616), __webpack_require__.e(17622)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Polls/Detail/index.tsx */ 52317));
               }),
               '72': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Polls__Answer__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(79817), __webpack_require__.e(83306), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(65148)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Polls/Answer/index.tsx */ 59675));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Polls__Answer__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(79817), __webpack_require__.e(83306), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(65148)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Polls/Answer/index.tsx */ 59675));
               }),
               '73': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Board__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(52409), __webpack_require__.e(25324), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(43442)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Board/Add/index.tsx */ 53321));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Board__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(52409), __webpack_require__.e(25324), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(43442)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Board/Add/index.tsx */ 53321));
               }),
               '74': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Board__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(52409), __webpack_require__.e(34506), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(12102)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Board/Edit/index.tsx */ 3814));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Board__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(52409), __webpack_require__.e(34506), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(12102)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Board/Edit/index.tsx */ 3814));
               }),
               '75': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Board__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(75791), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(82425)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Board/Detail/index.tsx */ 35150));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Board__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(75791), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(82425)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Board/Detail/index.tsx */ 35150));
               }),
               '76': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Template__teacher__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37408), __webpack_require__.e(70130), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(52404)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Template/teacher/index.tsx */ 13963));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Template__teacher__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37408), __webpack_require__.e(70130), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(52404)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Template/teacher/index.tsx */ 13963));
               }),
               '77': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Template__student__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37408), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(89785)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Template/student/index.tsx */ 8898));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Template__student__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37408), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(89785)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Template/student/index.tsx */ 8898));
               }),
               '78': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Guidance__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(50869)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Guidance/index.tsx */ 40623));
+                return Promise.all(/*! import() | p__Guidance__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(50869)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Guidance/index.tsx */ 40623));
               }),
               '79': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Template__detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(44425), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(2819)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Template/detail/index.tsx */ 25790));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Template__detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(44425), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(2819)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Template/detail/index.tsx */ 25790));
               }),
               '80': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Classrooms__Lists__Exercise__AnswerCheck__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(59981), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(19208), __webpack_require__.e(80457), __webpack_require__.e(45413), __webpack_require__.e(15845), __webpack_require__.e(38289), __webpack_require__.e(11512)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Exercise/AnswerCheck/index.tsx */ 21114));
@@ -138129,37 +138264,37 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Classrooms__Lists__Engineering__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(73755), __webpack_require__.e(4977), __webpack_require__.e(46963)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Engineering/Detail/index.tsx */ 4417));
               }),
               '84': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Problemset__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(61314), __webpack_require__.e(68998), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(14599)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/index.tsx */ 93826));
+                return Promise.all(/*! import() | p__Problemset__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(61314), __webpack_require__.e(68998), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(14599)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/index.tsx */ 93826));
               }),
               '85': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Problemset__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(61314), __webpack_require__.e(68998), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(14599)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/index.tsx */ 93826));
+                return Promise.all(/*! import() | p__Problemset__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(61314), __webpack_require__.e(68998), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(14599)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/index.tsx */ 93826));
               }),
               '86': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Classrooms__Lists__ProgramHomework__Ranking__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(7260), __webpack_require__.e(80399), __webpack_require__.e(6127)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ProgramHomework/Ranking/index.tsx */ 86471));
               }),
               '87': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__ProgramHomework__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(92461), __webpack_require__.e(7814), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(86637), __webpack_require__.e(81830), __webpack_require__.e(3951)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ProgramHomework/Detail/index.tsx */ 168));
+                return Promise.all(/*! import() | p__Classrooms__Lists__ProgramHomework__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(92461), __webpack_require__.e(7814), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(86637), __webpack_require__.e(81830), __webpack_require__.e(3951)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ProgramHomework/Detail/index.tsx */ 168));
               }),
               '88': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__ProgramHomework__Detail__Ranking__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(7260), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(80399), __webpack_require__.e(41048)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ProgramHomework/Detail/Ranking/index.tsx */ 3834));
+                return Promise.all(/*! import() | p__Classrooms__Lists__ProgramHomework__Detail__Ranking__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(7260), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(80399), __webpack_require__.e(41048)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ProgramHomework/Detail/Ranking/index.tsx */ 3834));
               }),
               '89': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__ProgramHomework__Comment__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(19208), __webpack_require__.e(44425), __webpack_require__.e(86129), __webpack_require__.e(27809), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(12884)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ProgramHomework/Comment/index.tsx */ 86834));
+                return Promise.all(/*! import() | p__Classrooms__Lists__ProgramHomework__Comment__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(19208), __webpack_require__.e(44425), __webpack_require__.e(86129), __webpack_require__.e(27809), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(12884)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ProgramHomework/Comment/index.tsx */ 86834));
               }),
               '90': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__ProgramHomework__Detail__answer__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(41867), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(99313), __webpack_require__.e(52720), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(54770)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ProgramHomework/Detail/answer/index.tsx */ 47723));
+                return Promise.all(/*! import() | p__Classrooms__Lists__ProgramHomework__Detail__answer__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(41867), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(99313), __webpack_require__.e(52720), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(54770)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ProgramHomework/Detail/answer/index.tsx */ 47723));
               }),
               '91': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__ProgramHomework__Detail__answer__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(82010), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(92603)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ProgramHomework/Detail/answer/Add/index.tsx */ 41901));
+                return Promise.all(/*! import() | p__Classrooms__Lists__ProgramHomework__Detail__answer__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(82010), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(92603)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ProgramHomework/Detail/answer/Add/index.tsx */ 41901));
               }),
               '92': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__ProgramHomework__Detail__answer__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(87648), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(44216)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ProgramHomework/Detail/answer/Edit/index.tsx */ 29165));
+                return Promise.all(/*! import() | p__Classrooms__Lists__ProgramHomework__Detail__answer__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(87648), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(44216)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ProgramHomework/Detail/answer/Edit/index.tsx */ 29165));
               }),
               '93': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__ProgramHomework__Detail__answer__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(52720), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(15319)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ProgramHomework/Detail/answer/Detail/index.tsx */ 26158));
+                return Promise.all(/*! import() | p__Classrooms__Lists__ProgramHomework__Detail__answer__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(52720), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(15319)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ProgramHomework/Detail/answer/Detail/index.tsx */ 26158));
               }),
               '94': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Video__Items__videoInfo__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(76980), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(80457), __webpack_require__.e(31087), __webpack_require__.e(12911), __webpack_require__.e(23422), __webpack_require__.e(6305), __webpack_require__.e(40895)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Video/Items/videoInfo/index.tsx */ 94498));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Video__Items__videoInfo__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(27627), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(80457), __webpack_require__.e(31087), __webpack_require__.e(12911), __webpack_require__.e(23422), __webpack_require__.e(6305), __webpack_require__.e(40895)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Video/Items/videoInfo/index.tsx */ 94498));
               }),
               '95': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | layouts__ShixunDetail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(99313), __webpack_require__.e(98228), __webpack_require__.e(30335), __webpack_require__.e(71476), __webpack_require__.e(4977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(93282)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/ShixunDetail/index.tsx */ 85412));
@@ -138222,10 +138357,10 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Classrooms__Lists__Engineering__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(31962)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Engineering/index.tsx */ 57491));
               }),
               '115': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__LearningPath__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(59981), __webpack_require__.e(76980), __webpack_require__.e(31087), __webpack_require__.e(6305), __webpack_require__.e(54928)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/LearningPath/index.tsx */ 75342));
+                return Promise.all(/*! import() | p__Classrooms__Lists__LearningPath__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(59981), __webpack_require__.e(27627), __webpack_require__.e(31087), __webpack_require__.e(6305), __webpack_require__.e(54928)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/LearningPath/index.tsx */ 75342));
               }),
               '116': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__ResourceRecommend__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(76980), __webpack_require__.e(99313), __webpack_require__.e(31087), __webpack_require__.e(72032), __webpack_require__.e(4977), __webpack_require__.e(6305), __webpack_require__.e(46659), __webpack_require__.e(91257)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ResourceRecommend/index.tsx */ 6488));
+                return Promise.all(/*! import() | p__Classrooms__Lists__ResourceRecommend__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(27627), __webpack_require__.e(99313), __webpack_require__.e(31087), __webpack_require__.e(72032), __webpack_require__.e(4977), __webpack_require__.e(6305), __webpack_require__.e(46659), __webpack_require__.e(91257)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/ResourceRecommend/index.tsx */ 6488));
               }),
               '117': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Classrooms__Lists__Attendance__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(93948), __webpack_require__.e(52409), __webpack_require__.e(42441), __webpack_require__.e(19208), __webpack_require__.e(98228), __webpack_require__.e(5073), __webpack_require__.e(4977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(80399), __webpack_require__.e(28435)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Attendance/index.tsx */ 10655));
@@ -138237,16 +138372,16 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Classrooms__Lists__Attendance__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(93948), __webpack_require__.e(15845), __webpack_require__.e(4977), __webpack_require__.e(34093)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Attendance/Detail/index.tsx */ 41782));
               }),
               '120': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Announcement__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(89536), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(21265)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Announcement/index.tsx */ 42022));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Announcement__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(89536), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(21265)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Announcement/index.tsx */ 42022));
               }),
               '121': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__Announcement__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(89536), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(21265)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Announcement/index.tsx */ 42022));
+                return Promise.all(/*! import() | p__Classrooms__Lists__Announcement__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(89536), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(21265)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Announcement/index.tsx */ 42022));
               }),
               '122': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__OnlineLearning__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(89536), __webpack_require__.e(30335), __webpack_require__.e(93125), __webpack_require__.e(20970), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(34310), __webpack_require__.e(68827)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/OnlineLearning/index.tsx */ 39023));
+                return Promise.all(/*! import() | p__Classrooms__Lists__OnlineLearning__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(89536), __webpack_require__.e(30335), __webpack_require__.e(93125), __webpack_require__.e(20970), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(34310), __webpack_require__.e(68827)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/OnlineLearning/index.tsx */ 39023));
               }),
               '123': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Classrooms__Lists__OnlineLearning__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(89536), __webpack_require__.e(30335), __webpack_require__.e(93125), __webpack_require__.e(20970), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(34310), __webpack_require__.e(68827)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/OnlineLearning/index.tsx */ 39023));
+                return Promise.all(/*! import() | p__Classrooms__Lists__OnlineLearning__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(89536), __webpack_require__.e(30335), __webpack_require__.e(93125), __webpack_require__.e(20970), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(34310), __webpack_require__.e(68827)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/OnlineLearning/index.tsx */ 39023));
               }),
               '124': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Classrooms__Lists__Attachment__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(85731), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(92461), __webpack_require__.e(13488), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(86637), __webpack_require__.e(6758)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Attachment/index.tsx */ 39506));
@@ -138333,7 +138468,7 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Classrooms__Lists__Template__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(4977), __webpack_require__.e(15148)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Classrooms/Lists/Template/index.tsx */ 12667));
               }),
               '152': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '153': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Competitions__Index__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(42441), __webpack_require__.e(73755), __webpack_require__.e(23760), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(26883)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Competitions/Index/index.tsx */ 9042));
@@ -138348,10 +138483,10 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Competitions__Index__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(42441), __webpack_require__.e(73755), __webpack_require__.e(23760), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(26883)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Competitions/Index/index.tsx */ 9042));
               }),
               '157': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Competitions__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(19842), __webpack_require__.e(19208), __webpack_require__.e(80457), __webpack_require__.e(86129), __webpack_require__.e(9951), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(76444), __webpack_require__.e(5620), __webpack_require__.e(72570)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Competitions/Detail/index.tsx */ 2778));
+                return Promise.all(/*! import() | p__Competitions__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(19842), __webpack_require__.e(19208), __webpack_require__.e(80457), __webpack_require__.e(86129), __webpack_require__.e(9951), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(76444), __webpack_require__.e(5620), __webpack_require__.e(72570)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Competitions/Detail/index.tsx */ 2778));
               }),
               '158': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Competitions__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(19842), __webpack_require__.e(19208), __webpack_require__.e(80457), __webpack_require__.e(86129), __webpack_require__.e(9951), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(76444), __webpack_require__.e(5620), __webpack_require__.e(72570)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Competitions/Detail/index.tsx */ 2778));
+                return Promise.all(/*! import() | p__Competitions__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(19842), __webpack_require__.e(19208), __webpack_require__.e(80457), __webpack_require__.e(86129), __webpack_require__.e(9951), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(76444), __webpack_require__.e(5620), __webpack_require__.e(72570)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Competitions/Detail/index.tsx */ 2778));
               }),
               '159': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Competitions__Entered__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(29414), __webpack_require__.e(8787)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Competitions/Entered/index.tsx */ 3043));
@@ -138363,10 +138498,10 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Competitions__Entered__Assembly__TeamDateil */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(49127), __webpack_require__.e(81799)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Competitions/Entered/Assembly/TeamDateil.tsx */ 23477));
               }),
               '162': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Competitions__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(19842), __webpack_require__.e(80457), __webpack_require__.e(30335), __webpack_require__.e(45582), __webpack_require__.e(15220), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(76444), __webpack_require__.e(5620), __webpack_require__.e(38797)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Competitions/Edit/index.tsx */ 17841));
+                return Promise.all(/*! import() | p__Competitions__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(19842), __webpack_require__.e(80457), __webpack_require__.e(30335), __webpack_require__.e(45582), __webpack_require__.e(15220), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(76444), __webpack_require__.e(5620), __webpack_require__.e(38797)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Competitions/Edit/index.tsx */ 17841));
               }),
               '163': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '164': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return __webpack_require__.e(/*! import() | p__Forums__Index__redirect */ 28639).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Forums/Index/redirect.tsx */ 13759));
@@ -138375,46 +138510,46 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Forums__Index__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(38177), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(92983)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Forums/Index/index.tsx */ 50866));
               }),
               '166': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Forums__New__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(77484), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(74264)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Forums/New/index.tsx */ 85996));
+                return Promise.all(/*! import() | p__Forums__New__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(77484), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(74264)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Forums/New/index.tsx */ 85996));
               }),
               '167': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Forums__New__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(77484), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(74264)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Forums/New/index.tsx */ 85996));
+                return Promise.all(/*! import() | p__Forums__New__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(77484), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(74264)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Forums/New/index.tsx */ 85996));
               }),
               '168': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Forums__Detail__id */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(89536), __webpack_require__.e(62964), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(80508)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Forums/Detail/[id].tsx */ 17344));
+                return Promise.all(/*! import() | p__Forums__Detail__id */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(89536), __webpack_require__.e(62964), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(80508)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Forums/Detail/[id].tsx */ 17344));
               }),
               '169': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '170': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Problemset__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(61314), __webpack_require__.e(68998), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(14599)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/index.tsx */ 93826));
+                return Promise.all(/*! import() | p__Problemset__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(61314), __webpack_require__.e(68998), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(14599)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/index.tsx */ 93826));
               }),
               '171': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Problemset__NewItem__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(19842), __webpack_require__.e(56156), __webpack_require__.e(47758), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41953)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/NewItem/index.tsx */ 91560));
+                return Promise.all(/*! import() | p__Problemset__NewItem__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(19842), __webpack_require__.e(56156), __webpack_require__.e(47758), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41953)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/NewItem/index.tsx */ 91560));
               }),
               '172': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Problemset__NewItem__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(19842), __webpack_require__.e(56156), __webpack_require__.e(47758), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41953)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/NewItem/index.tsx */ 91560));
+                return Promise.all(/*! import() | p__Problemset__NewItem__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(19842), __webpack_require__.e(56156), __webpack_require__.e(47758), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41953)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/NewItem/index.tsx */ 91560));
               }),
               '173': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Problemset__Preview__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(30335), __webpack_require__.e(88699), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(11581)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/Preview/index.tsx */ 51053));
+                return Promise.all(/*! import() | p__Problemset__Preview__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(30335), __webpack_require__.e(88699), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(11581)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/Preview/index.tsx */ 51053));
               }),
               '174': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Problemset__Preview__New__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(85731), __webpack_require__.e(19842), __webpack_require__.e(64144)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/Preview/New/index.tsx */ 49302));
               }),
               '175': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Problemset__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(61314), __webpack_require__.e(68998), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(14599)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/index.tsx */ 93826));
+                return Promise.all(/*! import() | p__Problemset__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(61314), __webpack_require__.e(68998), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(19403), __webpack_require__.e(14599)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problemset/index.tsx */ 93826));
               }),
               '176': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '177': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Shixuns__Index__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(37825), __webpack_require__.e(83012), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(19403), __webpack_require__.e(28782)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Index/index.tsx */ 66087));
               }),
               '178': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Shixuns__Exports__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(44425), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(80399), __webpack_require__.e(97120), __webpack_require__.e(7884)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Exports/index.tsx */ 66660));
+                return Promise.all(/*! import() | p__Shixuns__Exports__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(44425), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(80399), __webpack_require__.e(97120), __webpack_require__.e(7884)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Exports/index.tsx */ 66660));
               }),
               '179': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Shixuns__New__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(90647), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(75956), __webpack_require__.e(97008)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/New/index.tsx */ 45577));
+                return Promise.all(/*! import() | p__Shixuns__New__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(90647), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(75956), __webpack_require__.e(97008)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/New/index.tsx */ 45577));
               }),
               '180': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Shixuns__New__CreateImg__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(65549)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/New/CreateImg/index.tsx */ 1741));
@@ -138426,31 +138561,31 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Shixuns__Detail__Merge__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(41867), __webpack_require__.e(62778), __webpack_require__.e(4977), __webpack_require__.e(55573)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Detail/Merge/index.tsx */ 52843));
               }),
               '183': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Shixuns__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(19842), __webpack_require__.e(80457), __webpack_require__.e(30335), __webpack_require__.e(11392), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(97866), __webpack_require__.e(75956), __webpack_require__.e(98357), __webpack_require__.e(34495), __webpack_require__.e(56277)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Edit/index.tsx */ 82027));
+                return Promise.all(/*! import() | p__Shixuns__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(19842), __webpack_require__.e(80457), __webpack_require__.e(30335), __webpack_require__.e(11392), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(97866), __webpack_require__.e(75956), __webpack_require__.e(98357), __webpack_require__.e(34495), __webpack_require__.e(56277)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Edit/index.tsx */ 82027));
               }),
               '184': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Shixuns__Edit__body__Warehouse__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(99313), __webpack_require__.e(78892), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(98357), __webpack_require__.e(16328)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Edit/body/Warehouse/index.tsx */ 98357));
               }),
               '185': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Shixuns__Edit__body__Level__Challenges__NewQuestion__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(77857)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Edit/body/Level/Challenges/NewQuestion/index.tsx */ 56590));
+                return Promise.all(/*! import() | p__Shixuns__Edit__body__Level__Challenges__NewQuestion__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(77857)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Edit/body/Level/Challenges/NewQuestion/index.tsx */ 56590));
               }),
               '186': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Shixuns__Edit__body__Level__Challenges__EditQuestion__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(7295), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(34830), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(41657)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Edit/body/Level/Challenges/EditQuestion/index.tsx */ 81625));
+                return Promise.all(/*! import() | p__Shixuns__Edit__body__Level__Challenges__EditQuestion__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(7295), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(34830), __webpack_require__.e(41657)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Edit/body/Level/Challenges/EditQuestion/index.tsx */ 81625));
               }),
               '187': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Shixuns__Edit__body__Level__Challenges__EditQuestion__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(7295), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(34830), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(41657)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Edit/body/Level/Challenges/EditQuestion/index.tsx */ 81625));
+                return Promise.all(/*! import() | p__Shixuns__Edit__body__Level__Challenges__EditQuestion__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(7295), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(34830), __webpack_require__.e(41657)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Edit/body/Level/Challenges/EditQuestion/index.tsx */ 81625));
               }),
               '188': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Shixuns__Edit__body__Level__Challenges__NewPractice__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(49127), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(94498)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Edit/body/Level/Challenges/NewPractice/index.tsx */ 66626));
+                return Promise.all(/*! import() | p__Shixuns__Edit__body__Level__Challenges__NewPractice__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(49127), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(94498)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Edit/body/Level/Challenges/NewPractice/index.tsx */ 66626));
               }),
               '189': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Shixuns__Edit__body__Level__Challenges__NewPractice__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(49127), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(94498)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Edit/body/Level/Challenges/NewPractice/index.tsx */ 66626));
+                return Promise.all(/*! import() | p__Shixuns__Edit__body__Level__Challenges__NewPractice__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(49127), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(94498)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Edit/body/Level/Challenges/NewPractice/index.tsx */ 66626));
               }),
               '190': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Shixuns__Edit__body__Level__Challenges__EditPracticeSetting__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(85731), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(99313), __webpack_require__.e(80457), __webpack_require__.e(74997), __webpack_require__.e(27783), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(77350), __webpack_require__.e(49205)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Edit/body/Level/Challenges/EditPracticeSetting/index.tsx */ 60778));
               }),
               '191': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Shixuns__Edit__body__Level__Challenges__EditPracticeAnswer__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(63952), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(21423)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Edit/body/Level/Challenges/EditPracticeAnswer/index.tsx */ 89467));
+                return Promise.all(/*! import() | p__Shixuns__Edit__body__Level__Challenges__EditPracticeAnswer__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(63952), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(21423)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Edit/body/Level/Challenges/EditPracticeAnswer/index.tsx */ 89467));
               }),
               '192': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Shixuns__Edit__body__Level__Challenges__RankingSetting__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(26588), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(57614)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Edit/body/Level/Challenges/RankingSetting/index.tsx */ 8238));
@@ -138459,7 +138594,7 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Shixuns__Detail__id */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(93948), __webpack_require__.e(19842), __webpack_require__.e(43428), __webpack_require__.e(4977), __webpack_require__.e(19403), __webpack_require__.e(50251), __webpack_require__.e(52875)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Detail/[id].tsx */ 53673));
               }),
               '194': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Shixuns__Detail__Challenges__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(37825), __webpack_require__.e(42441), __webpack_require__.e(89536), __webpack_require__.e(53877), __webpack_require__.e(56047), __webpack_require__.e(39236), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(59133)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Detail/Challenges/index.tsx */ 92143));
+                return Promise.all(/*! import() | p__Shixuns__Detail__Challenges__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(37825), __webpack_require__.e(42441), __webpack_require__.e(89536), __webpack_require__.e(53877), __webpack_require__.e(56047), __webpack_require__.e(39236), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(59133)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Detail/Challenges/index.tsx */ 92143));
               }),
               '195': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Shixuns__Detail__Repository__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(93948), __webpack_require__.e(42441), __webpack_require__.e(56047), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(14993), __webpack_require__.e(98688)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Detail/Repository/index.tsx */ 83894));
@@ -138468,19 +138603,19 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Shixuns__Detail__Repository__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(93948), __webpack_require__.e(42441), __webpack_require__.e(56047), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(14993), __webpack_require__.e(98688)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Detail/Repository/index.tsx */ 83894));
               }),
               '197': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Shixuns__Detail__Collaborators__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(93948), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(42441), __webpack_require__.e(56047), __webpack_require__.e(44361), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(34495), __webpack_require__.e(25470)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Detail/Collaborators/index.tsx */ 2403));
+                return Promise.all(/*! import() | p__Shixuns__Detail__Collaborators__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(93948), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(42441), __webpack_require__.e(56047), __webpack_require__.e(44361), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(34495), __webpack_require__.e(25470)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Detail/Collaborators/index.tsx */ 2403));
               }),
               '198': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Shixuns__Detail__Dataset__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(42441), __webpack_require__.e(80457), __webpack_require__.e(56047), __webpack_require__.e(4977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(14993), __webpack_require__.e(86541)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Detail/Dataset/index.tsx */ 62898));
               }),
               '199': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Shixuns__Detail__Discuss__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(42441), __webpack_require__.e(89536), __webpack_require__.e(60720), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(22254)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Detail/Discuss/index.tsx */ 90531));
+                return Promise.all(/*! import() | p__Shixuns__Detail__Discuss__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(42441), __webpack_require__.e(89536), __webpack_require__.e(60720), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(22254)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Detail/Discuss/index.tsx */ 90531));
               }),
               '200': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Shixuns__Detail__RankingList__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(93948), __webpack_require__.e(42441), __webpack_require__.e(56047), __webpack_require__.e(4977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(14993), __webpack_require__.e(6685)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Detail/RankingList/index.tsx */ 87522));
               }),
               '201': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Shixuns__Detail__Settings__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(49127), __webpack_require__.e(90647), __webpack_require__.e(23536), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(19403), __webpack_require__.e(16845)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Detail/Settings/index.tsx */ 32252));
+                return Promise.all(/*! import() | p__Shixuns__Detail__Settings__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(52409), __webpack_require__.e(49127), __webpack_require__.e(90647), __webpack_require__.e(23536), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(19403), __webpack_require__.e(16845)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Detail/Settings/index.tsx */ 32252));
               }),
               '202': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Shixuns__Detail__Repository__Commit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(93948), __webpack_require__.e(42441), __webpack_require__.e(56047), __webpack_require__.e(4977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(14993), __webpack_require__.e(4884)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Detail/Repository/Commit/index.tsx */ 46104));
@@ -138513,7 +138648,7 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Shixuns__Detail__ForkList__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(19215)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Shixuns/Detail/ForkList/index.tsx */ 77172));
               }),
               '212': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '213': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__User__Detail__Videos__Protocol__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(77915), __webpack_require__.e(95176)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Videos/Protocol/index.tsx */ 78461));
@@ -138528,31 +138663,31 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__User__Detail__Topicbank__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(4977), __webpack_require__.e(97594), __webpack_require__.e(98062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Topicbank/index.tsx */ 32331));
               }),
               '217': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__User__Detail__Topics__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(26634), __webpack_require__.e(23744), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(15402)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Topics/Detail/index.tsx */ 36370));
+                return Promise.all(/*! import() | p__User__Detail__Topics__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(26634), __webpack_require__.e(23744), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(15402)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Topics/Detail/index.tsx */ 36370));
               }),
               '218': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__User__Detail__Topics__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(26634), __webpack_require__.e(23744), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(15402)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Topics/Detail/index.tsx */ 36370));
+                return Promise.all(/*! import() | p__User__Detail__Topics__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(26634), __webpack_require__.e(23744), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(15402)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Topics/Detail/index.tsx */ 36370));
               }),
               '219': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__User__Detail__Topics__Normal__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(47821), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(86820)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Topics/Normal/index.tsx */ 67889));
+                return Promise.all(/*! import() | p__User__Detail__Topics__Normal__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(47821), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(86820)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Topics/Normal/index.tsx */ 67889));
               }),
               '220': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__User__Detail__Topics__Group__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99200), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(88517)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Topics/Group/index.tsx */ 70195));
+                return Promise.all(/*! import() | p__User__Detail__Topics__Group__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99200), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(88517)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Topics/Group/index.tsx */ 70195));
               }),
               '221': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__User__Detail__Topics__Exercise__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(43428), __webpack_require__.e(82575), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(7043)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Topics/Exercise/Edit/index.tsx */ 20777));
+                return Promise.all(/*! import() | p__User__Detail__Topics__Exercise__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(43428), __webpack_require__.e(82575), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(7043)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Topics/Exercise/Edit/index.tsx */ 20777));
               }),
               '222': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__User__Detail__Topics__Exercise__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(26634), __webpack_require__.e(27739), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(52806)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Topics/Exercise/Detail/index.tsx */ 71265));
+                return Promise.all(/*! import() | p__User__Detail__Topics__Exercise__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(26634), __webpack_require__.e(27739), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(52806)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Topics/Exercise/Detail/index.tsx */ 71265));
               }),
               '223': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__User__Detail__Topics__Poll__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(73757), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(75043)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Topics/Poll/Edit/index.tsx */ 37065));
+                return Promise.all(/*! import() | p__User__Detail__Topics__Poll__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(73757), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(75043)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Topics/Poll/Edit/index.tsx */ 37065));
               }),
               '224': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__User__Detail__Topics__Poll__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(26634), __webpack_require__.e(81326), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(10799)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Topics/Poll/Detail/index.tsx */ 52966));
+                return Promise.all(/*! import() | p__User__Detail__Topics__Poll__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(26634), __webpack_require__.e(81326), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(10799)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Topics/Poll/Detail/index.tsx */ 52966));
               }),
               '225': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__User__Detail__ExperImentImg__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(97866), __webpack_require__.e(75956), __webpack_require__.e(63157)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/ExperImentImg/Add/index.tsx */ 45682));
+                return Promise.all(/*! import() | p__User__Detail__ExperImentImg__Add__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(97866), __webpack_require__.e(75956), __webpack_require__.e(63157)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/ExperImentImg/Add/index.tsx */ 45682));
               }),
               '226': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__User__Detail__id */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(72529)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/[id].tsx */ 10206));
@@ -138579,10 +138714,10 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__User__Detail__Competitions__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(37825), __webpack_require__.e(73755), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(12076)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Competitions/index.tsx */ 41569));
               }),
               '234': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__User__Detail__ExperImentImg__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(97866), __webpack_require__.e(69244), __webpack_require__.e(94849)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/ExperImentImg/index.tsx */ 34363));
+                return Promise.all(/*! import() | p__User__Detail__ExperImentImg__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(97866), __webpack_require__.e(69244), __webpack_require__.e(94849)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/ExperImentImg/index.tsx */ 34363));
               }),
               '235': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__User__Detail__ExperImentImg__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(97866), __webpack_require__.e(69244), __webpack_require__.e(310)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/ExperImentImg/Detail/index.tsx */ 73673));
+                return Promise.all(/*! import() | p__User__Detail__ExperImentImg__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(97866), __webpack_require__.e(69244), __webpack_require__.e(310)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/ExperImentImg/Detail/index.tsx */ 73673));
               }),
               '236': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__User__Detail__Certificate__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(37825), __webpack_require__.e(44425), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(19011), __webpack_require__.e(65191)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Certificate/index.tsx */ 62026));
@@ -138597,7 +138732,7 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__User__Detail__Projects__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(61169), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(19403), __webpack_require__.e(4736)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Projects/index.tsx */ 60888));
               }),
               '240': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__User__Detail__Videos__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(76980), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(31087), __webpack_require__.e(26634), __webpack_require__.e(72032), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(19403), __webpack_require__.e(6305), __webpack_require__.e(12412)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Videos/index.tsx */ 52226));
+                return Promise.all(/*! import() | p__User__Detail__Videos__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(27627), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(31087), __webpack_require__.e(26634), __webpack_require__.e(72032), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(19403), __webpack_require__.e(6305), __webpack_require__.e(12412)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Videos/index.tsx */ 52226));
               }),
               '241': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__User__Detail__Videos__Upload__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(93125), __webpack_require__.e(42240)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Videos/Upload/index.tsx */ 23939));
@@ -138618,46 +138753,46 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__User__Detail__ResourceGuarantee__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(85731), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(9507)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/ResourceGuarantee/index.tsx */ 25675));
               }),
               '247': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__User__Detail__ResourceAllocation__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(1343)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/ResourceAllocation/index.tsx */ 5815));
+                return Promise.all(/*! import() | p__User__Detail__ResourceAllocation__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(1343)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/ResourceAllocation/index.tsx */ 36233));
               }),
               '248': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return __webpack_require__.e(/*! import() */ 68761).then(__webpack_require__.bind(__webpack_require__, /*! ./EmptyRoute */ 68761));
               }),
               '249': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '250': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Question__Index__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(9951), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(29647)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Question/Index/index.tsx */ 70288));
+                return Promise.all(/*! import() | p__Question__Index__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(9951), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(29647)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Question/Index/index.tsx */ 70288));
               }),
               '251': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Question__AddOrEdit__BatchAdd__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(10485)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Question/AddOrEdit/BatchAdd/index.tsx */ 25366));
               }),
               '252': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Problems__OjForm__NewEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(19842), __webpack_require__.e(43428), __webpack_require__.e(80457), __webpack_require__.e(21560), __webpack_require__.e(74997), __webpack_require__.e(39787), __webpack_require__.e(54204), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(77350), __webpack_require__.e(34741)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problems/OjForm/NewEdit/index.tsx */ 92704));
+                return Promise.all(/*! import() | p__Problems__OjForm__NewEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(19842), __webpack_require__.e(43428), __webpack_require__.e(80457), __webpack_require__.e(21560), __webpack_require__.e(74997), __webpack_require__.e(39787), __webpack_require__.e(54204), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(77350), __webpack_require__.e(34741)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problems/OjForm/NewEdit/index.tsx */ 92704));
               }),
               '253': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Problems__OjForm__NewEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(19842), __webpack_require__.e(43428), __webpack_require__.e(80457), __webpack_require__.e(21560), __webpack_require__.e(74997), __webpack_require__.e(39787), __webpack_require__.e(54204), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(77350), __webpack_require__.e(34741)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problems/OjForm/NewEdit/index.tsx */ 92704));
+                return Promise.all(/*! import() | p__Problems__OjForm__NewEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(19842), __webpack_require__.e(43428), __webpack_require__.e(80457), __webpack_require__.e(21560), __webpack_require__.e(74997), __webpack_require__.e(39787), __webpack_require__.e(54204), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(77350), __webpack_require__.e(34741)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problems/OjForm/NewEdit/index.tsx */ 92704));
               }),
               '254': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Problems__OjForm__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(19842), __webpack_require__.e(43428), __webpack_require__.e(80457), __webpack_require__.e(21560), __webpack_require__.e(61314), __webpack_require__.e(74997), __webpack_require__.e(39787), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(77350), __webpack_require__.e(34994)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problems/OjForm/index.tsx */ 11525));
+                return Promise.all(/*! import() | p__Problems__OjForm__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(19842), __webpack_require__.e(43428), __webpack_require__.e(80457), __webpack_require__.e(21560), __webpack_require__.e(61314), __webpack_require__.e(74997), __webpack_require__.e(39787), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(77350), __webpack_require__.e(34994)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problems/OjForm/index.tsx */ 11525));
               }),
               '255': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Problems__OjForm__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(19842), __webpack_require__.e(43428), __webpack_require__.e(80457), __webpack_require__.e(21560), __webpack_require__.e(61314), __webpack_require__.e(74997), __webpack_require__.e(39787), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(77350), __webpack_require__.e(34994)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problems/OjForm/index.tsx */ 11525));
+                return Promise.all(/*! import() | p__Problems__OjForm__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(19842), __webpack_require__.e(43428), __webpack_require__.e(80457), __webpack_require__.e(21560), __webpack_require__.e(61314), __webpack_require__.e(74997), __webpack_require__.e(39787), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(77350), __webpack_require__.e(34994)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Problems/OjForm/index.tsx */ 11525));
               }),
               '256': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Question__OjProblem__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(89536), __webpack_require__.e(43428), __webpack_require__.e(31087), __webpack_require__.e(93125), __webpack_require__.e(21560), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(77460)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Question/OjProblem/index.tsx */ 68912));
+                return Promise.all(/*! import() | p__Question__OjProblem__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(89536), __webpack_require__.e(43428), __webpack_require__.e(31087), __webpack_require__.e(93125), __webpack_require__.e(21560), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(77460)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Question/OjProblem/index.tsx */ 68912));
               }),
               '257': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Question__OjProblem__RecordDetail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(26588), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(49716)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Question/OjProblem/RecordDetail/index.tsx */ 80428));
+                return Promise.all(/*! import() | p__Question__OjProblem__RecordDetail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(26588), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(49716)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Question/OjProblem/RecordDetail/index.tsx */ 80428));
               }),
               '258': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Question__AddOrEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(80457), __webpack_require__.e(21560), __webpack_require__.e(72422), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(77350), __webpack_require__.e(86913)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Question/AddOrEdit/index.tsx */ 41750));
+                return Promise.all(/*! import() | p__Question__AddOrEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(80457), __webpack_require__.e(21560), __webpack_require__.e(72422), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(77350), __webpack_require__.e(86913)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Question/AddOrEdit/index.tsx */ 41750));
               }),
               '259': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Question__AddOrEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(80457), __webpack_require__.e(21560), __webpack_require__.e(72422), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(77350), __webpack_require__.e(86913)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Question/AddOrEdit/index.tsx */ 41750));
+                return Promise.all(/*! import() | p__Question__AddOrEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(80457), __webpack_require__.e(21560), __webpack_require__.e(72422), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(77350), __webpack_require__.e(86913)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Question/AddOrEdit/index.tsx */ 41750));
               }),
               '260': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '261': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Engineering__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(13006)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Engineering/index.tsx */ 97698));
@@ -138717,10 +138852,10 @@ function _getRoutes() {
                 return __webpack_require__.e(/*! import() */ 68761).then(__webpack_require__.bind(__webpack_require__, /*! ./EmptyRoute */ 68761));
               }),
               '280': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '281': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Innovation__Tasks__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(85731), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(56156), __webpack_require__.e(48691), __webpack_require__.e(78974), __webpack_require__.e(4977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(51315), __webpack_require__.e(86634)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Innovation/Tasks/index.jsx */ 49364));
+                return Promise.all(/*! import() | p__Innovation__Tasks__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(85731), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(43428), __webpack_require__.e(56156), __webpack_require__.e(48691), __webpack_require__.e(78974), __webpack_require__.e(4977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(51315), __webpack_require__.e(86634)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Innovation/Tasks/index.jsx */ 49364));
               }),
               '282': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Innovation__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(20680)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Innovation/index.tsx */ 32830));
@@ -138750,37 +138885,37 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Innovation__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(14642), __webpack_require__.e(36784)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Innovation/Edit/index.tsx */ 21654));
               }),
               '291': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Innovation__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(85731), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(53877), __webpack_require__.e(78974), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(83141)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Innovation/Detail/index.tsx */ 29214));
+                return Promise.all(/*! import() | p__Innovation__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(85731), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(53877), __webpack_require__.e(78974), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(83141)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Innovation/Detail/index.tsx */ 29214));
               }),
               '292': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return __webpack_require__.e(/*! import() */ 68761).then(__webpack_require__.bind(__webpack_require__, /*! ./EmptyRoute */ 68761));
               }),
               '293': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__tasks__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(89536), __webpack_require__.e(56156), __webpack_require__.e(80457), __webpack_require__.e(12911), __webpack_require__.e(21560), __webpack_require__.e(48691), __webpack_require__.e(62010), __webpack_require__.e(30851), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(51315), __webpack_require__.e(11649), __webpack_require__.e(14058), __webpack_require__.e(93665)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/tasks/index.jsx */ 68157));
+                return Promise.all(/*! import() | p__tasks__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(89536), __webpack_require__.e(56156), __webpack_require__.e(80457), __webpack_require__.e(12911), __webpack_require__.e(21560), __webpack_require__.e(48691), __webpack_require__.e(62010), __webpack_require__.e(30851), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(51315), __webpack_require__.e(11649), __webpack_require__.e(14058), __webpack_require__.e(93665)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/tasks/index.jsx */ 78105));
               }),
               '294': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__tasks__Jupyter__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(43428), __webpack_require__.e(62010), __webpack_require__.e(92113), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(11649), __webpack_require__.e(20700)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/tasks/Jupyter/index.tsx */ 37818));
+                return Promise.all(/*! import() | p__tasks__Jupyter__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(43428), __webpack_require__.e(62010), __webpack_require__.e(92113), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(11649), __webpack_require__.e(20700)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/tasks/Jupyter/index.tsx */ 37818));
               }),
               '295': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__tasks__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(89536), __webpack_require__.e(56156), __webpack_require__.e(80457), __webpack_require__.e(12911), __webpack_require__.e(21560), __webpack_require__.e(48691), __webpack_require__.e(62010), __webpack_require__.e(30851), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(51315), __webpack_require__.e(11649), __webpack_require__.e(14058), __webpack_require__.e(93665)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/tasks/index.jsx */ 68157));
+                return Promise.all(/*! import() | p__tasks__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(89536), __webpack_require__.e(56156), __webpack_require__.e(80457), __webpack_require__.e(12911), __webpack_require__.e(21560), __webpack_require__.e(48691), __webpack_require__.e(62010), __webpack_require__.e(30851), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(51315), __webpack_require__.e(11649), __webpack_require__.e(14058), __webpack_require__.e(93665)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/tasks/index.jsx */ 78105));
               }),
               '296': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__tasks__Jupyter__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(43428), __webpack_require__.e(62010), __webpack_require__.e(92113), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(11649), __webpack_require__.e(20700)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/tasks/Jupyter/index.tsx */ 37818));
+                return Promise.all(/*! import() | p__tasks__Jupyter__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(43428), __webpack_require__.e(62010), __webpack_require__.e(92113), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(11649), __webpack_require__.e(20700)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/tasks/Jupyter/index.tsx */ 37818));
               }),
               '297': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__tasks__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(89536), __webpack_require__.e(56156), __webpack_require__.e(80457), __webpack_require__.e(12911), __webpack_require__.e(21560), __webpack_require__.e(48691), __webpack_require__.e(62010), __webpack_require__.e(30851), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(51315), __webpack_require__.e(11649), __webpack_require__.e(14058), __webpack_require__.e(93665)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/tasks/index.jsx */ 68157));
+                return Promise.all(/*! import() | p__tasks__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(89536), __webpack_require__.e(56156), __webpack_require__.e(80457), __webpack_require__.e(12911), __webpack_require__.e(21560), __webpack_require__.e(48691), __webpack_require__.e(62010), __webpack_require__.e(30851), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(51315), __webpack_require__.e(11649), __webpack_require__.e(14058), __webpack_require__.e(93665)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/tasks/index.jsx */ 78105));
               }),
               '298': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return __webpack_require__.e(/*! import() */ 68761).then(__webpack_require__.bind(__webpack_require__, /*! ./EmptyRoute */ 68761));
               }),
               '299': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__MyProblem__RecordDetail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(26588), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(56156), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(17527)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/MyProblem/RecordDetail/index.tsx */ 15144));
+                return Promise.all(/*! import() | p__MyProblem__RecordDetail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(26588), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(56156), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(17527)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/MyProblem/RecordDetail/index.tsx */ 15144));
               }),
               '300': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__MyProblem__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(89536), __webpack_require__.e(43428), __webpack_require__.e(56156), __webpack_require__.e(21560), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(51315), __webpack_require__.e(36270)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/MyProblem/index.tsx */ 48508));
+                return Promise.all(/*! import() | p__MyProblem__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(89536), __webpack_require__.e(43428), __webpack_require__.e(56156), __webpack_require__.e(21560), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(51315), __webpack_require__.e(36270)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/MyProblem/index.tsx */ 48508));
               }),
               '301': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '302': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Account__index */[__webpack_require__.e(45582), __webpack_require__.e(60547)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Account/index.tsx */ 57296));
@@ -138804,19 +138939,19 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Account__Results__index */[__webpack_require__.e(28647), __webpack_require__.e(46573), __webpack_require__.e(26588), __webpack_require__.e(14514)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Account/Results/index.tsx */ 14728));
               }),
               '309': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '310': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__RestFul__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(70928)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/RestFul/Edit/index.tsx */ 81052));
+                return Promise.all(/*! import() | p__RestFul__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(70928)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/RestFul/Edit/index.tsx */ 81052));
               }),
               '311': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__RestFul__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(98228), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(31006)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/RestFul/index.tsx */ 85742));
+                return Promise.all(/*! import() | p__RestFul__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(98228), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(31006)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/RestFul/index.tsx */ 85742));
               }),
               '312': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__RestFul__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(98228), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(31006)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/RestFul/index.tsx */ 85742));
+                return Promise.all(/*! import() | p__RestFul__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(77808), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(98228), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(31006)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/RestFul/index.tsx */ 85742));
               }),
               '313': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '314': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__User__Detail__Order__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(34668), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(21939)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Order/index.tsx */ 35617));
@@ -138837,31 +138972,31 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__User__Detail__Order__pages__orderInformation__index */[__webpack_require__.e(59981), __webpack_require__.e(85111)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Order/pages/orderInformation/index.tsx */ 26557));
               }),
               '320': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__User__Detail__Order__pages__orderPay__index */[__webpack_require__.e(59981), __webpack_require__.e(15845), __webpack_require__.e(30264)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Order/pages/orderPay/index.tsx */ 88962));
+                return Promise.all(/*! import() | p__User__Detail__Order__pages__orderPay__index */[__webpack_require__.e(59981), __webpack_require__.e(15845), __webpack_require__.e(30264)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Order/pages/orderPay/index.tsx */ 51099));
               }),
               '321': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__User__Detail__Order__pages__result__index */[__webpack_require__.e(59981), __webpack_require__.e(53114), __webpack_require__.e(44259)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/Detail/Order/pages/result/index.tsx */ 28310));
               }),
               '322': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '323': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Messages__Tidings__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(94078)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Messages/Tidings/index.tsx */ 52925));
               }),
               '324': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Messages__Private__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(52829)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Messages/Private/index.tsx */ 82699));
+                return Promise.all(/*! import() | p__Messages__Private__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(52829)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Messages/Private/index.tsx */ 82699));
               }),
               '325': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Messages__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(89536), __webpack_require__.e(75005), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(45359)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Messages/Detail/index.tsx */ 91889));
+                return Promise.all(/*! import() | p__Messages__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(89536), __webpack_require__.e(75005), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(45359)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Messages/Detail/index.tsx */ 91889));
               }),
               '326': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '327': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | layouts__virtualDetail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(26588), __webpack_require__.e(88652), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(30335), __webpack_require__.e(19403), __webpack_require__.e(3001), __webpack_require__.e(40559)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/virtualDetail/index.tsx */ 42570));
               }),
               '328': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Homepage__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(34830), __webpack_require__.e(33747)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Homepage/index.tsx */ 71025));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Homepage__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(34830), __webpack_require__.e(33747)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Homepage/index.tsx */ 71025));
               }),
               '329': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__virtualSpaces__Lists__Workplace__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(26588), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(52409), __webpack_require__.e(4977), __webpack_require__.e(4757)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Workplace/index.tsx */ 17512));
@@ -138870,16 +139005,16 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__virtualSpaces__Lists__Experiment__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(37825), __webpack_require__.e(43428), __webpack_require__.e(43695), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(19403), __webpack_require__.e(71783)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Experiment/index.tsx */ 73840));
               }),
               '331': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Announcement__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(37825), __webpack_require__.e(64802), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(65816)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Announcement/index.tsx */ 76079));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Announcement__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(37825), __webpack_require__.e(64802), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(65816)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Announcement/index.tsx */ 76079));
               }),
               '332': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Announcement__AddAndEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(34830), __webpack_require__.e(89677)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Announcement/AddAndEdit/index.tsx */ 73267));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Announcement__AddAndEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(34830), __webpack_require__.e(89677)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Announcement/AddAndEdit/index.tsx */ 73267));
               }),
               '333': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Announcement__AddAndEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(34830), __webpack_require__.e(89677)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Announcement/AddAndEdit/index.tsx */ 73267));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Announcement__AddAndEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(34830), __webpack_require__.e(89677)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Announcement/AddAndEdit/index.tsx */ 73267));
               }),
               '334': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Announcement__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(37825), __webpack_require__.e(10375), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(46796)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Announcement/Detail/index.tsx */ 53193));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Announcement__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(37825), __webpack_require__.e(10375), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(46796)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Announcement/Detail/index.tsx */ 53193));
               }),
               '335': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__virtualSpaces__Lists__Survey__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(24504)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Survey/index.tsx */ 82603));
@@ -138888,37 +139023,37 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__virtualSpaces__Lists__Survey__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(37825), __webpack_require__.e(34712), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(25954), __webpack_require__.e(87058)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Survey/Detail/index.tsx */ 64589));
               }),
               '337': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Knowledge__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(12911), __webpack_require__.e(13566), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(38447)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Knowledge/index.tsx */ 11943));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Knowledge__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(12911), __webpack_require__.e(13566), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(38447)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Knowledge/index.tsx */ 11943));
               }),
               '338': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Knowledge__AddAndEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(91045)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Knowledge/AddAndEdit/index.tsx */ 52985));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Knowledge__AddAndEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(91045)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Knowledge/AddAndEdit/index.tsx */ 52985));
               }),
               '339': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Knowledge__AddAndEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(91045)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Knowledge/AddAndEdit/index.tsx */ 52985));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Knowledge__AddAndEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(91045)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Knowledge/AddAndEdit/index.tsx */ 52985));
               }),
               '340': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Material__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(35238)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Material/index.tsx */ 65711));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Material__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(35238)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Material/index.tsx */ 65711));
               }),
               '341': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Material__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(94715)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Material/Detail/index.tsx */ 48377));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Material__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(94715)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Material/Detail/index.tsx */ 48377));
               }),
               '342': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Lesson__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(48923), __webpack_require__.e(23873)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Lesson/index.tsx */ 54460));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Lesson__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(48923), __webpack_require__.e(23873)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Lesson/index.tsx */ 54460));
               }),
               '343': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Lesson__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(48923), __webpack_require__.e(86069)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Lesson/Detail/index.tsx */ 69402));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Lesson__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(48923), __webpack_require__.e(86069)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Lesson/Detail/index.tsx */ 69402));
               }),
               '344': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Lesson__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(48923), __webpack_require__.e(86069)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Lesson/Detail/index.tsx */ 69402));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Lesson__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(48923), __webpack_require__.e(86069)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Lesson/Detail/index.tsx */ 69402));
               }),
               '345': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Discussion__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(76006), __webpack_require__.e(96265)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Discussion/index.tsx */ 58322));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Discussion__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(76006), __webpack_require__.e(96265)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Discussion/index.tsx */ 58322));
               }),
               '346': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Discussion__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(76006), __webpack_require__.e(78563)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Discussion/Detail/index.tsx */ 58743));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Discussion__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(76006), __webpack_require__.e(78563)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Discussion/Detail/index.tsx */ 58743));
               }),
               '347': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Discussion__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(76006), __webpack_require__.e(78563)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Discussion/Detail/index.tsx */ 58743));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Discussion__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(76006), __webpack_require__.e(78563)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Discussion/Detail/index.tsx */ 58743));
               }),
               '348': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__virtualSpaces__Lists__Settings__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(61713)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Settings/index.tsx */ 47336));
@@ -138939,19 +139074,19 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__virtualSpaces__Lists__DigitalTopics__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(67589)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/DigitalTopics/index.tsx */ 44725));
               }),
               '354': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Homepage__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(34830), __webpack_require__.e(33747)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Homepage/index.tsx */ 71025));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Homepage__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(34830), __webpack_require__.e(33747)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Homepage/index.tsx */ 71025));
               }),
               '355': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return __webpack_require__.e(/*! import() | p__virtualSpaces__Lists__Construction__index */ 25705).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Construction/index.tsx */ 39515));
               }),
               '356': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '357': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | layouts__virtualDetail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(26588), __webpack_require__.e(88652), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(30335), __webpack_require__.e(19403), __webpack_require__.e(3001), __webpack_require__.e(40559)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/virtualDetail/index.tsx */ 42570));
               }),
               '358': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Homepage__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(34830), __webpack_require__.e(33747)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Homepage/index.tsx */ 71025));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Homepage__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(34830), __webpack_require__.e(33747)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Homepage/index.tsx */ 71025));
               }),
               '359': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__virtualSpaces__Lists__Workplace__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(26588), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(52409), __webpack_require__.e(4977), __webpack_require__.e(4757)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Workplace/index.tsx */ 17512));
@@ -138960,16 +139095,16 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__virtualSpaces__Lists__Experiment__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(37825), __webpack_require__.e(43428), __webpack_require__.e(43695), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(19403), __webpack_require__.e(71783)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Experiment/index.tsx */ 73840));
               }),
               '361': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Announcement__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(37825), __webpack_require__.e(64802), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(65816)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Announcement/index.tsx */ 76079));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Announcement__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(37825), __webpack_require__.e(64802), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(65816)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Announcement/index.tsx */ 76079));
               }),
               '362': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Announcement__AddAndEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(34830), __webpack_require__.e(89677)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Announcement/AddAndEdit/index.tsx */ 73267));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Announcement__AddAndEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(34830), __webpack_require__.e(89677)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Announcement/AddAndEdit/index.tsx */ 73267));
               }),
               '363': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Announcement__AddAndEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(34830), __webpack_require__.e(89677)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Announcement/AddAndEdit/index.tsx */ 73267));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Announcement__AddAndEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(34830), __webpack_require__.e(89677)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Announcement/AddAndEdit/index.tsx */ 73267));
               }),
               '364': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Announcement__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(37825), __webpack_require__.e(10375), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(46796)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Announcement/Detail/index.tsx */ 53193));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Announcement__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(37825), __webpack_require__.e(10375), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(46796)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Announcement/Detail/index.tsx */ 53193));
               }),
               '365': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__virtualSpaces__Lists__Survey__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(24504)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Survey/index.tsx */ 82603));
@@ -138978,37 +139113,37 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__virtualSpaces__Lists__Survey__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(37825), __webpack_require__.e(34712), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(25954), __webpack_require__.e(87058)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Survey/Detail/index.tsx */ 64589));
               }),
               '367': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Knowledge__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(12911), __webpack_require__.e(13566), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(38447)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Knowledge/index.tsx */ 11943));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Knowledge__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(12911), __webpack_require__.e(13566), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(38447)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Knowledge/index.tsx */ 11943));
               }),
               '368': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Knowledge__AddAndEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(91045)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Knowledge/AddAndEdit/index.tsx */ 52985));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Knowledge__AddAndEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(91045)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Knowledge/AddAndEdit/index.tsx */ 52985));
               }),
               '369': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Knowledge__AddAndEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(91045)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Knowledge/AddAndEdit/index.tsx */ 52985));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Knowledge__AddAndEdit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(91045)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Knowledge/AddAndEdit/index.tsx */ 52985));
               }),
               '370': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Material__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(35238)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Material/index.tsx */ 65711));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Material__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(35238)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Material/index.tsx */ 65711));
               }),
               '371': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Material__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(94715)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Material/Detail/index.tsx */ 48377));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Material__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(94715)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Material/Detail/index.tsx */ 48377));
               }),
               '372': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Lesson__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(48923), __webpack_require__.e(23873)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Lesson/index.tsx */ 54460));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Lesson__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(48923), __webpack_require__.e(23873)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Lesson/index.tsx */ 54460));
               }),
               '373': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Lesson__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(48923), __webpack_require__.e(86069)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Lesson/Detail/index.tsx */ 69402));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Lesson__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(48923), __webpack_require__.e(86069)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Lesson/Detail/index.tsx */ 69402));
               }),
               '374': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Lesson__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(48923), __webpack_require__.e(86069)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Lesson/Detail/index.tsx */ 69402));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Lesson__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(48923), __webpack_require__.e(86069)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Lesson/Detail/index.tsx */ 69402));
               }),
               '375': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Discussion__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(76006), __webpack_require__.e(96265)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Discussion/index.tsx */ 58322));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Discussion__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(76006), __webpack_require__.e(96265)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Discussion/index.tsx */ 58322));
               }),
               '376': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Discussion__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(76006), __webpack_require__.e(78563)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Discussion/Detail/index.tsx */ 58743));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Discussion__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(76006), __webpack_require__.e(78563)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Discussion/Detail/index.tsx */ 58743));
               }),
               '377': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Discussion__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(76006), __webpack_require__.e(78563)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Discussion/Detail/index.tsx */ 58743));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Discussion__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(76006), __webpack_require__.e(78563)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Discussion/Detail/index.tsx */ 58743));
               }),
               '378': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__virtualSpaces__Lists__Settings__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(61713)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Settings/index.tsx */ 47336));
@@ -139029,13 +139164,13 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__virtualSpaces__Lists__DigitalTopics__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(67589)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/DigitalTopics/index.tsx */ 44725));
               }),
               '384': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__virtualSpaces__Lists__Homepage__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(34830), __webpack_require__.e(33747)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Homepage/index.tsx */ 71025));
+                return Promise.all(/*! import() | p__virtualSpaces__Lists__Homepage__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(34830), __webpack_require__.e(33747)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Homepage/index.tsx */ 71025));
               }),
               '385': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return __webpack_require__.e(/*! import() | p__virtualSpaces__Lists__Construction__index */ 25705).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/virtualSpaces/Lists/Construction/index.tsx */ 39515));
               }),
               '386': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '387': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return __webpack_require__.e(/*! import() | p__Administration__index */ 4766).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Administration/index.tsx */ 59007));
@@ -139050,7 +139185,7 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Administration__Student__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(45179)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Administration/Student/Edit/index.tsx */ 14322));
               }),
               '391': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '392': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Graduations__Index__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(19403), __webpack_require__.e(91831)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Index/index.tsx */ 16118));
@@ -139059,34 +139194,34 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Graduations__Review__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(85731), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(25954), __webpack_require__.e(72539)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Review/index.tsx */ 97137));
               }),
               '394': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__GraduationsDetail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(25490), __webpack_require__.e(38143)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/GraduationsDetail/index.tsx */ 76509));
+                return Promise.all(/*! import() | layouts__GraduationsDetail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(25954), __webpack_require__.e(25490), __webpack_require__.e(38143)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/GraduationsDetail/index.tsx */ 76509));
               }),
               '395': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Graduations__Lists__Index__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(92461), __webpack_require__.e(49127), __webpack_require__.e(76678), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(64473), __webpack_require__.e(55624)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/Index/index.tsx */ 64079));
+                return Promise.all(/*! import() | p__Graduations__Lists__Index__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(92461), __webpack_require__.e(49127), __webpack_require__.e(76678), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(64473), __webpack_require__.e(55624)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/Index/index.tsx */ 64079));
               }),
               '396': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Graduations__Lists__Topics__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(51461)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/Topics/index.tsx */ 56435));
+                return Promise.all(/*! import() | p__Graduations__Lists__Topics__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(51461)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/Topics/index.tsx */ 56435));
               }),
               '397': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Graduations__Lists__StudentSelection__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(64473), __webpack_require__.e(54492)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/StudentSelection/index.tsx */ 22243));
+                return Promise.all(/*! import() | p__Graduations__Lists__StudentSelection__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(64473), __webpack_require__.e(54492)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/StudentSelection/index.tsx */ 22243));
               }),
               '398': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Graduations__Lists__Tasks__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(19208), __webpack_require__.e(86129), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(64473), __webpack_require__.e(9416)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/Tasks/index.tsx */ 23735));
+                return Promise.all(/*! import() | p__Graduations__Lists__Tasks__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(19208), __webpack_require__.e(86129), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(64473), __webpack_require__.e(9416)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/Tasks/index.tsx */ 23735));
               }),
               '399': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Graduations__Lists__StageModule__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(64473), __webpack_require__.e(82443)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/StageModule/index.tsx */ 29553));
+                return Promise.all(/*! import() | p__Graduations__Lists__StageModule__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(64473), __webpack_require__.e(82443)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/StageModule/index.tsx */ 29553));
               }),
               '400': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Graduations__Lists__StageModule__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(64473), __webpack_require__.e(82443)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/StageModule/index.tsx */ 29553));
+                return Promise.all(/*! import() | p__Graduations__Lists__StageModule__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(64473), __webpack_require__.e(82443)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/StageModule/index.tsx */ 29553));
               }),
               '401': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Graduations__Lists__StageModule__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(64473), __webpack_require__.e(82443)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/StageModule/index.tsx */ 29553));
+                return Promise.all(/*! import() | p__Graduations__Lists__StageModule__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(64473), __webpack_require__.e(82443)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/StageModule/index.tsx */ 29553));
               }),
               '402': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Graduations__Lists__StageModule__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(64473), __webpack_require__.e(82443)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/StageModule/index.tsx */ 29553));
+                return Promise.all(/*! import() | p__Graduations__Lists__StageModule__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(64473), __webpack_require__.e(82443)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/StageModule/index.tsx */ 29553));
               }),
               '403': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Graduations__Lists__StageModule__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(64473), __webpack_require__.e(82443)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/StageModule/index.tsx */ 29553));
+                return Promise.all(/*! import() | p__Graduations__Lists__StageModule__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(64473), __webpack_require__.e(82443)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/StageModule/index.tsx */ 29553));
               }),
               '404': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Graduations__Lists__Settings__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(25022)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/Settings/index.tsx */ 52838));
@@ -139098,7 +139233,7 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Graduations__Lists__Personmanage__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(25490), __webpack_require__.e(66063)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/Personmanage/index.tsx */ 9635));
               }),
               '407': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Graduations__Lists__Archives__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(19208), __webpack_require__.e(86129), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(64473), __webpack_require__.e(47545)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/Archives/index.tsx */ 60487));
+                return Promise.all(/*! import() | p__Graduations__Lists__Archives__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(52409), __webpack_require__.e(19208), __webpack_require__.e(86129), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(86637), __webpack_require__.e(64473), __webpack_require__.e(47545)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/Archives/index.tsx */ 60487));
               }),
               '408': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Graduations__Lists__Gradingsummary__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(85731), __webpack_require__.e(37825), __webpack_require__.e(4977), __webpack_require__.e(25954), __webpack_require__.e(11253)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Graduations/Lists/Gradingsummary/index.tsx */ 92596));
@@ -139107,10 +139242,10 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Demo__index */[__webpack_require__.e(85160), __webpack_require__.e(41330), __webpack_require__.e(14058)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Demo/index.tsx */ 96554));
               }),
               '410': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '411': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__IntrainCourse__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(41867), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(9951), __webpack_require__.e(76938), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(54056)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/IntrainCourse/index.tsx */ 33735));
+                return Promise.all(/*! import() | p__IntrainCourse__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(41867), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(9951), __webpack_require__.e(76938), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(54056)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/IntrainCourse/index.tsx */ 33735));
               }),
               '412': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__User__BindAccount__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(26588), __webpack_require__.e(77808), __webpack_require__.e(27178)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/BindAccount/index.tsx */ 23044));
@@ -139149,22 +139284,22 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__User__ResetPassword__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(26588), __webpack_require__.e(77808), __webpack_require__.e(27182)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/User/ResetPassword/index.tsx */ 68570));
               }),
               '424': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '425': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Colleges__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(42441), __webpack_require__.e(4977), __webpack_require__.e(12476)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Colleges/index.tsx */ 12077));
               }),
               '426': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '427': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Help__Index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(19403), __webpack_require__.e(35729)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Help/Index.tsx */ 57246));
+                return Promise.all(/*! import() | p__Help__Index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(59981), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(19403), __webpack_require__.e(35729)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Help/Index.tsx */ 57246));
               }),
               '428': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '429': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Video__Detail__id */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(31087), __webpack_require__.e(56168), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(6305), __webpack_require__.e(96444)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Video/Detail/[id].tsx */ 32892));
+                return Promise.all(/*! import() | p__Video__Detail__id */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(31087), __webpack_require__.e(56168), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(6305), __webpack_require__.e(96444)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Video/Detail/[id].tsx */ 32892));
               }),
               '430': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Terminal__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(26588), __webpack_require__.e(93948), __webpack_require__.e(56156), __webpack_require__.e(48691), __webpack_require__.e(65111)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Terminal/index.tsx */ 22806));
@@ -139173,10 +139308,10 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__Report__index */[__webpack_require__.e(59981), __webpack_require__.e(22307)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Report/index.tsx */ 22178));
               }),
               '432': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
+                return Promise.all(/*! import() | layouts__SimpleLayouts */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(9951), __webpack_require__.e(42563), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(37062)]).then(__webpack_require__.bind(__webpack_require__, /*! @/layouts/SimpleLayouts.tsx */ 90266));
               }),
               '433': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(76980), __webpack_require__.e(93948), __webpack_require__.e(99313), __webpack_require__.e(31087), __webpack_require__.e(9951), __webpack_require__.e(45413), __webpack_require__.e(62945), __webpack_require__.e(42563), __webpack_require__.e(38365), __webpack_require__.e(4977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(88866)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/index.tsx */ 8441));
+                return Promise.all(/*! import() | p__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(59981), __webpack_require__.e(27627), __webpack_require__.e(93948), __webpack_require__.e(99313), __webpack_require__.e(31087), __webpack_require__.e(9951), __webpack_require__.e(45413), __webpack_require__.e(62945), __webpack_require__.e(42563), __webpack_require__.e(38365), __webpack_require__.e(4977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(88866)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/index.tsx */ 8441));
               }),
               '434': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return __webpack_require__.e(/*! import() | p__Api__index */ 62300).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Api/index.tsx */ 3591));
@@ -139188,22 +139323,22 @@ function _getRoutes() {
                 return Promise.all(/*! import() | p__MoopCases__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(41867), __webpack_require__.e(83212)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/MoopCases/index.tsx */ 66090));
               }),
               '437': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__MoopCases__FormPanel__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(9594), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(76904)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/MoopCases/FormPanel/index.tsx */ 22937));
+                return Promise.all(/*! import() | p__MoopCases__FormPanel__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(9594), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(76904)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/MoopCases/FormPanel/index.tsx */ 22937));
               }),
               '438': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__MoopCases__InfoPanel__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(37091), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(51855)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/MoopCases/InfoPanel/index.tsx */ 27166));
+                return Promise.all(/*! import() | p__MoopCases__InfoPanel__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(37091), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41977), __webpack_require__.e(51855)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/MoopCases/InfoPanel/index.tsx */ 27166));
               }),
               '439': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__MoopCases__FormPanel__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(9594), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(76904)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/MoopCases/FormPanel/index.tsx */ 22937));
+                return Promise.all(/*! import() | p__MoopCases__FormPanel__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(9594), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(76904)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/MoopCases/FormPanel/index.tsx */ 22937));
               }),
               '440': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return __webpack_require__.e(/*! import() | p__MoopCases__Success__index */ 51276).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/MoopCases/Success/index.tsx */ 66815));
               }),
               '441': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Paperlibrary__Random__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(19842), __webpack_require__.e(56156), __webpack_require__.e(30335), __webpack_require__.e(47758), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(53210), __webpack_require__.e(75816)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paperlibrary/Random/Edit/index.tsx */ 81974));
+                return Promise.all(/*! import() | p__Paperlibrary__Random__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(19842), __webpack_require__.e(56156), __webpack_require__.e(30335), __webpack_require__.e(47758), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(53210), __webpack_require__.e(75816)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paperlibrary/Random/Edit/index.tsx */ 81974));
               }),
               '442': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Paperlibrary__Random__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(19842), __webpack_require__.e(56156), __webpack_require__.e(30335), __webpack_require__.e(47758), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(53210), __webpack_require__.e(75816)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paperlibrary/Random/Edit/index.tsx */ 81974));
+                return Promise.all(/*! import() | p__Paperlibrary__Random__Edit__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(89868), __webpack_require__.e(72315), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(37825), __webpack_require__.e(99313), __webpack_require__.e(19842), __webpack_require__.e(56156), __webpack_require__.e(30335), __webpack_require__.e(47758), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(53210), __webpack_require__.e(75816)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paperlibrary/Random/Edit/index.tsx */ 81974));
               }),
               '443': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__Paperlibrary__Random__Detail__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(59981), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(85731), __webpack_require__.e(99313), __webpack_require__.e(50251), __webpack_require__.e(14000), __webpack_require__.e(33784)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Paperlibrary/Random/Detail/index.tsx */ 27038));
@@ -139218,34 +139353,34 @@ function _getRoutes() {
                 return __webpack_require__.e(/*! import() | p__HttpStatus__404 */ 66531).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/HttpStatus/404.tsx */ 2609));
               }),
               '447': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__HttpStatus__HpcCourse */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(64496)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/HttpStatus/HpcCourse.tsx */ 85914));
+                return Promise.all(/*! import() | p__HttpStatus__HpcCourse */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(64496)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/HttpStatus/HpcCourse.tsx */ 85914));
               }),
               '448': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__HttpStatus__SixActivities */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(50812), __webpack_require__.e(34333), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(79817), __webpack_require__.e(3509)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/HttpStatus/SixActivities.tsx */ 90155));
               }),
               '449': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__HttpStatus__HpcCourse */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(64496)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/HttpStatus/HpcCourse.tsx */ 85914));
+                return Promise.all(/*! import() | p__HttpStatus__HpcCourse */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(64496)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/HttpStatus/HpcCourse.tsx */ 85914));
               }),
               '450': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__HttpStatus__HpcCourse */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(64496)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/HttpStatus/HpcCourse.tsx */ 85914));
+                return Promise.all(/*! import() | p__HttpStatus__HpcCourse */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(64496)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/HttpStatus/HpcCourse.tsx */ 85914));
               }),
               '451': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return Promise.all(/*! import() | p__HttpStatus__UserAgents */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(41867), __webpack_require__.e(66034)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/HttpStatus/UserAgents.tsx */ 71128));
               }),
               '452': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Three__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(48302), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(8999)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Three/index.tsx */ 68590));
+                return Promise.all(/*! import() | p__Three__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(93948), __webpack_require__.e(48826), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(48302), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(8999)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Three/index.tsx */ 68590));
               }),
               '453': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return __webpack_require__.e(/*! import() | p__HttpStatus__introduction */ 53910).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/HttpStatus/introduction.tsx */ 19282));
               }),
               '454': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | p__Message__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(76980), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(21773), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(30067)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Message/index.tsx */ 85354));
+                return Promise.all(/*! import() | p__Message__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(89868), __webpack_require__.e(27627), __webpack_require__.e(85731), __webpack_require__.e(37091), __webpack_require__.e(54513), __webpack_require__.e(85160), __webpack_require__.e(37966), __webpack_require__.e(21773), __webpack_require__.e(4977), __webpack_require__.e(44888), __webpack_require__.e(41330), __webpack_require__.e(41977), __webpack_require__.e(34830), __webpack_require__.e(30067)]).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/Message/index.tsx */ 85354));
               }),
               '455': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
                 return __webpack_require__.e(/*! import() | p__HttpStatus__404 */ 66531).then(__webpack_require__.bind(__webpack_require__, /*! @/pages/HttpStatus/404.tsx */ 2609));
               }),
               '@@/global-layout': /*#__PURE__*/_react_17_0_2_react.lazy(function () {
-                return Promise.all(/*! import() | layouts__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(99313), __webpack_require__.e(4977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(40847), __webpack_require__.e(63998), __webpack_require__.e(41717)]).then(__webpack_require__.bind(__webpack_require__, /*! ./src/layouts/index.tsx */ 54355));
+                return Promise.all(/*! import() | layouts__index */[__webpack_require__.e(28647), __webpack_require__.e(84728), __webpack_require__.e(6848), __webpack_require__.e(46573), __webpack_require__.e(50812), __webpack_require__.e(26588), __webpack_require__.e(34333), __webpack_require__.e(96232), __webpack_require__.e(24665), __webpack_require__.e(88652), __webpack_require__.e(20834), __webpack_require__.e(91857), __webpack_require__.e(5112), __webpack_require__.e(77808), __webpack_require__.e(41867), __webpack_require__.e(78782), __webpack_require__.e(77437), __webpack_require__.e(72315), __webpack_require__.e(99313), __webpack_require__.e(4977), __webpack_require__.e(55351), __webpack_require__.e(53114), __webpack_require__.e(30797), __webpack_require__.e(19403), __webpack_require__.e(68337), __webpack_require__.e(63998), __webpack_require__.e(41717)]).then(__webpack_require__.bind(__webpack_require__, /*! ./src/layouts/index.tsx */ 54355));
               })
             }
           });