ckplayer-plus 1.1.0 → 1.1.1

package/dist/index.js

@@ -119,8 +119,8 @@ var require_ckplayer = __commonJS({
         //默认需要跳转的秒数
         next: null,
         //下一集按钮动作
-        loaded: "",
-        //加载播放器后调用的函数
+        loaded: null,
+        //加载播放器后调用的函数（仅支持 function）
         plug: "",
         //使用插件
         duration: 0,
@@ -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.0/dist/";
+      var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.1/dist/";
       function ckplayerEmbed(videoObj) {
         var rightMenu = [
           {
@@ -232,9 +232,11 @@ var require_ckplayer = __commonJS({
         var seekRetryTimer = null;
         var seekRetryCount = 0;
         var seekApplyLock = false;
+        var autoplayPending = false;
         var decodeRecoverCount = 0;
         var hlsStartPositionUsed = false;
         var hlsResumeTarget = -1;
+        var hlsResumeWarmup = false;
         var hlsLoadAt = -1;
         var hlsLoadTs = 0;
         var oldTime = 0, playTime = 0, firstSeekTime = -1, maxSeeTime = 0;
@@ -424,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.0") > -1) {
+          if (!allowCdn || !cdn || cdn.indexOf("1.1.1") > -1) {
             return folder + "/" + file;
           }
           if (cdn.slice(-1) !== "/") {
@@ -518,8 +520,8 @@ var require_ckplayer = __commonJS({
             player.volume(0);
             player.muted();
             recoveryVolume = true;
-            video.attr("autoplay", "autoplay");
-            paused = false;
+            video.attr("preload", "auto");
+            autoplayPending = true;
           } else {
             video.attr("preload", "metadata");
           }
@@ -671,6 +673,7 @@ var require_ckplayer = __commonJS({
           seekApplyLock = false;
           hlsStartPositionUsed = false;
           hlsResumeTarget = -1;
+          hlsResumeWarmup = false;
           hlsLoadAt = -1;
           hlsLoadTs = 0;
           decodeRecoverCount = 0;
@@ -826,27 +829,38 @@ var require_ckplayer = __commonJS({
                 resumeAt = parseResumeSeekFromVars();
               }
               if (resumeAt && resumeAt > 0 && (isUndefined(vars["live"]) || !vars["live"])) {
-                hlsConf.startPosition = resumeAt;
                 maxSeeTime = Math.max(maxSeeTime, resumeAt);
                 if (firstSeekTime < 0) {
                   firstSeekTime = resumeAt;
                 }
+                seekTime = resumeAt;
                 hlsResumeTarget = resumeAt;
-                hlsLoadAt = resumeAt;
-                hlsLoadTs = Date.now();
-                seekTime = 0;
-                hlsStartPositionUsed = true;
-                clearSeekRetry();
+                hlsResumeWarmup = true;
+                hlsConf.startPosition = hlsPriorLoadTime(resumeAt);
               }
               hls = new Hls(hlsConf);
               hls.loadSource(url);
               hls.attachMedia(video);
               hls.on(Hls.Events.MANIFEST_PARSED, function() {
+                if (hlsResumeWarmup && seekTime > 0) {
+                  try {
+                    hls.startLoad(hlsPriorLoadTime(seekTime));
+                  } catch (event2) {
+                  }
+                  return;
+                }
                 if (!hlsStartPositionUsed) {
                   applyPendingSeek();
                 }
               });
               hls.on(Hls.Events.FRAG_BUFFERED, function(event2, data) {
+                if (hlsResumeWarmup && seekTime > 0) {
+                  if (hlsCanSafelySeekTo(seekTime)) {
+                    hlsResumeWarmup = false;
+                    applySeekToMedia(seekTime);
+                  }
+                  return;
+                }
                 if (hlsResumeTarget <= 0 || !data || !data.frag) {
                   return;
                 }
@@ -1579,12 +1593,53 @@ var require_ckplayer = __commonJS({
           } catch (event2) {
           }
           return false;
+        }, hlsPriorLoadTime = function(t) {
+          if (isNaN(t) || t <= 0) {
+            return 0;
+          }
+          return Math.max(0, t - 12);
+        }, hlsCanSafelySeekTo = function(t) {
+          if (!video || isUndefined(video.buffered) || isNaN(t) || t < 0) {
+            return false;
+          }
+          try {
+            var buf = video.buffered;
+            var needFrom = hlsPriorLoadTime(t);
+            for (var i = 0; i < buf.length; i++) {
+              var start = buf.start(i);
+              var end = buf.end(i);
+              if (t <= end + 0.15 && needFrom >= start - 0.35) {
+                return true;
+              }
+            }
+          } catch (event2) {
+          }
+          return false;
         }, clearSeekRetry = function() {
           if (seekRetryTimer) {
             clearTimeout(seekRetryTimer);
             seekRetryTimer = null;
           }
           seekRetryCount = 0;
+        }, startPendingAutoplay = function() {
+          if (!autoplayPending || !video || !vars["autoplay"] || seekTime || seekApplyLock || loadedmetadataNum < 1) {
+            return;
+          }
+          autoplayPending = false;
+          player.play();
+        }, applySeekToMedia = function(t) {
+          clearSeekRetry();
+          seekApplyLock = true;
+          seekTime = 0;
+          try {
+            video.currentTime = t;
+          } catch (event2) {
+            seekTime = t;
+            seekApplyLock = false;
+          }
+          setTimeout(function() {
+            seekApplyLock = false;
+          }, 800);
         }, applyPendingSeek = function(force) {
           if (!seekTime || !video || seekApplyLock) {
             return;
@@ -1608,14 +1663,39 @@ var require_ckplayer = __commonJS({
               firstSeekTime = t;
             }
           }
-          if (hlsSeekTo(t, !!force)) {
-            clearSeekRetry();
-            seekTime = 0;
+          if (hlsResumeWarmup) {
+            if (hlsCanSafelySeekTo(t)) {
+              hlsResumeWarmup = false;
+              applySeekToMedia(t);
+            }
             return;
           }
-          var readyEnough = !isUndefined(video.readyState) && video.readyState >= 2;
-          var bufferedOk = timeInBuffered(t);
-          if (!force && !bufferedOk && (!readyEnough || video.readyState < 3)) {
+          if (hls && typeof hls.startLoad === "function") {
+            if (!hlsCanSafelySeekTo(t) && t > 1) {
+              hlsResumeWarmup = true;
+              hlsResumeTarget = t;
+              try {
+                hls.startLoad(hlsPriorLoadTime(t));
+              } catch (event2) {
+              }
+              seekRetryCount++;
+              if (seekRetryCount <= 50) {
+                if (seekRetryTimer) {
+                  clearTimeout(seekRetryTimer);
+                }
+                seekRetryTimer = setTimeout(function() {
+                  applyPendingSeek(false);
+                }, 200);
+              }
+              return;
+            }
+            if (hlsSeekTo(t, !!force)) {
+              clearSeekRetry();
+              seekTime = 0;
+              return;
+            }
+          }
+          if (!force && (!isUndefined(video.readyState) && video.readyState < 1)) {
             seekRetryCount++;
             if (seekRetryCount <= 50) {
               if (seekRetryTimer) {
@@ -1627,45 +1707,54 @@ var require_ckplayer = __commonJS({
               return;
             }
           }
-          clearSeekRetry();
-          seekApplyLock = true;
-          seekTime = 0;
-          try {
-            video.currentTime = t;
-          } catch (event2) {
-            seekTime = t;
-            seekApplyLock = false;
-          }
-          setTimeout(function() {
-            seekApplyLock = false;
-          }, 800);
+          applySeekToMedia(t);
         }, recoverDecodeError = function() {
-          if (decodeRecoverCount >= 2) {
+          if (decodeRecoverCount >= 3) {
             return false;
           }
           decodeRecoverCount++;
-          var resumeAt = playTime > 0 ? playTime : vars["seek"] ? parseFloat(vars["seek"]) : 0;
+          var resumeAt = hlsResumeTarget > 0 ? hlsResumeTarget : playTime > 0 ? playTime : vars["seek"] ? parseFloat(vars["seek"]) : 0;
           if (isNaN(resumeAt) || resumeAt < 0) {
             resumeAt = 0;
           }
+          var loadFrom = Math.max(0, resumeAt - 12 * decodeRecoverCount);
+          seekApplyLock = false;
+          clearSeekRetry();
           try {
             if (hls && typeof hls.recoverMediaError === "function") {
               hls.recoverMediaError();
-              if (resumeAt > 0) {
-                seekTime = resumeAt;
-                seekApplyLock = false;
-                setTimeout(function() {
-                  applyPendingSeek(true);
-                }, 300);
-              }
-              return true;
             }
           } catch (event2) {
           }
+          if (resumeAt > 0 && hls && typeof hls.startLoad === "function") {
+            seekTime = resumeAt;
+            hlsResumeTarget = resumeAt;
+            hlsResumeWarmup = true;
+            hlsLoadAt = -1;
+            hlsLoadTs = 0;
+            try {
+              hls.startLoad(loadFrom);
+            } catch (event2) {
+            }
+            setTimeout(function() {
+              if (hlsCanSafelySeekTo(resumeAt)) {
+                hlsResumeWarmup = false;
+                applySeekToMedia(resumeAt);
+                if (video && video.paused && vars["autoplay"]) {
+                  try {
+                    video.play();
+                  } catch (e2) {
+                  }
+                }
+              } else {
+                applyPendingSeek(false);
+              }
+            }, 500);
+            return true;
+          }
           try {
             var soft = Math.max(0, resumeAt - 1.5);
             seekTime = resumeAt;
-            seekApplyLock = false;
             if (video) {
               video.currentTime = soft;
             }
@@ -1724,6 +1813,7 @@ var require_ckplayer = __commonJS({
             C["loading"].hide();
             eventTarget("canplay");
             applyPendingSeek();
+            startPendingAutoplay();
           },
           loadedData: function() {
             eventTarget("loadeddata");
@@ -1776,6 +1866,7 @@ var require_ckplayer = __commonJS({
             }
             pSliderMouseDown = false;
             loadedmetadataNum++;
+            startPendingAutoplay();
             if (!isUndefined(ad) && !isUndefined(ad["frontPlay"]) && ad["frontPlay"] && loadedmetadataNum > 1) {
               player.play();
               calculationAdFrontTime(duration);
@@ -1859,8 +1950,6 @@ var require_ckplayer = __commonJS({
                     msg = errorInfo.message;
                   }
                   if (code === 3 && recoverDecodeError()) {
-                    CT.error = { code, message: msg };
-                    eventTarget("error", CT.error);
                     return;
                   }
                   CT.error = { code, message: msg };
@@ -1900,8 +1989,6 @@ var require_ckplayer = __commonJS({
           },
           stalled: function() {
             eventTarget("stalled");
-            CT.error = { code: 13, message: "load:stalled" };
-            eventTarget("error", CT.error);
           },
           suspend: function() {
             eventTarget("suspend");
@@ -1914,9 +2001,7 @@ var require_ckplayer = __commonJS({
           seeked: function() {
             seekApplyLock = false;
             decodeRecoverCount = 0;
-            if (paused) {
-              player.play();
-            }
+            startPendingAutoplay();
             pSliderMouseDown = false;
             eventTarget("seek", { time: this.currentTime, state: "seeked" });
             eventTarget("seeked");
@@ -2693,9 +2778,12 @@ var require_ckplayer = __commonJS({
             } else {
               if (loadedmetadataNum > 0 && video) {
                 try {
-                  video.play();
+                  var playPromise = video.play();
+                  if (playPromise && typeof playPromise.catch === "function") {
+                    playPromise.catch(function() {
+                    });
+                  }
                 } catch (event2) {
-                  console.error(event2);
                 }
               }
             }
@@ -2882,6 +2970,17 @@ var require_ckplayer = __commonJS({
                     applyPendingSeek(false);
                     return player;
                   }
+                  if (hls && target > 1 && !hlsCanSafelySeekTo(target)) {
+                    seekTime = target;
+                    hlsResumeWarmup = true;
+                    hlsResumeTarget = target;
+                    try {
+                      hls.startLoad(hlsPriorLoadTime(target));
+                    } catch (event2) {
+                    }
+                    applyPendingSeek(false);
+                    return player;
+                  }
                   if (hlsSeekTo(target, false)) {
                     seekTime = 0;
                     return player;
@@ -6100,7 +6199,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.0") === -1 && m) {
+              if (cdn && cdn.indexOf("1.1.1") === -1 && m) {
                 if (cdn.slice(-1) !== "/") {
                   cdn += "/";
                 }