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

BarrageGrab/AppRuntime.cs

@@ -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

@@ -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

@@ -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;
@@ -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();