ckplayer-plus 1.1.8 → 1.1.9

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (9) hide show
  1. package/dist/ckplayer.js +45 -30
  2. package/dist/ckplayer.min.js +2 -2
  3. package/dist/index.cjs +33 -28
  4. package/dist/index.js +33 -28
  5. package/dist/react.cjs +33 -28
  6. package/dist/react.js +33 -28
  7. package/dist/vue.cjs +33 -28
  8. package/dist/vue.js +33 -28
  9. package/package.json +1 -1
package/dist/index.cjs CHANGED
@@ -210,7 +210,7 @@ var require_ckplayer = __commonJS({
210
210
  cdnFallback: true
211
211
  // getPath 失败时是否回退到 jsDelivr（内网可设 false，并配置 pluginPath）
212
212
  };
213
- var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.8/dist/";
213
+ var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.9/dist/";
214
214
  function ckplayerEmbed(videoObj) {
215
215
  var rightMenu = [
216
216
  {
@@ -435,7 +435,7 @@ var require_ckplayer = __commonJS({
435
435
  }
436
436
  var allowCdn = !vars || vars["cdnFallback"] !== false;
437
437
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
438
- if (!allowCdn || !cdn || cdn.indexOf("1.1.8") > -1) {
438
+ if (!allowCdn || !cdn || cdn.indexOf("1.1.9") > -1) {
439
439
  return folder + "/" + file;
440
440
  }
441
441
  if (cdn.slice(-1) !== "/") {
@@ -671,7 +671,7 @@ var require_ckplayer = __commonJS({
671
671
  return true;
672
672
  }
673
673
  }
674
- var loadAt = hlsPriorLoadTime(target);
674
+ var loadAt = hlsFragStartTime(target);
675
675
  if (!force) {
676
676
  if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - loadAt) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
677
677
  return true;
@@ -826,7 +826,7 @@ var require_ckplayer = __commonJS({
826
826
  } });
827
827
  return;
828
828
  } else {
829
- if (vars["plug"] && !canPlay(vstr)) {
829
+ if (vars["plug"] && (vars["preferBuiltinPlug"] || !canPlay(vstr))) {
830
830
  plugPlayer(vstr);
831
831
  } else {
832
832
  if (!existenceObj) {
@@ -838,7 +838,7 @@ var require_ckplayer = __commonJS({
838
838
  } else if (valType(vstr) == "array") {
839
839
  for (i = 0; i < vstr.length; i++) {
840
840
  if (valType(vstr[i]) == "array") {
841
- if (vars["plug"] && !canPlay(vstr[i][0])) {
841
+ if (vars["plug"] && (vars["preferBuiltinPlug"] || !canPlay(vstr[i][0]))) {
842
842
  plugPlayer(vstr[i][0]);
843
843
  } else {
844
844
  var type = ' type="' + vstr[i][1] + '"';
@@ -941,14 +941,13 @@ var require_ckplayer = __commonJS({
941
941
  C["buffer"].show();
942
942
  }
943
943
  setTimeout(function() {
944
- if (!hlsResumeSettling) {
945
- return;
946
- }
947
- var t = seekTime > 0 ? seekTime : hlsResumeTarget;
948
- if (t > 0 && !tryCompleteResumeSeek(t) && hlsResumeSettling) {
949
- finishResumeSeek(t);
944
+ if (hlsResumeSettling) {
945
+ var t = seekTime > 0 ? seekTime : hlsResumeTarget;
946
+ if (t > 0) {
947
+ finishResumeSeek(t);
948
+ }
950
949
  }
951
- }, 8e3);
950
+ }, 1e4);
952
951
  return;
953
952
  }
954
953
  if (!hlsStartPositionUsed) {
@@ -1804,19 +1803,7 @@ var require_ckplayer = __commonJS({
1804
1803
  if (!timeInBuffered(t)) {
1805
1804
  return false;
1806
1805
  }
1807
- var loadStart = hlsPriorLoadTime(t);
1808
- try {
1809
- var buf = video.buffered;
1810
- for (var i = 0; i < buf.length; i++) {
1811
- var start = buf.start(i);
1812
- var end = buf.end(i);
1813
- if (loadStart >= start - 0.35 && t <= end + 0.15) {
1814
- return true;
1815
- }
1816
- }
1817
- } catch (event2) {
1818
- }
1819
- return false;
1806
+ return true;
1820
1807
  }, tryCompleteResumeSeek = function(t) {
1821
1808
  if (!hlsResumeSettling || isNaN(t) || t <= 0 || !video) {
1822
1809
  return false;
@@ -2224,10 +2211,28 @@ var require_ckplayer = __commonJS({
2224
2211
  seekApplyLock = false;
2225
2212
  decodeRecoverCount = 0;
2226
2213
  hlsScrubbing = false;
2227
- hlsResumeSettling = false;
2214
+ var resumePending = false;
2215
+ if (hlsResumeSettling && hlsResumeTarget > 0) {
2216
+ if (!timeInBuffered(hlsResumeTarget)) {
2217
+ resumePending = true;
2218
+ } else if (Math.abs(this.currentTime - hlsResumeTarget) > 0.5) {
2219
+ resumePending = true;
2220
+ var resumeTarget = hlsResumeTarget;
2221
+ setTimeout(function() {
2222
+ if (hlsResumeSettling && timeInBuffered(resumeTarget)) {
2223
+ finishResumeSeek(resumeTarget);
2224
+ }
2225
+ }, 0);
2226
+ }
2227
+ }
2228
+ if (!resumePending) {
2229
+ hlsResumeSettling = false;
2230
+ }
2228
2231
  startPendingAutoplay();
2229
2232
  pSliderMouseDown = false;
2230
- hidePlaybackBuffer();
2233
+ if (!resumePending) {
2234
+ hidePlaybackBuffer();
2235
+ }
2231
2236
  if (hlsScrubResumePlay) {
2232
2237
  hlsScrubResumePlay = false;
2233
2238
  try {
@@ -6442,7 +6447,7 @@ var require_ckplayer = __commonJS({
6442
6447
  if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
6443
6448
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
6444
6449
  var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
6445
- if (cdn && cdn.indexOf("1.1.8") === -1 && m) {
6450
+ if (cdn && cdn.indexOf("1.1.9") === -1 && m) {
6446
6451
  if (cdn.slice(-1) !== "/") {
6447
6452
  cdn += "/";
6448
6453
  }
package/dist/index.js CHANGED
@@ -204,7 +204,7 @@ var require_ckplayer = __commonJS({
204
204
  cdnFallback: true
205
205
  // getPath 失败时是否回退到 jsDelivr（内网可设 false，并配置 pluginPath）
206
206
  };
207
- var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.8/dist/";
207
+ var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.9/dist/";
208
208
  function ckplayerEmbed(videoObj) {
209
209
  var rightMenu = [
210
210
  {
@@ -429,7 +429,7 @@ var require_ckplayer = __commonJS({
429
429
  }
430
430
  var allowCdn = !vars || vars["cdnFallback"] !== false;
431
431
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
432
- if (!allowCdn || !cdn || cdn.indexOf("1.1.8") > -1) {
432
+ if (!allowCdn || !cdn || cdn.indexOf("1.1.9") > -1) {
433
433
  return folder + "/" + file;
434
434
  }
435
435
  if (cdn.slice(-1) !== "/") {
@@ -665,7 +665,7 @@ var require_ckplayer = __commonJS({
665
665
  return true;
666
666
  }
667
667
  }
668
- var loadAt = hlsPriorLoadTime(target);
668
+ var loadAt = hlsFragStartTime(target);
669
669
  if (!force) {
670
670
  if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - loadAt) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
671
671
  return true;
@@ -820,7 +820,7 @@ var require_ckplayer = __commonJS({
820
820
  } });
821
821
  return;
822
822
  } else {
823
- if (vars["plug"] && !canPlay(vstr)) {
823
+ if (vars["plug"] && (vars["preferBuiltinPlug"] || !canPlay(vstr))) {
824
824
  plugPlayer(vstr);
825
825
  } else {
826
826
  if (!existenceObj) {
@@ -832,7 +832,7 @@ var require_ckplayer = __commonJS({
832
832
  } else if (valType(vstr) == "array") {
833
833
  for (i = 0; i < vstr.length; i++) {
834
834
  if (valType(vstr[i]) == "array") {
835
- if (vars["plug"] && !canPlay(vstr[i][0])) {
835
+ if (vars["plug"] && (vars["preferBuiltinPlug"] || !canPlay(vstr[i][0]))) {
836
836
  plugPlayer(vstr[i][0]);
837
837
  } else {
838
838
  var type = ' type="' + vstr[i][1] + '"';
@@ -935,14 +935,13 @@ var require_ckplayer = __commonJS({
935
935
  C["buffer"].show();
936
936
  }
937
937
  setTimeout(function() {
938
- if (!hlsResumeSettling) {
939
- return;
940
- }
941
- var t = seekTime > 0 ? seekTime : hlsResumeTarget;
942
- if (t > 0 && !tryCompleteResumeSeek(t) && hlsResumeSettling) {
943
- finishResumeSeek(t);
938
+ if (hlsResumeSettling) {
939
+ var t = seekTime > 0 ? seekTime : hlsResumeTarget;
940
+ if (t > 0) {
941
+ finishResumeSeek(t);
942
+ }
944
943
  }
945
- }, 8e3);
944
+ }, 1e4);
946
945
  return;
947
946
  }
948
947
  if (!hlsStartPositionUsed) {
@@ -1798,19 +1797,7 @@ var require_ckplayer = __commonJS({
1798
1797
  if (!timeInBuffered(t)) {
1799
1798
  return false;
1800
1799
  }
1801
- var loadStart = hlsPriorLoadTime(t);
1802
- try {
1803
- var buf = video.buffered;
1804
- for (var i = 0; i < buf.length; i++) {
1805
- var start = buf.start(i);
1806
- var end = buf.end(i);
1807
- if (loadStart >= start - 0.35 && t <= end + 0.15) {
1808
- return true;
1809
- }
1810
- }
1811
- } catch (event2) {
1812
- }
1813
- return false;
1800
+ return true;
1814
1801
  }, tryCompleteResumeSeek = function(t) {
1815
1802
  if (!hlsResumeSettling || isNaN(t) || t <= 0 || !video) {
1816
1803
  return false;
@@ -2218,10 +2205,28 @@ var require_ckplayer = __commonJS({
2218
2205
  seekApplyLock = false;
2219
2206
  decodeRecoverCount = 0;
2220
2207
  hlsScrubbing = false;
2221
- hlsResumeSettling = false;
2208
+ var resumePending = false;
2209
+ if (hlsResumeSettling && hlsResumeTarget > 0) {
2210
+ if (!timeInBuffered(hlsResumeTarget)) {
2211
+ resumePending = true;
2212
+ } else if (Math.abs(this.currentTime - hlsResumeTarget) > 0.5) {
2213
+ resumePending = true;
2214
+ var resumeTarget = hlsResumeTarget;
2215
+ setTimeout(function() {
2216
+ if (hlsResumeSettling && timeInBuffered(resumeTarget)) {
2217
+ finishResumeSeek(resumeTarget);
2218
+ }
2219
+ }, 0);
2220
+ }
2221
+ }
2222
+ if (!resumePending) {
2223
+ hlsResumeSettling = false;
2224
+ }
2222
2225
  startPendingAutoplay();
2223
2226
  pSliderMouseDown = false;
2224
- hidePlaybackBuffer();
2227
+ if (!resumePending) {
2228
+ hidePlaybackBuffer();
2229
+ }
2225
2230
  if (hlsScrubResumePlay) {
2226
2231
  hlsScrubResumePlay = false;
2227
2232
  try {
@@ -6436,7 +6441,7 @@ var require_ckplayer = __commonJS({
6436
6441
  if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
6437
6442
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
6438
6443
  var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
6439
- if (cdn && cdn.indexOf("1.1.8") === -1 && m) {
6444
+ if (cdn && cdn.indexOf("1.1.9") === -1 && m) {
6440
6445
  if (cdn.slice(-1) !== "/") {
6441
6446
  cdn += "/";
6442
6447
  }
package/dist/react.cjs CHANGED
@@ -210,7 +210,7 @@ var require_ckplayer = __commonJS({
210
210
  cdnFallback: true
211
211
  // getPath 失败时是否回退到 jsDelivr（内网可设 false，并配置 pluginPath）
212
212
  };
213
- var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.8/dist/";
213
+ var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.9/dist/";
214
214
  function ckplayerEmbed(videoObj) {
215
215
  var rightMenu = [
216
216
  {
@@ -435,7 +435,7 @@ var require_ckplayer = __commonJS({
435
435
  }
436
436
  var allowCdn = !vars || vars["cdnFallback"] !== false;
437
437
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
438
- if (!allowCdn || !cdn || cdn.indexOf("1.1.8") > -1) {
438
+ if (!allowCdn || !cdn || cdn.indexOf("1.1.9") > -1) {
439
439
  return folder + "/" + file;
440
440
  }
441
441
  if (cdn.slice(-1) !== "/") {
@@ -671,7 +671,7 @@ var require_ckplayer = __commonJS({
671
671
  return true;
672
672
  }
673
673
  }
674
- var loadAt = hlsPriorLoadTime(target);
674
+ var loadAt = hlsFragStartTime(target);
675
675
  if (!force) {
676
676
  if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - loadAt) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
677
677
  return true;
@@ -826,7 +826,7 @@ var require_ckplayer = __commonJS({
826
826
  } });
827
827
  return;
828
828
  } else {
829
- if (vars["plug"] && !canPlay(vstr)) {
829
+ if (vars["plug"] && (vars["preferBuiltinPlug"] || !canPlay(vstr))) {
830
830
  plugPlayer(vstr);
831
831
  } else {
832
832
  if (!existenceObj) {
@@ -838,7 +838,7 @@ var require_ckplayer = __commonJS({
838
838
  } else if (valType(vstr) == "array") {
839
839
  for (i = 0; i < vstr.length; i++) {
840
840
  if (valType(vstr[i]) == "array") {
841
- if (vars["plug"] && !canPlay(vstr[i][0])) {
841
+ if (vars["plug"] && (vars["preferBuiltinPlug"] || !canPlay(vstr[i][0]))) {
842
842
  plugPlayer(vstr[i][0]);
843
843
  } else {
844
844
  var type = ' type="' + vstr[i][1] + '"';
@@ -941,14 +941,13 @@ var require_ckplayer = __commonJS({
941
941
  C["buffer"].show();
942
942
  }
943
943
  setTimeout(function() {
944
- if (!hlsResumeSettling) {
945
- return;
946
- }
947
- var t = seekTime > 0 ? seekTime : hlsResumeTarget;
948
- if (t > 0 && !tryCompleteResumeSeek(t) && hlsResumeSettling) {
949
- finishResumeSeek(t);
944
+ if (hlsResumeSettling) {
945
+ var t = seekTime > 0 ? seekTime : hlsResumeTarget;
946
+ if (t > 0) {
947
+ finishResumeSeek(t);
948
+ }
950
949
  }
951
- }, 8e3);
950
+ }, 1e4);
952
951
  return;
953
952
  }
954
953
  if (!hlsStartPositionUsed) {
@@ -1804,19 +1803,7 @@ var require_ckplayer = __commonJS({
1804
1803
  if (!timeInBuffered(t)) {
1805
1804
  return false;
1806
1805
  }
1807
- var loadStart = hlsPriorLoadTime(t);
1808
- try {
1809
- var buf = video.buffered;
1810
- for (var i = 0; i < buf.length; i++) {
1811
- var start = buf.start(i);
1812
- var end = buf.end(i);
1813
- if (loadStart >= start - 0.35 && t <= end + 0.15) {
1814
- return true;
1815
- }
1816
- }
1817
- } catch (event2) {
1818
- }
1819
- return false;
1806
+ return true;
1820
1807
  }, tryCompleteResumeSeek = function(t) {
1821
1808
  if (!hlsResumeSettling || isNaN(t) || t <= 0 || !video) {
1822
1809
  return false;
@@ -2224,10 +2211,28 @@ var require_ckplayer = __commonJS({
2224
2211
  seekApplyLock = false;
2225
2212
  decodeRecoverCount = 0;
2226
2213
  hlsScrubbing = false;
2227
- hlsResumeSettling = false;
2214
+ var resumePending = false;
2215
+ if (hlsResumeSettling && hlsResumeTarget > 0) {
2216
+ if (!timeInBuffered(hlsResumeTarget)) {
2217
+ resumePending = true;
2218
+ } else if (Math.abs(this.currentTime - hlsResumeTarget) > 0.5) {
2219
+ resumePending = true;
2220
+ var resumeTarget = hlsResumeTarget;
2221
+ setTimeout(function() {
2222
+ if (hlsResumeSettling && timeInBuffered(resumeTarget)) {
2223
+ finishResumeSeek(resumeTarget);
2224
+ }
2225
+ }, 0);
2226
+ }
2227
+ }
2228
+ if (!resumePending) {
2229
+ hlsResumeSettling = false;
2230
+ }
2228
2231
  startPendingAutoplay();
2229
2232
  pSliderMouseDown = false;
2230
- hidePlaybackBuffer();
2233
+ if (!resumePending) {
2234
+ hidePlaybackBuffer();
2235
+ }
2231
2236
  if (hlsScrubResumePlay) {
2232
2237
  hlsScrubResumePlay = false;
2233
2238
  try {
@@ -6442,7 +6447,7 @@ var require_ckplayer = __commonJS({
6442
6447
  if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
6443
6448
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
6444
6449
  var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
6445
- if (cdn && cdn.indexOf("1.1.8") === -1 && m) {
6450
+ if (cdn && cdn.indexOf("1.1.9") === -1 && m) {
6446
6451
  if (cdn.slice(-1) !== "/") {
6447
6452
  cdn += "/";
6448
6453
  }
package/dist/react.js CHANGED
@@ -204,7 +204,7 @@ var require_ckplayer = __commonJS({
204
204
  cdnFallback: true
205
205
  // getPath 失败时是否回退到 jsDelivr（内网可设 false，并配置 pluginPath）
206
206
  };
207
- var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.8/dist/";
207
+ var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.9/dist/";
208
208
  function ckplayerEmbed(videoObj) {
209
209
  var rightMenu = [
210
210
  {
@@ -429,7 +429,7 @@ var require_ckplayer = __commonJS({
429
429
  }
430
430
  var allowCdn = !vars || vars["cdnFallback"] !== false;
431
431
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
432
- if (!allowCdn || !cdn || cdn.indexOf("1.1.8") > -1) {
432
+ if (!allowCdn || !cdn || cdn.indexOf("1.1.9") > -1) {
433
433
  return folder + "/" + file;
434
434
  }
435
435
  if (cdn.slice(-1) !== "/") {
@@ -665,7 +665,7 @@ var require_ckplayer = __commonJS({
665
665
  return true;
666
666
  }
667
667
  }
668
- var loadAt = hlsPriorLoadTime(target);
668
+ var loadAt = hlsFragStartTime(target);
669
669
  if (!force) {
670
670
  if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - loadAt) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
671
671
  return true;
@@ -820,7 +820,7 @@ var require_ckplayer = __commonJS({
820
820
  } });
821
821
  return;
822
822
  } else {
823
- if (vars["plug"] && !canPlay(vstr)) {
823
+ if (vars["plug"] && (vars["preferBuiltinPlug"] || !canPlay(vstr))) {
824
824
  plugPlayer(vstr);
825
825
  } else {
826
826
  if (!existenceObj) {
@@ -832,7 +832,7 @@ var require_ckplayer = __commonJS({
832
832
  } else if (valType(vstr) == "array") {
833
833
  for (i = 0; i < vstr.length; i++) {
834
834
  if (valType(vstr[i]) == "array") {
835
- if (vars["plug"] && !canPlay(vstr[i][0])) {
835
+ if (vars["plug"] && (vars["preferBuiltinPlug"] || !canPlay(vstr[i][0]))) {
836
836
  plugPlayer(vstr[i][0]);
837
837
  } else {
838
838
  var type = ' type="' + vstr[i][1] + '"';
@@ -935,14 +935,13 @@ var require_ckplayer = __commonJS({
935
935
  C["buffer"].show();
936
936
  }
937
937
  setTimeout(function() {
938
- if (!hlsResumeSettling) {
939
- return;
940
- }
941
- var t = seekTime > 0 ? seekTime : hlsResumeTarget;
942
- if (t > 0 && !tryCompleteResumeSeek(t) && hlsResumeSettling) {
943
- finishResumeSeek(t);
938
+ if (hlsResumeSettling) {
939
+ var t = seekTime > 0 ? seekTime : hlsResumeTarget;
940
+ if (t > 0) {
941
+ finishResumeSeek(t);
942
+ }
944
943
  }
945
- }, 8e3);
944
+ }, 1e4);
946
945
  return;
947
946
  }
948
947
  if (!hlsStartPositionUsed) {
@@ -1798,19 +1797,7 @@ var require_ckplayer = __commonJS({
1798
1797
  if (!timeInBuffered(t)) {
1799
1798
  return false;
1800
1799
  }
1801
- var loadStart = hlsPriorLoadTime(t);
1802
- try {
1803
- var buf = video.buffered;
1804
- for (var i = 0; i < buf.length; i++) {
1805
- var start = buf.start(i);
1806
- var end = buf.end(i);
1807
- if (loadStart >= start - 0.35 && t <= end + 0.15) {
1808
- return true;
1809
- }
1810
- }
1811
- } catch (event2) {
1812
- }
1813
- return false;
1800
+ return true;
1814
1801
  }, tryCompleteResumeSeek = function(t) {
1815
1802
  if (!hlsResumeSettling || isNaN(t) || t <= 0 || !video) {
1816
1803
  return false;
@@ -2218,10 +2205,28 @@ var require_ckplayer = __commonJS({
2218
2205
  seekApplyLock = false;
2219
2206
  decodeRecoverCount = 0;
2220
2207
  hlsScrubbing = false;
2221
- hlsResumeSettling = false;
2208
+ var resumePending = false;
2209
+ if (hlsResumeSettling && hlsResumeTarget > 0) {
2210
+ if (!timeInBuffered(hlsResumeTarget)) {
2211
+ resumePending = true;
2212
+ } else if (Math.abs(this.currentTime - hlsResumeTarget) > 0.5) {
2213
+ resumePending = true;
2214
+ var resumeTarget = hlsResumeTarget;
2215
+ setTimeout(function() {
2216
+ if (hlsResumeSettling && timeInBuffered(resumeTarget)) {
2217
+ finishResumeSeek(resumeTarget);
2218
+ }
2219
+ }, 0);
2220
+ }
2221
+ }
2222
+ if (!resumePending) {
2223
+ hlsResumeSettling = false;
2224
+ }
2222
2225
  startPendingAutoplay();
2223
2226
  pSliderMouseDown = false;
2224
- hidePlaybackBuffer();
2227
+ if (!resumePending) {
2228
+ hidePlaybackBuffer();
2229
+ }
2225
2230
  if (hlsScrubResumePlay) {
2226
2231
  hlsScrubResumePlay = false;
2227
2232
  try {
@@ -6436,7 +6441,7 @@ var require_ckplayer = __commonJS({
6436
6441
  if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
6437
6442
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
6438
6443
  var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
6439
- if (cdn && cdn.indexOf("1.1.8") === -1 && m) {
6444
+ if (cdn && cdn.indexOf("1.1.9") === -1 && m) {
6440
6445
  if (cdn.slice(-1) !== "/") {
6441
6446
  cdn += "/";
6442
6447
  }
package/dist/vue.cjs CHANGED
@@ -210,7 +210,7 @@ var require_ckplayer = __commonJS({
210
210
  cdnFallback: true
211
211
  // getPath 失败时是否回退到 jsDelivr（内网可设 false，并配置 pluginPath）
212
212
  };
213
- var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.8/dist/";
213
+ var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.9/dist/";
214
214
  function ckplayerEmbed(videoObj) {
215
215
  var rightMenu = [
216
216
  {
@@ -435,7 +435,7 @@ var require_ckplayer = __commonJS({
435
435
  }
436
436
  var allowCdn = !vars || vars["cdnFallback"] !== false;
437
437
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
438
- if (!allowCdn || !cdn || cdn.indexOf("1.1.8") > -1) {
438
+ if (!allowCdn || !cdn || cdn.indexOf("1.1.9") > -1) {
439
439
  return folder + "/" + file;
440
440
  }
441
441
  if (cdn.slice(-1) !== "/") {
@@ -671,7 +671,7 @@ var require_ckplayer = __commonJS({
671
671
  return true;
672
672
  }
673
673
  }
674
- var loadAt = hlsPriorLoadTime(target);
674
+ var loadAt = hlsFragStartTime(target);
675
675
  if (!force) {
676
676
  if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - loadAt) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
677
677
  return true;
@@ -826,7 +826,7 @@ var require_ckplayer = __commonJS({
826
826
  } });
827
827
  return;
828
828
  } else {
829
- if (vars["plug"] && !canPlay(vstr)) {
829
+ if (vars["plug"] && (vars["preferBuiltinPlug"] || !canPlay(vstr))) {
830
830
  plugPlayer(vstr);
831
831
  } else {
832
832
  if (!existenceObj) {
@@ -838,7 +838,7 @@ var require_ckplayer = __commonJS({
838
838
  } else if (valType(vstr) == "array") {
839
839
  for (i = 0; i < vstr.length; i++) {
840
840
  if (valType(vstr[i]) == "array") {
841
- if (vars["plug"] && !canPlay(vstr[i][0])) {
841
+ if (vars["plug"] && (vars["preferBuiltinPlug"] || !canPlay(vstr[i][0]))) {
842
842
  plugPlayer(vstr[i][0]);
843
843
  } else {
844
844
  var type = ' type="' + vstr[i][1] + '"';
@@ -941,14 +941,13 @@ var require_ckplayer = __commonJS({
941
941
  C["buffer"].show();
942
942
  }
943
943
  setTimeout(function() {
944
- if (!hlsResumeSettling) {
945
- return;
946
- }
947
- var t = seekTime > 0 ? seekTime : hlsResumeTarget;
948
- if (t > 0 && !tryCompleteResumeSeek(t) && hlsResumeSettling) {
949
- finishResumeSeek(t);
944
+ if (hlsResumeSettling) {
945
+ var t = seekTime > 0 ? seekTime : hlsResumeTarget;
946
+ if (t > 0) {
947
+ finishResumeSeek(t);
948
+ }
950
949
  }
951
- }, 8e3);
950
+ }, 1e4);
952
951
  return;
953
952
  }
954
953
  if (!hlsStartPositionUsed) {
@@ -1804,19 +1803,7 @@ var require_ckplayer = __commonJS({
1804
1803
  if (!timeInBuffered(t)) {
1805
1804
  return false;
1806
1805
  }
1807
- var loadStart = hlsPriorLoadTime(t);
1808
- try {
1809
- var buf = video.buffered;
1810
- for (var i = 0; i < buf.length; i++) {
1811
- var start = buf.start(i);
1812
- var end = buf.end(i);
1813
- if (loadStart >= start - 0.35 && t <= end + 0.15) {
1814
- return true;
1815
- }
1816
- }
1817
- } catch (event2) {
1818
- }
1819
- return false;
1806
+ return true;
1820
1807
  }, tryCompleteResumeSeek = function(t) {
1821
1808
  if (!hlsResumeSettling || isNaN(t) || t <= 0 || !video) {
1822
1809
  return false;
@@ -2224,10 +2211,28 @@ var require_ckplayer = __commonJS({
2224
2211
  seekApplyLock = false;
2225
2212
  decodeRecoverCount = 0;
2226
2213
  hlsScrubbing = false;
2227
- hlsResumeSettling = false;
2214
+ var resumePending = false;
2215
+ if (hlsResumeSettling && hlsResumeTarget > 0) {
2216
+ if (!timeInBuffered(hlsResumeTarget)) {
2217
+ resumePending = true;
2218
+ } else if (Math.abs(this.currentTime - hlsResumeTarget) > 0.5) {
2219
+ resumePending = true;
2220
+ var resumeTarget = hlsResumeTarget;
2221
+ setTimeout(function() {
2222
+ if (hlsResumeSettling && timeInBuffered(resumeTarget)) {
2223
+ finishResumeSeek(resumeTarget);
2224
+ }
2225
+ }, 0);
2226
+ }
2227
+ }
2228
+ if (!resumePending) {
2229
+ hlsResumeSettling = false;
2230
+ }
2228
2231
  startPendingAutoplay();
2229
2232
  pSliderMouseDown = false;
2230
- hidePlaybackBuffer();
2233
+ if (!resumePending) {
2234
+ hidePlaybackBuffer();
2235
+ }
2231
2236
  if (hlsScrubResumePlay) {
2232
2237
  hlsScrubResumePlay = false;
2233
2238
  try {
@@ -6442,7 +6447,7 @@ var require_ckplayer = __commonJS({
6442
6447
  if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
6443
6448
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
6444
6449
  var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
6445
- if (cdn && cdn.indexOf("1.1.8") === -1 && m) {
6450
+ if (cdn && cdn.indexOf("1.1.9") === -1 && m) {
6446
6451
  if (cdn.slice(-1) !== "/") {
6447
6452
  cdn += "/";
6448
6453
  }