ckplayer-plus 1.0.3 → 1.0.6

package/dist/react.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.3/dist/";
+      var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.0.6/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 = "";
@@ -370,26 +375,34 @@ var require_ckplayer = __commonJS({
           } else {
             return embed(obj2);
           }
+        }, isUnreliablePluginBase = function(base2) {
+          if (!base2 || valType(base2) != "string") {
+            return true;
+          }
+          return /\/(?:assets|\.vite\/deps|_next\/static|chunks?)\/?$/i.test(base2);
         }, resolveAssetPath = function(folder, file) {
-          var base = "";
+          var base2 = "";
           if (vars && vars["pluginPath"]) {
-            base = vars["pluginPath"];
+            base2 = vars["pluginPath"];
           } else if (typeof window !== "undefined" && window.ckplayerBasePath) {
-            base = window.ckplayerBasePath;
+            base2 = window.ckplayerBasePath;
+          }
+          if (base2 && isUnreliablePluginBase(base2)) {
+            base2 = "";
           }
-          if (base) {
-            if (base.slice(-1) !== "/") {
-              base += "/";
+          if (base2) {
+            if (base2.slice(-1) !== "/") {
+              base2 += "/";
             }
-            return base + folder + "/" + file;
+            return base2 + folder + "/" + file;
           }
           var fromScript = getPath(folder) + file;
-          if (fromScript && fromScript.indexOf(folder + "/") > -1 && fromScript.indexOf("undefined") === -1) {
+          if (fromScript && fromScript.indexOf(folder + "/") > -1 && fromScript.indexOf("undefined") === -1 && !isUnreliablePluginBase(getPath())) {
             return fromScript;
           }
           var allowCdn = !vars || vars["cdnFallback"] !== false;
           var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
-          if (!allowCdn || !cdn || cdn.indexOf("1.0.3") > -1) {
+          if (!allowCdn || !cdn || cdn.indexOf("1.0.6") > -1) {
             return folder + "/" + file;
           }
           if (cdn.slice(-1) !== "/") {
@@ -703,11 +716,24 @@ var require_ckplayer = __commonJS({
         }, hlsPlayer = function(url) {
           var startHls = function() {
             if (typeof Hls !== "undefined" && !isUndefined(Hls) && Hls.isSupported()) {
-              hls = new Hls();
+              var hlsConf = {};
+              if (seekTime && seekTime > 0 && (isUndefined(vars["live"]) || !vars["live"])) {
+                hlsConf.startPosition = seekTime;
+                maxSeeTime = Math.max(maxSeeTime, seekTime);
+                if (firstSeekTime < 0) {
+                  firstSeekTime = seekTime;
+                }
+                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;
@@ -725,6 +751,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) {
@@ -1406,8 +1439,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")) {
@@ -1418,18 +1471,92 @@ 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;
+          }
+          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);
+              }
+              seekRetryTimer = setTimeout(function() {
+                applyPendingSeek(false);
+              }, 200);
+              return;
+            }
+          }
+          clearSeekRetry();
           if (t > 0) {
             maxSeeTime = Math.max(maxSeeTime, t);
             if (firstSeekTime < 0) {
               firstSeekTime = t;
             }
           }
+          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(),
@@ -1606,6 +1733,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 {
@@ -1655,6 +1787,8 @@ var require_ckplayer = __commonJS({
             eventTarget("error", CT.error);
           },
           seeked: function() {
+            seekApplyLock = false;
+            decodeRecoverCount = 0;
             if (paused) {
               player.play();
             }
@@ -2606,10 +2740,6 @@ var require_ckplayer = __commonJS({
                         firstSeekTime = target;
                       }
                     }
-                    try {
-                      video.currentTime = target;
-                    } catch (event2) {
-                    }
                     return player;
                   }
                   if (duration && isFinite(duration) && duration > 0 && target > duration) {
@@ -2621,6 +2751,11 @@ 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) {
+                    seekTime = target;
+                    applyPendingSeek(false);
+                    return player;
+                  }
                   try {
                     video.currentTime = target;
                     seekTime = 0;
@@ -5780,7 +5915,7 @@ var require_ckplayer = __commonJS({
           }
           varsTime += time;
           return language["lookBack"] + date("H:i:s", varsTime);
-        }, loadJs = function(file, callback2) {
+        }, loadJs = function(file, callback2, isRetry) {
           var fn2 = function() {
           };
           if (!isUndefined(callback2)) {
@@ -5815,19 +5950,37 @@ var require_ckplayer = __commonJS({
               ;
             }, 10);
           };
-          var w3c = function() {
-            if (valType(fn2) == "function") {
-              fn2();
+          var removeScript = function() {
+            try {
+              if (script.parentNode) {
+                script.parentNode.removeChild(script);
+              }
+            } catch (event2) {
             }
+          };
+          var w3c = function() {
             removeListener(script, "load", w3c);
             removeListener(script, "error", w3cError);
+            doReady();
           };
           var w3cError = function() {
-            if (valType(fn2) == "function") {
-              fn2();
-            }
             removeListener(script, "load", w3c);
             removeListener(script, "error", w3cError);
+            removeScript();
+            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.slice(-1) !== "/") {
+                  cdn += "/";
+                }
+                var retryUrl = cdn + m2[1] + "/" + m2[2];
+                if (retryUrl !== file) {
+                  loadJs(retryUrl, callback2, true);
+                  return;
+                }
+              }
+            }
           };
           try {
             addListener(script, "load", w3c);
@@ -6053,14 +6206,19 @@ var require_ckplayer = __commonJS({
       }
       function getPath(siz) {
         if (typeof window !== "undefined" && window.ckplayerBasePath) {
-          var base = window.ckplayerBasePath;
-          if (base.slice(-1) !== "/") {
-            base += "/";
+          var base2 = window.ckplayerBasePath;
+          if (/\/(?:assets|\.vite\/deps|_next\/static|chunks?)\/?$/i.test(base2)) {
+            base2 = "";
           }
-          if (!isUndefined(siz)) {
-            return base + siz + "/";
+          if (base2) {
+            if (base2.slice(-1) !== "/") {
+              base2 += "/";
+            }
+            if (!isUndefined(siz)) {
+              return base2 + siz + "/";
+            }
+            return base2;
           }
-          return base;
         }
         var scriptList = document.scripts || [], thisPath = scriptList.length ? scriptList[scriptList.length - 1].src : "";
         for (var i2 = 0; i2 < scriptList.length; i2++) {
@@ -6574,13 +6732,17 @@ var import_ckplayer = __toESM(require_ckplayer());
 var import_meta = {};
 try {
   if (typeof window !== "undefined" && !window.ckplayerBasePath) {
-    window.ckplayerBasePath = new URL("./", import_meta.url).href;
+    base = new URL("./", import_meta.url).href;
+    if (/\/dist\/$/i.test(base) || /\/ckplayer-plus(?:@[^/]+)?\/(?:dist\/)?$/i.test(base) || /\/node_modules\/ckplayer-plus\/(?:dist\/)?$/i.test(base)) {
+      window.ckplayerBasePath = base;
+    }
   }
 } catch (e) {
 }
+var base;
 var index_default = import_ckplayer.default;
 
-// src/react/CkPlayer.js
+// src/shared.js
 var EVENT_MAP = {
   play: "onPlay",
   pause: "onPause",
@@ -6596,6 +6758,34 @@ var EVENT_MAP = {
 function createUid() {
   return "ckp-" + Math.random().toString(36).slice(2, 10);
 }
+function buildPlayerConfig(input) {
+  var opts = input.options || {};
+  var config = {
+    container: input.container,
+    video: input.video,
+    poster: input.poster || "",
+    autoplay: !!input.autoplay,
+    live: input.live != null ? input.live : false,
+    plug: input.plug || "",
+    autoPlug: input.autoPlug !== false,
+    volume: input.volume != null ? input.volume : 0.8,
+    cookie: opts.cookie || input.cookie || createUid()
+  };
+  if (input.pluginPath) {
+    config.pluginPath = input.pluginPath;
+  }
+  for (var key in opts) {
+    if (Object.prototype.hasOwnProperty.call(opts, key) && key !== "container") {
+      config[key] = opts[key];
+    }
+  }
+  if (typeof config.loaded === "string") {
+    delete config.loaded;
+  }
+  return config;
+}
+
+// src/react/CkPlayer.js
 var CkPlayer = forwardRef(function CkPlayer2(props, ref) {
   var containerRef = useRef(null);
   var playerRef = useRef(null);
@@ -6610,47 +6800,30 @@ var CkPlayer = forwardRef(function CkPlayer2(props, ref) {
   var autoPlug = props.autoPlug;
   var volume = props.volume;
   var pluginPath = props.pluginPath;
-  var options = props.options;
   var width = props.width != null ? props.width : "100%";
   var height = props.height != null ? props.height : "400px";
   var className = props.className || "";
   var style = props.style;
   useEffect(function() {
-    var cancelled = false;
     var el = containerRef.current;
     if (typeof window === "undefined" || !el) {
       return void 0;
     }
-    var opts = propsRef.current && propsRef.current.options || {};
-    var config = {
+    var current = propsRef.current || {};
+    var config = buildPlayerConfig({
       container: el,
-      video: propsRef.current.video,
-      poster: propsRef.current.poster || "",
-      autoplay: !!propsRef.current.autoplay,
-      live: propsRef.current.live != null ? propsRef.current.live : false,
-      plug: propsRef.current.plug || "",
-      autoPlug: propsRef.current.autoPlug !== false,
-      volume: propsRef.current.volume != null ? propsRef.current.volume : 0.8,
-      cookie: opts.cookie || instanceIdRef.current
-    };
-    if (propsRef.current.pluginPath) {
-      config.pluginPath = propsRef.current.pluginPath;
-    }
-    Object.keys(opts).forEach(function(key) {
-      if (key !== "container") {
-        config[key] = opts[key];
-      }
+      video: current.video,
+      poster: current.poster,
+      autoplay: current.autoplay,
+      live: current.live,
+      plug: current.plug,
+      autoPlug: current.autoPlug,
+      volume: current.volume,
+      pluginPath: current.pluginPath,
+      options: current.options,
+      cookie: instanceIdRef.current
     });
-    if (typeof config.loaded === "string") {
-      delete config.loaded;
-    }
     var player2 = new index_default(config);
-    if (cancelled) {
-      if (player2 && typeof player2.remove === "function") {
-        player2.remove();
-      }
-      return void 0;
-    }
     playerRef.current = player2;
     Object.keys(EVENT_MAP).forEach(function(name) {
       if (typeof player2[name] === "function") {
@@ -6666,7 +6839,6 @@ var CkPlayer = forwardRef(function CkPlayer2(props, ref) {
       propsRef.current.onReady(player2);
     }
     return function cleanup() {
-      cancelled = true;
       if (playerRef.current && typeof playerRef.current.remove === "function") {
         try {
           playerRef.current.remove();
@@ -6675,7 +6847,12 @@ var CkPlayer = forwardRef(function CkPlayer2(props, ref) {
       }
       playerRef.current = null;
     };
-  }, [video2, poster, autoplay, live, plug, autoPlug, volume, pluginPath]);
+  }, [video2, poster, autoplay, live, plug, autoPlug, pluginPath]);
+  useEffect(function() {
+    if (playerRef.current && typeof volume === "number" && typeof playerRef.current.volume === "function") {
+      playerRef.current.volume(volume);
+    }
+  }, [volume]);
   useImperativeHandle(ref, function() {
     return {
       play: function() {