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

package/dist/modules.mjs

@@ -265,15 +265,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 +443,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 +486,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,7 +505,7 @@ const getSource = (sourceOptions, {
 function getVersion() {
   try {
     // eslint-disable-next-line no-undef
-    return "2.25.0-canary.0";
+    return "2.25.0-canary.2";
   } catch (e) {
     return undefined;
   }
@@ -1502,7 +1503,7 @@ const createAnalytics = ({
   const logTarget = mapLogEvents({
     video,
     playerName: 'shaka',
-    version: "2.25.0-canary.0"
+    version: "2.25.0-canary.2"
   });
   logTarget.all((type, data) => {
     const payload = {