wz1531/DanMuRead
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

修补因抖音更新导致webroomid 获取不到的问题

Browse Source
This commit is contained in:
小白猿
2023-11-04 21:30:37 +08:00
parent 6c573ee18c
commit 5c2248048a
3 changed files with 35 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
BarrageGrab/AppRuntime.cs
+1 -1
View File
@@ -95,7 +95,7 @@ namespace BarrageGrab
/// <returns></returns>
public long GetCachedWebRoomid(string roomid)
{
if (RoomInfoCache.TryGetValue(roomid, out var value)) return long.Parse(value.WebRoomId);
if (RoomInfoCache.TryGetValue(roomid, out var value)) return long.Parse(value.WebRoomId??"-1");
return -1;
}
BarrageGrab/Modles/RoomInfo.cs
+10 -1
View File
@@ -517,7 +517,11 @@ namespace BarrageGrab.Modles
{
return (-1, "无效的页面数据");
}
var roomDataReg = new Regex(@"(?<=self\.__pace_f\.push\(\[1,""a:)\[.+?\](?=\\n?""\]\)[\s\n\r]*?<\/script>)");
//var roomDataReg = new Regex(@"(?<=self\.__pace_f\.push\(\[1,""a:)\[.+?\](?=\\n?""\]\)[\s\n\r]*?<\/script>)");
//var roomDataReg = new Regex(@"(?<=self\.__pace_f\.push\(\[1,\s*""0:)\[.+?\](?=\\n""?\]\)[\s\n\r]*?<\/script>)");
var roomDataReg = new Regex(@"(?<=self\.__pace_f\.push\(\[1,\s*""9:)\[.+?\](?=\\n""?\]\)[\s\n\r]*?<\/script>)");
//字符串转义符号版本
var match = roomDataReg.Match(html);
if (!match.Success)
{
@@ -535,6 +539,11 @@ namespace BarrageGrab.Modles
{
return (2, "匹配到的房间数据格式有错误");
}
//var root = jsonObject["children"][3];
//var roomInfo = root["initialState"]["roomStore"]["roomInfo"];
//var odin = root["initialState"]["userStore"]["odin"];
//var room = roomInfo["room"];
//var roomOwner = roomInfo["anchor"];
var roomInfo = jsonObject["state"]["roomStore"]["roomInfo"];
var odin = jsonObject["state"]["userStore"]["odin"];
BarrageGrab/Proxy/TitaniumProxy.cs
+24 -5
View File
@@ -9,6 +9,7 @@ using System.Threading.Tasks;
using BarrageGrab.Modles;
using BarrageGrab.Proxy.ProxyEventArgs;
using ColorConsole;
using Org.BouncyCastle.Ocsp;
using Titanium.Web.Proxy;
using Titanium.Web.Proxy.EventArguments;
using Titanium.Web.Proxy.Http;
@@ -77,7 +78,7 @@ namespace BarrageGrab.Proxy
string uri = e.HttpClient.Request.RequestUri.ToString();
string hostname = e.HttpClient.Request.RequestUri.Host;
var processid = e.HttpClient.ProcessId.Value;
var processName = base.GetProcessName(processid);
var processName = base.GetProcessName(processid);
var contentType = e.HttpClient.Response.ContentType ?? "";
//处理弹幕
@@ -89,7 +90,7 @@ namespace BarrageGrab.Proxy
//处理脚本拦截修改
await HookScriptAsync(e);
}
private async Task HookBarrage(SessionEventArgs e)
{
string uri = e.HttpClient.Request.RequestUri.ToString();
@@ -140,7 +141,7 @@ namespace BarrageGrab.Proxy
{
string uri = e.HttpClient.Request.RequestUri.ToString();
string hostname = e.HttpClient.Request.RequestUri.Host;
string url = e.HttpClient.Request.Url;
string url = e.HttpClient.Request.Url;
var urlNoQuery = url.Split('?')[0];
var processid = e.HttpClient.ProcessId.Value;
var processName = base.GetProcessName(processid);
@@ -174,6 +175,7 @@ namespace BarrageGrab.Proxy
var html = await e.GetResponseBodyAsString();
(int code, string msg) = RoomInfo.TryParseRoomPageHtml(html, out var roominfo);
if (code == 0)
{
Logger.LogInfo($"直播页{webrid}房间信息已采集到缓存");
@@ -181,7 +183,24 @@ namespace BarrageGrab.Proxy
roominfo.LiveUrl = url;
AppRuntime.RoomCaches.AddRoomInfoCache(roominfo);
}
else
{
roominfo = new RoomInfo();
roominfo.WebRoomId = webrid;
roominfo.LiveUrl = url;
//正则匹配主播标题
//<div class="st8eGKi4" data-e2e="live-room-nickname">和平精英小夜y</div>
var match = Regex.Match(html, @"(?<=live-room-nickname""\>).+(?=<\/div>)");
if (match.Success)
{
roominfo.Owner = new RoomInfo.RoomAnchor()
{
Nickname = match.Value,
UserId = "-1"
};
}
AppRuntime.RoomCaches.AddRoomInfoCache(roominfo);
}
try
{
var doc = new HtmlAgilityPack.HtmlDocument();
@@ -242,7 +261,7 @@ namespace BarrageGrab.Proxy
}
}
}
private Task ProxyServer_ServerCertificateValidationCallback(object sender, CertificateValidationEventArgs e)
{
// set IsValid to true/false based on Certificate Errors