ckplayer-plus 1.1.9 → 1.1.10

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 +57 -38
  2. package/dist/ckplayer.min.js +2 -2
  3. package/dist/index.cjs +36 -28
  4. package/dist/index.js +36 -28
  5. package/dist/react.cjs +36 -28
  6. package/dist/react.js +36 -28
  7. package/dist/vue.cjs +36 -28
  8. package/dist/vue.js +36 -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.9/dist/";
213
+ var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.10/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.9") > -1) {
438
+ if (!allowCdn || !cdn || cdn.indexOf("1.1.10") > -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 = hlsFragStartTime(target);
674
+ var loadAt = hlsPriorLoadTime(target);
675
675
  if (!force) {
676
676
  if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - loadAt) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
677
677
  return true;
@@ -919,7 +919,6 @@ var require_ckplayer = __commonJS({
919
919
  resumeAt = parseResumeSeekFromVars();
920
920
  }
921
921
  if (resumeAt && resumeAt > 0 && (isUndefined(vars["live"]) || !vars["live"])) {
922
- hlsConf.autoStartLoad = false;
923
922
  maxSeeTime = Math.max(maxSeeTime, resumeAt);
924
923
  if (firstSeekTime < 0) {
925
924
  firstSeekTime = resumeAt;
@@ -936,16 +935,32 @@ var require_ckplayer = __commonJS({
936
935
  hls.on(Hls.Events.MANIFEST_PARSED, function() {
937
936
  if (seekTime > 0 && hlsResumeSettling) {
938
937
  hlsStartPositionUsed = true;
939
- hlsSeekTo(seekTime, true);
940
938
  if (C["buffer"]) {
941
939
  C["buffer"].show();
942
940
  }
943
- setTimeout(function() {
944
- if (hlsResumeSettling) {
945
- var t = seekTime > 0 ? seekTime : hlsResumeTarget;
946
- if (t > 0) {
947
- finishResumeSeek(t);
941
+ var doResumeSeek = function() {
942
+ if (!hlsResumeSettling || !seekTime) {
943
+ return;
944
+ }
945
+ var t = seekTime;
946
+ if (video && video.seekable && video.seekable.length > 0 && video.seekable.end(0) >= t) {
947
+ finishResumeSeek(t);
948
+ return;
949
+ }
950
+ seekRetryCount++;
951
+ if (seekRetryCount <= 100) {
952
+ if (seekRetryTimer) {
953
+ clearTimeout(seekRetryTimer);
948
954
  }
955
+ seekRetryTimer = setTimeout(doResumeSeek, 50);
956
+ } else {
957
+ finishResumeSeek(t);
958
+ }
959
+ };
960
+ doResumeSeek();
961
+ setTimeout(function() {
962
+ if (hlsResumeSettling && seekTime > 0) {
963
+ finishResumeSeek(seekTime);
949
964
  }
950
965
  }, 1e4);
951
966
  return;
@@ -1008,9 +1023,9 @@ var require_ckplayer = __commonJS({
1008
1023
  }
1009
1024
  }
1010
1025
  }
1011
- CT.error = { code, message: message2 };
1012
- eventTarget("error", CT.error);
1013
1026
  if (fatal) {
1027
+ CT.error = { code, message: message2 };
1028
+ eventTarget("error", CT.error);
1014
1029
  showError();
1015
1030
  }
1016
1031
  });
@@ -1808,11 +1823,11 @@ var require_ckplayer = __commonJS({
1808
1823
  if (!hlsResumeSettling || isNaN(t) || t <= 0 || !video) {
1809
1824
  return false;
1810
1825
  }
1811
- if (hlsCanSafelySeekTo(t)) {
1812
- finishResumeSeek(t);
1813
- return true;
1826
+ if (!timeInBuffered(t)) {
1827
+ return false;
1814
1828
  }
1815
- return false;
1829
+ finishResumeSeek(t);
1830
+ return true;
1816
1831
  }, finishResumeSeek = function(t) {
1817
1832
  hlsResumeWarmup = false;
1818
1833
  hlsResumeSettling = false;
@@ -1866,6 +1881,9 @@ var require_ckplayer = __commonJS({
1866
1881
  if (!seekTime || !video || seekApplyLock) {
1867
1882
  return;
1868
1883
  }
1884
+ if (hlsResumeSettling && hls) {
1885
+ return;
1886
+ }
1869
1887
  if (!isUndefined(vars["live"]) && (valType(vars["live"]) == "boolean" && vars["live"] || valType(vars["live"]) == "number")) {
1870
1888
  return;
1871
1889
  }
@@ -2213,17 +2231,7 @@ var require_ckplayer = __commonJS({
2213
2231
  hlsScrubbing = false;
2214
2232
  var resumePending = false;
2215
2233
  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
- }
2234
+ resumePending = true;
2227
2235
  }
2228
2236
  if (!resumePending) {
2229
2237
  hlsResumeSettling = false;
@@ -6447,7 +6455,7 @@ var require_ckplayer = __commonJS({
6447
6455
  if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
6448
6456
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
6449
6457
  var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
6450
- if (cdn && cdn.indexOf("1.1.9") === -1 && m) {
6458
+ if (cdn && cdn.indexOf("1.1.10") === -1 && m) {
6451
6459
  if (cdn.slice(-1) !== "/") {
6452
6460
  cdn += "/";
6453
6461
  }
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.9/dist/";
207
+ var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.10/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.9") > -1) {
432
+ if (!allowCdn || !cdn || cdn.indexOf("1.1.10") > -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 = hlsFragStartTime(target);
668
+ var loadAt = hlsPriorLoadTime(target);
669
669
  if (!force) {
670
670
  if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - loadAt) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
671
671
  return true;
@@ -913,7 +913,6 @@ var require_ckplayer = __commonJS({
913
913
  resumeAt = parseResumeSeekFromVars();
914
914
  }
915
915
  if (resumeAt && resumeAt > 0 && (isUndefined(vars["live"]) || !vars["live"])) {
916
- hlsConf.autoStartLoad = false;
917
916
  maxSeeTime = Math.max(maxSeeTime, resumeAt);
918
917
  if (firstSeekTime < 0) {
919
918
  firstSeekTime = resumeAt;
@@ -930,16 +929,32 @@ var require_ckplayer = __commonJS({
930
929
  hls.on(Hls.Events.MANIFEST_PARSED, function() {
931
930
  if (seekTime > 0 && hlsResumeSettling) {
932
931
  hlsStartPositionUsed = true;
933
- hlsSeekTo(seekTime, true);
934
932
  if (C["buffer"]) {
935
933
  C["buffer"].show();
936
934
  }
937
- setTimeout(function() {
938
- if (hlsResumeSettling) {
939
- var t = seekTime > 0 ? seekTime : hlsResumeTarget;
940
- if (t > 0) {
941
- finishResumeSeek(t);
935
+ var doResumeSeek = function() {
936
+ if (!hlsResumeSettling || !seekTime) {
937
+ return;
938
+ }
939
+ var t = seekTime;
940
+ if (video && video.seekable && video.seekable.length > 0 && video.seekable.end(0) >= t) {
941
+ finishResumeSeek(t);
942
+ return;
943
+ }
944
+ seekRetryCount++;
945
+ if (seekRetryCount <= 100) {
946
+ if (seekRetryTimer) {
947
+ clearTimeout(seekRetryTimer);
942
948
  }
949
+ seekRetryTimer = setTimeout(doResumeSeek, 50);
950
+ } else {
951
+ finishResumeSeek(t);
952
+ }
953
+ };
954
+ doResumeSeek();
955
+ setTimeout(function() {
956
+ if (hlsResumeSettling && seekTime > 0) {
957
+ finishResumeSeek(seekTime);
943
958
  }
944
959
  }, 1e4);
945
960
  return;
@@ -1002,9 +1017,9 @@ var require_ckplayer = __commonJS({
1002
1017
  }
1003
1018
  }
1004
1019
  }
1005
- CT.error = { code, message: message2 };
1006
- eventTarget("error", CT.error);
1007
1020
  if (fatal) {
1021
+ CT.error = { code, message: message2 };
1022
+ eventTarget("error", CT.error);
1008
1023
  showError();
1009
1024
  }
1010
1025
  });
@@ -1802,11 +1817,11 @@ var require_ckplayer = __commonJS({
1802
1817
  if (!hlsResumeSettling || isNaN(t) || t <= 0 || !video) {
1803
1818
  return false;
1804
1819
  }
1805
- if (hlsCanSafelySeekTo(t)) {
1806
- finishResumeSeek(t);
1807
- return true;
1820
+ if (!timeInBuffered(t)) {
1821
+ return false;
1808
1822
  }
1809
- return false;
1823
+ finishResumeSeek(t);
1824
+ return true;
1810
1825
  }, finishResumeSeek = function(t) {
1811
1826
  hlsResumeWarmup = false;
1812
1827
  hlsResumeSettling = false;
@@ -1860,6 +1875,9 @@ var require_ckplayer = __commonJS({
1860
1875
  if (!seekTime || !video || seekApplyLock) {
1861
1876
  return;
1862
1877
  }
1878
+ if (hlsResumeSettling && hls) {
1879
+ return;
1880
+ }
1863
1881
  if (!isUndefined(vars["live"]) && (valType(vars["live"]) == "boolean" && vars["live"] || valType(vars["live"]) == "number")) {
1864
1882
  return;
1865
1883
  }
@@ -2207,17 +2225,7 @@ var require_ckplayer = __commonJS({
2207
2225
  hlsScrubbing = false;
2208
2226
  var resumePending = false;
2209
2227
  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
- }
2228
+ resumePending = true;
2221
2229
  }
2222
2230
  if (!resumePending) {
2223
2231
  hlsResumeSettling = false;
@@ -6441,7 +6449,7 @@ var require_ckplayer = __commonJS({
6441
6449
  if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
6442
6450
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
6443
6451
  var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
6444
- if (cdn && cdn.indexOf("1.1.9") === -1 && m) {
6452
+ if (cdn && cdn.indexOf("1.1.10") === -1 && m) {
6445
6453
  if (cdn.slice(-1) !== "/") {
6446
6454
  cdn += "/";
6447
6455
  }
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.9/dist/";
213
+ var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.10/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.9") > -1) {
438
+ if (!allowCdn || !cdn || cdn.indexOf("1.1.10") > -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 = hlsFragStartTime(target);
674
+ var loadAt = hlsPriorLoadTime(target);
675
675
  if (!force) {
676
676
  if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - loadAt) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
677
677
  return true;
@@ -919,7 +919,6 @@ var require_ckplayer = __commonJS({
919
919
  resumeAt = parseResumeSeekFromVars();
920
920
  }
921
921
  if (resumeAt && resumeAt > 0 && (isUndefined(vars["live"]) || !vars["live"])) {
922
- hlsConf.autoStartLoad = false;
923
922
  maxSeeTime = Math.max(maxSeeTime, resumeAt);
924
923
  if (firstSeekTime < 0) {
925
924
  firstSeekTime = resumeAt;
@@ -936,16 +935,32 @@ var require_ckplayer = __commonJS({
936
935
  hls.on(Hls.Events.MANIFEST_PARSED, function() {
937
936
  if (seekTime > 0 && hlsResumeSettling) {
938
937
  hlsStartPositionUsed = true;
939
- hlsSeekTo(seekTime, true);
940
938
  if (C["buffer"]) {
941
939
  C["buffer"].show();
942
940
  }
943
- setTimeout(function() {
944
- if (hlsResumeSettling) {
945
- var t = seekTime > 0 ? seekTime : hlsResumeTarget;
946
- if (t > 0) {
947
- finishResumeSeek(t);
941
+ var doResumeSeek = function() {
942
+ if (!hlsResumeSettling || !seekTime) {
943
+ return;
944
+ }
945
+ var t = seekTime;
946
+ if (video && video.seekable && video.seekable.length > 0 && video.seekable.end(0) >= t) {
947
+ finishResumeSeek(t);
948
+ return;
949
+ }
950
+ seekRetryCount++;
951
+ if (seekRetryCount <= 100) {
952
+ if (seekRetryTimer) {
953
+ clearTimeout(seekRetryTimer);
948
954
  }
955
+ seekRetryTimer = setTimeout(doResumeSeek, 50);
956
+ } else {
957
+ finishResumeSeek(t);
958
+ }
959
+ };
960
+ doResumeSeek();
961
+ setTimeout(function() {
962
+ if (hlsResumeSettling && seekTime > 0) {
963
+ finishResumeSeek(seekTime);
949
964
  }
950
965
  }, 1e4);
951
966
  return;
@@ -1008,9 +1023,9 @@ var require_ckplayer = __commonJS({
1008
1023
  }
1009
1024
  }
1010
1025
  }
1011
- CT.error = { code, message: message2 };
1012
- eventTarget("error", CT.error);
1013
1026
  if (fatal) {
1027
+ CT.error = { code, message: message2 };
1028
+ eventTarget("error", CT.error);
1014
1029
  showError();
1015
1030
  }
1016
1031
  });
@@ -1808,11 +1823,11 @@ var require_ckplayer = __commonJS({
1808
1823
  if (!hlsResumeSettling || isNaN(t) || t <= 0 || !video) {
1809
1824
  return false;
1810
1825
  }
1811
- if (hlsCanSafelySeekTo(t)) {
1812
- finishResumeSeek(t);
1813
- return true;
1826
+ if (!timeInBuffered(t)) {
1827
+ return false;
1814
1828
  }
1815
- return false;
1829
+ finishResumeSeek(t);
1830
+ return true;
1816
1831
  }, finishResumeSeek = function(t) {
1817
1832
  hlsResumeWarmup = false;
1818
1833
  hlsResumeSettling = false;
@@ -1866,6 +1881,9 @@ var require_ckplayer = __commonJS({
1866
1881
  if (!seekTime || !video || seekApplyLock) {
1867
1882
  return;
1868
1883
  }
1884
+ if (hlsResumeSettling && hls) {
1885
+ return;
1886
+ }
1869
1887
  if (!isUndefined(vars["live"]) && (valType(vars["live"]) == "boolean" && vars["live"] || valType(vars["live"]) == "number")) {
1870
1888
  return;
1871
1889
  }
@@ -2213,17 +2231,7 @@ var require_ckplayer = __commonJS({
2213
2231
  hlsScrubbing = false;
2214
2232
  var resumePending = false;
2215
2233
  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
- }
2234
+ resumePending = true;
2227
2235
  }
2228
2236
  if (!resumePending) {
2229
2237
  hlsResumeSettling = false;
@@ -6447,7 +6455,7 @@ var require_ckplayer = __commonJS({
6447
6455
  if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
6448
6456
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
6449
6457
  var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
6450
- if (cdn && cdn.indexOf("1.1.9") === -1 && m) {
6458
+ if (cdn && cdn.indexOf("1.1.10") === -1 && m) {
6451
6459
  if (cdn.slice(-1) !== "/") {
6452
6460
  cdn += "/";
6453
6461
  }
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.9/dist/";
207
+ var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.10/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.9") > -1) {
432
+ if (!allowCdn || !cdn || cdn.indexOf("1.1.10") > -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 = hlsFragStartTime(target);
668
+ var loadAt = hlsPriorLoadTime(target);
669
669
  if (!force) {
670
670
  if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - loadAt) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
671
671
  return true;
@@ -913,7 +913,6 @@ var require_ckplayer = __commonJS({
913
913
  resumeAt = parseResumeSeekFromVars();
914
914
  }
915
915
  if (resumeAt && resumeAt > 0 && (isUndefined(vars["live"]) || !vars["live"])) {
916
- hlsConf.autoStartLoad = false;
917
916
  maxSeeTime = Math.max(maxSeeTime, resumeAt);
918
917
  if (firstSeekTime < 0) {
919
918
  firstSeekTime = resumeAt;
@@ -930,16 +929,32 @@ var require_ckplayer = __commonJS({
930
929
  hls.on(Hls.Events.MANIFEST_PARSED, function() {
931
930
  if (seekTime > 0 && hlsResumeSettling) {
932
931
  hlsStartPositionUsed = true;
933
- hlsSeekTo(seekTime, true);
934
932
  if (C["buffer"]) {
935
933
  C["buffer"].show();
936
934
  }
937
- setTimeout(function() {
938
- if (hlsResumeSettling) {
939
- var t = seekTime > 0 ? seekTime : hlsResumeTarget;
940
- if (t > 0) {
941
- finishResumeSeek(t);
935
+ var doResumeSeek = function() {
936
+ if (!hlsResumeSettling || !seekTime) {
937
+ return;
938
+ }
939
+ var t = seekTime;
940
+ if (video && video.seekable && video.seekable.length > 0 && video.seekable.end(0) >= t) {
941
+ finishResumeSeek(t);
942
+ return;
943
+ }
944
+ seekRetryCount++;
945
+ if (seekRetryCount <= 100) {
946
+ if (seekRetryTimer) {
947
+ clearTimeout(seekRetryTimer);
942
948
  }
949
+ seekRetryTimer = setTimeout(doResumeSeek, 50);
950
+ } else {
951
+ finishResumeSeek(t);
952
+ }
953
+ };
954
+ doResumeSeek();
955
+ setTimeout(function() {
956
+ if (hlsResumeSettling && seekTime > 0) {
957
+ finishResumeSeek(seekTime);
943
958
  }
944
959
  }, 1e4);
945
960
  return;
@@ -1002,9 +1017,9 @@ var require_ckplayer = __commonJS({
1002
1017
  }
1003
1018
  }
1004
1019
  }
1005
- CT.error = { code, message: message2 };
1006
- eventTarget("error", CT.error);
1007
1020
  if (fatal) {
1021
+ CT.error = { code, message: message2 };
1022
+ eventTarget("error", CT.error);
1008
1023
  showError();
1009
1024
  }
1010
1025
  });
@@ -1802,11 +1817,11 @@ var require_ckplayer = __commonJS({
1802
1817
  if (!hlsResumeSettling || isNaN(t) || t <= 0 || !video) {
1803
1818
  return false;
1804
1819
  }
1805
- if (hlsCanSafelySeekTo(t)) {
1806
- finishResumeSeek(t);
1807
- return true;
1820
+ if (!timeInBuffered(t)) {
1821
+ return false;
1808
1822
  }
1809
- return false;
1823
+ finishResumeSeek(t);
1824
+ return true;
1810
1825
  }, finishResumeSeek = function(t) {
1811
1826
  hlsResumeWarmup = false;
1812
1827
  hlsResumeSettling = false;
@@ -1860,6 +1875,9 @@ var require_ckplayer = __commonJS({
1860
1875
  if (!seekTime || !video || seekApplyLock) {
1861
1876
  return;
1862
1877
  }
1878
+ if (hlsResumeSettling && hls) {
1879
+ return;
1880
+ }
1863
1881
  if (!isUndefined(vars["live"]) && (valType(vars["live"]) == "boolean" && vars["live"] || valType(vars["live"]) == "number")) {
1864
1882
  return;
1865
1883
  }
@@ -2207,17 +2225,7 @@ var require_ckplayer = __commonJS({
2207
2225
  hlsScrubbing = false;
2208
2226
  var resumePending = false;
2209
2227
  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
- }
2228
+ resumePending = true;
2221
2229
  }
2222
2230
  if (!resumePending) {
2223
2231
  hlsResumeSettling = false;
@@ -6441,7 +6449,7 @@ var require_ckplayer = __commonJS({
6441
6449
  if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
6442
6450
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
6443
6451
  var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
6444
- if (cdn && cdn.indexOf("1.1.9") === -1 && m) {
6452
+ if (cdn && cdn.indexOf("1.1.10") === -1 && m) {
6445
6453
  if (cdn.slice(-1) !== "/") {
6446
6454
  cdn += "/";
6447
6455
  }