修复虎牙直播状态错误 #410

xiaoyaocz · May 30, 2024 · a7b0004 · a7b0004
1 parent eda8a79
commit a7b0004
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/simple_live_app/pubspec.yaml b/simple_live_app/pubspec.yaml
@@ -1,5 +1,5 @@
 name: simple_live_app
-version: 1.5.4+10504
+version: 1.5.5+10505
 publish_to: none
 description: "Simple Live APP"
 environment: 

diff --git a/simple_live_core/lib/src/huya_site.dart b/simple_live_core/lib/src/huya_site.dart
@@ -391,11 +391,18 @@ class HuyaSite implements LiveSite {
         .getText("https://m.huya.com/$roomId", queryParameters: {}, header: {
       "user-agent": kUserAgent,
     });
-    var text = RegExp(r"window\.HNF_GLOBAL_INIT.=.\{(.*?)\}.</script>",
+    var text = RegExp(
+            r"window\.HNF_GLOBAL_INIT.=.\{[\s\S]*?\}[\s\S]*?</script>",
             multiLine: false)
         .firstMatch(resultText)
-        ?.group(1);
-    var jsonObj = json.decode("{$text}");
+        ?.group(0);
+    var jsonText = text!
+        .replaceAll(RegExp(r"window\.HNF_GLOBAL_INIT.=."), '')
+        .replaceAll("</script>", "")
+        .replaceAllMapped(RegExp(r'function.*?\(.*?\).\{[\s\S]*?\}'), (match) {
+      return '""';
+    });
+    var jsonObj = json.decode(jsonText);
     return jsonObj["roomInfo"]["eLiveStatus"] == 2;
   }
 

diff --git a/simple_live_tv_app/pubspec.yaml b/simple_live_tv_app/pubspec.yaml
@@ -1,7 +1,7 @@
 name: simple_live_tv_app
 description: A new Flutter project.
 publish_to: 'none'
-version: 1.0.4+10004
+version: 1.0.5+10005
 
 environment:
   sdk: '>=3.1.2 <4.0.0'