ckplayer-plus 1.0.6 → 1.0.8

package/dist/vue.cjs

@@ -212,7 +212,7 @@ var require_ckplayer = __commonJS({
         cdnFallback: true
         // getPath 失败时是否回退到 jsDelivr（内网可设 false，并配置 pluginPath）
       };
-      var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.0.6/dist/";
+      var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.0.8/dist/";
       function ckplayerEmbed(videoObj) {
         var rightMenu = [
           {
@@ -242,6 +242,9 @@ var require_ckplayer = __commonJS({
         var seekApplyLock = false;
         var decodeRecoverCount = 0;
         var hlsStartPositionUsed = false;
+        var hlsResumeTarget = -1;
+        var hlsLoadAt = -1;
+        var hlsLoadTs = 0;
         var oldTime = 0, playTime = 0, firstSeekTime = -1, maxSeeTime = 0;
         var isChangeDef = true;
         var playType = "";
@@ -407,7 +410,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.6") > -1) {
+          if (!allowCdn || !cdn || cdn.indexOf("1.0.8") > -1) {
             return folder + "/" + file;
           }
           if (cdn.slice(-1) !== "/") {
@@ -565,9 +568,120 @@ 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());
+          }
+        }, hlsSeekTo = function(target, force) {
+          if (!hls || typeof hls.startLoad !== "function" || !video) {
+            return false;
+          }
+          if (isNaN(target) || target < 0) {
+            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;
+              }
+            }
+            if (timeInBuffered(target) && Math.abs(curTime - target) < 1.5) {
+              hlsResumeTarget = target;
+              return true;
+            }
+            if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - target) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
+              return true;
+            }
+          }
+          hlsLoadAt = target;
+          hlsLoadTs = Date.now();
+          hlsResumeTarget = target;
+          try {
+            hls.startLoad(target);
+          } catch (event2) {
+            return false;
+          }
+          return true;
+        }, destroyStreamPlayers = function() {
+          clearSeekRetry();
+          seekApplyLock = false;
+          hlsStartPositionUsed = false;
+          hlsResumeTarget = -1;
+          hlsLoadAt = -1;
+          hlsLoadTs = 0;
+          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();
           }
@@ -652,46 +766,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":
@@ -721,13 +795,31 @@ var require_ckplayer = __commonJS({
         }, hlsPlayer = function(url) {
           var startHls = function() {
             if (typeof Hls !== "undefined" && !isUndefined(Hls) && Hls.isSupported()) {
-              var hlsConf = {};
-              if (seekTime && seekTime > 0 && (isUndefined(vars["live"]) || !vars["live"])) {
-                hlsConf.startPosition = seekTime;
-                maxSeeTime = Math.max(maxSeeTime, seekTime);
+              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 = seekTime;
+                  firstSeekTime = resumeAt;
                 }
+                hlsResumeTarget = resumeAt;
+                hlsLoadAt = resumeAt;
+                hlsLoadTs = Date.now();
                 seekTime = 0;
                 hlsStartPositionUsed = true;
                 clearSeekRetry();
@@ -740,6 +832,21 @@ var require_ckplayer = __commonJS({
                   applyPendingSeek();
                 }
               });
+              hls.on(Hls.Events.FRAG_BUFFERED, function(event2, data) {
+                if (hlsResumeTarget <= 0 || !data || !data.frag) {
+                  return;
+                }
+                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();
+                    }
+                  }
+                }
+              });
               hls.on(Hls.Events.ERROR, function(event2, data) {
                 var code = 9;
                 var message2 = language["error"]["loadingFailed"];
@@ -1481,17 +1588,22 @@ var require_ckplayer = __commonJS({
             clearSeekRetry();
             return;
           }
+          if (t > 0) {
+            maxSeeTime = Math.max(maxSeeTime, t);
+            if (firstSeekTime < 0) {
+              firstSeekTime = t;
+            }
+          }
+          if (hlsSeekTo(t, !!force)) {
+            clearSeekRetry();
+            seekTime = 0;
+            return;
+          }
           var readyEnough = !isUndefined(video.readyState) && video.readyState >= 2;
           var bufferedOk = timeInBuffered(t);
           if (!force && !bufferedOk && (!readyEnough || video.readyState < 3)) {
             seekRetryCount++;
             if (seekRetryCount <= 50) {
-              try {
-                if (hls && typeof hls.startLoad === "function") {
-                  hls.startLoad(t);
-                }
-              } catch (event2) {
-              }
               if (seekRetryTimer) {
                 clearTimeout(seekRetryTimer);
               }
@@ -1502,12 +1614,6 @@ var require_ckplayer = __commonJS({
             }
           }
           clearSeekRetry();
-          if (t > 0) {
-            maxSeeTime = Math.max(maxSeeTime, t);
-            if (firstSeekTime < 0) {
-              firstSeekTime = t;
-            }
-          }
           seekApplyLock = true;
           seekTime = 0;
           try {
@@ -2171,7 +2277,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 {
@@ -2756,11 +2863,15 @@ 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) {
+                  if (target > 0.5 && !timeInBuffered(target) && video.readyState < 3 && !hls) {
                     seekTime = target;
                     applyPendingSeek(false);
                     return player;
                   }
+                  if (hlsSeekTo(target, false)) {
+                    seekTime = 0;
+                    return player;
+                  }
                   try {
                     video.currentTime = target;
                     seekTime = 0;
@@ -5975,7 +6086,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.6") === -1 && m2) {
+              if (cdn && cdn.indexOf("1.0.8") === -1 && m2) {
                 if (cdn.slice(-1) !== "/") {
                   cdn += "/";
                 }
@@ -6776,6 +6887,9 @@ function buildPlayerConfig(input) {
   if (input.pluginPath) {
     config.pluginPath = input.pluginPath;
   }
+  if (input.seek != null && input.seek !== "" && !isNaN(parseFloat(input.seek)) && parseFloat(input.seek) > 0) {
+    config.seek = parseFloat(input.seek);
+  }
   for (var key in opts) {
     if (Object.prototype.hasOwnProperty.call(opts, key) && key !== "container") {
       config[key] = opts[key];
@@ -6801,6 +6915,8 @@ var CkPlayer = {
     autoPlug: { type: Boolean, default: true },
     volume: { type: Number, default: 0.8 },
     pluginPath: { type: String, default: "" },
+    /** 续播秒数；请在创建时传入，不要在 onReady 里再 player.seek 同一时间点 */
+    seek: { default: 0 },
     options: { type: Object, default: function() {
       return {};
     } },
@@ -6842,6 +6958,10 @@ var CkPlayer = {
     pluginPath: function() {
       this.reinit();
     },
+    seek: function(val) {
+      if (!this.player || val == null || val === "" || isNaN(parseFloat(val)) || parseFloat(val) <= 0) return;
+      this.player.seek(parseFloat(val));
+    },
     volume: function(vol) {
       if (this.player && typeof this.player.volume === "function" && typeof vol === "number") {
         this.player.volume(vol);
@@ -6860,6 +6980,7 @@ var CkPlayer = {
         autoPlug: this.autoPlug,
         volume: this.volume,
         pluginPath: this.pluginPath,
+        seek: this.seek,
         options: this.options,
         cookie: this.instanceId
       });