ckplayer-plus 1.1.1 → 1.1.3

package/dist/vue.cjs

@@ -210,7 +210,7 @@ var require_ckplayer = __commonJS({
         cdnFallback: true
         // getPath 失败时是否回退到 jsDelivr（内网可设 false，并配置 pluginPath）
       };
-      var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.1/dist/";
+      var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.3/dist/";
       function ckplayerEmbed(videoObj) {
         var rightMenu = [
           {
@@ -432,7 +432,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.1") > -1) {
+          if (!allowCdn || !cdn || cdn.indexOf("1.1.3") > -1) {
             return folder + "/" + file;
           }
           if (cdn.slice(-1) !== "/") {
@@ -527,7 +527,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");
           }
@@ -643,6 +647,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;
@@ -842,17 +849,30 @@ var require_ckplayer = __commonJS({
                 seekTime = resumeAt;
                 hlsResumeTarget = resumeAt;
                 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) {
+                  var loadAt = hlsPriorLoadTime(seekTime);
                   try {
-                    hls.startLoad(hlsPriorLoadTime(seekTime));
+                    hls.startLoad(loadAt);
                   } catch (event2) {
                   }
+                  setTimeout(function() {
+                    if (!hlsResumeWarmup || !seekTime) {
+                      return;
+                    }
+                    var target = seekTime;
+                    if (hlsCanSafelySeekTo(target)) {
+                      finishResumeSeek(target);
+                      return;
+                    }
+                    var snap = hlsPriorLoadTime(target);
+                    hlsResumeWarmup = false;
+                    finishResumeSeek(snap);
+                  }, 5e3);
                   return;
                 }
                 if (!hlsStartPositionUsed) {
@@ -862,8 +882,7 @@ var require_ckplayer = __commonJS({
               hls.on(Hls.Events.FRAG_BUFFERED, function(event2, data) {
                 if (hlsResumeWarmup && seekTime > 0) {
                   if (hlsCanSafelySeekTo(seekTime)) {
-                    hlsResumeWarmup = false;
-                    applySeekToMedia(seekTime);
+                    finishResumeSeek(seekTime);
                   }
                   return;
                 }
@@ -1599,28 +1618,94 @@ var require_ckplayer = __commonJS({
           } catch (event2) {
           }
           return false;
+        }, hlsFragAround = function(t) {
+          if (!hls || isNaN(t) || t < 0) {
+            return null;
+          }
+          try {
+            var level = -1;
+            if (typeof hls.currentLevel === "number" && hls.currentLevel >= 0) {
+              level = hls.currentLevel;
+            } else if (typeof hls.firstLevel === "number" && hls.firstLevel >= 0) {
+              level = hls.firstLevel;
+            } else {
+              level = 0;
+            }
+            var details = hls.levels && hls.levels[level] && hls.levels[level].details;
+            var frags = details && details.fragments;
+            if (!frags || !frags.length) {
+              return null;
+            }
+            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 f;
+              }
+            }
+            return frags[frags.length - 1];
+          } catch (event2) {
+          }
+          return null;
         }, hlsPriorLoadTime = function(t) {
           if (isNaN(t) || t <= 0) {
             return 0;
           }
+          var frag = hlsFragAround(t);
+          if (frag && !isUndefined(frag.start)) {
+            return Math.max(0, frag.start);
+          }
           return Math.max(0, t - 12);
         }, hlsCanSafelySeekTo = function(t) {
           if (!video || isUndefined(video.buffered) || isNaN(t) || t < 0) {
             return false;
           }
+          if (!timeInBuffered(t)) {
+            return false;
+          }
+          var fragStart = hlsPriorLoadTime(t);
           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) {
+              if (fragStart >= start - 0.35 && t <= end + 0.15) {
                 return true;
               }
             }
           } catch (event2) {
           }
           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["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() {
           if (seekRetryTimer) {
             clearTimeout(seekRetryTimer);
@@ -1671,8 +1756,7 @@ var require_ckplayer = __commonJS({
           }
           if (hlsResumeWarmup) {
             if (hlsCanSafelySeekTo(t)) {
-              hlsResumeWarmup = false;
-              applySeekToMedia(t);
+              finishResumeSeek(t);
             }
             return;
           }
@@ -1723,7 +1807,10 @@ var require_ckplayer = __commonJS({
           if (isNaN(resumeAt) || resumeAt < 0) {
             resumeAt = 0;
           }
-          var loadFrom = Math.max(0, resumeAt - 12 * decodeRecoverCount);
+          var loadFrom = hlsPriorLoadTime(resumeAt);
+          if (decodeRecoverCount >= 2) {
+            loadFrom = Math.max(0, loadFrom - 10);
+          }
           seekApplyLock = false;
           clearSeekRetry();
           try {
@@ -1733,7 +1820,8 @@ var require_ckplayer = __commonJS({
           } catch (event2) {
           }
           if (resumeAt > 0 && hls && typeof hls.startLoad === "function") {
-            seekTime = resumeAt;
+            var target = decodeRecoverCount >= 3 ? loadFrom : resumeAt;
+            seekTime = target;
             hlsResumeTarget = resumeAt;
             hlsResumeWarmup = true;
             hlsLoadAt = -1;
@@ -1743,36 +1831,18 @@ var require_ckplayer = __commonJS({
             } catch (event2) {
             }
             setTimeout(function() {
-              if (hlsCanSafelySeekTo(resumeAt)) {
-                hlsResumeWarmup = false;
-                applySeekToMedia(resumeAt);
-                if (video && video.paused && vars["autoplay"]) {
-                  try {
-                    video.play();
-                  } catch (e2) {
-                  }
-                }
+              if (hlsCanSafelySeekTo(target)) {
+                finishResumeSeek(target);
+              } else if (decodeRecoverCount >= 2) {
+                finishResumeSeek(loadFrom);
               } else {
                 applyPendingSeek(false);
               }
-            }, 500);
+            }, 600);
             return true;
           }
           try {
-            var soft = Math.max(0, resumeAt - 1.5);
-            seekTime = resumeAt;
-            if (video) {
-              video.currentTime = soft;
-            }
-            setTimeout(function() {
-              applyPendingSeek(true);
-              if (video && video.paused && vars["autoplay"]) {
-                try {
-                  video.play();
-                } catch (e2) {
-                }
-              }
-            }, 400);
+            finishResumeSeek(Math.max(0, resumeAt - 1.5));
             return true;
           } catch (event2) {
           }
@@ -2013,7 +2083,7 @@ var require_ckplayer = __commonJS({
             eventTarget("seeked");
           },
           seeking: function() {
-            if (paused) {
+            if (paused && !seekApplyLock && !hlsResumeWarmup && !seekTime && !autoplayPending) {
               player.play();
             }
             var seekingTime = this.currentTime;
@@ -4213,7 +4283,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());
@@ -6205,7 +6278,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.1") === -1 && m) {
+              if (cdn && cdn.indexOf("1.1.3") === -1 && m) {
                 if (cdn.slice(-1) !== "/") {
                   cdn += "/";
                 }
@@ -7021,6 +7094,9 @@ function buildPlayerConfig(input) {
       config[key] = opts[key];
     }
   }
+  if (config.seek > 0) {
+    config.autoplay = false;
+  }
   if (config.loaded != null && typeof config.loaded !== "function") {
     delete config.loaded;
   }

package/dist/vue.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.1/dist/";
+      var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.3/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.1") > -1) {
+          if (!allowCdn || !cdn || cdn.indexOf("1.1.3") > -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;
@@ -836,17 +843,30 @@ var require_ckplayer = __commonJS({
                 seekTime = resumeAt;
                 hlsResumeTarget = resumeAt;
                 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) {
+                  var loadAt = hlsPriorLoadTime(seekTime);
                   try {
-                    hls.startLoad(hlsPriorLoadTime(seekTime));
+                    hls.startLoad(loadAt);
                   } catch (event2) {
                   }
+                  setTimeout(function() {
+                    if (!hlsResumeWarmup || !seekTime) {
+                      return;
+                    }
+                    var target = seekTime;
+                    if (hlsCanSafelySeekTo(target)) {
+                      finishResumeSeek(target);
+                      return;
+                    }
+                    var snap = hlsPriorLoadTime(target);
+                    hlsResumeWarmup = false;
+                    finishResumeSeek(snap);
+                  }, 5e3);
                   return;
                 }
                 if (!hlsStartPositionUsed) {
@@ -856,8 +876,7 @@ var require_ckplayer = __commonJS({
               hls.on(Hls.Events.FRAG_BUFFERED, function(event2, data) {
                 if (hlsResumeWarmup && seekTime > 0) {
                   if (hlsCanSafelySeekTo(seekTime)) {
-                    hlsResumeWarmup = false;
-                    applySeekToMedia(seekTime);
+                    finishResumeSeek(seekTime);
                   }
                   return;
                 }
@@ -1593,28 +1612,94 @@ var require_ckplayer = __commonJS({
           } catch (event2) {
           }
           return false;
+        }, hlsFragAround = function(t) {
+          if (!hls || isNaN(t) || t < 0) {
+            return null;
+          }
+          try {
+            var level = -1;
+            if (typeof hls.currentLevel === "number" && hls.currentLevel >= 0) {
+              level = hls.currentLevel;
+            } else if (typeof hls.firstLevel === "number" && hls.firstLevel >= 0) {
+              level = hls.firstLevel;
+            } else {
+              level = 0;
+            }
+            var details = hls.levels && hls.levels[level] && hls.levels[level].details;
+            var frags = details && details.fragments;
+            if (!frags || !frags.length) {
+              return null;
+            }
+            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 f;
+              }
+            }
+            return frags[frags.length - 1];
+          } catch (event2) {
+          }
+          return null;
         }, hlsPriorLoadTime = function(t) {
           if (isNaN(t) || t <= 0) {
             return 0;
           }
+          var frag = hlsFragAround(t);
+          if (frag && !isUndefined(frag.start)) {
+            return Math.max(0, frag.start);
+          }
           return Math.max(0, t - 12);
         }, hlsCanSafelySeekTo = function(t) {
           if (!video || isUndefined(video.buffered) || isNaN(t) || t < 0) {
             return false;
           }
+          if (!timeInBuffered(t)) {
+            return false;
+          }
+          var fragStart = hlsPriorLoadTime(t);
           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) {
+              if (fragStart >= start - 0.35 && t <= end + 0.15) {
                 return true;
               }
             }
           } catch (event2) {
           }
           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["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() {
           if (seekRetryTimer) {
             clearTimeout(seekRetryTimer);
@@ -1665,8 +1750,7 @@ var require_ckplayer = __commonJS({
           }
           if (hlsResumeWarmup) {
             if (hlsCanSafelySeekTo(t)) {
-              hlsResumeWarmup = false;
-              applySeekToMedia(t);
+              finishResumeSeek(t);
             }
             return;
           }
@@ -1717,7 +1801,10 @@ var require_ckplayer = __commonJS({
           if (isNaN(resumeAt) || resumeAt < 0) {
             resumeAt = 0;
           }
-          var loadFrom = Math.max(0, resumeAt - 12 * decodeRecoverCount);
+          var loadFrom = hlsPriorLoadTime(resumeAt);
+          if (decodeRecoverCount >= 2) {
+            loadFrom = Math.max(0, loadFrom - 10);
+          }
           seekApplyLock = false;
           clearSeekRetry();
           try {
@@ -1727,7 +1814,8 @@ var require_ckplayer = __commonJS({
           } catch (event2) {
           }
           if (resumeAt > 0 && hls && typeof hls.startLoad === "function") {
-            seekTime = resumeAt;
+            var target = decodeRecoverCount >= 3 ? loadFrom : resumeAt;
+            seekTime = target;
             hlsResumeTarget = resumeAt;
             hlsResumeWarmup = true;
             hlsLoadAt = -1;
@@ -1737,36 +1825,18 @@ var require_ckplayer = __commonJS({
             } catch (event2) {
             }
             setTimeout(function() {
-              if (hlsCanSafelySeekTo(resumeAt)) {
-                hlsResumeWarmup = false;
-                applySeekToMedia(resumeAt);
-                if (video && video.paused && vars["autoplay"]) {
-                  try {
-                    video.play();
-                  } catch (e2) {
-                  }
-                }
+              if (hlsCanSafelySeekTo(target)) {
+                finishResumeSeek(target);
+              } else if (decodeRecoverCount >= 2) {
+                finishResumeSeek(loadFrom);
               } else {
                 applyPendingSeek(false);
               }
-            }, 500);
+            }, 600);
             return true;
           }
           try {
-            var soft = Math.max(0, resumeAt - 1.5);
-            seekTime = resumeAt;
-            if (video) {
-              video.currentTime = soft;
-            }
-            setTimeout(function() {
-              applyPendingSeek(true);
-              if (video && video.paused && vars["autoplay"]) {
-                try {
-                  video.play();
-                } catch (e2) {
-                }
-              }
-            }, 400);
+            finishResumeSeek(Math.max(0, resumeAt - 1.5));
             return true;
           } catch (event2) {
           }
@@ -2007,7 +2077,7 @@ var require_ckplayer = __commonJS({
             eventTarget("seeked");
           },
           seeking: function() {
-            if (paused) {
+            if (paused && !seekApplyLock && !hlsResumeWarmup && !seekTime && !autoplayPending) {
               player.play();
             }
             var seekingTime = this.currentTime;
@@ -4207,7 +4277,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());
@@ -6199,7 +6272,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.1") === -1 && m) {
+              if (cdn && cdn.indexOf("1.1.3") === -1 && m) {
                 if (cdn.slice(-1) !== "/") {
                   cdn += "/";
                 }
@@ -7007,6 +7080,9 @@ function buildPlayerConfig(input) {
       config[key] = opts[key];
     }
   }
+  if (config.seek > 0) {
+    config.autoplay = false;
+  }
   if (config.loaded != null && typeof config.loaded !== "function") {
     delete config.loaded;
   }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ckplayer-plus",
-  "version": "1.1.1",
+  "version": "1.1.3",
   "description": "Enhanced ckplayer X3 packaging with Vue 2/3 and React wrappers — ESM-ready HTML5 video player",
   "keywords": [
     "ckplayer",