diff --git a/SrcJyAlist.js b/SrcJyAlist.js index dc720c72..411e0a51 100644 --- a/SrcJyAlist.js +++ b/SrcJyAlist.js @@ -944,9 +944,9 @@ function getAliUrl(share_id, file_id, alitoken) { let urls = []; let names = []; let heads = []; - let u = startProxyServer($.toString((aliSharePlayUrl,share_id,file_id,alitoken) => { + let u = startProxyServer($.toString((aliSharePlayUrl,share_id,alitoken) => { function geturl(fileid,line){ - fileid = fileid || file_id;//预加载时会变file_id,所以ts过期更新时还取原来的id + //预加载时会变file_id,所以ts过期更新时还取原来的id let playUrlList = aliSharePlayUrl(share_id, fileid, alitoken) || []; let aliurl; playUrlList.forEach((item) => { @@ -963,15 +963,15 @@ function getAliUrl(share_id, file_id, alitoken) { } return it; }).join("\n"); - let fid = aliurl.split('&f=')[1].split('&')[0]; - //log('ufid-'+fid); - writeFile('hiker://files/cache/_fileSelect_'+fid+'.m3u8',ff); + //let fid = aliurl.split('&f=')[1].split('&')[0]; + log('ufid-'+fileid); + writeFile('hiker://files/cache/_fileSelect_'+fileid+'.m3u8',ff); return ff; } let url = base64Decode(MY_PARAMS.url); if(url.includes(".ts")){ let fid = url.split('&f=')[1].split('&')[0]; - //log('sfid-'+fid); + log('sfid-'+fid); let f = fetch('hiker://files/cache/_fileSelect_'+fid+'.m3u8').split("\n"); f.forEach(it => { if(it&&it.startsWith('/proxy?url=')){ @@ -987,7 +987,6 @@ function getAliUrl(share_id, file_id, alitoken) { log('过期更新') let line = url.split('/media')[0];//取之前播放的ts段线路 line = line.substring(line.lastIndexOf('/')+1); - log(line); let f = geturl(fid,line).split("\n"); f.forEach(it => { if(it&&it.startsWith('/proxy?url=')){ @@ -1011,16 +1010,17 @@ function getAliUrl(share_id, file_id, alitoken) { }); }else{ log('首次更新') - let line = url.split('|')[1]; - let ff = geturl(file_id,line); + let fileid = url.split('|')[1]; + let line = url.split('|')[2]; + let ff = geturl(fileid,line); return ff; } - },aliSharePlayUrl,share_id,file_id,alitoken)); + },aliSharePlayUrl,share_id,alitoken)); let playUrlList = aliSharePlayUrl(share_id, file_id, alitoken) || []; if(playUrlList.length>0){ playUrlList.forEach((item) => { - urls.push(u + "?url=" + base64Encode(item.url+"|"+item.template_id) + "#.m3u8#pre#"); + urls.push(u + "?url=" + base64Encode(item.url+"|"+file_id+"|"+item.template_id) + "#.m3u8#pre#"); names.push(transcoding[item.template_id] ? transcoding[item.template_id] : item.template_height); heads.push({ 'Referer': 'https://www.aliyundrive.com/' }); })