ckplayer-plus 1.1.6 → 1.1.8

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.6/dist/";
+      var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.8/dist/";
       function ckplayerEmbed(videoObj) {
         var rightMenu = [
           {
@@ -240,6 +240,8 @@ var require_ckplayer = __commonJS({
         var hlsLoadAt = -1;
         var hlsLoadTs = 0;
         var hlsScrubResumePlay = false;
+        var hlsScrubbing = false;
+        var hlsResumeSettling = false;
         var oldTime = 0, playTime = 0, firstSeekTime = -1, maxSeeTime = 0;
         var isChangeDef = true;
         var playType = "";
@@ -427,7 +429,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.6") > -1) {
+          if (!allowCdn || !cdn || cdn.indexOf("1.1.8") > -1) {
             return folder + "/" + file;
           }
           if (cdn.slice(-1) !== "/") {
@@ -689,22 +691,61 @@ var require_ckplayer = __commonJS({
           if (dur && isFinite(dur) && dur > 0 && target >= dur) {
             target = Math.max(0, dur - 0.3);
           }
-          hlsScrubResumePlay = !paused;
+          var wasPlaying = !paused;
+          hlsScrubbing = true;
+          hlsScrubResumePlay = wasPlaying;
           clearSeekRetry();
           hlsResumeWarmup = false;
+          hlsResumeSettling = false;
           hlsResumeTarget = -1;
           seekTime = 0;
           seekApplyLock = true;
+          if (timeInBuffered(target)) {
+            try {
+              video.currentTime = target;
+            } catch (event2) {
+              seekApplyLock = false;
+              hlsScrubbing = false;
+              return false;
+            }
+            setTimeout(function() {
+              seekApplyLock = false;
+              hlsScrubbing = false;
+              if (C["buffer"]) {
+                C["buffer"].hide();
+              }
+              waited = true;
+              if (wasPlaying) {
+                hlsScrubResumePlay = false;
+                try {
+                  player.play();
+                } catch (errPlay) {
+                }
+              } else {
+                hlsScrubResumePlay = false;
+              }
+            }, 80);
+            return true;
+          }
           try {
             video.currentTime = target;
           } catch (event2) {
             seekApplyLock = false;
+            hlsScrubbing = false;
             return false;
           }
           setTimeout(function() {
             seekApplyLock = false;
           }, 120);
           return true;
+        }, hidePlaybackBuffer = function() {
+          waited = true;
+          if (C["buffer"]) {
+            C["buffer"].hide();
+          }
+          if (C["loading"]) {
+            C["loading"].hide();
+          }
         }, destroyStreamPlayers = function() {
           clearSeekRetry();
           seekApplyLock = false;
@@ -714,6 +755,8 @@ var require_ckplayer = __commonJS({
           hlsLoadAt = -1;
           hlsLoadTs = 0;
           hlsScrubResumePlay = false;
+          hlsScrubbing = false;
+          hlsResumeSettling = false;
           decodeRecoverCount = 0;
           if (hls) {
             try {
@@ -870,44 +913,36 @@ var require_ckplayer = __commonJS({
                 resumeAt = parseResumeSeekFromVars();
               }
               if (resumeAt && resumeAt > 0 && (isUndefined(vars["live"]) || !vars["live"])) {
+                hlsConf.autoStartLoad = false;
                 maxSeeTime = Math.max(maxSeeTime, resumeAt);
                 if (firstSeekTime < 0) {
                   firstSeekTime = resumeAt;
                 }
                 seekTime = resumeAt;
                 hlsResumeTarget = resumeAt;
-                hlsResumeWarmup = true;
-                hlsConf.autoStartLoad = false;
+                hlsResumeSettling = true;
+                hlsResumeWarmup = false;
+                autoplayPending = false;
               }
               hls = new Hls(hlsConf);
               hls.loadSource(url);
               hls.attachMedia(video);
               hls.on(Hls.Events.MANIFEST_PARSED, function() {
-                if (hlsResumeWarmup && seekTime > 0) {
-                  var loadAt = hlsPriorLoadTime(seekTime);
-                  hlsLoadAt = loadAt;
-                  hlsLoadTs = Date.now();
+                if (seekTime > 0 && hlsResumeSettling) {
                   hlsStartPositionUsed = true;
-                  try {
-                    hls.startLoad(loadAt);
-                  } catch (event2) {
+                  hlsSeekTo(seekTime, true);
+                  if (C["buffer"]) {
+                    C["buffer"].show();
                   }
                   setTimeout(function() {
-                    if (!hlsResumeWarmup || !seekTime) {
-                      return;
-                    }
-                    var target = seekTime;
-                    if (hlsCanSafelySeekTo(target)) {
-                      finishResumeSeek(target);
+                    if (!hlsResumeSettling) {
                       return;
                     }
-                    var snap = hlsFragStartTime(target);
-                    if (timeInBuffered(snap) || hlsCanSafelySeekTo(snap)) {
-                      finishResumeSeek(snap);
-                      return;
+                    var t = seekTime > 0 ? seekTime : hlsResumeTarget;
+                    if (t > 0 && !tryCompleteResumeSeek(t) && hlsResumeSettling) {
+                      finishResumeSeek(t);
                     }
-                    finishResumeSeek(Math.max(0, loadAt));
-                  }, 5e3);
+                  }, 8e3);
                   return;
                 }
                 if (!hlsStartPositionUsed) {
@@ -915,10 +950,9 @@ var require_ckplayer = __commonJS({
                 }
               });
               hls.on(Hls.Events.FRAG_BUFFERED, function(event2, data) {
-                if (hlsResumeWarmup && seekTime > 0) {
-                  if (hlsCanSafelySeekTo(seekTime)) {
-                    finishResumeSeek(seekTime);
-                  }
+                if (hlsResumeSettling && (seekTime > 0 || hlsResumeTarget > 0)) {
+                  var resumeT = seekTime > 0 ? seekTime : hlsResumeTarget;
+                  tryCompleteResumeSeek(resumeT);
                   return;
                 }
                 if (hlsResumeTarget <= 0 || !data || !data.frag) {
@@ -927,12 +961,7 @@ var require_ckplayer = __commonJS({
                 var fragStart = data.frag.start;
                 var fragEnd = fragStart + data.frag.duration;
                 if (hlsResumeTarget >= fragStart - 0.5 && hlsResumeTarget <= fragEnd + 0.5) {
-                  if (!waited) {
-                    waited = true;
-                    if (C["buffer"]) {
-                      C["buffer"].hide();
-                    }
-                  }
+                  hidePlaybackBuffer();
                 }
               });
               hls.on(Hls.Events.ERROR, function(event2, data) {
@@ -951,11 +980,27 @@ var require_ckplayer = __commonJS({
                     }
                   }
                 }
-                if (fatal && data.type === Hls.ErrorTypes.MEDIA_ERROR && hls && typeof hls.recoverMediaError === "function") {
-                  try {
-                    hls.recoverMediaError();
-                    fatal = false;
-                  } catch (errRecover) {
+                if (fatal && hls) {
+                  if (data.type === Hls.ErrorTypes.NETWORK_ERROR && typeof hls.startLoad === "function") {
+                    try {
+                      if (data.details === "keyLoadError") {
+                        setTimeout(function() {
+                          if (hls && typeof hls.startLoad === "function") {
+                            hls.startLoad();
+                          }
+                        }, 2e3);
+                      } else {
+                        hls.startLoad();
+                      }
+                      fatal = false;
+                    } catch (errNet) {
+                    }
+                  } else if (data.type === Hls.ErrorTypes.MEDIA_ERROR && typeof hls.recoverMediaError === "function") {
+                    try {
+                      hls.recoverMediaError();
+                      fatal = false;
+                    } catch (errRecover) {
+                    }
                   }
                 }
                 CT.error = { code, message: message2 };
@@ -1766,8 +1811,18 @@ var require_ckplayer = __commonJS({
           } catch (event2) {
           }
           return false;
+        }, tryCompleteResumeSeek = function(t) {
+          if (!hlsResumeSettling || isNaN(t) || t <= 0 || !video) {
+            return false;
+          }
+          if (hlsCanSafelySeekTo(t)) {
+            finishResumeSeek(t);
+            return true;
+          }
+          return false;
         }, finishResumeSeek = function(t) {
           hlsResumeWarmup = false;
+          hlsResumeSettling = false;
           autoplayPending = false;
           applySeekToMedia(t);
           setTimeout(function() {
@@ -1779,10 +1834,7 @@ var require_ckplayer = __commonJS({
             } catch (event2) {
             }
             paused = true;
-            if (C["buffer"]) {
-              C["buffer"].hide();
-            }
-            waited = true;
+            hidePlaybackBuffer();
             if (!vars["controls"] && C["centerPlay"]) {
               C["centerPlay"].show();
             }
@@ -1832,6 +1884,7 @@ var require_ckplayer = __commonJS({
           if (t <= 0) {
             seekTime = 0;
             clearSeekRetry();
+            hlsResumeSettling = false;
             return;
           }
           if (t > 0) {
@@ -1840,42 +1893,36 @@ var require_ckplayer = __commonJS({
               firstSeekTime = t;
             }
           }
-          if (hls && typeof hls.startLoad === "function") {
-            if (hlsCanSafelySeekTo(t)) {
-              finishResumeSeek(t);
+          if (hls) {
+            hlsResumeSettling = true;
+            hlsResumeTarget = t;
+            autoplayPending = false;
+            if (hlsResumeWarmup) {
               return;
             }
-            if (t > 1) {
-              hlsResumeWarmup = true;
-              hlsResumeTarget = t;
-              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) {
-                }
+            if (tryCompleteResumeSeek(t)) {
+              return;
+            }
+            if (hlsSeekTo(t, force)) {
+              if (C["buffer"]) {
+                C["buffer"].show();
               }
+              return;
+            }
+            if (!force && (!isUndefined(video.readyState) && video.readyState < 1) && !(dur && isFinite(dur) && dur > 0)) {
               seekRetryCount++;
-              if (seekRetryCount <= 50) {
+              if (seekRetryCount <= 40) {
                 if (seekRetryTimer) {
                   clearTimeout(seekRetryTimer);
                 }
                 seekRetryTimer = setTimeout(function() {
                   applyPendingSeek(false);
-                }, 200);
+                }, 120);
                 return;
               }
-              finishResumeSeek(hlsFragStartTime(t) || loadAt || t);
-              return;
             }
+            finishResumeSeek(t);
+            return;
           }
           if (!force && (!isUndefined(video.readyState) && video.readyState < 1)) {
             seekRetryCount++;
@@ -1979,6 +2026,7 @@ var require_ckplayer = __commonJS({
           },
           canPlay: function() {
             C["loading"].hide();
+            hidePlaybackBuffer();
             eventTarget("canplay");
             applyPendingSeek();
             startPendingAutoplay();
@@ -2169,12 +2217,11 @@ var require_ckplayer = __commonJS({
           seeked: function() {
             seekApplyLock = false;
             decodeRecoverCount = 0;
+            hlsScrubbing = false;
+            hlsResumeSettling = false;
             startPendingAutoplay();
             pSliderMouseDown = false;
-            waited = true;
-            if (C["buffer"]) {
-              C["buffer"].hide();
-            }
+            hidePlaybackBuffer();
             if (hlsScrubResumePlay) {
               hlsScrubResumePlay = false;
               try {
@@ -2186,54 +2233,56 @@ var require_ckplayer = __commonJS({
             eventTarget("seeked");
           },
           seeking: function() {
-            if (paused && !seekApplyLock && !hlsResumeWarmup && !seekTime && !autoplayPending) {
+            if (paused && !seekApplyLock && !hlsResumeWarmup && !hlsResumeSettling && !hlsScrubbing && !seekTime && !autoplayPending) {
               player.play();
             }
             var seekingTime = this.currentTime;
             if (firstSeekTime == -1) {
               firstSeekTime = seekingTime;
             }
-            switch (vars["timeScheduleAdjust"]) {
-              case 0:
-                if (oldTime != seekingTime) {
-                  waitingMessage = false;
-                  player.seek(oldTime);
-                  message(language["timeScheduleAdjust"]["prohibit"]);
-                  return;
-                }
-                break;
-              case 2:
-                if (seekingTime < oldTime) {
-                  waitingMessage = false;
-                  player.seek(oldTime);
-                  message(language["timeScheduleAdjust"]["prohibitBackOff"]);
-                  return;
-                }
-                break;
-              case 3:
-                if (seekingTime > oldTime) {
-                  waitingMessage = false;
-                  player.seek(oldTime);
-                  message(language["timeScheduleAdjust"]["prohibitForward"]);
-                  return;
-                }
-                break;
-              case 4:
-                if (seekingTime < firstSeekTime) {
-                  waitingMessage = false;
-                  player.seek(firstSeekTime);
-                  message(language["timeScheduleAdjust"]["prohibitLookBack"]);
-                  return;
-                }
-                break;
-              case 5:
-                if (seekingTime > maxSeeTime) {
-                  waitingMessage = false;
-                  player.seek(maxSeeTime);
-                  message(language["timeScheduleAdjust"]["prohibitForwardNotViewed"]);
-                  return;
-                }
-                break;
+            if (!(hlsScrubbing || hlsScrubResumePlay || hlsResumeSettling || hlsResumeWarmup)) {
+              switch (vars["timeScheduleAdjust"]) {
+                case 0:
+                  if (oldTime != seekingTime) {
+                    waitingMessage = false;
+                    player.seek(oldTime);
+                    message(language["timeScheduleAdjust"]["prohibit"]);
+                    return;
+                  }
+                  break;
+                case 2:
+                  if (seekingTime < oldTime) {
+                    waitingMessage = false;
+                    player.seek(oldTime);
+                    message(language["timeScheduleAdjust"]["prohibitBackOff"]);
+                    return;
+                  }
+                  break;
+                case 3:
+                  if (seekingTime > oldTime) {
+                    waitingMessage = false;
+                    player.seek(oldTime);
+                    message(language["timeScheduleAdjust"]["prohibitForward"]);
+                    return;
+                  }
+                  break;
+                case 4:
+                  if (seekingTime < firstSeekTime) {
+                    waitingMessage = false;
+                    player.seek(firstSeekTime);
+                    message(language["timeScheduleAdjust"]["prohibitLookBack"]);
+                    return;
+                  }
+                  break;
+                case 5:
+                  if (seekingTime > maxSeeTime) {
+                    waitingMessage = false;
+                    player.seek(maxSeeTime);
+                    message(language["timeScheduleAdjust"]["prohibitForwardNotViewed"]);
+                    return;
+                  }
+                  break;
+              }
             }
             eventTarget("seek", { time: seekingTime, state: "seeking" });
             eventTarget("seeking");
@@ -2245,10 +2294,15 @@ var require_ckplayer = __commonJS({
           waiting: function() {
             waited = false;
             eventTarget("buffer", "start");
-            C["centerPlay"].hide();
+            if (!(hlsScrubbing || hlsScrubResumePlay || hlsResumeSettling)) {
+              C["centerPlay"].hide();
+            }
             if (!vars["controls"]) {
               C["buffer"].show();
             }
+            if (hlsScrubbing || hlsScrubResumePlay || hlsResumeSettling) {
+              return;
+            }
             if (!waitingMessage) {
               waitingMessage = true;
             } else {
@@ -2261,6 +2315,7 @@ var require_ckplayer = __commonJS({
             C["bar"]["playAndPause"]["pause"].show();
             C["bar"]["playAndPause"]["refresh"].hide();
             C["centerPlay"].hide();
+            hidePlaybackBuffer();
             if (playType == "button") {
               C["bar"]["pbox"].removeClass("ck-bar-progress-out");
             } else {
@@ -4979,6 +5034,7 @@ var require_ckplayer = __commonJS({
             e = e || window.event;
             var eleOffset = slider.offset(), bgOffset = bg.offset(), client = getClient(e);
             pSliderMouseDown = true;
+            hlsScrubbing = true;
             posRecord = client["x"];
             var left = eleOffset["left"] - bgOffset["left"];
             sliderDownTime = left * duration / (bg.getWidth() - slider.getWidth());
@@ -5074,6 +5130,11 @@ var require_ckplayer = __commonJS({
               eventTarget("playback", { time: playbackTime2, date: date("Y-m-d H:i:s", playbackTime2) });
               eventTarget("seek", { time: playbackTime2, state: "seeking", date: date("Y-m-d H:i:s", playbackTime2) });
             }
+            setTimeout(function() {
+              if (!pSliderMouseDown) {
+                hlsScrubbing = false;
+              }
+            }, 800);
             C["bar"]["pbox"].removeClass("ck-bar-progress-slider-move");
             if (isMouseLeave) {
               tip();
@@ -6375,7 +6436,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.6") === -1 && m) {
+              if (cdn && cdn.indexOf("1.1.8") === -1 && m) {
                 if (cdn.slice(-1) !== "/") {
                   cdn += "/";
                 }