ckplayer-plus 1.0.6 → 1.0.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.0.6/dist/';
+	var ckplayerPlusDefaultCdn='https://cdn.jsdelivr.net/npm/ckplayer-plus@1.0.7/dist/';
 	function ckplayerEmbed(videoObj){
 		/*
 		 * rightMenu
@@ -414,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.6')>-1){
+			if(!allowCdn || !cdn || cdn.indexOf('1.0.7')>-1){
 				// 避免占位版本或显式关闭 CDN 时请求坏地址；交给相对路径或业务 pluginPath
 				return folder+'/'+file;
 			}
@@ -662,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
 		 * 功能：初始化视频地址或修改视频地址
@@ -669,6 +762,8 @@
 		changeVideo=function (vstr){
 			var i=0;
 			ensureAutoPlug(vstr);
+			prepareCookieAndSeek();
+			destroyStreamPlayers();
 			if(video.attr('src') || video.htm()){
 				player.pause();
 			}
@@ -760,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
@@ -847,13 +896,27 @@
 		hlsPlayer=function (url){
 			var startHls=function(){
 				if (typeof Hls!=='undefined' && !isUndefined(Hls) && Hls.isSupported()) {
-					var hlsConf={};
-					// 断点续播：优先用 startPosition，让 hls 从正确分片/关键帧起播，避免裸 currentTime 解码失败
-					if(seekTime && seekTime>0 && (isUndefined(vars['live']) || !vars['live'])){
-						hlsConf.startPosition=seekTime;
-						maxSeeTime=Math.max(maxSeeTime,seekTime);
+					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=seekTime;
+							firstSeekTime=resumeAt;
 						}
 						seekTime=0;
 						hlsStartPositionUsed=true;
@@ -1691,17 +1754,28 @@
 				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);
-			// 未进入可播缓冲时先等待，并引导 hls 加载目标位置
 			if(!force && !bufferedOk && (!readyEnough || video.readyState<3)){
 				seekRetryCount++;
 				if(seekRetryCount<=50){
-					try{
-						if(hls && typeof hls.startLoad==='function'){
-							hls.startLoad(t);
-						}
-					}catch(event){}
 					if(seekRetryTimer){
 						clearTimeout(seekRetryTimer);
 					}
@@ -1712,12 +1786,6 @@
 				}
 			}
 			clearSeekRetry();
-			if(t>0){
-				maxSeeTime=Math.max(maxSeeTime,t);
-				if(firstSeekTime<0){
-					firstSeekTime=t;
-				}
-			}
 			seekApplyLock=true;
 			seekTime=0;
 			try{
@@ -1726,7 +1794,6 @@
 				seekTime=t;
 				seekApplyLock=false;
 			}
-			// seeked / 短暂延时后解锁，允许后续切换清晰度再 seek
 			setTimeout(function(){
 				seekApplyLock=false;
 			},800);
@@ -2449,7 +2516,8 @@
 				ad['frontPlay']=false;
 				C['ad'].hide();
 				allBarShow();
-				seekTime=vars['seek'];
+				seekTime=0;
+				applyResumeSeekState(parseResumeSeekFromVars());
 				if(ad['front']['video']){//如果包含视频广告
 					changeVideo(vars['video']);
 				}
@@ -3081,11 +3149,20 @@
 								maxSeeTime=Math.max(maxSeeTime,target);
 							}
 							// 目标尚未进入缓冲时改为挂起，由 applyPendingSeek 等待后再跳
-							if(target>0.5 && !timeInBuffered(target) && video.readyState<3){
+							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;
@@ -6901,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.6')===-1 && m){
+					if(cdn && cdn.indexOf('1.0.7')===-1 && m){
 						if(cdn.slice(-1)!=='/'){
 							cdn+='/';
 						}