ckplayer-plus 1.0.2 → 1.0.5

package/dist/vue.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.2/dist/";
+      var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.0.5/dist/";
       function ckplayerEmbed(videoObj) {
         var rightMenu = [
           {
@@ -370,26 +370,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 (base) {
-            if (base.slice(-1) !== "/") {
-              base += "/";
+          if (base2 && isUnreliablePluginBase(base2)) {
+            base2 = "";
+          }
+          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.2") > -1) {
+          if (!allowCdn || !cdn || cdn.indexOf("1.0.5") > -1) {
             return folder + "/" + file;
           }
           if (cdn.slice(-1) !== "/") {
@@ -2086,8 +2094,8 @@ var require_ckplayer = __commonJS({
             img = createlImg(adv["file"]);
             C["ad"]["picture"].append(img);
             img.addListener("load", function() {
-              var w = this.getWidth(), h = this.getHeight();
-              if (w > 0 || h > 0) {
+              var w = this.getWidth(), h2 = this.getHeight();
+              if (w > 0 || h2 > 0) {
                 if (adv["link"]) {
                   var a2 = createlA("", adv["link"]);
                   a2.append(this);
@@ -2165,8 +2173,8 @@ var require_ckplayer = __commonJS({
                 C["adPause"].htm("");
                 C["adPause"].append(img);
                 img.addListener("load", function() {
-                  var w = this.getWidth(), h = this.getHeight();
-                  if (w > 0 || h > 0) {
+                  var w = this.getWidth(), h2 = this.getHeight();
+                  if (w > 0 || h2 > 0) {
                     C["adPause"].htm("");
                     if (adv["link"]) {
                       var a2 = createlA("", adv["link"]);
@@ -2177,7 +2185,7 @@ var require_ckplayer = __commonJS({
                     }
                     C["adPause"].css({
                       "width": w + "px",
-                      "height": h + "px"
+                      "height": h2 + "px"
                     });
                     if (ad["pauseClose"]) {
                       C["adPause"].append(ad["pauseClose"]);
@@ -3589,11 +3597,11 @@ var require_ckplayer = __commonJS({
           C["about"]["textareaEle"].hide();
           message(language["copySucceeded"], true);
         }, getBarHeight = function() {
-          var h = C["bar"].getHeight();
+          var h2 = C["bar"].getHeight();
           if (parseFloat(C["bar"]["pbox"].css("top")) < 0) {
-            h -= parseInt(C["bar"]["pbox"].css("top"));
+            h2 -= parseInt(C["bar"]["pbox"].css("top"));
           }
-          return h;
+          return h2;
         }, hideBar = function() {
           if (mouseSetTime) {
             clearTimeout(mouseSetTime);
@@ -3656,17 +3664,17 @@ var require_ckplayer = __commonJS({
           if (!isUndefined(vars["playbackrateOpen"]) && vars["playbackrateOpen"]) {
             C["bar"]["playbackrate"].show();
             C["bar"]["playbackrate"]["bgbox"].show();
-            var w = C["bar"]["playbackrate"]["bg"].getWidth(), h = C["bar"]["playbackrate"]["bg"].getHeight();
+            var w = C["bar"]["playbackrate"]["bg"].getWidth(), h2 = C["bar"]["playbackrate"]["bg"].getHeight();
             var bw = C["bar"]["playbackrate"]["button"].getWidth();
             C["bar"]["playbackrate"]["bg"].css({ "width": w + 10 + "px" });
             w = C["bar"]["playbackrate"]["bg"].getWidth();
             if (getBarHeight() > C["bar"].getHeight()) {
-              h += getBarHeight() - C["bar"].getHeight();
+              h2 += getBarHeight() - C["bar"].getHeight();
             }
             C["bar"]["playbackrate"]["bgbox"].attr("style", "");
             C["bar"]["playbackrate"]["bgbox"].css({
               "width": w + "px",
-              "height": h + 2 + "px",
+              "height": h2 + 2 + "px",
               "left": -(w - bw) * 0.5 + "px"
             });
             C["bar"]["playbackrate"]["button"].mouseover(function() {
@@ -3726,17 +3734,17 @@ var require_ckplayer = __commonJS({
           C["bar"]["track"].hide();
           C["bar"]["track"].show();
           C["bar"]["track"]["bgbox"].show();
-          var w = C["bar"]["track"]["bg"].getWidth(), h = C["bar"]["track"]["bg"].getHeight();
+          var w = C["bar"]["track"]["bg"].getWidth(), h2 = C["bar"]["track"]["bg"].getHeight();
           var bw = C["bar"]["track"]["button"].getWidth();
           C["bar"]["track"]["bg"].css({ "width": w + 10 + "px" });
           w = C["bar"]["track"]["bg"].getWidth();
           if (getBarHeight() > C["bar"].getHeight()) {
-            h += getBarHeight() - C["bar"].getHeight();
+            h2 += getBarHeight() - C["bar"].getHeight();
           }
           C["bar"]["track"]["bgbox"].attr("style", "");
           C["bar"]["track"]["bgbox"].css({
             "width": w + "px",
-            "height": h + 2 + "px",
+            "height": h2 + 2 + "px",
             "left": -(w - bw) * 0.5 + "px"
           });
           C["bar"]["track"]["button"].mouseover(function() {
@@ -3796,17 +3804,17 @@ var require_ckplayer = __commonJS({
             }
             C["bar"]["definition"].show();
             C["bar"]["definition"]["bgbox"].show();
-            var w = C["bar"]["definition"]["bg"].getWidth(), h = C["bar"]["definition"]["bg"].getHeight();
+            var w = C["bar"]["definition"]["bg"].getWidth(), h2 = C["bar"]["definition"]["bg"].getHeight();
             var bw = C["bar"]["definition"]["button"].getWidth();
             C["bar"]["definition"]["bg"].css({ "width": w + 10 + "px" });
             w = C["bar"]["definition"]["bg"].getWidth();
             if (getBarHeight() > C["bar"].getHeight()) {
-              h += getBarHeight() - C["bar"].getHeight();
+              h2 += getBarHeight() - C["bar"].getHeight();
             }
             C["bar"]["definition"]["bgbox"].attr("style", "");
             C["bar"]["definition"]["bgbox"].css({
               "width": w + "px",
-              "height": h + 2 + "px",
+              "height": h2 + 2 + "px",
               "left": -(w - bw) * 0.5 + "px"
             });
             C["bar"]["definition"]["button"].mouseover(function() {
@@ -4390,9 +4398,9 @@ var require_ckplayer = __commonJS({
         }, tipResize = function(ele, cl, align) {
           var offset = ele.offset();
           var ckOffset = CK.offset();
-          var w = C["tip"].getWidth(), h = C["tip"].getHeight();
+          var w = C["tip"].getWidth(), h2 = C["tip"].getHeight();
           var ew = ele.getWidth();
-          var left = 0, top = offset["top"] - ckOffset["top"] - h;
+          var left = 0, top = offset["top"] - ckOffset["top"] - h2;
           if (getBarHeight() > C["bar"].getHeight()) {
             top -= getBarHeight() - C["bar"].getHeight();
           }
@@ -4417,8 +4425,8 @@ var require_ckplayer = __commonJS({
           if (left > CM.getWidth() - w) {
             left = CM.getWidth() - w;
           }
-          if (top > CM.getHeight() - h) {
-            top = CM.getHeight() - h;
+          if (top > CM.getHeight() - h2) {
+            top = CM.getHeight() - h2;
           }
           C["tip"].css({
             "left": left + "px",
@@ -4716,9 +4724,9 @@ var require_ckplayer = __commonJS({
             e = e || window.event;
             var client = getClient(e);
             var bgOffset = bg.offset();
-            var h = client["y"] - bgOffset["top"];
+            var h2 = client["y"] - bgOffset["top"];
             var max = bg.getHeight();
-            var vol = 1 - h / max;
+            var vol = 1 - h2 / max;
             player.volume(vol);
           };
           bg.mousedown(bgMouseDown);
@@ -5274,7 +5282,7 @@ var require_ckplayer = __commonJS({
                 }
                 var thisTemp = this;
                 var parNode = this.CK;
-                var w = parNode.getWidth(), h = parNode.getHeight();
+                var w = parNode.getWidth(), h2 = parNode.getHeight();
                 var speed = 10;
                 this.timerTween = null;
                 this.tweenPlay = true;
@@ -5475,7 +5483,7 @@ var require_ckplayer = __commonJS({
                     case "width":
                       current = thisTemp.getWidth();
                       if (vars2.substring(vars2.length - 1, vars2.length) == "%") {
-                        result = parseInt(vars2) * h * 0.01;
+                        result = parseInt(vars2) * h2 * 0.01;
                       } else {
                         result = parseInt(vars2);
                       }
@@ -5483,7 +5491,7 @@ var require_ckplayer = __commonJS({
                     case "height":
                       current = thisTemp.getHeight();
                       if (vars2.substring(vars2.length - 1, vars2.length) == "%") {
-                        result = parseInt(vars2) * h * 0.01;
+                        result = parseInt(vars2) * h2 * 0.01;
                       } else {
                         result = parseInt(vars2);
                       }
@@ -5521,7 +5529,7 @@ var require_ckplayer = __commonJS({
                         current = thisTemp.offset()["top"] - parNode.offset()["top"];
                       }
                       if (vars2.substring(vars2.length - 1, vars2.length) == "%") {
-                        result = parseInt(vars2) * h * 0.01;
+                        result = parseInt(vars2) * h2 * 0.01;
                       } else {
                         result = parseInt(vars2);
                       }
@@ -5534,7 +5542,7 @@ var require_ckplayer = __commonJS({
                         current = parNode.getHeight() - (thisTemp.offset()["top"] - parNode.offset()["top"] + thisTemp.getHeight());
                       }
                       if (vars2.substring(vars2.length - 1, vars2.length) == "%") {
-                        result = parseInt(vars2) * h * 0.01;
+                        result = parseInt(vars2) * h2 * 0.01;
                       } else {
                         result = parseInt(vars2);
                       }
@@ -5780,7 +5788,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 +5823,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.5") === -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 +6079,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++) {
@@ -6116,41 +6147,41 @@ var require_ckplayer = __commonJS({
         };
       }
       function standardization(o, n) {
-        var h = {};
+        var h2 = {};
         var k;
         for (k in o) {
-          h[k] = o[k];
+          h2[k] = o[k];
         }
         for (k in n) {
-          if (k in h) {
-            h[k] = n[k];
+          if (k in h2) {
+            h2[k] = n[k];
           }
         }
-        return h;
+        return h2;
       }
       function mergeObj(o, n) {
-        var h = {};
+        var h2 = {};
         var k;
         for (k in o) {
-          h[k] = o[k];
+          h2[k] = o[k];
         }
         for (k in n) {
-          if (k in h) {
-            switch (valType(h[k])) {
+          if (k in h2) {
+            switch (valType(h2[k])) {
               case "object":
                 if (valType(n[k]) == "object") {
-                  h[k] = mergeObj(h[k], n[k]);
+                  h2[k] = mergeObj(h2[k], n[k]);
                 }
                 break;
               default:
-                if (valType(h[k]) == valType(n[k])) {
-                  h[k] = n[k];
+                if (valType(h2[k]) == valType(n[k])) {
+                  h2[k] = n[k];
                 }
                 break;
             }
           }
         }
-        return h;
+        return h2;
       }
       function valType(val) {
         if (typeof val === "undefined") return "undefined";
@@ -6264,8 +6295,8 @@ var require_ckplayer = __commonJS({
         var result = parseInt(val);
         if (isUndefined(result)) result = 0;
         if (result < 0) result = 0;
-        var h = Math.floor(result / 3600) < 10 ? "0" + Math.floor(result / 3600) : Math.floor(result / 3600), m2 = Math.floor(result / 60 % 60) < 10 ? "0" + Math.floor(result / 60 % 60) : Math.floor(result / 60 % 60), s = Math.floor(result % 60) < 10 ? "0" + Math.floor(result % 60) : Math.floor(result % 60), res = "";
-        if (h !== "00") res += h + ":";
+        var h2 = Math.floor(result / 3600) < 10 ? "0" + Math.floor(result / 3600) : Math.floor(result / 3600), m2 = Math.floor(result / 60 % 60) < 10 ? "0" + Math.floor(result / 60 % 60) : Math.floor(result / 60 % 60), s = Math.floor(result % 60) < 10 ? "0" + Math.floor(result % 60) : Math.floor(result % 60), res = "";
+        if (h2 !== "00") res += h2 + ":";
         res += m2 + ":" + s;
         return res;
       }
@@ -6566,24 +6597,61 @@ var require_ckplayer = __commonJS({
   }
 });
 
+// src/vue/CkPlayer.js
+import { h, version as vueVersion } from "vue";
+
 // src/index.js
 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/vue/CkPlayer.js
+// src/shared.js
 var EVENT_NAMES = ["play", "pause", "ended", "volume", "muted", "full", "error", "time", "seek", "screenshot"];
 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/vue/CkPlayer.js
+var unmountHook = typeof vueVersion === "string" && vueVersion.charAt(0) === "3" ? "beforeUnmount" : "beforeDestroy";
 var CkPlayer = {
   name: "CkPlayer",
+  emits: EVENT_NAMES.concat(["ready"]),
   props: {
     video: { required: true },
     poster: { type: String, default: "" },
@@ -6602,35 +6670,47 @@ var CkPlayer = {
   },
   data: function() {
     return {
-      player: null,
-      instanceId: createUid(),
-      destroyed: false
+      instanceId: createUid()
     };
   },
+  created: function() {
+    this.player = null;
+    this._destroyed = false;
+  },
   mounted: function() {
     this.initPlayer();
   },
-  beforeDestroy: function() {
-    this.teardown();
-  },
-  beforeUnmount: function() {
-    this.teardown();
-  },
   watch: {
-    video: function() {
-      this.reinit();
+    video: {
+      deep: true,
+      handler: function() {
+        this.reinit();
+      }
     },
     poster: function() {
       this.reinit();
     },
     plug: function() {
       this.reinit();
+    },
+    autoplay: function() {
+      this.reinit();
+    },
+    live: function() {
+      this.reinit();
+    },
+    pluginPath: function() {
+      this.reinit();
+    },
+    volume: function(vol) {
+      if (this.player && typeof this.player.volume === "function" && typeof vol === "number") {
+        this.player.volume(vol);
+      }
     }
   },
   methods: {
     buildConfig: function() {
-      var opts = this.options || {};
-      var config = {
+      return buildPlayerConfig({
         container: this.$refs.container,
         video: this.video,
         poster: this.poster,
@@ -6639,20 +6719,10 @@ var CkPlayer = {
         plug: this.plug,
         autoPlug: this.autoPlug,
         volume: this.volume,
-        cookie: opts.cookie || this.instanceId
-      };
-      if (this.pluginPath) {
-        config.pluginPath = this.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;
+        pluginPath: this.pluginPath,
+        options: this.options,
+        cookie: this.instanceId
+      });
     },
     bindEvents: function() {
       var self2 = this;
@@ -6667,14 +6737,13 @@ var CkPlayer = {
       });
     },
     initPlayer: function() {
-      if (typeof window === "undefined" || !this.$refs.container) return;
-      this.destroyed = false;
+      if (typeof window === "undefined" || this._destroyed || !this.$refs.container) return;
       this.player = new index_default(this.buildConfig());
       this.bindEvents();
       this.$emit("ready", this.player);
     },
     teardown: function() {
-      this.destroyed = true;
+      this._destroyed = true;
       if (this.player && typeof this.player.remove === "function") {
         try {
           this.player.remove();
@@ -6686,8 +6755,9 @@ var CkPlayer = {
     reinit: function() {
       var self2 = this;
       this.teardown();
-      this.destroyed = false;
+      this._destroyed = false;
       this.$nextTick(function() {
+        if (self2._destroyed) return;
         self2.initPlayer();
       });
     },
@@ -6722,7 +6792,7 @@ var CkPlayer = {
     }
   },
   render: function() {
-    return this.$createElement("div", {
+    return h("div", {
       ref: "container",
       class: ["ckplayer-plus", this.className].filter(Boolean).join(" "),
       style: {
@@ -6732,6 +6802,9 @@ var CkPlayer = {
     });
   }
 };
+CkPlayer[unmountHook] = function() {
+  this.teardown();
+};
 var CkPlayer_default = CkPlayer;
 
 // src/vue/index.js

package/package.json

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

package/types/index.d.ts

@@ -34,6 +34,8 @@ export interface CkplayerConfig {
   pluginPath?: string;
   /** 初始跳转秒数；续播时会同步 maxSeeTime（兼容 timeScheduleAdjust=5） */
   seek?: number | string;
+  language?: string;
+  timeScheduleAdjust?: 0 | 1 | 2 | 3 | 4 | 5;
   crossOrigin?: string;
   cookie?: string | object | any[];
   /** 仅支持函数；字符串形式已禁用 */

package/types/vue.d.ts

@@ -15,6 +15,17 @@ export interface CkPlayerProps {
   width?: string;
   height?: string;
   className?: string;
+  onReady?: (player: CkplayerInstance) => void;
+  onPlay?: (...args: any[]) => void;
+  onPause?: (...args: any[]) => void;
+  onEnded?: (...args: any[]) => void;
+  onVolume?: (vol: number) => void;
+  onMuted?: (state: boolean) => void;
+  onFull?: (state: boolean) => void;
+  onError?: (err: any) => void;
+  onTime?: (t: number) => void;
+  onSeek?: (...args: any[]) => void;
+  onScreenshot?: (...args: any[]) => void;
 }
 
 declare const CkPlayer: {