ckplayer-plus 1.1.2 → 1.1.4

package/dist/index.js

@@ -204,7 +204,7 @@ var require_ckplayer = __commonJS({
         cdnFallback: true
         // getPath 失败时是否回退到 jsDelivr（内网可设 false，并配置 pluginPath）
       };
-      var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.2/dist/";
+      var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.4/dist/";
       function ckplayerEmbed(videoObj) {
         var rightMenu = [
           {
@@ -426,7 +426,7 @@ var require_ckplayer = __commonJS({
           }
           var allowCdn = !vars || vars["cdnFallback"] !== false;
           var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
-          if (!allowCdn || !cdn || cdn.indexOf("1.1.2") > -1) {
+          if (!allowCdn || !cdn || cdn.indexOf("1.1.4") > -1) {
             return folder + "/" + file;
           }
           if (cdn.slice(-1) !== "/") {
@@ -521,7 +521,11 @@ var require_ckplayer = __commonJS({
             player.muted();
             recoveryVolume = true;
             video.attr("preload", "auto");
-            autoplayPending = true;
+            if (parseResumeSeekFromVars() > 0) {
+              autoplayPending = false;
+            } else {
+              autoplayPending = true;
+            }
           } else {
             video.attr("preload", "metadata");
           }
@@ -637,6 +641,9 @@ var require_ckplayer = __commonJS({
           if (!seekTime) {
             applyResumeSeekState(parseResumeSeekFromVars());
           }
+          if (seekTime > 0) {
+            autoplayPending = false;
+          }
         }, hlsSeekTo = function(target, force) {
           if (!hls || typeof hls.startLoad !== "function" || !video) {
             return false;
@@ -645,25 +652,27 @@ var require_ckplayer = __commonJS({
             target = 0;
           }
           var curTime = video.currentTime || 0;
-          if (!force) {
-            if (hlsResumeTarget >= 0 && Math.abs(hlsResumeTarget - target) < 1.5) {
-              if (timeInBuffered(target) && Math.abs(curTime - target) < 2.5) {
-                return true;
-              }
+          hlsResumeTarget = target;
+          if (!force && timeInBuffered(target)) {
+            if (Math.abs(curTime - target) < 1.5) {
+              return true;
             }
-            if (timeInBuffered(target) && Math.abs(curTime - target) < 1.5) {
-              hlsResumeTarget = target;
+            if (hlsCanSafelySeekTo(target)) {
+              finishResumeSeek(target);
               return true;
             }
-            if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - target) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
+          }
+          var loadAt = hlsPriorLoadTime(target);
+          if (!force) {
+            if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - loadAt) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
               return true;
             }
           }
-          hlsLoadAt = target;
+          hlsLoadAt = loadAt;
           hlsLoadTs = Date.now();
-          hlsResumeTarget = target;
+          hlsResumeWarmup = true;
           try {
-            hls.startLoad(target);
+            hls.startLoad(loadAt);
           } catch (event2) {
             return false;
           }
@@ -836,6 +845,7 @@ var require_ckplayer = __commonJS({
                 seekTime = resumeAt;
                 hlsResumeTarget = resumeAt;
                 hlsResumeWarmup = true;
+                hlsConf.autoStartLoad = false;
               }
               hls = new Hls(hlsConf);
               hls.loadSource(url);
@@ -843,6 +853,9 @@ var require_ckplayer = __commonJS({
               hls.on(Hls.Events.MANIFEST_PARSED, function() {
                 if (hlsResumeWarmup && seekTime > 0) {
                   var loadAt = hlsPriorLoadTime(seekTime);
+                  hlsLoadAt = loadAt;
+                  hlsLoadTs = Date.now();
+                  hlsStartPositionUsed = true;
                   try {
                     hls.startLoad(loadAt);
                   } catch (event2) {
@@ -856,9 +869,12 @@ var require_ckplayer = __commonJS({
                       finishResumeSeek(target);
                       return;
                     }
-                    var snap = hlsPriorLoadTime(target);
-                    hlsResumeWarmup = false;
-                    finishResumeSeek(snap);
+                    var snap = hlsFragStartTime(target);
+                    if (timeInBuffered(snap) || hlsCanSafelySeekTo(snap)) {
+                      finishResumeSeek(snap);
+                      return;
+                    }
+                    finishResumeSeek(Math.max(0, loadAt));
                   }, 5e3);
                   return;
                 }
@@ -1605,8 +1621,8 @@ var require_ckplayer = __commonJS({
           } catch (event2) {
           }
           return false;
-        }, hlsFragAround = function(t) {
-          if (!hls || isNaN(t) || t < 0) {
+        }, hlsGetFragments = function() {
+          if (!hls) {
             return null;
           }
           try {
@@ -1623,6 +1639,19 @@ var require_ckplayer = __commonJS({
             if (!frags || !frags.length) {
               return null;
             }
+            return frags;
+          } catch (event2) {
+          }
+          return null;
+        }, hlsFragAround = function(t) {
+          if (!hls || isNaN(t) || t < 0) {
+            return null;
+          }
+          try {
+            var frags = hlsGetFragments();
+            if (!frags) {
+              return null;
+            }
             for (var i = 0; i < frags.length; i++) {
               var f = frags[i];
               if (!f) {
@@ -1638,7 +1667,24 @@ var require_ckplayer = __commonJS({
           } catch (event2) {
           }
           return null;
-        }, hlsPriorLoadTime = function(t) {
+        }, hlsFragIndexAround = function(t) {
+          var frags = hlsGetFragments();
+          if (!frags || isNaN(t) || t < 0) {
+            return -1;
+          }
+          for (var i = 0; i < frags.length; i++) {
+            var f = frags[i];
+            if (!f) {
+              continue;
+            }
+            var start = f.start || 0;
+            var end = start + (f.duration || 0);
+            if (t >= start - 0.05 && t < end + 0.05) {
+              return i;
+            }
+          }
+          return frags.length - 1;
+        }, hlsFragStartTime = function(t) {
           if (isNaN(t) || t <= 0) {
             return 0;
           }
@@ -1646,6 +1692,27 @@ var require_ckplayer = __commonJS({
           if (frag && !isUndefined(frag.start)) {
             return Math.max(0, frag.start);
           }
+          return Math.max(0, t);
+        }, hlsPriorLoadTime = function(t) {
+          if (isNaN(t) || t <= 0) {
+            return 0;
+          }
+          var frags = hlsGetFragments();
+          if (frags && frags.length) {
+            var idx = hlsFragIndexAround(t);
+            if (idx < 0) {
+              idx = frags.length - 1;
+            }
+            var loadIdx = Math.max(0, idx - 1);
+            var loadFrag = frags[loadIdx];
+            if (loadFrag && !isUndefined(loadFrag.start)) {
+              return Math.max(0, loadFrag.start);
+            }
+          }
+          var frag = hlsFragAround(t);
+          if (frag && !isUndefined(frag.start)) {
+            return Math.max(0, frag.start - 12);
+          }
           return Math.max(0, t - 12);
         }, hlsCanSafelySeekTo = function(t) {
           if (!video || isUndefined(video.buffered) || isNaN(t) || t < 0) {
@@ -1654,13 +1721,13 @@ var require_ckplayer = __commonJS({
           if (!timeInBuffered(t)) {
             return false;
           }
-          var fragStart = hlsPriorLoadTime(t);
+          var loadStart = hlsPriorLoadTime(t);
           try {
             var buf = video.buffered;
             for (var i = 0; i < buf.length; i++) {
               var start = buf.start(i);
               var end = buf.end(i);
-              if (fragStart >= start - 0.35 && t <= end + 0.15) {
+              if (loadStart >= start - 0.35 && t <= end + 0.15) {
                 return true;
               }
             }
@@ -1669,25 +1736,28 @@ var require_ckplayer = __commonJS({
           return false;
         }, finishResumeSeek = function(t) {
           hlsResumeWarmup = false;
+          autoplayPending = false;
           applySeekToMedia(t);
           setTimeout(function() {
             if (!video) {
               return;
             }
+            try {
+              video.pause();
+            } catch (event2) {
+            }
+            paused = true;
             if (C["buffer"]) {
               C["buffer"].hide();
             }
             waited = true;
-            if (vars["autoplay"] || autoplayPending) {
-              try {
-                var p = video.play();
-                if (p && typeof p.then === "function") {
-                  p.catch(function() {
-                  });
-                }
-              } catch (event2) {
-              }
-              autoplayPending = false;
+            if (!vars["controls"] && C["centerPlay"]) {
+              C["centerPlay"].show();
+            }
+            if (C["bar"] && C["bar"]["playAndPause"]) {
+              C["bar"]["playAndPause"]["pause"].hide();
+              C["bar"]["playAndPause"]["play"].show();
+              C["bar"]["playAndPause"]["refresh"].hide();
             }
           }, 120);
         }, clearSeekRetry = function() {
@@ -1738,19 +1808,28 @@ var require_ckplayer = __commonJS({
               firstSeekTime = t;
             }
           }
-          if (hlsResumeWarmup) {
+          if (hls && typeof hls.startLoad === "function") {
             if (hlsCanSafelySeekTo(t)) {
               finishResumeSeek(t);
+              return;
             }
-            return;
-          }
-          if (hls && typeof hls.startLoad === "function") {
-            if (!hlsCanSafelySeekTo(t) && t > 1) {
+            if (t > 1) {
               hlsResumeWarmup = true;
               hlsResumeTarget = t;
-              try {
-                hls.startLoad(hlsPriorLoadTime(t));
-              } catch (event2) {
+              var loadAt = hlsPriorLoadTime(t);
+              var shouldLoad = !!force;
+              if (!shouldLoad) {
+                if (!(hlsLoadAt >= 0 && Math.abs(hlsLoadAt - loadAt) < 1.5 && Date.now() - hlsLoadTs < 4e3)) {
+                  shouldLoad = true;
+                }
+              }
+              if (shouldLoad) {
+                hlsLoadAt = loadAt;
+                hlsLoadTs = Date.now();
+                try {
+                  hls.startLoad(loadAt);
+                } catch (event2) {
+                }
               }
               seekRetryCount++;
               if (seekRetryCount <= 50) {
@@ -1763,11 +1842,6 @@ var require_ckplayer = __commonJS({
               }
               return;
             }
-            if (hlsSeekTo(t, !!force)) {
-              clearSeekRetry();
-              seekTime = 0;
-              return;
-            }
           }
           if (!force && (!isUndefined(video.readyState) && video.readyState < 1)) {
             seekRetryCount++;
@@ -2067,7 +2141,7 @@ var require_ckplayer = __commonJS({
             eventTarget("seeked");
           },
           seeking: function() {
-            if (paused && !seekApplyLock && !hlsResumeWarmup && !seekTime) {
+            if (paused && !seekApplyLock && !hlsResumeWarmup && !seekTime && !autoplayPending) {
               player.play();
             }
             var seekingTime = this.currentTime;
@@ -3030,20 +3104,19 @@ var require_ckplayer = __commonJS({
                     applyPendingSeek(false);
                     return player;
                   }
-                  if (hls && target > 1 && !hlsCanSafelySeekTo(target)) {
+                  if (hls) {
                     seekTime = target;
-                    hlsResumeWarmup = true;
                     hlsResumeTarget = target;
-                    try {
-                      hls.startLoad(hlsPriorLoadTime(target));
-                    } catch (event2) {
+                    if (target > 1 && hlsCanSafelySeekTo(target)) {
+                      finishResumeSeek(target);
+                      return player;
+                    }
+                    if (target > 1) {
+                      hlsResumeWarmup = true;
+                      hlsSeekTo(target, false);
+                      applyPendingSeek(false);
+                      return player;
                     }
-                    applyPendingSeek(false);
-                    return player;
-                  }
-                  if (hlsSeekTo(target, false)) {
-                    seekTime = 0;
-                    return player;
                   }
                   try {
                     video.currentTime = target;
@@ -4267,7 +4340,10 @@ var require_ckplayer = __commonJS({
                 }
               }
               seekTime = player.time();
-              video.attr("autoplay", "autoplay");
+              try {
+                video.removeAttr("autoplay");
+              } catch (event2) {
+              }
               changeVideo(ele.attr("data-video"));
               message(language["switchTo"] + ele.htm());
               C["bar"]["definition"]["button"].htm(ele.htm());
@@ -6259,7 +6335,7 @@ var require_ckplayer = __commonJS({
             if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
               var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
               var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
-              if (cdn && cdn.indexOf("1.1.2") === -1 && m) {
+              if (cdn && cdn.indexOf("1.1.4") === -1 && m) {
                 if (cdn.slice(-1) !== "/") {
                   cdn += "/";
                 }