Add http support. Most of these are untested

twitchio/client.py

@@ -25,7 +25,8 @@
 import asyncio
 from typing import Union, Callable
 
-from twitchio.websocket import WSConnection
+from .websocket import WSConnection
+from .http import TwitchHTTP
 
 
 class Client:
@@ -46,6 +47,7 @@ def __init__(self,
         self.loop = loop or asyncio.get_event_loop()
         self._connection = WSConnection(bot=self, token=irc_token, nick=nick.lower(), loop=self.loop,
                                         initial_channels=initial_channels)
+        self._http = TwitchHTTP(self, nick, api_token=api_token, client_id=client_id, client_secret=client_secret)
 
 
     def run(self):

twitchio/cooldowns.py

@@ -30,7 +30,7 @@
 
 class RateBucket:
 
-    HTTPLIMIT = 30
+    HTTPLIMIT = 800
     IRCLIMIT = 20
     MODLIMIT = 100
 
@@ -52,15 +52,24 @@ def __init__(self, *, method: str):
 
         self.tokens = 0
         self._reset = time.time() + self.reset_time
+        self._event = asyncio.Event()
+        self._event.set()
 
     @property
     def limited(self):
-        return self.tokens == self.limit
+        return self.tokens >= self.limit
 
     def reset(self):
         self.tokens = 0
         self._reset = time.time() + self.reset_time
 
+    def limit_until(self, t):
+        """
+        artificially causes a limit until t
+        """
+        self.tokens = self.limit
+        self._reset = t
+
     def update(self, *, reset=None, remaining=None):
         now = time.time()
 
@@ -76,7 +85,23 @@ def update(self, *, reset=None, remaining=None):
             self.tokens += 1
 
     async def wait_reset(self):
-        now = time.time()
+        await self._wait()
+
+    def __await__(self):
+        return self._wait()
+
+    async def _wait(self):
+        if self.tokens < self.limit:
+            if self._event.is_set():
+                self._event.clear()
 
-        await asyncio.sleep(self._reset - now)
-        self.reset()
+            return
+
+        if not self._event.is_set():
+            await self._event.wait()
+            return
+        else:
+            now = time.time()
+            await asyncio.sleep(self._reset - now)
+            self.reset()
+            self._event.set()

twitchio/errors.py

@@ -16,3 +16,15 @@ class IRCCooldownError(TwitchIOException):
 
 class EchoMessageWarning(TwitchIOException):
     pass
+
+class NoClientID(TwitchIOException):
+    pass
+
+class NoToken(TwitchIOException):
+    pass
+
+class HTTPException(TwitchIOException):
+    pass
+
+class Unauthorized(HTTPException):
+    pass