From f1ea19da9082fb9b8a261f284a69165d7b39b048 Mon Sep 17 00:00:00 2001
From: skmcj <2604597248@qq.com>
Date: Tue, 5 Sep 2023 17:22:48 +0800
Subject: [PATCH] =?UTF-8?q?<fix>=E4=BF=AE=E5=A4=8D=E7=94=B1=E4=BA=8Edy?=
 =?UTF-8?q?=E6=9B=B4=E6=96=B0=E9=83=A8=E5=88=86=E9=80=BB=E8=BE=91=E5=AF=BC?=
 =?UTF-8?q?=E8=87=B4=E7=9A=84roomId=E8=8E=B7=E5=8F=96=E5=A4=B1=E8=B4=A5?=
 =?UTF-8?q?=E7=9A=84BUG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/api/commonApi.ts    | 38 +++++++++++++++++++++++++++++++-------
 src/components/Left.vue |  1 +
 2 files changed, 32 insertions(+), 7 deletions(-)

diff --git a/src/api/commonApi.ts b/src/api/commonApi.ts
index 8bb1ee4..55c1f10 100644
--- a/src/api/commonApi.ts
+++ b/src/api/commonApi.ts
@@ -9,13 +9,37 @@ export const getRoomInfoApi = function (roomNumber: string) {
     .get(`/dy/${roomNumber}`)
     .then((res: any) => {
       let html = res.data;
-      let str = html.match(/<script id="RENDER_DATA" type="application\/json">(.*?)<\/script>/g);
-      let dict = JSON.parse(decodeURIComponent(str?.[0].slice(49, -9)));
-      let roomId = dict['app']['initialState']['roomStore']['roomInfo']['roomId'];
-      let roomTitle = dict['app']['initialState']['roomStore']['roomInfo']['room']['title'];
-      let roomUserCount = dict['app']['initialState']['roomStore']['roomInfo']['room']['user_count_str'];
-      let uniqueId = dict['app']['odin']['user_unique_id'];
-      let avatar = dict['app']['initialState']['roomStore']['roomInfo']['anchor']['avatar_thumb']['url_list'][0];
+      const matchRes = html.match(
+        /<script\snonce=\"\S+?\"\s>self\.__pace_f\.push\(\[1,\"c:\[\\\"\$\\\",\\\"\$L13\\\",null,([\s\S]+?)]\\n\"\]\)<\/script>/
+      );
+      const REGLIST = [
+        {
+          reg: /\\{1,7}"/g,
+          str: '"'
+        },
+        {
+          reg: /"\{/g,
+          str: '{'
+        },
+        {
+          reg: /\}"/g,
+          str: '}'
+        }
+      ];
+      if (!matchRes) throw new Error('房间信息获取失败');
+      // 获取目标信息编码字符串，替换其中的转义字符
+      let json: string = matchRes[1];
+      for (const REG of REGLIST) {
+        json = json.replace(REG.reg, REG.str);
+      }
+      // let dict = JSON.parse(decodeURIComponent(matchRes[1]));
+      const dict = JSON.parse(json);
+      let roomId = dict['state']['roomStore']['roomInfo']['roomId'];
+      let roomTitle = dict['state']['roomStore']['roomInfo']['room']['title'];
+      let roomUserCount = dict['state']['roomStore']['roomInfo']['room']['user_count_str'];
+      let uniqueId = dict['state']['userStore']['odin']['user_unique_id'];
+      let avatar = dict['state']['roomStore']['roomInfo']['anchor']['avatar_thumb']['url_list'][0];
+      console.log(dict);
       return {
         roomId,
         roomTitle,
diff --git a/src/components/Left.vue b/src/components/Left.vue
index c565fe3..4d05ba9 100644
--- a/src/components/Left.vue
+++ b/src/components/Left.vue
@@ -126,6 +126,7 @@ function gotoConnect() {
           // console.log(res);
           roomAvatar.value = res.avatar;
           roomTitle.value = res.roomTitle;
+          console.log('room', res);
           if (!res.roomId || !res.uniqueId) {
             // 房间ID和uniqueID获取失败
             connectCode.value = 400;