From 51304896fc682787670506b44054150054dfd71e Mon Sep 17 00:00:00 2001
From: Noah <mounderfod@gmail.com>
Date: Fri, 8 Jul 2022 20:01:29 +0100
Subject: feat(gateway): Added basic gateway connection

Could really use refining, this is just a basic implementation
---
 discord/client.py | 49 +++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 49 insertions(+)

(limited to 'discord')

diff --git a/discord/client.py b/discord/client.py
index e69de29..73fe0e3 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -0,0 +1,49 @@
+import asyncio
+import json
+import sys
+import threading
+
+import websockets
+
+from discord.intents import Intents, gen_number
+
+loop = asyncio.get_event_loop()
+
+
+class Client:
+    def __init__(self, token: str, intents: list[Intents]):
+        self.gateway = None
+        code = gen_number(intents)
+        asyncio.run(self.connect(token, code))
+
+    async def connect(self, token: str, intent_code: int):
+        async with websockets.connect("wss://gateway.discord.gg/?v=10&encoding=json") as gateway:
+            hello = await gateway.recv()
+            self.gateway = gateway
+            threading.Thread(target=loop.run_forever).start()
+            heartbeat = asyncio.run_coroutine_threadsafe(
+                self.heartbeat(gateway, json.loads(hello)['d']['heartbeat_interval']), loop)
+            identify = {
+                "op": 2,
+                "d": {
+                    "token": token,
+                    "intents": intent_code,
+                    "properties": {
+                        "os": sys.platform,
+                        "browser": "discobra",
+                        "device": "discobra"
+                    }
+                }
+            }
+            await gateway.send(json.dumps(identify))
+            ready = await gateway.recv()
+
+    async def heartbeat(self, gateway: websockets.WebSocketClientProtocol, interval: int):
+        while True:
+            await asyncio.sleep(interval / 1000)
+            heartbeat = {
+                "op": 1,
+                "d": None
+            }
+            await gateway.send(json.dumps(heartbeat))
+            ack = await gateway.recv()
-- 
cgit 1.4.1-2-gfad0


From 99da423d99378eaf446031451f9f6de76010d7c0 Mon Sep 17 00:00:00 2001
From: mjk134 <57556877+mjk134@users.noreply.github.com>
Date: Fri, 8 Jul 2022 20:19:55 +0000
Subject: - Add `run` to `Client` to start async loop - Add event decorator
 with a `on_ready` event call

---
 discord/client.py | 29 +++++++++++++++++++----------
 1 file changed, 19 insertions(+), 10 deletions(-)

(limited to 'discord')

diff --git a/discord/client.py b/discord/client.py
index 73fe0e3..c500d1c 100644
--- a/discord/client.py
+++ b/discord/client.py
@@ -2,27 +2,23 @@ import asyncio
 import json
 import sys
 import threading
-
 import websockets
-
+from typing import Coroutine
 from discord.intents import Intents, gen_number
 
-loop = asyncio.get_event_loop()
-
-
 class Client:
-    def __init__(self, token: str, intents: list[Intents]):
+    def __init__(self, intents: list[Intents]):
         self.gateway = None
-        code = gen_number(intents)
-        asyncio.run(self.connect(token, code))
+        self.loop = asyncio.get_event_loop()
+        self.code = gen_number(intents)
 
     async def connect(self, token: str, intent_code: int):
         async with websockets.connect("wss://gateway.discord.gg/?v=10&encoding=json") as gateway:
             hello = await gateway.recv()
             self.gateway = gateway
-            threading.Thread(target=loop.run_forever).start()
+            threading.Thread(target=self.loop.run_forever).start()
             heartbeat = asyncio.run_coroutine_threadsafe(
-                self.heartbeat(gateway, json.loads(hello)['d']['heartbeat_interval']), loop)
+                self.heartbeat(gateway, json.loads(hello)['d']['heartbeat_interval']), self.loop)
             identify = {
                 "op": 2,
                 "d": {
@@ -37,6 +33,8 @@ class Client:
             }
             await gateway.send(json.dumps(identify))
             ready = await gateway.recv()
+            if (hasattr(self, 'on_ready')):
+                await getattr(self, 'on_ready')()
 
     async def heartbeat(self, gateway: websockets.WebSocketClientProtocol, interval: int):
         while True:
@@ -47,3 +45,14 @@ class Client:
             }
             await gateway.send(json.dumps(heartbeat))
             ack = await gateway.recv()
+
+    def event(self, coro: Coroutine, /) -> Coroutine:
+        if not asyncio.iscoroutinefunction(coro):
+            raise TypeError('event registered must be a coroutine function')
+
+        setattr(self, coro.__name__, coro)
+        return coro
+
+    def run(self, token: str):
+        self.token = token
+        asyncio.run(self.connect(self.token, self.code))
-- 
cgit 1.4.1-2-gfad0