ckplayer-plus 1.1.6 → 1.1.7

package/dist/ckplayer.js

@@ -141,7 +141,7 @@
 		cdnFallback:true// getPath 失败时是否回退到 jsDelivr（内网可设 false，并配置 pluginPath）
 	};
 	// 打包时替换为真实版本；用于 bundler 下 getPath 失效时的 CDN 回退
-	var ckplayerPlusDefaultCdn='https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.6/dist/';
+	var ckplayerPlusDefaultCdn='https://cdn.jsdelivr.net/npm/ckplayer-plus@1.1.7/dist/';
 	function ckplayerEmbed(videoObj){
 		/*
 		 * rightMenu
@@ -182,6 +182,8 @@
 		var hlsLoadAt=-1;//最近一次 hls.startLoad 目标
 		var hlsLoadTs=0;//最近一次 hls.startLoad 时间戳
 		var hlsScrubResumePlay=false;//用户拖动后是否需要在 seeked 时恢复播放
+		var hlsScrubbing=false;//进度条拖动中（seeking 钩子跳过二次 seek）
+		var hlsResumeSettling=false;//断点续播定位中（弱化 waiting、跳过二次 seek）
 		var oldTime=0,playTime=0,firstSeekTime=-1,maxSeeTime=0;//oldTime=记录上次播放时间，playTime=当前播放时间，firstSeekTime=记录第一次拖动的时间,maxSeeTime=看过的最大时间
 		var isChangeDef=true;//是否需要重置清晰度
 		var playType='';//播放类别，默认=''，是通过api接口播放，='button'则判定是通过点击按钮播放
@@ -447,7 +449,7 @@
 			}
 			var allowCdn=!vars || vars['cdnFallback']!==false;
 			var cdn=(typeof window!=='undefined' && window.ckplayerPlusCdn) ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
-			if(!allowCdn || !cdn || cdn.indexOf('1.1.6')>-1){
+			if(!allowCdn || !cdn || cdn.indexOf('1.1.7')>-1){
 				// 避免占位版本或显式关闭 CDN 时请求坏地址；交给相对路径或业务 pluginPath
 				return folder+'/'+file;
 			}
@@ -822,8 +824,7 @@
 		/*
 		 * hlsInteractiveSeek
 		 * 功能：用户拖动/点击进度条时的 HLS 跳转
-		 * 对齐 EZ/标准 hls.js 做法：只改 video.currentTime，由 hls.js 内部响应 seeking 拉片。
-		 * 禁止再手动 startLoad，否则会与内部加载竞态、取消 .ts 并永久转圈。
+		 * 对齐三站/标准 hls.js：只改 video.currentTime，由 hls.js 内部响应 seeking 拉片。
 		*/
 		hlsInteractiveSeek=function(target){
 			if(!hls || !video){
@@ -836,24 +837,68 @@
 			if(dur && isFinite(dur) && dur>0 && target>=dur){
 				target=Math.max(0,dur-0.3);
 			}
-			hlsScrubResumePlay=!paused;
+			var wasPlaying=!paused;
+			hlsScrubbing=true;
+			hlsScrubResumePlay=wasPlaying;
 			clearSeekRetry();
 			hlsResumeWarmup=false;
+			hlsResumeSettling=false;
 			hlsResumeTarget=-1;
 			seekTime=0;
 			seekApplyLock=true;
+			// 已在缓冲区内：秒切并尽快恢复播放
+			if(timeInBuffered(target)){
+				try{
+					video.currentTime=target;
+				}catch(event){
+					seekApplyLock=false;
+					hlsScrubbing=false;
+					return false;
+				}
+				setTimeout(function(){
+					seekApplyLock=false;
+					hlsScrubbing=false;
+					if(C['buffer']){
+						C['buffer'].hide();
+					}
+					waited=true;
+					if(wasPlaying){
+						hlsScrubResumePlay=false;
+						try{
+							player.play();
+						}catch(errPlay){}
+					}
+					else{
+						hlsScrubResumePlay=false;
+					}
+				},80);
+				return true;
+			}
 			try{
 				video.currentTime=target;
 			}catch(event){
 				seekApplyLock=false;
+				hlsScrubbing=false;
 				return false;
 			}
-			// 短暂锁避免 seeking 钩子里抢先 play 打断分片；seeked 后再恢复
 			setTimeout(function(){
 				seekApplyLock=false;
 			},120);
 			return true;
 		},
+		/*
+		 * hidePlaybackBuffer
+		 * 功能：统一关闭 loading/转圈（seeked/canplay/续播完成共用）
+		*/
+		hidePlaybackBuffer=function(){
+			waited=true;
+			if(C['buffer']){
+				C['buffer'].hide();
+			}
+			if(C['loading']){
+				C['loading'].hide();
+			}
+		},
 		/*
 		 * destroyStreamPlayers
 		 * 功能：切换地址前销毁 hls/flv/mpegts 实例
@@ -867,6 +912,8 @@
 			hlsLoadAt=-1;
 			hlsLoadTs=0;
 			hlsScrubResumePlay=false;
+			hlsScrubbing=false;
+			hlsResumeSettling=false;
 			decodeRecoverCount=0;
 			if(hls){
 				try{
@@ -1043,8 +1090,8 @@
 					if(!resumeAt){
 						resumeAt=parseResumeSeekFromVars();
 					}
-					// HLS 续播：autoStartLoad=false，避免默认从 0 拉片后再 startLoad 导致 .ts canceled。
-					// 清单解析后只 startLoad 一次（对齐目标前一片），缓冲覆盖后再 currentTime。
+					// 断点续播对齐 ZWPlayer：保持默认 autoStartLoad，媒体就绪后 currentTime=seek。
+					// 不再 autoStartLoad:false + 手动 startLoad 预热（易自相 cancel）。
 					if(resumeAt && resumeAt>0 && (isUndefined(vars['live']) || !vars['live'])){
 						maxSeeTime=Math.max(maxSeeTime,resumeAt);
 						if(firstSeekTime<0){
@@ -1052,36 +1099,40 @@
 						}
 						seekTime=resumeAt;
 						hlsResumeTarget=resumeAt;
-						hlsResumeWarmup=true;
-						hlsConf.autoStartLoad=false;
+						hlsResumeSettling=true;
+						hlsResumeWarmup=false;
 					}
 					hls = new Hls(hlsConf);
 					hls.loadSource(url);
 					hls.attachMedia(video);
 					hls.on(Hls.Events.MANIFEST_PARSED, function(){
-						if(hlsResumeWarmup && seekTime>0){
-							var loadAt=hlsPriorLoadTime(seekTime);
-							hlsLoadAt=loadAt;
-							hlsLoadTs=Date.now();
+						if(seekTime>0 && hlsResumeSettling){
 							hlsStartPositionUsed=true;
-							try{
-								hls.startLoad(loadAt);
-							}catch(event){}
-							// 超时兜底：仍未定位则落到可解码的对齐点，避免一直转圈
-							setTimeout(function(){
-								if(!hlsResumeWarmup || !seekTime){return;}
-								var target=seekTime;
-								if(hlsCanSafelySeekTo(target)){
-									finishResumeSeek(target);
+							var tryResume=function(){
+								if(!seekTime || !hlsResumeSettling){return;}
+								var t=seekTime;
+								if(video && (video.readyState>=1 || (duration && isFinite(duration) && duration>0))){
+									finishResumeSeek(t);
 									return;
 								}
-								var snap=hlsFragStartTime(target);
-								if(timeInBuffered(snap) || hlsCanSafelySeekTo(snap)){
-									finishResumeSeek(snap);
-									return;
+								seekRetryCount++;
+								if(seekRetryCount<=25){
+									if(seekRetryTimer){
+										clearTimeout(seekRetryTimer);
+									}
+									seekRetryTimer=setTimeout(tryResume,120);
+								}
+								else{
+									finishResumeSeek(t);
 								}
-								finishResumeSeek(Math.max(0,loadAt));
-							},5000);
+							};
+							tryResume();
+							// 超时兜底：避免永久转圈
+							setTimeout(function(){
+								if(hlsResumeSettling && seekTime>0){
+									finishResumeSeek(seekTime);
+								}
+							},4000);
 							return;
 						}
 						if(!hlsStartPositionUsed){
@@ -1089,10 +1140,7 @@
 						}
 					});
 					hls.on(Hls.Events.FRAG_BUFFERED, function(event, data){
-						if(hlsResumeWarmup && seekTime>0){
-							if(hlsCanSafelySeekTo(seekTime)){
-								finishResumeSeek(seekTime);
-							}
+						if(hlsResumeSettling && seekTime>0){
 							return;
 						}
 						if(hlsResumeTarget<=0 || !data || !data.frag){
@@ -1101,12 +1149,7 @@
 						var fragStart=data.frag.start;
 						var fragEnd=fragStart+data.frag.duration;
 						if(hlsResumeTarget>=fragStart-0.5 && hlsResumeTarget<=fragEnd+0.5){
-							if(!waited){
-								waited=true;
-								if(C['buffer']){
-									C['buffer'].hide();
-								}
-							}
+							hidePlaybackBuffer();
 						}
 					});
 					hls.on(Hls.Events.ERROR, function(event, data){
@@ -1126,12 +1169,29 @@
 								}
 							}
 						}
-						// 媒体解码类错误先尝试恢复，避免续播直接黑屏
-						if(fatal && data.type===Hls.ErrorTypes.MEDIA_ERROR && hls && typeof hls.recoverMediaError==='function'){
-							try{
-								hls.recoverMediaError();
-								fatal=false;
-							}catch(errRecover){}
+						// 对齐 ZWPlayer / ezwebtools：网络错误重拉，媒体错误恢复解码
+						if(fatal && hls){
+							if(data.type===Hls.ErrorTypes.NETWORK_ERROR && typeof hls.startLoad==='function'){
+								try{
+									if(data.details==='keyLoadError'){
+										setTimeout(function(){
+											if(hls && typeof hls.startLoad==='function'){
+												hls.startLoad();
+											}
+										},2000);
+									}
+									else{
+										hls.startLoad();
+									}
+									fatal=false;
+								}catch(errNet){}
+							}
+							else if(data.type===Hls.ErrorTypes.MEDIA_ERROR && typeof hls.recoverMediaError==='function'){
+								try{
+									hls.recoverMediaError();
+									fatal=false;
+								}catch(errRecover){}
+							}
 						}
 						CT.error={code:code,message:message};
 						eventTarget('error',CT.error);//注册监听error
@@ -2045,10 +2105,11 @@
 		/*
 		 * finishResumeSeek
 		 * 功能：完成续播定位。只 seek、不自动 play（由用户点击中央按钮/播放键）
-		 * 避免 seek 后立刻 play 打断 HLS 分片请求（Network 出现 canceled .ts）并导致永久转圈
+		 * ZW 模型：直接 currentTime，不依赖前片预热完成态
 		*/
 		finishResumeSeek=function(t){
 			hlsResumeWarmup=false;
+			hlsResumeSettling=false;
 			// 续播场景取消挂起的自动播放，统一改为点击播放
 			autoplayPending=false;
 			applySeekToMedia(t);
@@ -2058,10 +2119,7 @@
 					video.pause();
 				}catch(event){}
 				paused=true;
-				if(C['buffer']){
-					C['buffer'].hide();
-				}
-				waited=true;
+				hidePlaybackBuffer();
 				if(!vars['controls'] && C['centerPlay']){
 					C['centerPlay'].show();
 				}
@@ -2114,9 +2172,8 @@
 		},
 		/*
 		 * applyPendingSeek
-		 * 功能：在媒体就绪且目标时间可解码后再应用挂起的 seekTime
-		 * 避免断点续播过早 seek 触发 PIPELINE_ERROR_DECODE（非关键帧）
-		 * seekTime 仅在 finishResumeSeek / applySeekToMedia 成功后清零
+		 * 功能：在媒体就绪后应用挂起的 seekTime
+		 * HLS 对齐 ZWPlayer：就绪后直接 currentTime（finishResumeSeek），不再主路径 startLoad 预热
 		*/
 		applyPendingSeek=function(force){
 			if(!seekTime || !video || seekApplyLock){
@@ -2133,6 +2190,7 @@
 			if(t<=0){
 				seekTime=0;
 				clearSeekRetry();
+				hlsResumeSettling=false;
 				return;
 			}
 			if(t>0){
@@ -2141,47 +2199,25 @@
 					firstSeekTime=t;
 				}
 			}
-			// HLS：缓冲已可安全定位 → 只 finish，禁止再 startLoad / 勿提前清 seekTime
-			if(hls && typeof hls.startLoad==='function'){
-				if(hlsCanSafelySeekTo(t)){
-					finishResumeSeek(t);
-					return;
-				}
-				// 预热中或需加载：只按对齐点 startLoad（去重），保留 seekTime 等 FRAG_BUFFERED
-				if(t>1){
-					hlsResumeWarmup=true;
-					hlsResumeTarget=t;
-					var loadAt=hlsPriorLoadTime(t);
-					var shouldLoad=!!force;
-					if(!shouldLoad){
-						if(!(hlsLoadAt>=0 && Math.abs(hlsLoadAt-loadAt)<1.5 && (Date.now()-hlsLoadTs)<4000)){
-							shouldLoad=true;
-						}
-					}
-					if(shouldLoad){
-						hlsLoadAt=loadAt;
-						hlsLoadTs=Date.now();
-						try{
-							hls.startLoad(loadAt);
-						}catch(event){}
-					}
+			// HLS：媒体元数据就绪即可定位（由 hls.js 响应 seeking 拉片）
+			if(hls){
+				hlsResumeSettling=true;
+				if(!force && (!isUndefined(video.readyState) && video.readyState<1) && !(dur && isFinite(dur) && dur>0)){
 					seekRetryCount++;
-					if(seekRetryCount<=50){
+					if(seekRetryCount<=40){
 						if(seekRetryTimer){
 							clearTimeout(seekRetryTimer);
 						}
 						seekRetryTimer=setTimeout(function(){
 							applyPendingSeek(false);
-						},200);
+						},120);
 						return;
 					}
-					// 重试耗尽：落到目标片起点，避免永久转圈
-					finishResumeSeek(hlsFragStartTime(t) || loadAt || t);
-					return;
 				}
+				finishResumeSeek(t);
+				return;
 			}
 			// 对普通 MP4，metadata 后设置 currentTime 会由浏览器自动请求目标 Range。
-			// 等待目标已缓冲会形成循环等待：目标分片只有 seek 后才会下载。
 			if(!force && (!isUndefined(video.readyState) && video.readyState<1)){
 				seekRetryCount++;
 				if(seekRetryCount<=50){
@@ -2302,6 +2338,7 @@
 			},
 			canPlay:function(){
 				C['loading'].hide();
+				hidePlaybackBuffer();
 				eventTarget('canplay');
 				applyPendingSeek();
 				startPendingAutoplay();
@@ -2503,12 +2540,11 @@
 			seeked:function(){
 				seekApplyLock=false;
 				decodeRecoverCount=0;
+				hlsScrubbing=false;
+				hlsResumeSettling=false;
 				startPendingAutoplay();
 				pSliderMouseDown=false;
-				waited=true;
-				if(C['buffer']){
-					C['buffer'].hide();
-				}
+				hidePlaybackBuffer();
 				// 用户拖动后恢复播放（标准 video + hls.js 行为）
 				if(hlsScrubResumePlay){
 					hlsScrubResumePlay=false;
@@ -2520,55 +2556,58 @@
 				eventTarget('seeked');
 			},
 			seeking:function(){
-				// 续播/初始化定位中禁止抢先 play：会取消进行中的 .ts 并导致永久 loading
-				if(paused && !seekApplyLock && !hlsResumeWarmup && !seekTime && !autoplayPending){
+				// 续播/拖动定位中禁止抢先 play：会取消进行中的 .ts 并导致永久 loading
+				if(paused && !seekApplyLock && !hlsResumeWarmup && !hlsResumeSettling && !hlsScrubbing && !seekTime && !autoplayPending){
 					player.play();
 				}
 				var seekingTime=this.currentTime;
 				if(firstSeekTime==-1){
 					firstSeekTime=seekingTime;//记录第一次拖动的时间
 				}
-				switch(vars['timeScheduleAdjust']){
-					case 0://禁止拖动
-						if(oldTime!=seekingTime){
-							waitingMessage=false;
-							player.seek(oldTime);
-							message(language['timeScheduleAdjust']['prohibit']);
-							return;
-						}
-						break;
-					case 2://只能前进（向右拖动
-						if(seekingTime<oldTime){
-							waitingMessage=false;
-							player.seek(oldTime);
-							message(language['timeScheduleAdjust']['prohibitBackOff']);
-							return;
-						}
-						break;
-					case 3://是只能后退
-						if(seekingTime>oldTime){
-							waitingMessage=false;
-							player.seek(oldTime);
-							message(language['timeScheduleAdjust']['prohibitForward']);
-							return;
-						}
-						break;
-					case 4://只能前进但能回到第一次拖动时的位置
-						if(seekingTime<firstSeekTime){
-							waitingMessage=false;
-							player.seek(firstSeekTime);
-							message(language['timeScheduleAdjust']['prohibitLookBack']);
-							return;
-						}
-						break;
-					case 5://看过的地方可以随意拖动
-						if(seekingTime>maxSeeTime){
-							waitingMessage=false;
-							player.seek(maxSeeTime);
-							message(language['timeScheduleAdjust']['prohibitForwardNotViewed']);
-							return;
-						}
-						break;
+				// scrub/续播定位期间：跳过二次 player.seek（timeScheduleAdjust 由进度条侧执法）
+				if(!(hlsScrubbing || hlsScrubResumePlay || hlsResumeSettling || hlsResumeWarmup)){
+					switch(vars['timeScheduleAdjust']){
+						case 0://禁止拖动
+							if(oldTime!=seekingTime){
+								waitingMessage=false;
+								player.seek(oldTime);
+								message(language['timeScheduleAdjust']['prohibit']);
+								return;
+							}
+							break;
+						case 2://只能前进（向右拖动
+							if(seekingTime<oldTime){
+								waitingMessage=false;
+								player.seek(oldTime);
+								message(language['timeScheduleAdjust']['prohibitBackOff']);
+								return;
+							}
+							break;
+						case 3://是只能后退
+							if(seekingTime>oldTime){
+								waitingMessage=false;
+								player.seek(oldTime);
+								message(language['timeScheduleAdjust']['prohibitForward']);
+								return;
+							}
+							break;
+						case 4://只能前进但能回到第一次拖动时的位置
+							if(seekingTime<firstSeekTime){
+								waitingMessage=false;
+								player.seek(firstSeekTime);
+								message(language['timeScheduleAdjust']['prohibitLookBack']);
+								return;
+							}
+							break;
+						case 5://看过的地方可以随意拖动
+							if(seekingTime>maxSeeTime){
+								waitingMessage=false;
+								player.seek(maxSeeTime);
+								message(language['timeScheduleAdjust']['prohibitForwardNotViewed']);
+								return;
+							}
+							break;
+					}
 				}
 				eventTarget('seek',{time:seekingTime,state:'seeking'});
 				eventTarget('seeking');
@@ -2581,10 +2620,16 @@
 			waiting:function(){
 				waited=false;
 				eventTarget('buffer','start');//注册监听视频缓冲
-				C['centerPlay'].hide();
+				if(!(hlsScrubbing || hlsScrubResumePlay || hlsResumeSettling)){
+					C['centerPlay'].hide();
+				}
 				if(!vars['controls']){
 					C['buffer'].show();
 				}
+				// scrub/续播定位中的短暂 waiting 不刷文案，避免钉死「缓冲中」体验
+				if(hlsScrubbing || hlsScrubResumePlay || hlsResumeSettling){
+					return;
+				}
 				if(!waitingMessage){
 					waitingMessage=true;
 				}
@@ -2599,6 +2644,7 @@
 				C['bar']['playAndPause']['pause'].show();
 				C['bar']['playAndPause']['refresh'].hide();
 				C['centerPlay'].hide();
+				hidePlaybackBuffer();
 				if(playType=='button'){
 					C['bar']['pbox'].removeClass('ck-bar-progress-out');
 				}
@@ -5696,6 +5742,7 @@
 				e = e || window.event;
 				var eleOffset = slider.offset(),bgOffset=bg.offset(),client = getClient(e);
 				pSliderMouseDown=true;
+				hlsScrubbing=true;
 				posRecord = client['x'];
 				//供比较
 				var left = eleOffset['left']-bgOffset['left'];
@@ -5797,6 +5844,12 @@
 					eventTarget('playback',{time:playbackTime,date:date('Y-m-d H:i:s',playbackTime)});
 					eventTarget('seek',{time:playbackTime,state:'seeking',date:date('Y-m-d H:i:s',playbackTime)});
 				}
+				// seek 完成后由 seeked 清 hlsScrubbing；此处延迟兜底
+				setTimeout(function(){
+					if(!pSliderMouseDown){
+						hlsScrubbing=false;
+					}
+				},800);
 				C['bar']['pbox'].removeClass('ck-bar-progress-slider-move');
 				if(isMouseLeave){
 					tip();
@@ -7410,7 +7463,7 @@
 				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.6')===-1 && m){
+					if(cdn && cdn.indexOf('1.1.7')===-1 && m){
 						if(cdn.slice(-1)!=='/'){
 							cdn+='/';
 						}