matthew/enhanced-discord.py
1
0
Fork 0
Code Issues 4 Pull Requests 21 Projects Releases Wiki Activity

Revert "Implement zlib streaming for the gateway."

Browse Source 
This reverts commit 462191a08b5b2efb83f5bc32935dc546d35a744b.
This commit is contained in:
Rapptz 2017-10-14 15:22:39 -04:00
parent 462191a08b
commit 92a37c2e4f
2 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
discord/gateway.py
View File

@ -186,8 +186,6 @@ class DiscordWebSocket(websockets.client.WebSocketClientProtocol):
# ws related stuff # ws related stuff
self.session_id = None self.session_id = None
self.sequence = None self.sequence = None
self._zlib = zlib.decompressobj()
self._buffer = bytearray()
@classmethod @classmethod
@asyncio.coroutine @asyncio.coroutine
@ -314,18 +312,8 @@ class DiscordWebSocket(websockets.client.WebSocketClientProtocol):
self._dispatch('socket_raw_receive', msg) self._dispatch('socket_raw_receive', msg)
if isinstance(msg, bytes): if isinstance(msg, bytes):
self._buffer.extend(msg) msg = zlib.decompress(msg, 15, 10490000) # This is 10 MiB
msg = msg.decode('utf-8')
if len(msg) >= 4:
suffix = int.from_bytes(msg[-4:], byteorder='big')
if suffix == 0xFFFF:
msg = self._zlib.decompress(self._buffer)
msg = msg.decode('utf-8')
self._buffer = bytearray()
else:
return
else:
return
msg = json.loads(msg) msg = json.loads(msg)

16
discord/http.py
View File

@ -739,29 +739,21 @@ class HTTPClient:
return self.request(Route('GET', '/oauth2/applications/@me')) return self.request(Route('GET', '/oauth2/applications/@me'))
@asyncio.coroutine @asyncio.coroutine
def get_gateway(self, *, encoding='json', v=6, zlib=True): def get_gateway(self):
try: try:
data = yield from self.request(Route('GET', '/gateway')) data = yield from self.request(Route('GET', '/gateway'))
except HTTPException as e: except HTTPException as e:
raise GatewayNotFound() from e raise GatewayNotFound() from e
if zlib: return data.get('url') + '?encoding=json&v=6'
value = '{0}?encoding={1}&v={2}&compress=zlib-stream'
else:
value = '{0}?encoding={1}&v={2}'
return value.format(data['url'], encoding, v)
@asyncio.coroutine @asyncio.coroutine
def get_bot_gateway(self, *, encoding='json', v=6, zlib=True): def get_bot_gateway(self):
try: try:
data = yield from self.request(Route('GET', '/gateway/bot')) data = yield from self.request(Route('GET', '/gateway/bot'))
except HTTPException as e: except HTTPException as e:
raise GatewayNotFound() from e raise GatewayNotFound() from e
if zlib:
value = '{0}?encoding={1}&v={2}&compress=zlib-stream'
else: else:
value = '{0}?encoding={1}&v={2}' return data['shards'], data['url'] + '?encoding=json&v=6'
return data['shards'], value.format(data['url'], encoding, v)
def get_user_info(self, user_id): def get_user_info(self, user_id):
return self.request(Route('GET', '/users/{user_id}', user_id=user_id)) return self.request(Route('GET', '/users/{user_id}', user_id=user_id))