Merge pull request #275 from colorsakura/master

fix bilibili, thanks https://github.com/wbt5/real-url/issues/257#issu…

bilibili.py

@@ -3,49 +3,70 @@
 # qn=250超清
 # qn=400蓝光
 # qn=10000原画
-import re
-
 import requests
 
 
 class BiliBili:
 
     def __init__(self, rid):
-        self.rid = rid
+        rid = rid
-
+        self.header = {
-    def get_real_url(self):
+            'User-Agent': 'Mozilla/5.0 (iPod; CPU iPhone OS 14_5 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) CriOS/87.0.4280.163 Mobile/15E148 Safari/604.1',
+        }
         # 先获取直播状态和真实房间号
-        r_url = 'https://api.live.bilibili.com/room/v1/Room/room_init?id={}'.format(self.rid)
+        r_url = 'https://api.live.bilibili.com/room/v1/Room/room_init'
+        param = {
+            'id': rid
+        }
         with requests.Session() as s:
-            res = s.get(r_url).json()
+            res = s.get(r_url, headers=self.header, params=param).json()
-        code = res['code']
+        if res['msg'] == '直播间不存在':
-        if code == 0:
+            raise Exception(f'bilibili {rid} {res["msg"]}')
-            live_status = res['data']['live_status']
+        live_status = res['data']['live_status']
-            if live_status == 1:
+        if live_status != 1:
-                room_id = res['data']['room_id']
+            raise Exception(f'bilibili {rid} 未开播')
+        self.real_room_id = res['data']['room_id']
 
-                def u(pf):
+    def get_real_url(self, current_qn: int = 10000) -> list:
-                    f_url = 'https://api.live.bilibili.com/xlive/web-room/v1/playUrl/playUrl'
+        url = 'https://api.live.bilibili.com/xlive/web-room/v2/index/getRoomPlayInfo'
-                    params = {
+        param = {
-                        'cid': room_id,
+            'device': 'pc',
-                        'platform': pf,
+            'platform': 'h5',
-                        'otype': 'json',
+            'scale': 0,
-                        'quality': 0
+            'build': '10000',
-                    }
+            'protocol': '0,1',
-                    resp = s.get(f_url, params=params).json()
+            'format': '0,1,2',
-                    try:
+            'codec': '0,1',
-                        durl = resp['data']['durl']
+            'room_id': self.real_room_id,
-                        real_url = durl[0]['url']
+            'qn': current_qn
-                        real_url = re.sub(r'live_(\d+)_(\d+)_\d+.m3u8', r'live_\1_\2.m3u8', real_url)
+        }
-                        return real_url
+        with requests.Session() as session:
-                    except KeyError or IndexError:
+            res = session.get(url, headers=self.header, params=param)
-                        raise Exception('获取失败')
+            res = res.json()
-
+            stream_info = res['data']['playurl_info']['playurl']['stream']
-                return u('h5')
+            qn_max = 0
-            else:
+            for data in stream_info:
-                raise Exception('未开播')
+                accept_qn = data['format'][0]['codec'][0]['accept_qn']
-        else:
+                for qn in accept_qn:
-            raise Exception('房间不存在')
+                    qn_max = qn if qn > qn_max else qn_max
+            if qn_max != current_qn:
+                param['qn'] = qn_max
+                res = session.get(url, headers=self.header, params=param)
+                res = res.json()
+                stream_info = res['data']['playurl_info']['playurl']['stream']
+            stream_url_list = []
+            for data in stream_info:
+                format_name = data['format'][0]['format_name']
+                if format_name == 'flv':
+                    base_url = data['format'][0]['codec'][0]['base_url']
+                    url_info = data['format'][0]['codec'][0]['url_info']
+                    for info in url_info:
+                        host = info['host']
+                        extra = info['extra']
+                        # print(host + base_url + extra)
+                        stream_url_list.append(host + base_url + extra)
+                    break
+            return stream_url_list
 
 
 def get_real_url(rid):

douyu.py

@@ -126,8 +126,10 @@ class DouYu:
             raise Exception('房间未开播')
         else:
             key = self.get_js()
-        return "http://dyscdnali1.douyucdn.cn/live/{}.flv?uuid=".format(key)
+        real_url = {}
-
+        real_url["flv"] = "http://dyscdnali1.douyucdn.cn/live/{}.flv?uuid=".format(key)
+        real_url["x-p2p"] = "http://tx2play1.douyucdn.cn/live/{}.xs?uuid=".format(key)
+        return real_url
 
 if __name__ == '__main__':
     r = input('输入斗鱼直播间号：\n')

requirements.txt

@@ -8,7 +8,7 @@ multidict==4.7.6
 protobuf==3.12.2
 pycryptodome==3.9.8
 PyExecJS==1.5.1
-requests==2.24.0
+requests==2.26.0
 six==1.15.0
 typing-extensions==3.7.4.3
 urllib3==1.26.5