@kkcompany/player 2.25.0-canary.0 → 2.25.0-canary.1

package/dist/modules.mjs

@@ -1,16 +1,18 @@
+import axios from 'axios';
 import mitt from 'mitt';
 import UAParser from 'ua-parser-js';
 
 /* eslint-disable no-param-reassign */
+
 const waitMs$1 = time => new Promise(resolve => {
   setTimeout(resolve, time);
 });
 
-const handleRequestError = (request, {
+const handleRequestError = (result, {
   onError,
   retryTimes = 0
-}) => request().catch(error => onError(error, {
-  retry: () => handleRequestError(request, {
+}) => result.catch(error => onError(error, {
+  retry: () => handleRequestError(axios(error.config), {
     onError,
     retryTimes: retryTimes + 1
   }),
@@ -65,26 +67,28 @@ const createApi = (config, {
 
   const request = (url, {
     method
-  } = {}) => handleRequestError(() => fetch(`${url}?${new URLSearchParams(params).toString()}`, {
+  } = {}) => handleRequestError(axios(url, {
     method,
-    headers: getHeaders()
-  }).then(response => response.json()), {
+    headers: getHeaders(),
+    params
+  }), {
     onError
-  });
+  }).then(response => response.data);
 
   const sessionRequest = (path, {
     method = 'POST',
     type,
     id,
     token
-  }) => handleRequestError(() => fetch(`${host}/sessions/${type}/${id}/playback/${deviceId}/${path}?${new URLSearchParams({ ...params,
-    playback_token: token
-  }).toString()}`, {
+  }) => handleRequestError(axios(`${host}/sessions/${type}/${id}/playback/${deviceId}/${path}`, {
     method,
-    headers: getHeaders()
-  }).then(response => response.json()), {
+    headers: getHeaders(),
+    params: { ...params,
+      playback_token: token
+    }
+  }), {
     onError
-  });
+  }).then(response => response === null || response === void 0 ? void 0 : response.data);
 
   return {
     config,
@@ -265,15 +269,15 @@ function getDevice() {
 function getBrowser() {
   return parser.getBrowser();
 }
+
+const isSafari = () => /^((?!chrome|android|X11|Linux).)*(safari|iPad|iPhone|Version)/i.test(navigator.userAgent);
+
 function needNativeHls() {
   // Don't let Android phones play HLS, even if some of them report supported
   // This covers Samsung & OPPO special cases
-  const isAndroid = /android|X11|Linux/i.test(navigator.userAgent); // canPlayType isn't reliable across all iOS verion / device combinations, so also check user agent
-
-  const isSafari = /^((?!chrome|android|X11|Linux).)*(safari|iPad|iPhone|Version)/i.test(navigator.userAgent); // ref: https://stackoverflow.com/a/12905122/4578017
-  // none of our supported browsers other than Safari response to this
-
-  return isAndroid || /firefox/i.test(navigator.userAgent) ? '' : isSafari ? 'maybe' : document.createElement('video').canPlayType('application/vnd.apple.mpegURL');
+  const isAndroid = /android|X11|Linux/i.test(navigator.userAgent);
+  return isAndroid || /firefox/i.test(navigator.userAgent) ? '' : // canPlayType isn't reliable across all iOS verion / device combinations, so also check user agent
+  isSafari() ? 'maybe' : document.createElement('video').canPlayType('application/vnd.apple.mpegURL');
 }
 
 const isDesktop = () => !getDevice().type; // TODO solve lint error:
@@ -443,7 +447,7 @@ const getDrmOptions = fallbackDrm => {
  * @typedef {{hls: string, dash: string}} SourceObjectAlt backward compatiable form
  *
  * @param {SourceObject[]|SourceObject|SourceObjectAlt|string} sourceOptions
- * @param {{preferManifestType?: ('dash'|'hls')}} options
+ * @param {{preferManifestType?: ('dash'|'hls'|'platform')}} options
  * @return {{src: string, type: string, drm: Object}}
  */
 
@@ -486,7 +490,8 @@ const getSource = (sourceOptions, {
     });
   }
 
-  const matched = sourceOptions.find(source => !preferManifestType || matchType(source, preferManifestType));
+  const targetType = preferManifestType !== 'platform' ? preferManifestType : isSafari() ? 'hls' : 'dash';
+  const matched = sourceOptions.find(source => matchType(source, targetType));
   const selected = matched || sourceOptions[0];
 
   if (!selected) {
@@ -504,14 +509,12 @@ const getSource = (sourceOptions, {
 function getVersion() {
   try {
     // eslint-disable-next-line no-undef
-    return "2.25.0-canary.0";
+    return "2.25.0-canary.1";
   } 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);
@@ -1391,12 +1394,6 @@ const retrieveModuleConfig = (modulesConfig, query) => {
 
 /* eslint-disable camelcase */
 const HEARTBEAT_INTERVAL_MS = 10000;
-//@ts-ignore
-const axios$1 = {
-  post: (...args) => {
-    console.log(args);
-  }
-}; // TODO
 
 const eventHeartbeat = ({
   token,
@@ -1429,7 +1426,7 @@ const eventHeartbeat = ({
     }; // Avoid template literals because the env variable would be replaced in the rollup
 
     await retryWithBackoff$1({
-      fn: () => axios$1.post(endpoint, payload, {
+      fn: () => axios.post(endpoint, payload, {
         headers: {
           'Kks-Bv-Token': token
         }
@@ -1442,12 +1439,6 @@ var eventHeartbeat$1 = eventHeartbeat;
 
 /* eslint-disable camelcase */
 
-const axios = {
-  post: (...args) => {
-    console.log(args);
-  }
-}; // TODO
-
 const getDeviceInfo = () => {
   const browser = getBrowser();
   return {
@@ -1502,7 +1493,7 @@ const createAnalytics = ({
   const logTarget = mapLogEvents({
     video,
     playerName: 'shaka',
-    version: "2.25.0-canary.0"
+    version: "2.25.0-canary.1"
   });
   logTarget.all((type, data) => {
     const payload = {

package/dist/plugins.mjs

@@ -1,4 +1,5 @@
 import mitt from 'mitt';
+import axios from 'axios';
 import UAParser from 'ua-parser-js';
 
 /** @param {string} m3u8Manifest */
@@ -486,13 +487,13 @@ const snapback = ({
   }
 };
 
-const axios = () => {};
-
 const addFetchPolyfill = () => {
   window.fetch = async (url, {
     method
   } = {}) => {
-    const result = await axios();
+    const result = await axios(url, {
+      method
+    });
     return Promise.resolve({
       json: () => result.data
     });