@kkcompany/player 2.25.0-canary.2 → 2.25.0-canary.20

package/dist/modules.mjs

@@ -21,7 +21,7 @@ const ignoreMinorError = async (event, {
   retry,
   retryTimes
 } = {}) => {
-  var _event$response, _event$response2, _event$config, _event$config2;
+  var _event$response, _event$response2, _event$response3;
 
   console.warn(event);
 
@@ -30,17 +30,34 @@ const ignoreMinorError = async (event, {
     return retry();
   }
 
-  if (/start$|info$|heartbeat$/.test((_event$config = event.config) === null || _event$config === void 0 ? void 0 : _event$config.url)) {
+  const url = new URL(((_event$response3 = event.response) === null || _event$response3 === void 0 ? void 0 : _event$response3.url) || 'http://unknown/');
+
+  if (/start$|info$|heartbeat$/.test(url.pathname)) {
     return Promise.reject(event);
   }
 
-  if (/end$/.test((_event$config2 = event.config) === null || _event$config2 === void 0 ? void 0 : _event$config2.url)) {
+  if (/end$/.test(url.pathname)) {
     return Promise.resolve();
   }
 
   console.log('Ignore non-critical playback API fail', event);
   return new Promise(() => {});
 };
+/** @param {Response} response */
+
+
+const handleFetchResponse = response => {
+  if (response.ok) {
+    return response.status === 200 ? response.json() : '';
+  }
+
+  return response.json().then(errorData => {
+    const error = new Error(`HTTP error status: ${response.status} ${errorData.message}`);
+    error.data = errorData;
+    error.response = response;
+    return Promise.reject(error);
+  });
+};
 
 const createApi = (config, {
   onError = ignoreMinorError
@@ -68,7 +85,7 @@ const createApi = (config, {
   } = {}) => handleRequestError(() => fetch(`${url}?${new URLSearchParams(params).toString()}`, {
     method,
     headers: getHeaders()
-  }).then(response => response.json()), {
+  }).then(handleFetchResponse), {
     onError
   });
 
@@ -82,7 +99,7 @@ const createApi = (config, {
   }).toString()}`, {
     method,
     headers: getHeaders()
-  }).then(response => response.json()), {
+  }).then(handleFetchResponse), {
     onError
   });
 
@@ -373,38 +390,6 @@ const validateEnvironment = (supportEnvironmentList = []) => {
   }
 }; // Some touch devices with a mouse can't be distinguished, assume no mouse
 
-const timeoutError = () => new Error('request timeout');
-/**
- * @param {URL|RequestInfo} url 
- * @param {RequestInit} options 
- * @param {{responseType: 'json'|'text'}}
- */
-
-
-const retryRequest = (url, options = {}, {
-  responseType = 'json',
-  timeout = 6,
-  retryTimes = 6
-} = {}) => new Promise((resolve, reject) => {
-  setTimeout(() => reject(timeoutError()), timeout * 1000);
-  fetch(url, options).then(response => {
-    var _response$responseTyp;
-
-    return resolve(((_response$responseTyp = response[responseType]) === null || _response$responseTyp === void 0 ? void 0 : _response$responseTyp.call(response)) || response);
-  }).catch(reject);
-}).catch(error => {
-  console.log(error);
-
-  if (retryTimes > 0) {
-    return retryRequest(url, options, {
-      timeout,
-      retryTimes: retryTimes - 1
-    });
-  }
-
-  return error;
-});
-
 const protocolExtensions = {
   hls: 'm3u8',
   dash: 'mpd'
@@ -502,90 +487,6 @@ const getSource = (sourceOptions, {
   };
 };
 
-function getVersion() {
-  try {
-    // eslint-disable-next-line no-undef
-    return "2.25.0-canary.2";
-  } catch (e) {
-    return undefined;
-  }
-}
-
-/* eslint-disable no-param-reassign */
-
-const matchAll = (input, pattern) => {
-  const flags = [pattern.global && 'g', pattern.ignoreCase && 'i', pattern.multiline && 'm'].filter(Boolean).join('');
-  const clone = new RegExp(pattern, flags);
-  return Array.from(function* () {
-    let matched = true;
-
-    while (1) {
-      matched = clone.exec(input);
-
-      if (!matched) {
-        return;
-      }
-
-      yield matched;
-    }
-  }());
-};
-
-const rewriteUrls = (manifest, sourceUrl) => manifest.replace(/((#EXT-X-MEDIA:.*URI=")([^"]*))|((#EXT-X-STREAM-INF.*\n)(.*)(?=\n))/g, (...matches) => [matches[2], matches[5], new URL(matches[3] || matches[6], sourceUrl)].filter(Boolean).join(''));
-
-const filterHlsManifestQualities = (originalManifest, filter) => {
-  if (!filter) {
-    return;
-  }
-
-  const manifest = `${originalManifest}\n`;
-  const profiles = matchAll(manifest, /RESOLUTION=(\d+)x(\d+)/g).map(([, width, height]) => ({
-    width: +width,
-    height: +height
-  }));
-  const allowed = filter(profiles) || profiles;
-  const newManifest = manifest.replace(/#EXT-X-STREAM-INF.*RESOLUTION=(\d+)x(\d+).*\n.*\n/g, (item, width, height) => allowed.some(p => p.width === +width && p.height === +height) ? item : '');
-  return newManifest !== manifest && newManifest;
-};
-
-const meetRestriction = (quality, {
-  minHeight,
-  maxHeight
-} = {}) => !(quality.height < minHeight || quality.height > maxHeight);
-
-const selectHlsQualities = async (source, restrictions = {}) => {
-  if (!needNativeHls() || !(restrictions.minHeight || restrictions.maxHeight)) {
-    return source;
-  }
-
-  const selected = getSource(source, {
-    preferManifestType: 'hls'
-  });
-
-  if (!((selected === null || selected === void 0 ? void 0 : selected.type.toLowerCase()) === mimeTypes.hls)) {
-    return source;
-  }
-
-  const filtered = filterHlsManifestQualities(await retryRequest(selected.src, {}, {
-    responseType: 'text'
-  }), items => items.filter(item => meetRestriction(item, restrictions)));
-
-  if (filtered) {
-    return { ...selected,
-
-      /*
-        Native Safari couldn't support blob .m3u8. and will throw MediaError: 4
-        We find the hacky method: dataURI.
-        By the way, bitmovin also use this form even user gives the blob URI.
-      */
-      src: `data:application/x-mpegURL,${encodeURI(rewriteUrls(filtered, selected.src))}`
-    };
-  }
-
-  return source;
-};
- // for unit test
-
 /* eslint-disable no-param-reassign */
 
 const SHAKA_LIVE_DURATION = 4294967296;
@@ -1087,6 +988,15 @@ const mapLogEvents$1 = ({
   };
 };
 
+function getVersion() {
+  try {
+    // eslint-disable-next-line no-undef
+    return "2.25.0-canary.20";
+  } catch (e) {
+    return undefined;
+  }
+}
+
 const logEventNames = {
   playbackBeganLoading: 'playback_began_player_loading',
   playbackBeganPlayerStartupTime: 'playback_began_player_startup_time',
@@ -1503,7 +1413,7 @@ const createAnalytics = ({
   const logTarget = mapLogEvents({
     video,
     playerName: 'shaka',
-    version: "2.25.0-canary.2"
+    version: "2.25.0-canary.20"
   });
   logTarget.all((type, data) => {
     const payload = {
@@ -1560,6 +1470,113 @@ const createAnalytics = ({
   };
 };
 
+const timeoutError = () => new Error('request timeout');
+/**
+ * @param {URL|RequestInfo} url 
+ * @param {RequestInit} options 
+ * @param {{responseType: 'json'|'text'}}
+ */
+
+
+const retryRequest = (url, options = {}, {
+  responseType = 'json',
+  timeout = 6,
+  retryTimes = 6
+} = {}) => new Promise((resolve, reject) => {
+  setTimeout(() => reject(timeoutError()), timeout * 1000);
+  fetch(url, options).then(response => {
+    var _response$responseTyp;
+
+    return resolve(((_response$responseTyp = response[responseType]) === null || _response$responseTyp === void 0 ? void 0 : _response$responseTyp.call(response)) || response);
+  }).catch(reject);
+}).catch(error => {
+  console.log(error);
+
+  if (retryTimes > 0) {
+    return retryRequest(url, options, {
+      timeout,
+      retryTimes: retryTimes - 1
+    });
+  }
+
+  return error;
+});
+
+/* eslint-disable no-param-reassign */
+
+const matchAll = (input, pattern) => {
+  const flags = [pattern.global && 'g', pattern.ignoreCase && 'i', pattern.multiline && 'm'].filter(Boolean).join('');
+  const clone = new RegExp(pattern, flags);
+  return Array.from(function* () {
+    let matched = true;
+
+    while (1) {
+      matched = clone.exec(input);
+
+      if (!matched) {
+        return;
+      }
+
+      yield matched;
+    }
+  }());
+};
+
+const rewriteUrls = (manifest, sourceUrl) => manifest.replace(/((#EXT-X-MEDIA:.*URI=")([^"]*))|((#EXT-X-STREAM-INF.*\n)(.*)(?=\n))/g, (...matches) => [matches[2], matches[5], new URL(matches[3] || matches[6], sourceUrl)].filter(Boolean).join(''));
+
+const filterHlsManifestQualities = (originalManifest, filter) => {
+  if (!filter) {
+    return;
+  }
+
+  const manifest = `${originalManifest}\n`;
+  const profiles = matchAll(manifest, /RESOLUTION=(\d+)x(\d+)/g).map(([, width, height]) => ({
+    width: +width,
+    height: +height
+  }));
+  const allowed = filter(profiles) || profiles;
+  const newManifest = manifest.replace(/#EXT-X-STREAM-INF.*RESOLUTION=(\d+)x(\d+).*\n.*\n/g, (item, width, height) => allowed.some(p => p.width === +width && p.height === +height) ? item : '');
+  return newManifest !== manifest && newManifest;
+};
+
+const meetRestriction = (quality, {
+  minHeight,
+  maxHeight
+} = {}) => !(quality.height < minHeight || quality.height > maxHeight);
+
+const selectHlsQualities = async (source, restrictions = {}) => {
+  if (!isSafari() || !(restrictions.minHeight || restrictions.maxHeight)) {
+    return source;
+  }
+
+  const selected = getSource(source, {
+    preferManifestType: 'hls'
+  });
+
+  if (!((selected === null || selected === void 0 ? void 0 : selected.type.toLowerCase()) === mimeTypes.hls)) {
+    return source;
+  }
+
+  const filtered = filterHlsManifestQualities(await retryRequest(selected.src, {}, {
+    responseType: 'text'
+  }), items => items.filter(item => meetRestriction(item, restrictions)));
+
+  if (filtered) {
+    return { ...selected,
+
+      /*
+        Native Safari couldn't support blob .m3u8. and will throw MediaError: 4
+        We find the hacky method: dataURI.
+        By the way, bitmovin also use this form even user gives the blob URI.
+      */
+      src: `data:application/x-mpegURL,${encodeURI(rewriteUrls(filtered, selected.src))}`
+    };
+  }
+
+  return source;
+};
+ // for unit test
+
 /* eslint-disable no-empty */
 const storageKey = 'playcraft-tab-lock';
 const lockRenewTime = 3000;