ckplayer-plus 1.0.5 → 1.0.7

package/README.md

@@ -77,7 +77,7 @@ React：
 | `preferBuiltinPlug` | `true` | 优先加载本包内置脚本，避免复用页面上其它全局 `Hls` |
 | `cdnFallback` | `true` | `getPath` 失败时回退 jsDelivr；内网无外网请设 `false` 并配 `pluginPath` |
 | `pluginPath` | 自动 | 插件脚本根路径。默认：`window.ckplayerBasePath` → 本包 `dist/` → jsDelivr CDN |
-| `seek` | `0` | 续播秒数（number 或数字字符串）；会同步 `maxSeeTime`，兼容 `timeScheduleAdjust: 5` |
+| `seek` | `0` | 续播秒数（number 或数字字符串）；会同步 `maxSeeTime`。HLS 优先用 `startPosition`，并等待缓冲后再跳，降低非关键帧解码失败 |
 | `loaded` | — | **只支持函数**；字符串形式已禁用（防 XSS） |
 
 ### 进阶（按需）

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.0.5/dist/';
+	var ckplayerPlusDefaultCdn='https://cdn.jsdelivr.net/npm/ckplayer-plus@1.0.7/dist/';
 	function ckplayerEmbed(videoObj){
 		/*
 		 * rightMenu
@@ -171,6 +171,11 @@
 		var paused=true;//默认暂停状态
 		var loadTime=0;//已加载部分
 		var seekTime=0;//需要跳转的时间，初次播放以及切换清晰度后会用该变量记录需要seek的时间
+		var seekRetryTimer=null;//续播等待缓冲的重试计时器
+		var seekRetryCount=0;//续播重试次数
+		var seekApplyLock=false;//防止并发多次 currentTime 赋值
+		var decodeRecoverCount=0;//MEDIA_ERR_DECODE 恢复次数
+		var hlsStartPositionUsed=false;//是否已用 hls.js startPosition 处理续播
 		var oldTime=0,playTime=0,firstSeekTime=-1,maxSeeTime=0;//oldTime=记录上次播放时间，playTime=当前播放时间，firstSeekTime=记录第一次拖动的时间,maxSeeTime=看过的最大时间
 		var isChangeDef=true;//是否需要重置清晰度
 		var playType='';//播放类别，默认=''，是通过api接口播放，='button'则判定是通过点击按钮播放
@@ -409,7 +414,7 @@
 			}
 			var allowCdn=!vars || vars['cdnFallback']!==false;
 			var cdn=(typeof window!=='undefined' && window.ckplayerPlusCdn) ? window.ckplayerPlusCdn : ckplayerPlusDefaultCdn;
-			if(!allowCdn || !cdn || cdn.indexOf('1.0.5')>-1){
+			if(!allowCdn || !cdn || cdn.indexOf('1.0.7')>-1){
 				// 避免占位版本或显式关闭 CDN 时请求坏地址；交给相对路径或业务 pluginPath
 				return folder+'/'+file;
 			}
@@ -657,6 +662,99 @@
 			 */
 			return player;
 		},
+		/*
+		 * parseResumeSeekFromVars
+		 * 功能：从 vars 解析续播秒数（不含 seekTime 缓存）
+		*/
+		parseResumeSeekFromVars=function(){
+			if(isUndefined(vars['seek'])){
+				return 0;
+			}
+			if(valType(vars['seek'])=='number' && vars['seek']>0){
+				return vars['seek'];
+			}
+			if(valType(vars['seek'])=='string' && vars['seek']=='cookie' && cookieName){
+				var cke=player.cookie(cookieName);
+				if(cke && cke['time']){
+					return cke['time'];
+				}
+				return 0;
+			}
+			if(valType(vars['seek'])=='string' && vars['seek']!=='' && !isNaN(parseFloat(vars['seek']))){
+				return parseFloat(vars['seek']);
+			}
+			return 0;
+		},
+		/*
+		 * applyResumeSeekState
+		 * 功能：写入续播目标并同步 maxSeeTime（timeScheduleAdjust=5 依赖）
+		*/
+		applyResumeSeekState=function(t){
+			if(!t || t<=0){
+				return;
+			}
+			seekTime=t;
+			maxSeeTime=Math.max(maxSeeTime,t);
+			if(firstSeekTime<0){
+				firstSeekTime=t;
+			}
+		},
+		/*
+		 * prepareCookieAndSeek
+		 * 功能：解析 cookie / seek，必须在 plugPlayer 之前调用
+		*/
+		prepareCookieAndSeek=function(){
+			if(vars['cookie']){
+				if(valType(vars['cookie'])=='array' && vars['cookie'].length>=2){
+					if(vars['cookie'][0] && valType(vars['cookie'][0])=='string'){
+						cookieName=vars['cookie'][0];
+					}
+					if(vars['cookie'][1] && valType(vars['cookie'][1])=='number'){
+						cookieTime=vars['cookie'][1];
+					}
+				}
+				if(valType(vars['cookie'])=='object' && !isUndefined(vars['cookie']['name'])){
+					cookieName=vars['cookie']['name'];
+					if(!isUndefined(vars['cookie']['hour']) && valType(vars['cookie']['hour'])=='number'){
+						cookieTime=vars['cookie']['hour'];
+					}
+				}
+				if(valType(vars['cookie'])=='string'){
+					cookieName=vars['cookie'];
+				}
+				if(cookieName){
+					cookieName=cookieName.replace(/[ ]*,[ ]*|[ ]+/g, '').replace(/[ ]*;[ ]*|[ ]+/g, '');
+				}
+			}
+			if(!seekTime){
+				applyResumeSeekState(parseResumeSeekFromVars());
+			}
+		},
+		/*
+		 * destroyStreamPlayers
+		 * 功能：切换地址前销毁 hls/flv/mpegts 实例
+		*/
+		destroyStreamPlayers=function(){
+			clearSeekRetry();
+			seekApplyLock=false;
+			hlsStartPositionUsed=false;
+			decodeRecoverCount=0;
+			if(hls){
+				try{
+					hls.destroy();
+				}catch(event){}
+				hls=null;
+			}
+			if(pugPlayer){
+				try{
+					pugPlayer.pause();
+					pugPlayer.unload();
+					pugPlayer.detachMediaElement();
+					pugPlayer.destroy();
+				}catch(event){}
+				pugPlayer=null;
+			}
+		},
 		/*
 		 * changeVideo
 		 * 功能：初始化视频地址或修改视频地址
@@ -664,6 +762,8 @@
 		changeVideo=function (vstr){
 			var i=0;
 			ensureAutoPlug(vstr);
+			prepareCookieAndSeek();
+			destroyStreamPlayers();
 			if(video.attr('src') || video.htm()){
 				player.pause();
 			}
@@ -755,52 +855,6 @@
 			if(isChangeDef){
 				checkDefinition();
 			}
-			/*
-			 * 对cookie进行相关分析
-			*/
-			if(vars['cookie']){
-				if(valType(vars['cookie'])=='array' && vars['cookie'].length>=2){
-					if(vars['cookie'][0] && valType(vars['cookie'][0])=='string'){
-						cookieName=vars['cookie'][0];
-					}
-					if(vars['cookie'][1] && valType(vars['cookie'][1])=='number'){
-						cookieTime=vars['cookie'][1];
-					}
-				}
-				if(valType(vars['cookie'])=='object' && !isUndefined(vars['cookie']['name'])){
-					cookieName=vars['cookie']['name'];
-					if(!isUndefined(vars['cookie']['hour']) && valType(vars['cookie']['hour'])=='number'){
-						cookieTime=vars['cookie']['hour'];
-					}
-				}
-				if(valType(vars['cookie'])=='string'){
-					cookieName=vars['cookie'];
-				}
-				if(cookieName){
-					cookieName=cookieName.replace(/[ ]*,[ ]*|[ ]+/g, '').replace(/[ ]*;[ ]*|[ ]+/g, '');
-				}
-			}
-			if(!isUndefined(vars['seek']) && !seekTime){
-				if(valType(vars['seek'])=='number' && vars['seek']>0){
-					seekTime=vars['seek'];
-				}
-				else if(valType(vars['seek'])=='string' && vars['seek']=='cookie' && cookieName){
-					var cke=player.cookie(cookieName);
-					if(cke){
-						seekTime=cke['time'];
-					}
-				}
-				else if(valType(vars['seek'])=='string' && vars['seek']!=='' && !isNaN(parseFloat(vars['seek']))){
-					seekTime=parseFloat(vars['seek']);
-				}
-				// 与旧版对齐：续播 seek 同步进度水位，避免 timeScheduleAdjust=5 时被打回 0
-				if(seekTime && seekTime>0){
-					maxSeeTime=Math.max(maxSeeTime,seekTime);
-					if(firstSeekTime<0){
-						firstSeekTime=seekTime;
-					}
-				}
-			}
 		},
 		/*
 		 * plugPlayer
@@ -842,11 +896,39 @@
 		hlsPlayer=function (url){
 			var startHls=function(){
 				if (typeof Hls!=='undefined' && !isUndefined(Hls) && Hls.isSupported()) {
-					hls = new Hls();
+					if(hls){
+						try{
+							hls.destroy();
+						}catch(event){}
+						hls=null;
+					}
+					var hlsConf={
+						// 10s 分片流在续播点附近需要略大缓冲，减少卡住转圈
+						maxBufferLength:30,
+						maxMaxBufferLength:60
+					};
+					var resumeAt=seekTime;
+					if(!resumeAt){
+						resumeAt=parseResumeSeekFromVars();
+					}
+					// 断点续播：startPosition 必须在 loadSource 前设置，从正确 TS 分片起播
+					if(resumeAt && resumeAt>0 && (isUndefined(vars['live']) || !vars['live'])){
+						hlsConf.startPosition=resumeAt;
+						maxSeeTime=Math.max(maxSeeTime,resumeAt);
+						if(firstSeekTime<0){
+							firstSeekTime=resumeAt;
+						}
+						seekTime=0;
+						hlsStartPositionUsed=true;
+						clearSeekRetry();
+					}
+					hls = new Hls(hlsConf);
 					hls.loadSource(url);
 					hls.attachMedia(video);
 					hls.on(Hls.Events.MANIFEST_PARSED, function(){
-						applyPendingSeek();
+						if(!hlsStartPositionUsed){
+							applyPendingSeek();
+						}
 					});
 					hls.on(Hls.Events.ERROR, function(event, data){
 						var code=9;
@@ -865,6 +947,13 @@
 								}
 							}
 						}
+						// 媒体解码类错误先尝试恢复，避免续播直接黑屏
+						if(fatal && data.type===Hls.ErrorTypes.MEDIA_ERROR && hls && typeof hls.recoverMediaError==='function'){
+							try{
+								hls.recoverMediaError();
+								fatal=false;
+							}catch(errRecover){}
+						}
 						CT.error={code:code,message:message};
 						eventTarget('error',CT.error);//注册监听error
 						if(fatal){
@@ -1614,12 +1703,42 @@
 				}
 			}
 		},
+		/*
+		 * timeInBuffered
+		 * 功能：判断目标时间是否已在 buffered 区间内（续播前避免跳到未缓冲的非关键帧）
+		*/
+		timeInBuffered=function(t){
+			if(!video || isUndefined(video.buffered)){
+				return false;
+			}
+			try{
+				var buf=video.buffered;
+				for(var i=0;i<buf.length;i++){
+					if(t>=buf.start(i)-0.35 && t<=buf.end(i)+0.15){
+						return true;
+					}
+				}
+			}catch(event){}
+			return false;
+		},
+		/*
+		 * clearSeekRetry
+		 * 功能：清理续播等待计时器
+		*/
+		clearSeekRetry=function(){
+			if(seekRetryTimer){
+				clearTimeout(seekRetryTimer);
+				seekRetryTimer=null;
+			}
+			seekRetryCount=0;
+		},
 		/*
 		 * applyPendingSeek
-		 * 功能：在媒体就绪后应用挂起的 seekTime
+		 * 功能：在媒体就绪且目标时间可解码后再应用挂起的 seekTime
+		 * 避免断点续播过早 seek 触发 PIPELINE_ERROR_DECODE（非关键帧）
 		*/
-		applyPendingSeek=function(){
-			if(!seekTime || !video){
+		applyPendingSeek=function(force){
+			if(!seekTime || !video || seekApplyLock){
 				return;
 			}
 			if(!isUndefined(vars['live']) && ((valType(vars['live'])=='boolean' && vars['live']) || valType(vars['live'])=='number')){
@@ -1630,19 +1749,97 @@
 			if(dur && isFinite(dur) && dur>0 && t>=dur){
 				t=Math.max(0,dur-0.3);
 			}
-			// 续播水位同步（mode=5 依赖 maxSeeTime）
+			if(t<=0){
+				seekTime=0;
+				clearSeekRetry();
+				return;
+			}
 			if(t>0){
 				maxSeeTime=Math.max(maxSeeTime,t);
 				if(firstSeekTime<0){
 					firstSeekTime=t;
 				}
 			}
+			// HLS：用 hls.startLoad 从目标分片加载，避免裸 currentTime 导致 16s 处一直转圈/解码失败
+			if(hls && typeof hls.startLoad==='function'){
+				clearSeekRetry();
+				seekTime=0;
+				try{
+					hls.startLoad(t);
+				}catch(event){
+					seekTime=t;
+				}
+				return;
+			}
+			var readyEnough=!isUndefined(video.readyState) && video.readyState>=2;
+			var bufferedOk=timeInBuffered(t);
+			if(!force && !bufferedOk && (!readyEnough || video.readyState<3)){
+				seekRetryCount++;
+				if(seekRetryCount<=50){
+					if(seekRetryTimer){
+						clearTimeout(seekRetryTimer);
+					}
+					seekRetryTimer=setTimeout(function(){
+						applyPendingSeek(false);
+					},200);
+					return;
+				}
+			}
+			clearSeekRetry();
+			seekApplyLock=true;
 			seekTime=0;
 			try{
 				video.currentTime=t;
 			}catch(event){
 				seekTime=t;
+				seekApplyLock=false;
+			}
+			setTimeout(function(){
+				seekApplyLock=false;
+			},800);
+		},
+		/*
+		 * recoverDecodeError
+		 * 功能：断点续播触发的解码错误尝试恢复（Chrome PIPELINE_ERROR_DECODE）
+		*/
+		recoverDecodeError=function(){
+			if(decodeRecoverCount>=2){
+				return false;
 			}
+			decodeRecoverCount++;
+			var resumeAt=playTime>0?playTime:(vars['seek']?parseFloat(vars['seek']):0);
+			if(isNaN(resumeAt) || resumeAt<0){
+				resumeAt=0;
+			}
+			try{
+				if(hls && typeof hls.recoverMediaError==='function'){
+					hls.recoverMediaError();
+					if(resumeAt>0){
+						seekTime=resumeAt;
+						seekApplyLock=false;
+						setTimeout(function(){
+							applyPendingSeek(true);
+						},300);
+					}
+					return true;
+				}
+			}catch(event){}
+			try{
+				var soft=Math.max(0,resumeAt-1.5);
+				seekTime=resumeAt;
+				seekApplyLock=false;
+				if(video){
+					video.currentTime=soft;
+				}
+				setTimeout(function(){
+					applyPendingSeek(true);
+					if(video && video.paused && vars['autoplay']){
+						try{video.play();}catch(e2){}
+					}
+				},400);
+				return true;
+			}catch(event){}
+			return false;
 		},
 		/*
 		 * loadedMetaData
@@ -1834,6 +2031,12 @@
 							if(!isUndefined(errorInfo.message)){
 								msg=errorInfo.message;
 							}
+							// code=3 MEDIA_ERR_DECODE：续播非关键帧常见，先尝试恢复
+							if(code===3 && recoverDecodeError()){
+								CT.error={code:code,message:msg};
+								eventTarget('error',CT.error);
+								return;
+							}
 							CT.error={code:code,message:msg};
 							showError();
 						}
@@ -1887,6 +2090,8 @@
 				eventTarget('error',CT.error);//注册监听error
 			},
 			seeked:function(){
+				seekApplyLock=false;
+				decodeRecoverCount=0;
 				if(paused){
 					player.play();
 				}
@@ -2311,7 +2516,8 @@
 				ad['frontPlay']=false;
 				C['ad'].hide();
 				allBarShow();
-				seekTime=vars['seek'];
+				seekTime=0;
+				applyResumeSeekState(parseResumeSeekFromVars());
 				if(ad['front']['video']){//如果包含视频广告
 					changeVideo(vars['video']);
 				}
@@ -2920,7 +3126,7 @@
 									break;
 							}
 							pSliderMouseDown=false;
-							// 媒体未就绪时先记录，待 canplay/时长就绪后再应用
+							// 媒体未就绪时只记录目标，禁止抢先 currentTime（会触发非关键帧解码失败）
 							var ready=video.readyState>=2 || (duration && isFinite(duration) && duration>0);
 							if(!ready){
 								seekTime=target;
@@ -2930,7 +3136,6 @@
 										firstSeekTime=target;
 									}
 								}
-								try{video.currentTime=target;}catch(event){}
 								return player;
 							}
 							if(duration && isFinite(duration) && duration>0 && target>duration){
@@ -2943,6 +3148,21 @@
 							if(vars['timeScheduleAdjust']==5 && target>maxSeeTime && seekTime && Math.abs(seekTime-target)<0.5){
 								maxSeeTime=Math.max(maxSeeTime,target);
 							}
+							// 目标尚未进入缓冲时改为挂起，由 applyPendingSeek 等待后再跳
+							if(target>0.5 && !timeInBuffered(target) && video.readyState<3 && !hls){
+								seekTime=target;
+								applyPendingSeek(false);
+								return player;
+							}
+							if(hls && typeof hls.startLoad==='function'){
+								seekTime=0;
+								try{
+									hls.startLoad(target);
+								}catch(event){
+									seekTime=target;
+								}
+								return player;
+							}
 							try{
 								video.currentTime=target;
 								seekTime=0;
@@ -6758,7 +6978,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.0.5')===-1 && m){
+					if(cdn && cdn.indexOf('1.0.7')===-1 && m){
 						if(cdn.slice(-1)!=='/'){
 							cdn+='/';
 						}