ckplayer-plus 1.1.10 → 1.1.12

package/dist/vue.js

@@ -204,7 +204,8 @@ var require_ckplayer = __commonJS({
         cdnFallback: true
         // getPath 失败时是否回退到 jsDelivr（内网可设 false，并配置 pluginPath）
       };
-      var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.10/dist/";
+      var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.12/dist/";
+      var ckplayerPlusCdnReady = true;
       function ckplayerEmbed(videoObj) {
         var rightMenu = [
           {
@@ -402,12 +403,8 @@ var require_ckplayer = __commonJS({
           } else {
             return embed(obj2);
           }
-        }, isUnreliablePluginBase = function(base) {
-          if (!base || valType(base) != "string") {
-            return true;
-          }
-          return /\/(?:assets|\.vite\/deps|_next\/static|chunks?)\/?$/i.test(base);
         }, resolveAssetPath = function(folder, file) {
+          var asset = folder + "/" + file;
           var base = "";
           if (vars && vars["pluginPath"]) {
             base = vars["pluginPath"];
@@ -421,21 +418,29 @@ var require_ckplayer = __commonJS({
             if (base.slice(-1) !== "/") {
               base += "/";
             }
-            return base + folder + "/" + file;
+            return base + asset;
           }
-          var fromScript = getPath(folder) + file;
-          if (fromScript && fromScript.indexOf(folder + "/") > -1 && fromScript.indexOf("undefined") === -1 && !isUnreliablePluginBase(getPath())) {
+          var scriptBase = getPath();
+          var fromScript = scriptBase ? getPath(folder) + file : "";
+          if (fromScript && fromScript.indexOf(folder + "/") > -1 && fromScript.indexOf("undefined") === -1 && !isUnreliablePluginBase(scriptBase)) {
             return fromScript;
           }
           var allowCdn = !vars || vars["cdnFallback"] !== false;
           var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
-          if (!allowCdn || !cdn || cdn.indexOf("1.1.10") > -1) {
-            return folder + "/" + file;
+          if (allowCdn && ckplayerPlusCdnReady && cdn) {
+            if (cdn.slice(-1) !== "/") {
+              cdn += "/";
+            }
+            return cdn + asset;
+          }
+          var npmDist = guessNpmDistBase();
+          if (npmDist) {
+            return npmDist + asset;
           }
-          if (cdn.slice(-1) !== "/") {
-            cdn += "/";
+          if (typeof console !== "undefined" && console.warn) {
+            console.warn("[ckplayer-plus] cannot resolve plugin path for " + asset + ". Set pluginPath / window.ckplayerBasePath, or keep cdnFallback:true.");
           }
-          return cdn + folder + "/" + file;
+          return "";
         }, guessPlug = function(v) {
           var url = "";
           if (valType(v) == "string") {
@@ -6400,6 +6405,12 @@ var require_ckplayer = __commonJS({
           if (!isUndefined(callback2)) {
             fn = callback2;
           }
+          if (!file) {
+            if (typeof console !== "undefined" && console.warn) {
+              console.warn("[ckplayer-plus] loadJs skipped: empty plugin path");
+            }
+            return;
+          }
           if (checkJs(file)) {
             fn();
             return;
@@ -6448,8 +6459,8 @@ var require_ckplayer = __commonJS({
             removeScript();
             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.10") === -1 && m) {
+              var m = String(file).match(/(?:^|\/)(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
+              if (cdn && ckplayerPlusCdnReady && m) {
                 if (cdn.slice(-1) !== "/") {
                   cdn += "/";
                 }
@@ -6689,13 +6700,29 @@ var require_ckplayer = __commonJS({
           }
         }
       }
+      function guessNpmDistBase() {
+        return "/node_modules/ckplayer-plus/dist/";
+      }
+      function isUnreliablePluginBase(base) {
+        if (!base || typeof base !== "string") {
+          return true;
+        }
+        var b = base.replace(/\\/g, "/");
+        if (/\/(?:assets|\.vite\/deps|_next\/static|chunks?|static\/js|webpack|@fs|@id|@vite)\/?$/i.test(b)) {
+          return true;
+        }
+        if (/\/(?:src|app|pages|views|components)\/?$/i.test(b)) {
+          return true;
+        }
+        if (/^https?:\/\/[^/?#]+\/?$/i.test(b)) {
+          return true;
+        }
+        return false;
+      }
       function getPath(siz) {
         if (typeof window !== "undefined" && window.ckplayerBasePath) {
           var base = window.ckplayerBasePath;
-          if (/\/(?:assets|\.vite\/deps|_next\/static|chunks?)\/?$/i.test(base)) {
-            base = "";
-          }
-          if (base) {
+          if (!isUnreliablePluginBase(base)) {
             if (base.slice(-1) !== "/") {
               base += "/";
             }
@@ -6705,12 +6732,17 @@ var require_ckplayer = __commonJS({
             return base;
           }
         }
-        var scriptList = document.scripts || [], thisPath = scriptList.length ? scriptList[scriptList.length - 1].src : "";
+        var scriptList = document.scripts || [];
+        var thisPath = "";
         for (var i = 0; i < scriptList.length; i++) {
           var scriptName = scriptList[i].getAttribute("name") || scriptList[i].getAttribute("data-name");
-          var src = scriptList[i].src.slice(scriptList[i].src.lastIndexOf("/") + 1, scriptList[i].src.lastIndexOf("."));
-          if (scriptName && (scriptName == "ckplayer" || scriptName == "ckplayer.min" || scriptName == "ckplayer-plus") || scriptList[i].src && (src == "ckplayer" || src == "ckplayer.min" || src.indexOf("ckplayer") === 0)) {
-            thisPath = scriptList[i].src;
+          var srcFull = scriptList[i].src || "";
+          if (!srcFull) {
+            continue;
+          }
+          var src = srcFull.slice(srcFull.lastIndexOf("/") + 1, srcFull.lastIndexOf("."));
+          if (scriptName && (scriptName == "ckplayer" || scriptName == "ckplayer.min" || scriptName == "ckplayer-plus") || (src == "ckplayer" || src == "ckplayer.min" || src.indexOf("ckplayer") === 0)) {
+            thisPath = srcFull;
             break;
           }
         }
@@ -6720,6 +6752,9 @@ var require_ckplayer = __commonJS({
         } else if (thisPath && thisPath.lastIndexOf("/") > -1) {
           path = thisPath.substring(0, thisPath.lastIndexOf("/") + 1);
         }
+        if (!path || isUnreliablePluginBase(path)) {
+          return "";
+        }
         if (!isUndefined(siz)) {
           path += siz + "/";
         }
@@ -7214,17 +7249,24 @@ 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) {
-    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)) {
+    base = new URL("./", import.meta.url).href;
+    normalized = String(base).replace(/\\/g, "/");
+    trusted = /\/dist\/$/i.test(normalized) || /\/ckplayer-plus(?:@[^/]+)?\/(?:dist\/)?$/i.test(normalized) || /\/node_modules\/ckplayer-plus\/(?:dist\/)?$/i.test(normalized);
+    untrusted = /\/(?:assets|\.vite\/deps|_next\/static|chunks?|src|app|pages|views|components|@fs|@id|@vite)\/?$/i.test(
+      normalized
+    );
+    if (trusted && !untrusted) {
       window.ckplayerBasePath = base;
     }
   }
 } catch (e) {
 }
 var base;
+var normalized;
+var trusted;
+var untrusted;
 var index_default = import_ckplayer.default;
 
 // src/shared.js
@@ -7242,6 +7284,9 @@ function buildPlayerConfig(input) {
     live: input.live != null ? input.live : false,
     plug: input.plug || "",
     autoPlug: input.autoPlug !== false,
+    // Vue/React 经 bundler 引入时无 <script ckplayer>，强制走内置插件 + CDN 回退
+    preferBuiltinPlug: opts.preferBuiltinPlug !== false,
+    cdnFallback: opts.cdnFallback !== false,
     volume: input.volume != null ? input.volume : 0.8,
     cookie: opts.cookie || input.cookie || createUid()
   };

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ckplayer-plus",
-  "version": "1.1.10",
+  "version": "1.1.12",
   "description": "Enhanced ckplayer X3 packaging with Vue 2/3 and React wrappers — ESM-ready HTML5 video player",
   "keywords": [
     "ckplayer",
@@ -55,6 +55,10 @@
     "./ckplayer.css": "./dist/ckplayer.css",
     "./ckplayer.js": "./dist/ckplayer.js",
     "./ckplayer.min.js": "./dist/ckplayer.min.js",
+    "./hls.js/*": "./dist/hls.js/*",
+    "./flv.js/*": "./dist/flv.js/*",
+    "./mpegts.js/*": "./dist/mpegts.js/*",
+    "./language/*": "./dist/language/*",
     "./images/*": "./dist/images/*",
     "./package.json": "./package.json"
   },
@@ -68,7 +72,7 @@
     "build": "node scripts/build.mjs",
     "lint": "eslint src scripts",
     "typecheck": "tsc --noEmit",
-    "test": "node scripts/smoke.mjs && node scripts/hls-resume-regress.mjs",
+    "test": "node scripts/smoke.mjs && node scripts/plugin-path-regress.mjs && node scripts/hls-resume-regress.mjs",
     "check": "npm run lint && npm run typecheck && npm run build && npm run test",
     "prepublishOnly": "npm run build"
   },

package/types/vue.d.ts

@@ -36,7 +36,7 @@ declare const CkPlayer: {
   methods: {
     play(): void;
     pause(): void;
-    seekTo(time: number): void;
+    seekTo(time: number): void;
     setVolume(vol: number): void;
     muted(): void;
     exitMuted(): void;