ckplayer-plus 1.0.5 → 1.0.7

package/dist/index.js

@@ -207,7 +207,7 @@ var require_ckplayer = __commonJS({
         cdnFallback: true
         // getPath 失败时是否回退到 jsDelivr（内网可设 false，并配置 pluginPath）
       };
-      var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.0.5/dist/";
+      var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.0.7/dist/";
       function ckplayerEmbed(videoObj) {
         var rightMenu = [
           {
@@ -232,6 +232,11 @@ var require_ckplayer = __commonJS({
         var paused = true;
         var loadTime = 0;
         var seekTime = 0;
+        var seekRetryTimer = null;
+        var seekRetryCount = 0;
+        var seekApplyLock = false;
+        var decodeRecoverCount = 0;
+        var hlsStartPositionUsed = false;
         var oldTime = 0, playTime = 0, firstSeekTime = -1, maxSeeTime = 0;
         var isChangeDef = true;
         var playType = "";
@@ -397,7 +402,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.0.5") > -1) {
+          if (!allowCdn || !cdn || cdn.indexOf("1.0.7") > -1) {
             return folder + "/" + file;
           }
           if (cdn.slice(-1) !== "/") {
@@ -555,9 +560,86 @@ var require_ckplayer = __commonJS({
             changeVideo(video.attr("src"));
           }
           return player;
+        }, parseResumeSeekFromVars = function() {
+          if (isUndefined(vars["seek"])) {
+            return 0;
+          }
+          if (valType(vars["seek"]) == "number" && vars["seek"] > 0) {
+            return vars["seek"];
+          }
+          if (valType(vars["seek"]) == "string" && vars["seek"] == "cookie" && cookieName) {
+            var cke = player.cookie(cookieName);
+            if (cke && cke["time"]) {
+              return cke["time"];
+            }
+            return 0;
+          }
+          if (valType(vars["seek"]) == "string" && vars["seek"] !== "" && !isNaN(parseFloat(vars["seek"]))) {
+            return parseFloat(vars["seek"]);
+          }
+          return 0;
+        }, applyResumeSeekState = function(t) {
+          if (!t || t <= 0) {
+            return;
+          }
+          seekTime = t;
+          maxSeeTime = Math.max(maxSeeTime, t);
+          if (firstSeekTime < 0) {
+            firstSeekTime = t;
+          }
+        }, prepareCookieAndSeek = function() {
+          if (vars["cookie"]) {
+            if (valType(vars["cookie"]) == "array" && vars["cookie"].length >= 2) {
+              if (vars["cookie"][0] && valType(vars["cookie"][0]) == "string") {
+                cookieName = vars["cookie"][0];
+              }
+              if (vars["cookie"][1] && valType(vars["cookie"][1]) == "number") {
+                cookieTime = vars["cookie"][1];
+              }
+            }
+            if (valType(vars["cookie"]) == "object" && !isUndefined(vars["cookie"]["name"])) {
+              cookieName = vars["cookie"]["name"];
+              if (!isUndefined(vars["cookie"]["hour"]) && valType(vars["cookie"]["hour"]) == "number") {
+                cookieTime = vars["cookie"]["hour"];
+              }
+            }
+            if (valType(vars["cookie"]) == "string") {
+              cookieName = vars["cookie"];
+            }
+            if (cookieName) {
+              cookieName = cookieName.replace(/[ ]*,[ ]*|[ ]+/g, "").replace(/[ ]*;[ ]*|[ ]+/g, "");
+            }
+          }
+          if (!seekTime) {
+            applyResumeSeekState(parseResumeSeekFromVars());
+          }
+        }, destroyStreamPlayers = function() {
+          clearSeekRetry();
+          seekApplyLock = false;
+          hlsStartPositionUsed = false;
+          decodeRecoverCount = 0;
+          if (hls) {
+            try {
+              hls.destroy();
+            } catch (event2) {
+            }
+            hls = null;
+          }
+          if (pugPlayer) {
+            try {
+              pugPlayer.pause();
+              pugPlayer.unload();
+              pugPlayer.detachMediaElement();
+              pugPlayer.destroy();
+            } catch (event2) {
+            }
+            pugPlayer = null;
+          }
         }, changeVideo = function(vstr) {
           var i2 = 0;
           ensureAutoPlug(vstr);
+          prepareCookieAndSeek();
+          destroyStreamPlayers();
           if (video.attr("src") || video.htm()) {
             player.pause();
           }
@@ -642,46 +724,6 @@ var require_ckplayer = __commonJS({
           if (isChangeDef) {
             checkDefinition();
           }
-          if (vars["cookie"]) {
-            if (valType(vars["cookie"]) == "array" && vars["cookie"].length >= 2) {
-              if (vars["cookie"][0] && valType(vars["cookie"][0]) == "string") {
-                cookieName = vars["cookie"][0];
-              }
-              if (vars["cookie"][1] && valType(vars["cookie"][1]) == "number") {
-                cookieTime = vars["cookie"][1];
-              }
-            }
-            if (valType(vars["cookie"]) == "object" && !isUndefined(vars["cookie"]["name"])) {
-              cookieName = vars["cookie"]["name"];
-              if (!isUndefined(vars["cookie"]["hour"]) && valType(vars["cookie"]["hour"]) == "number") {
-                cookieTime = vars["cookie"]["hour"];
-              }
-            }
-            if (valType(vars["cookie"]) == "string") {
-              cookieName = vars["cookie"];
-            }
-            if (cookieName) {
-              cookieName = cookieName.replace(/[ ]*,[ ]*|[ ]+/g, "").replace(/[ ]*;[ ]*|[ ]+/g, "");
-            }
-          }
-          if (!isUndefined(vars["seek"]) && !seekTime) {
-            if (valType(vars["seek"]) == "number" && vars["seek"] > 0) {
-              seekTime = vars["seek"];
-            } else if (valType(vars["seek"]) == "string" && vars["seek"] == "cookie" && cookieName) {
-              var cke = player.cookie(cookieName);
-              if (cke) {
-                seekTime = cke["time"];
-              }
-            } else if (valType(vars["seek"]) == "string" && vars["seek"] !== "" && !isNaN(parseFloat(vars["seek"]))) {
-              seekTime = parseFloat(vars["seek"]);
-            }
-            if (seekTime && seekTime > 0) {
-              maxSeeTime = Math.max(maxSeeTime, seekTime);
-              if (firstSeekTime < 0) {
-                firstSeekTime = seekTime;
-              }
-            }
-          }
         }, plugPlayer = function(url) {
           switch (vars["plug"]) {
             case "hls.js":
@@ -711,11 +753,39 @@ var require_ckplayer = __commonJS({
         }, hlsPlayer = function(url) {
           var startHls = function() {
             if (typeof Hls !== "undefined" && !isUndefined(Hls) && Hls.isSupported()) {
-              hls = new Hls();
+              if (hls) {
+                try {
+                  hls.destroy();
+                } catch (event2) {
+                }
+                hls = null;
+              }
+              var hlsConf = {
+                // 10s 分片流在续播点附近需要略大缓冲，减少卡住转圈
+                maxBufferLength: 30,
+                maxMaxBufferLength: 60
+              };
+              var resumeAt = seekTime;
+              if (!resumeAt) {
+                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 = 0;
+                hlsStartPositionUsed = true;
+                clearSeekRetry();
+              }
+              hls = new Hls(hlsConf);
               hls.loadSource(url);
               hls.attachMedia(video);
               hls.on(Hls.Events.MANIFEST_PARSED, function() {
-                applyPendingSeek();
+                if (!hlsStartPositionUsed) {
+                  applyPendingSeek();
+                }
               });
               hls.on(Hls.Events.ERROR, function(event2, data) {
                 var code = 9;
@@ -733,6 +803,13 @@ var require_ckplayer = __commonJS({
                     }
                   }
                 }
+                if (fatal && data.type === Hls.ErrorTypes.MEDIA_ERROR && hls && typeof hls.recoverMediaError === "function") {
+                  try {
+                    hls.recoverMediaError();
+                    fatal = false;
+                  } catch (errRecover) {
+                  }
+                }
                 CT.error = { code, message: message2 };
                 eventTarget("error", CT.error);
                 if (fatal) {
@@ -1414,8 +1491,28 @@ var require_ckplayer = __commonJS({
               checkTrack();
             }
           }
-        }, applyPendingSeek = function() {
-          if (!seekTime || !video) {
+        }, timeInBuffered = function(t) {
+          if (!video || isUndefined(video.buffered)) {
+            return false;
+          }
+          try {
+            var buf = video.buffered;
+            for (var i2 = 0; i2 < buf.length; i2++) {
+              if (t >= buf.start(i2) - 0.35 && t <= buf.end(i2) + 0.15) {
+                return true;
+              }
+            }
+          } catch (event2) {
+          }
+          return false;
+        }, clearSeekRetry = function() {
+          if (seekRetryTimer) {
+            clearTimeout(seekRetryTimer);
+            seekRetryTimer = null;
+          }
+          seekRetryCount = 0;
+        }, applyPendingSeek = function(force) {
+          if (!seekTime || !video || seekApplyLock) {
             return;
           }
           if (!isUndefined(vars["live"]) && (valType(vars["live"]) == "boolean" && vars["live"] || valType(vars["live"]) == "number")) {
@@ -1426,18 +1523,96 @@ var require_ckplayer = __commonJS({
           if (dur && isFinite(dur) && dur > 0 && t >= dur) {
             t = Math.max(0, dur - 0.3);
           }
+          if (t <= 0) {
+            seekTime = 0;
+            clearSeekRetry();
+            return;
+          }
           if (t > 0) {
             maxSeeTime = Math.max(maxSeeTime, t);
             if (firstSeekTime < 0) {
               firstSeekTime = t;
             }
           }
+          if (hls && typeof hls.startLoad === "function") {
+            clearSeekRetry();
+            seekTime = 0;
+            try {
+              hls.startLoad(t);
+            } catch (event2) {
+              seekTime = t;
+            }
+            return;
+          }
+          var readyEnough = !isUndefined(video.readyState) && video.readyState >= 2;
+          var bufferedOk = timeInBuffered(t);
+          if (!force && !bufferedOk && (!readyEnough || video.readyState < 3)) {
+            seekRetryCount++;
+            if (seekRetryCount <= 50) {
+              if (seekRetryTimer) {
+                clearTimeout(seekRetryTimer);
+              }
+              seekRetryTimer = setTimeout(function() {
+                applyPendingSeek(false);
+              }, 200);
+              return;
+            }
+          }
+          clearSeekRetry();
+          seekApplyLock = true;
           seekTime = 0;
           try {
             video.currentTime = t;
           } catch (event2) {
             seekTime = t;
+            seekApplyLock = false;
           }
+          setTimeout(function() {
+            seekApplyLock = false;
+          }, 800);
+        }, recoverDecodeError = function() {
+          if (decodeRecoverCount >= 2) {
+            return false;
+          }
+          decodeRecoverCount++;
+          var resumeAt = playTime > 0 ? playTime : vars["seek"] ? parseFloat(vars["seek"]) : 0;
+          if (isNaN(resumeAt) || resumeAt < 0) {
+            resumeAt = 0;
+          }
+          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) {
+          }
+          try {
+            var soft = Math.max(0, resumeAt - 1.5);
+            seekTime = resumeAt;
+            seekApplyLock = false;
+            if (video) {
+              video.currentTime = soft;
+            }
+            setTimeout(function() {
+              applyPendingSeek(true);
+              if (video && video.paused && vars["autoplay"]) {
+                try {
+                  video.play();
+                } catch (e2) {
+                }
+              }
+            }, 400);
+            return true;
+          } catch (event2) {
+          }
+          return false;
         }, loadedMetaData = function() {
           eventTarget("loadedMetaData", {
             width: CK.getWidth(),
@@ -1614,6 +1789,11 @@ var require_ckplayer = __commonJS({
                   if (!isUndefined(errorInfo.message)) {
                     msg = errorInfo.message;
                   }
+                  if (code === 3 && recoverDecodeError()) {
+                    CT.error = { code, message: msg };
+                    eventTarget("error", CT.error);
+                    return;
+                  }
                   CT.error = { code, message: msg };
                   showError();
                 } else {
@@ -1663,6 +1843,8 @@ var require_ckplayer = __commonJS({
             eventTarget("error", CT.error);
           },
           seeked: function() {
+            seekApplyLock = false;
+            decodeRecoverCount = 0;
             if (paused) {
               player.play();
             }
@@ -2040,7 +2222,8 @@ var require_ckplayer = __commonJS({
             ad["frontPlay"] = false;
             C["ad"].hide();
             allBarShow();
-            seekTime = vars["seek"];
+            seekTime = 0;
+            applyResumeSeekState(parseResumeSeekFromVars());
             if (ad["front"]["video"]) {
               changeVideo(vars["video"]);
             } else {
@@ -2614,10 +2797,6 @@ var require_ckplayer = __commonJS({
                         firstSeekTime = target;
                       }
                     }
-                    try {
-                      video.currentTime = target;
-                    } catch (event2) {
-                    }
                     return player;
                   }
                   if (duration && isFinite(duration) && duration > 0 && target > duration) {
@@ -2629,6 +2808,20 @@ var require_ckplayer = __commonJS({
                   if (vars["timeScheduleAdjust"] == 5 && target > maxSeeTime && seekTime && Math.abs(seekTime - target) < 0.5) {
                     maxSeeTime = Math.max(maxSeeTime, target);
                   }
+                  if (target > 0.5 && !timeInBuffered(target) && video.readyState < 3 && !hls) {
+                    seekTime = target;
+                    applyPendingSeek(false);
+                    return player;
+                  }
+                  if (hls && typeof hls.startLoad === "function") {
+                    seekTime = 0;
+                    try {
+                      hls.startLoad(target);
+                    } catch (event2) {
+                      seekTime = target;
+                    }
+                    return player;
+                  }
                   try {
                     video.currentTime = target;
                     seekTime = 0;
@@ -5843,7 +6036,7 @@ var require_ckplayer = __commonJS({
             if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
               var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
               var m2 = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
-              if (cdn && cdn.indexOf("1.0.5") === -1 && m2) {
+              if (cdn && cdn.indexOf("1.0.7") === -1 && m2) {
                 if (cdn.slice(-1) !== "/") {
                   cdn += "/";
                 }