DEMO

Demo/Xigua.proto

@@ -0,0 +1,91 @@
+syntax = "proto2";
+// 用户信息
+message User {
+	// 头像
+	message Avatar {
+		optional string url = 1;
+	}
+	// 头衔
+	message Prefix {
+		message FanClubText {
+			required string text = 1;
+			optional string color = 2;
+			required int32 level = 3;
+		}
+		repeated string url = 1;
+		optional string localUrl = 2;
+		optional string clickTo = 7;
+		optional FanClubText fanClub = 8;
+	}
+	// 花钱等级
+	message PayGrade {
+		required int32 level = 6;
+		optional string unknownThing = 13;
+		optional Prefix prefix = 19;
+	}
+	// 荣誉等级
+	message HonorLevel {
+		required Prefix rpefix = 19;
+	}
+	required int32 id = 1;
+	required string nickname = 3;
+	optional Avatar avatar = 9;
+	repeated Prefix prefix = 21;
+	required PayGrade payGrade = 23;
+}
+// 样式
+message Style {
+	optional string color = 1;
+	optional int32 fontWeight = 4;
+}
+// 礼物
+message Gift {
+	message Detail {
+		required string gift_id = 1;
+		required string gift_name = 2;
+	}
+	required int32 id = 1;
+	required Detail gift = 2;
+}
+
+
+message XiguaLiveRoom {
+	message Data {
+		message Message {
+			// 通用定义
+			message Common {
+				// 自定义显示信息
+				message CustomDisplay {
+					// 参数
+					message Params {
+						required int32 type = 1;
+						optional Style style = 2;
+						optional string string = 11;
+						optional User user = 21;
+						optional Gift gift = 22;
+					}
+					required string method = 1;
+					required string format = 2;
+					optional Style bgStyle = 3;
+					optional Params params = 4;
+				}
+				optional string method = 1;
+				optional int32 msg_id = 2;
+				optional int32 room_id = 3;
+				optional int32 create_time = 4;
+				optional CustomDisplay customDisplay = 8;
+			}
+			required Common common = 1;
+			optional string content = 3;
+		}
+		// WebcastChatMessage 聊天
+		// WebcastGiftMessage 礼物
+		required string method = 1;
+		required Message message = 2;
+	}
+	repeated Data data = 1;
+	required string cursor = 2;
+	optional int32 fetch_interval = 3;
+	optional int32 now = 4;
+	required string internal_ext = 5;
+}

api.py

@@ -12,7 +12,6 @@ import requests
 import time
 from datetime import datetime, timedelta
 
-
 DEBUG = False
 COMMON_GET_PARAM = (
     "&iid=96159232732&device_id=55714661189&channel=xiaomi&aid=32&app_name=video_article&version_code=812"
@@ -25,6 +24,10 @@ COMMON_GET_PARAM = (
     "&manifest_version_code=412&update_version_code=81206&_rticket=1577627203917"
     "&_rticket=1577627935921&cdid_ts=1577625556989&fp=a_fake_fp&tma_jssdk_version=1290000"
     "&cdid=ed4295e8-5d9a-4cb9-b2a2-04009a3baa2d&oaid=a625f466e0975d42")
+SEARCH_USER_API = (
+    "https://security.snssdk.com/video/app/search/live/?format=json&search_sug=0&forum=0"
+    "&m_tab=live&is_native_req=0&offset=0&from=live&en_qc=1&pd=xigua_live&ssmix=a"
+    "{COMMON}&keyword={keyword}")
 
 
 class XiGuaLiveApi:
@@ -156,7 +159,7 @@ class XiGuaLiveApi:
         print("消息 :", "主播离开了")
         self.updRoomInfo()
 
-    def onLottery(self, i:Lottery):
+    def onLottery(self, i: Lottery):
         """
         中奖的内容
         :param i:
@@ -179,9 +182,7 @@ class XiGuaLiveApi:
         :return:
         """
         try:
-            p = self.s.get("https://security.snssdk.com/video/app/search/live/?format=json&search_sug=0&forum=0"
+            p = self.s.get(SEARCH_USER_API.format(COMMON=COMMON_GET_PARAM, keyword=self.name))
-                           "&m_tab=live&is_native_req=0&offset=0&from=live&en_qc=1&pd=xigua_live&ssmix=a"
-                           "&keyword={}{}".format(self.name, COMMON_GET_PARAM))
             d = p.json()
         except json.decoder.JSONDecodeError as e:
             self.apiChangedError("搜索接口错误", e.__str__())
@@ -214,10 +215,10 @@ class XiGuaLiveApi:
         """
         try:
             p = self.s.post("https://i.snssdk.com/videolive/room/enter?version_code=730"
-                       "&device_platform=android",
+                            "&device_platform=android",
-                       data="room_id={roomID}&version_code=730"
+                            data="room_id={roomID}&version_code=730"
-                            "&device_platform=android".format(roomID=self.roomID),
+                                 "&device_platform=android".format(roomID=self.roomID),
-                       headers={"Content-Type": "application/x-www-form-urlencoded"})
+                            headers={"Content-Type": "application/x-www-form-urlencoded"})
             d = p.json()
         except Exception as e:
             self.apiChangedError("更新房间接口错误", e.__str__())
@@ -258,7 +259,7 @@ class XiGuaLiveApi:
             return self._forceSearchUser()
 
     @staticmethod
-    def findRoomByUserId(userId:int):
+    def findRoomByUserId(userId: int):
         """
         通过UserId查找用户的房间号(已弃用)
         :param userId: 用户ID
@@ -282,7 +283,7 @@ class XiGuaLiveApi:
         """
         ret = []
         p = requests.get("https://security.snssdk.com/video/app/search/live/?version_code=730&device_platform=android"
-                  "&format=json&keyword={}".format(keyword))
+                         "&format=json&keyword={}".format(keyword))
         d = p.json()
         if "data" in d:
             for i in d["data"]:
@@ -299,10 +300,10 @@ class XiGuaLiveApi:
             self.updRoomInfo()
             return
         p = self.s.get("https://i.snssdk.com/videolive/im/get_msg?cursor={cursor}&room_id={roomID}"
-                  "&version_code=730&device_platform=android".format(
+                       "&version_code=730&device_platform=android".format(
-                      roomID=self.roomID,
+            roomID=self.roomID,
-                      cursor=self._cursor
+            cursor=self._cursor
-                  ))
+        ))
         d = p.json()
         if "data" not in d or "extra" not in d or "cursor" not in d["extra"]:
             if "base_resp" in d and d["base_resp"]["status_code"] != 10038: