ckplayer-plus 1.1.3 → 1.1.4

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 (17) hide show
  1. package/README.md +176 -176
  2. package/dist/ckplayer.js +140 -61
  3. package/dist/ckplayer.min.js +2 -2
  4. package/dist/flv.js/LICENSE +201 -201
  5. package/dist/flv.js/flv.min.js +9 -9
  6. package/dist/hls.js/LICENSE +28 -28
  7. package/dist/hls.js/hls.min.js +1 -1
  8. package/dist/index.cjs +109 -46
  9. package/dist/index.js +109 -46
  10. package/dist/mpegts.js/LICENSE +201 -201
  11. package/dist/mpegts.js/mpegts.min.js +8 -8
  12. package/dist/react.cjs +109 -46
  13. package/dist/react.js +109 -46
  14. package/dist/vue.cjs +109 -46
  15. package/dist/vue.js +109 -46
  16. package/package.json +118 -118
  17. package/types/vue.d.ts +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.3/dist/";
213
+ var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.4/dist/";
214
214
  function ckplayerEmbed(videoObj) {
215
215
  var rightMenu = [
216
216
  {
@@ -432,7 +432,7 @@ var require_ckplayer = __commonJS({
432
432
  }
433
433
  var allowCdn = !vars || vars["cdnFallback"] !== false;
434
434
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
435
- if (!allowCdn || !cdn || cdn.indexOf("1.1.3") > -1) {
435
+ if (!allowCdn || !cdn || cdn.indexOf("1.1.4") > -1) {
436
436
  return folder + "/" + file;
437
437
  }
438
438
  if (cdn.slice(-1) !== "/") {
@@ -658,25 +658,27 @@ var require_ckplayer = __commonJS({
658
658
  target = 0;
659
659
  }
660
660
  var curTime = video.currentTime || 0;
661
- if (!force) {
662
- if (hlsResumeTarget >= 0 && Math.abs(hlsResumeTarget - target) < 1.5) {
663
- if (timeInBuffered(target) && Math.abs(curTime - target) < 2.5) {
664
- return true;
665
- }
661
+ hlsResumeTarget = target;
662
+ if (!force && timeInBuffered(target)) {
663
+ if (Math.abs(curTime - target) < 1.5) {
664
+ return true;
666
665
  }
667
- if (timeInBuffered(target) && Math.abs(curTime - target) < 1.5) {
668
- hlsResumeTarget = target;
666
+ if (hlsCanSafelySeekTo(target)) {
667
+ finishResumeSeek(target);
669
668
  return true;
670
669
  }
671
- if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - target) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
670
+ }
671
+ var loadAt = hlsPriorLoadTime(target);
672
+ if (!force) {
673
+ if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - loadAt) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
672
674
  return true;
673
675
  }
674
676
  }
675
- hlsLoadAt = target;
677
+ hlsLoadAt = loadAt;
676
678
  hlsLoadTs = Date.now();
677
- hlsResumeTarget = target;
679
+ hlsResumeWarmup = true;
678
680
  try {
679
- hls.startLoad(target);
681
+ hls.startLoad(loadAt);
680
682
  } catch (event2) {
681
683
  return false;
682
684
  }
@@ -849,6 +851,7 @@ var require_ckplayer = __commonJS({
849
851
  seekTime = resumeAt;
850
852
  hlsResumeTarget = resumeAt;
851
853
  hlsResumeWarmup = true;
854
+ hlsConf.autoStartLoad = false;
852
855
  }
853
856
  hls = new Hls(hlsConf);
854
857
  hls.loadSource(url);
@@ -856,6 +859,9 @@ var require_ckplayer = __commonJS({
856
859
  hls.on(Hls.Events.MANIFEST_PARSED, function() {
857
860
  if (hlsResumeWarmup && seekTime > 0) {
858
861
  var loadAt = hlsPriorLoadTime(seekTime);
862
+ hlsLoadAt = loadAt;
863
+ hlsLoadTs = Date.now();
864
+ hlsStartPositionUsed = true;
859
865
  try {
860
866
  hls.startLoad(loadAt);
861
867
  } catch (event2) {
@@ -869,9 +875,12 @@ var require_ckplayer = __commonJS({
869
875
  finishResumeSeek(target);
870
876
  return;
871
877
  }
872
- var snap = hlsPriorLoadTime(target);
873
- hlsResumeWarmup = false;
874
- finishResumeSeek(snap);
878
+ var snap = hlsFragStartTime(target);
879
+ if (timeInBuffered(snap) || hlsCanSafelySeekTo(snap)) {
880
+ finishResumeSeek(snap);
881
+ return;
882
+ }
883
+ finishResumeSeek(Math.max(0, loadAt));
875
884
  }, 5e3);
876
885
  return;
877
886
  }
@@ -1618,8 +1627,8 @@ var require_ckplayer = __commonJS({
1618
1627
  } catch (event2) {
1619
1628
  }
1620
1629
  return false;
1621
- }, hlsFragAround = function(t) {
1622
- if (!hls || isNaN(t) || t < 0) {
1630
+ }, hlsGetFragments = function() {
1631
+ if (!hls) {
1623
1632
  return null;
1624
1633
  }
1625
1634
  try {
@@ -1636,6 +1645,19 @@ var require_ckplayer = __commonJS({
1636
1645
  if (!frags || !frags.length) {
1637
1646
  return null;
1638
1647
  }
1648
+ return frags;
1649
+ } catch (event2) {
1650
+ }
1651
+ return null;
1652
+ }, hlsFragAround = function(t) {
1653
+ if (!hls || isNaN(t) || t < 0) {
1654
+ return null;
1655
+ }
1656
+ try {
1657
+ var frags = hlsGetFragments();
1658
+ if (!frags) {
1659
+ return null;
1660
+ }
1639
1661
  for (var i = 0; i < frags.length; i++) {
1640
1662
  var f = frags[i];
1641
1663
  if (!f) {
@@ -1651,7 +1673,24 @@ var require_ckplayer = __commonJS({
1651
1673
  } catch (event2) {
1652
1674
  }
1653
1675
  return null;
1654
- }, hlsPriorLoadTime = function(t) {
1676
+ }, hlsFragIndexAround = function(t) {
1677
+ var frags = hlsGetFragments();
1678
+ if (!frags || isNaN(t) || t < 0) {
1679
+ return -1;
1680
+ }
1681
+ for (var i = 0; i < frags.length; i++) {
1682
+ var f = frags[i];
1683
+ if (!f) {
1684
+ continue;
1685
+ }
1686
+ var start = f.start || 0;
1687
+ var end = start + (f.duration || 0);
1688
+ if (t >= start - 0.05 && t < end + 0.05) {
1689
+ return i;
1690
+ }
1691
+ }
1692
+ return frags.length - 1;
1693
+ }, hlsFragStartTime = function(t) {
1655
1694
  if (isNaN(t) || t <= 0) {
1656
1695
  return 0;
1657
1696
  }
@@ -1659,6 +1698,27 @@ var require_ckplayer = __commonJS({
1659
1698
  if (frag && !isUndefined(frag.start)) {
1660
1699
  return Math.max(0, frag.start);
1661
1700
  }
1701
+ return Math.max(0, t);
1702
+ }, hlsPriorLoadTime = function(t) {
1703
+ if (isNaN(t) || t <= 0) {
1704
+ return 0;
1705
+ }
1706
+ var frags = hlsGetFragments();
1707
+ if (frags && frags.length) {
1708
+ var idx = hlsFragIndexAround(t);
1709
+ if (idx < 0) {
1710
+ idx = frags.length - 1;
1711
+ }
1712
+ var loadIdx = Math.max(0, idx - 1);
1713
+ var loadFrag = frags[loadIdx];
1714
+ if (loadFrag && !isUndefined(loadFrag.start)) {
1715
+ return Math.max(0, loadFrag.start);
1716
+ }
1717
+ }
1718
+ var frag = hlsFragAround(t);
1719
+ if (frag && !isUndefined(frag.start)) {
1720
+ return Math.max(0, frag.start - 12);
1721
+ }
1662
1722
  return Math.max(0, t - 12);
1663
1723
  }, hlsCanSafelySeekTo = function(t) {
1664
1724
  if (!video || isUndefined(video.buffered) || isNaN(t) || t < 0) {
@@ -1667,13 +1727,13 @@ var require_ckplayer = __commonJS({
1667
1727
  if (!timeInBuffered(t)) {
1668
1728
  return false;
1669
1729
  }
1670
- var fragStart = hlsPriorLoadTime(t);
1730
+ var loadStart = hlsPriorLoadTime(t);
1671
1731
  try {
1672
1732
  var buf = video.buffered;
1673
1733
  for (var i = 0; i < buf.length; i++) {
1674
1734
  var start = buf.start(i);
1675
1735
  var end = buf.end(i);
1676
- if (fragStart >= start - 0.35 && t <= end + 0.15) {
1736
+ if (loadStart >= start - 0.35 && t <= end + 0.15) {
1677
1737
  return true;
1678
1738
  }
1679
1739
  }
@@ -1754,19 +1814,28 @@ var require_ckplayer = __commonJS({
1754
1814
  firstSeekTime = t;
1755
1815
  }
1756
1816
  }
1757
- if (hlsResumeWarmup) {
1817
+ if (hls && typeof hls.startLoad === "function") {
1758
1818
  if (hlsCanSafelySeekTo(t)) {
1759
1819
  finishResumeSeek(t);
1820
+ return;
1760
1821
  }
1761
- return;
1762
- }
1763
- if (hls && typeof hls.startLoad === "function") {
1764
- if (!hlsCanSafelySeekTo(t) && t > 1) {
1822
+ if (t > 1) {
1765
1823
  hlsResumeWarmup = true;
1766
1824
  hlsResumeTarget = t;
1767
- try {
1768
- hls.startLoad(hlsPriorLoadTime(t));
1769
- } catch (event2) {
1825
+ var loadAt = hlsPriorLoadTime(t);
1826
+ var shouldLoad = !!force;
1827
+ if (!shouldLoad) {
1828
+ if (!(hlsLoadAt >= 0 && Math.abs(hlsLoadAt - loadAt) < 1.5 && Date.now() - hlsLoadTs < 4e3)) {
1829
+ shouldLoad = true;
1830
+ }
1831
+ }
1832
+ if (shouldLoad) {
1833
+ hlsLoadAt = loadAt;
1834
+ hlsLoadTs = Date.now();
1835
+ try {
1836
+ hls.startLoad(loadAt);
1837
+ } catch (event2) {
1838
+ }
1770
1839
  }
1771
1840
  seekRetryCount++;
1772
1841
  if (seekRetryCount <= 50) {
@@ -1779,11 +1848,6 @@ var require_ckplayer = __commonJS({
1779
1848
  }
1780
1849
  return;
1781
1850
  }
1782
- if (hlsSeekTo(t, !!force)) {
1783
- clearSeekRetry();
1784
- seekTime = 0;
1785
- return;
1786
- }
1787
1851
  }
1788
1852
  if (!force && (!isUndefined(video.readyState) && video.readyState < 1)) {
1789
1853
  seekRetryCount++;
@@ -3046,20 +3110,19 @@ var require_ckplayer = __commonJS({
3046
3110
  applyPendingSeek(false);
3047
3111
  return player;
3048
3112
  }
3049
- if (hls && target > 1 && !hlsCanSafelySeekTo(target)) {
3113
+ if (hls) {
3050
3114
  seekTime = target;
3051
- hlsResumeWarmup = true;
3052
3115
  hlsResumeTarget = target;
3053
- try {
3054
- hls.startLoad(hlsPriorLoadTime(target));
3055
- } catch (event2) {
3116
+ if (target > 1 && hlsCanSafelySeekTo(target)) {
3117
+ finishResumeSeek(target);
3118
+ return player;
3119
+ }
3120
+ if (target > 1) {
3121
+ hlsResumeWarmup = true;
3122
+ hlsSeekTo(target, false);
3123
+ applyPendingSeek(false);
3124
+ return player;
3056
3125
  }
3057
- applyPendingSeek(false);
3058
- return player;
3059
- }
3060
- if (hlsSeekTo(target, false)) {
3061
- seekTime = 0;
3062
- return player;
3063
3126
  }
3064
3127
  try {
3065
3128
  video.currentTime = target;
@@ -6278,7 +6341,7 @@ var require_ckplayer = __commonJS({
6278
6341
  if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
6279
6342
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
6280
6343
  var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
6281
- if (cdn && cdn.indexOf("1.1.3") === -1 && m) {
6344
+ if (cdn && cdn.indexOf("1.1.4") === -1 && m) {
6282
6345
  if (cdn.slice(-1) !== "/") {
6283
6346
  cdn += "/";
6284
6347
  }
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.3/dist/";
207
+ var ckplayerPlusDefaultCdn = "https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.4/dist/";
208
208
  function ckplayerEmbed(videoObj) {
209
209
  var rightMenu = [
210
210
  {
@@ -426,7 +426,7 @@ var require_ckplayer = __commonJS({
426
426
  }
427
427
  var allowCdn = !vars || vars["cdnFallback"] !== false;
428
428
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
429
- if (!allowCdn || !cdn || cdn.indexOf("1.1.3") > -1) {
429
+ if (!allowCdn || !cdn || cdn.indexOf("1.1.4") > -1) {
430
430
  return folder + "/" + file;
431
431
  }
432
432
  if (cdn.slice(-1) !== "/") {
@@ -652,25 +652,27 @@ var require_ckplayer = __commonJS({
652
652
  target = 0;
653
653
  }
654
654
  var curTime = video.currentTime || 0;
655
- if (!force) {
656
- if (hlsResumeTarget >= 0 && Math.abs(hlsResumeTarget - target) < 1.5) {
657
- if (timeInBuffered(target) && Math.abs(curTime - target) < 2.5) {
658
- return true;
659
- }
655
+ hlsResumeTarget = target;
656
+ if (!force && timeInBuffered(target)) {
657
+ if (Math.abs(curTime - target) < 1.5) {
658
+ return true;
660
659
  }
661
- if (timeInBuffered(target) && Math.abs(curTime - target) < 1.5) {
662
- hlsResumeTarget = target;
660
+ if (hlsCanSafelySeekTo(target)) {
661
+ finishResumeSeek(target);
663
662
  return true;
664
663
  }
665
- if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - target) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
664
+ }
665
+ var loadAt = hlsPriorLoadTime(target);
666
+ if (!force) {
667
+ if (hlsLoadAt >= 0 && Math.abs(hlsLoadAt - loadAt) < 1.5 && Date.now() - hlsLoadTs < 4e3) {
666
668
  return true;
667
669
  }
668
670
  }
669
- hlsLoadAt = target;
671
+ hlsLoadAt = loadAt;
670
672
  hlsLoadTs = Date.now();
671
- hlsResumeTarget = target;
673
+ hlsResumeWarmup = true;
672
674
  try {
673
- hls.startLoad(target);
675
+ hls.startLoad(loadAt);
674
676
  } catch (event2) {
675
677
  return false;
676
678
  }
@@ -843,6 +845,7 @@ var require_ckplayer = __commonJS({
843
845
  seekTime = resumeAt;
844
846
  hlsResumeTarget = resumeAt;
845
847
  hlsResumeWarmup = true;
848
+ hlsConf.autoStartLoad = false;
846
849
  }
847
850
  hls = new Hls(hlsConf);
848
851
  hls.loadSource(url);
@@ -850,6 +853,9 @@ var require_ckplayer = __commonJS({
850
853
  hls.on(Hls.Events.MANIFEST_PARSED, function() {
851
854
  if (hlsResumeWarmup && seekTime > 0) {
852
855
  var loadAt = hlsPriorLoadTime(seekTime);
856
+ hlsLoadAt = loadAt;
857
+ hlsLoadTs = Date.now();
858
+ hlsStartPositionUsed = true;
853
859
  try {
854
860
  hls.startLoad(loadAt);
855
861
  } catch (event2) {
@@ -863,9 +869,12 @@ var require_ckplayer = __commonJS({
863
869
  finishResumeSeek(target);
864
870
  return;
865
871
  }
866
- var snap = hlsPriorLoadTime(target);
867
- hlsResumeWarmup = false;
868
- finishResumeSeek(snap);
872
+ var snap = hlsFragStartTime(target);
873
+ if (timeInBuffered(snap) || hlsCanSafelySeekTo(snap)) {
874
+ finishResumeSeek(snap);
875
+ return;
876
+ }
877
+ finishResumeSeek(Math.max(0, loadAt));
869
878
  }, 5e3);
870
879
  return;
871
880
  }
@@ -1612,8 +1621,8 @@ var require_ckplayer = __commonJS({
1612
1621
  } catch (event2) {
1613
1622
  }
1614
1623
  return false;
1615
- }, hlsFragAround = function(t) {
1616
- if (!hls || isNaN(t) || t < 0) {
1624
+ }, hlsGetFragments = function() {
1625
+ if (!hls) {
1617
1626
  return null;
1618
1627
  }
1619
1628
  try {
@@ -1630,6 +1639,19 @@ var require_ckplayer = __commonJS({
1630
1639
  if (!frags || !frags.length) {
1631
1640
  return null;
1632
1641
  }
1642
+ return frags;
1643
+ } catch (event2) {
1644
+ }
1645
+ return null;
1646
+ }, hlsFragAround = function(t) {
1647
+ if (!hls || isNaN(t) || t < 0) {
1648
+ return null;
1649
+ }
1650
+ try {
1651
+ var frags = hlsGetFragments();
1652
+ if (!frags) {
1653
+ return null;
1654
+ }
1633
1655
  for (var i = 0; i < frags.length; i++) {
1634
1656
  var f = frags[i];
1635
1657
  if (!f) {
@@ -1645,7 +1667,24 @@ var require_ckplayer = __commonJS({
1645
1667
  } catch (event2) {
1646
1668
  }
1647
1669
  return null;
1648
- }, hlsPriorLoadTime = function(t) {
1670
+ }, hlsFragIndexAround = function(t) {
1671
+ var frags = hlsGetFragments();
1672
+ if (!frags || isNaN(t) || t < 0) {
1673
+ return -1;
1674
+ }
1675
+ for (var i = 0; i < frags.length; i++) {
1676
+ var f = frags[i];
1677
+ if (!f) {
1678
+ continue;
1679
+ }
1680
+ var start = f.start || 0;
1681
+ var end = start + (f.duration || 0);
1682
+ if (t >= start - 0.05 && t < end + 0.05) {
1683
+ return i;
1684
+ }
1685
+ }
1686
+ return frags.length - 1;
1687
+ }, hlsFragStartTime = function(t) {
1649
1688
  if (isNaN(t) || t <= 0) {
1650
1689
  return 0;
1651
1690
  }
@@ -1653,6 +1692,27 @@ var require_ckplayer = __commonJS({
1653
1692
  if (frag && !isUndefined(frag.start)) {
1654
1693
  return Math.max(0, frag.start);
1655
1694
  }
1695
+ return Math.max(0, t);
1696
+ }, hlsPriorLoadTime = function(t) {
1697
+ if (isNaN(t) || t <= 0) {
1698
+ return 0;
1699
+ }
1700
+ var frags = hlsGetFragments();
1701
+ if (frags && frags.length) {
1702
+ var idx = hlsFragIndexAround(t);
1703
+ if (idx < 0) {
1704
+ idx = frags.length - 1;
1705
+ }
1706
+ var loadIdx = Math.max(0, idx - 1);
1707
+ var loadFrag = frags[loadIdx];
1708
+ if (loadFrag && !isUndefined(loadFrag.start)) {
1709
+ return Math.max(0, loadFrag.start);
1710
+ }
1711
+ }
1712
+ var frag = hlsFragAround(t);
1713
+ if (frag && !isUndefined(frag.start)) {
1714
+ return Math.max(0, frag.start - 12);
1715
+ }
1656
1716
  return Math.max(0, t - 12);
1657
1717
  }, hlsCanSafelySeekTo = function(t) {
1658
1718
  if (!video || isUndefined(video.buffered) || isNaN(t) || t < 0) {
@@ -1661,13 +1721,13 @@ var require_ckplayer = __commonJS({
1661
1721
  if (!timeInBuffered(t)) {
1662
1722
  return false;
1663
1723
  }
1664
- var fragStart = hlsPriorLoadTime(t);
1724
+ var loadStart = hlsPriorLoadTime(t);
1665
1725
  try {
1666
1726
  var buf = video.buffered;
1667
1727
  for (var i = 0; i < buf.length; i++) {
1668
1728
  var start = buf.start(i);
1669
1729
  var end = buf.end(i);
1670
- if (fragStart >= start - 0.35 && t <= end + 0.15) {
1730
+ if (loadStart >= start - 0.35 && t <= end + 0.15) {
1671
1731
  return true;
1672
1732
  }
1673
1733
  }
@@ -1748,19 +1808,28 @@ var require_ckplayer = __commonJS({
1748
1808
  firstSeekTime = t;
1749
1809
  }
1750
1810
  }
1751
- if (hlsResumeWarmup) {
1811
+ if (hls && typeof hls.startLoad === "function") {
1752
1812
  if (hlsCanSafelySeekTo(t)) {
1753
1813
  finishResumeSeek(t);
1814
+ return;
1754
1815
  }
1755
- return;
1756
- }
1757
- if (hls && typeof hls.startLoad === "function") {
1758
- if (!hlsCanSafelySeekTo(t) && t > 1) {
1816
+ if (t > 1) {
1759
1817
  hlsResumeWarmup = true;
1760
1818
  hlsResumeTarget = t;
1761
- try {
1762
- hls.startLoad(hlsPriorLoadTime(t));
1763
- } catch (event2) {
1819
+ var loadAt = hlsPriorLoadTime(t);
1820
+ var shouldLoad = !!force;
1821
+ if (!shouldLoad) {
1822
+ if (!(hlsLoadAt >= 0 && Math.abs(hlsLoadAt - loadAt) < 1.5 && Date.now() - hlsLoadTs < 4e3)) {
1823
+ shouldLoad = true;
1824
+ }
1825
+ }
1826
+ if (shouldLoad) {
1827
+ hlsLoadAt = loadAt;
1828
+ hlsLoadTs = Date.now();
1829
+ try {
1830
+ hls.startLoad(loadAt);
1831
+ } catch (event2) {
1832
+ }
1764
1833
  }
1765
1834
  seekRetryCount++;
1766
1835
  if (seekRetryCount <= 50) {
@@ -1773,11 +1842,6 @@ var require_ckplayer = __commonJS({
1773
1842
  }
1774
1843
  return;
1775
1844
  }
1776
- if (hlsSeekTo(t, !!force)) {
1777
- clearSeekRetry();
1778
- seekTime = 0;
1779
- return;
1780
- }
1781
1845
  }
1782
1846
  if (!force && (!isUndefined(video.readyState) && video.readyState < 1)) {
1783
1847
  seekRetryCount++;
@@ -3040,20 +3104,19 @@ var require_ckplayer = __commonJS({
3040
3104
  applyPendingSeek(false);
3041
3105
  return player;
3042
3106
  }
3043
- if (hls && target > 1 && !hlsCanSafelySeekTo(target)) {
3107
+ if (hls) {
3044
3108
  seekTime = target;
3045
- hlsResumeWarmup = true;
3046
3109
  hlsResumeTarget = target;
3047
- try {
3048
- hls.startLoad(hlsPriorLoadTime(target));
3049
- } catch (event2) {
3110
+ if (target > 1 && hlsCanSafelySeekTo(target)) {
3111
+ finishResumeSeek(target);
3112
+ return player;
3113
+ }
3114
+ if (target > 1) {
3115
+ hlsResumeWarmup = true;
3116
+ hlsSeekTo(target, false);
3117
+ applyPendingSeek(false);
3118
+ return player;
3050
3119
  }
3051
- applyPendingSeek(false);
3052
- return player;
3053
- }
3054
- if (hlsSeekTo(target, false)) {
3055
- seekTime = 0;
3056
- return player;
3057
3120
  }
3058
3121
  try {
3059
3122
  video.currentTime = target;
@@ -6272,7 +6335,7 @@ var require_ckplayer = __commonJS({
6272
6335
  if (!isRetry && (!vars || vars["cdnFallback"] !== false)) {
6273
6336
  var cdn = typeof window !== "undefined" && window.ckplayerPlusCdn ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
6274
6337
  var m = String(file).match(/\/(hls\.js|flv\.js|mpegts\.js|language)\/([^/?#]+)(?:[?#].*)?$/i);
6275
- if (cdn && cdn.indexOf("1.1.3") === -1 && m) {
6338
+ if (cdn && cdn.indexOf("1.1.4") === -1 && m) {
6276
6339
  if (cdn.slice(-1) !== "/") {
6277
6340
  cdn += "/";
6278
6341
  }