Merge pull request #37 from Mineinjava/mineinjavaDev

Add RESUME data

Author: Mineinjava

discordSplash/__init__.py

@@ -281,6 +281,7 @@ def __init__(self, token: str, presence: Presence = None):
         TOKEN = token
         AUTH_HEADER = {"Authorization": f"Bot {token}"}
 
+
         self.auth = {
             "token": self.TOKEN,
             "properties": {
@@ -309,19 +310,32 @@ def __init__(self, token: str, presence: Presence = None):
                 "afk": False
             }
 
-        asyncio.run(self.main())
+        try:
+            asyncio.run(self.main(False))
+        except websockets.exceptions.ConnectionClosedError:
+            while True:
+                try:
+                    asyncio.run(self.main(True))
+                except websockets.exceptions.ConnectionClosedError:
+                    pass
         # asyncio.get_event_loop().run_until_complete(self.hello())
         # print(self.opcode(1, self.sequence))
 
-    async def main(self):
+    async def main(self, resume=False):
         async with websockets.connect(
                 'wss://gateway.discord.gg/?v=6&encoding=json') \
                 as self.websocket:
-            await self.hello()
-            if self.interval is None:
-                print("Hello failed, exiting")
-                return
-            await asyncio.gather(self.heartbeat(), self.receive())
+            if resume is False:
+                await self.hello()
+                if self.interval is None:
+                    print("Hello failed, exiting")
+                    return
+                await asyncio.gather(self.heartbeat(), self.receive())
+            if resume is True:
+                await self.resume()
+                print('RESUMING------------------------------------------------------------------------------------------------------------------------------------------------')
+                await asyncio.gather(self.heartbeat(), self.receive())
+
             # while self.interval is not None:
             #     pass
 
@@ -383,8 +397,19 @@ def opcode(self, opcode: int, payload) -> str:
             "d": payload
         }
         return json.dumps(data)
+
     async def resume(self):
-        pass
+        resume_pkt = await self.create_resume_packet()
+        await self.send(op.RESUME, resume_pkt)
+
+    async def create_resume_packet(self):
+        resume_blk = {
+                "token": self.TOKEN,
+                "session_id": self.session_id,
+                "seq": self.sequence
+            }
+        return resume_blk
+
 
 
 def command(name: str):

discordSplash/guild.py

@@ -1,6 +1,6 @@
 try:
-    from __init__ import AUTH_HEADER as HEADER
-    from __init__ import API_URL as URL
+    from ..discordSplash import AUTH_HEADER as HEADER
+    from ..discordSplash import API_URL as URL
     import member
     import channel
 except ImportError:

discordSplash/member.py

@@ -1,8 +1,8 @@
 import aiohttp
 
 try:
-    from __init__ import AUTH_HEADER as HEADER
-    from __init__ import API_URL as URL
+    from ..discordSplash import AUTH_HEADER as HEADER
+    from ..discordSplash import API_URL as URL
 except Exception:
     from discordSplash import API_URL as URL
     from discordSplash import AUTH_HEADER as HEADER