Merge branch 'master' into events

Author: EvieePy

docs/changelog.rst

@@ -1,4 +1,4 @@
-:orphan:     
+:orphan:
 
 
 Master
@@ -12,6 +12,7 @@ Master
             - This is dispatched when the bot fails to join a channel
             - This also makes the channel join error message in logs optional
     - Bug fixes
+        - Fix AuthenticationError not being properly propagated when a bad token is given
         - Fix channel join failures causing `ValueError: list.remove(x): x not in list` when joining channels after the initial start
         - Added :attr:`~twitchio.Chatter.is_vip` property to Chatter
         - New PartialUser methods
@@ -37,6 +38,7 @@ Master
     - Bug fixes      
         - Unsubscribing from Pubsubevents works again
         - Fix a forgotten nonce in :func:`~twitchio.ext.pubsub.websocket._send_topics`
+        - :class:`~twitchio.ext.pubsub.PubSubModerationActionChannelTerms` now uses the correct type data
 
 - ext.sound
     - Bug fixes
@@ -51,18 +53,17 @@ Master
             - :func:`~twitchio.ext.eventsub.event_eventsub_notification_channel_goal_begin`
             - :func:`~twitchio.ext.eventsub.event_eventsub_notification_channel_goal_progress`
             - :func:`~twitchio.ext.eventsub.event_eventsub_notification_channel_goal_end`
+
         - Channel subscription end
             - :func:`~twitchio.ext.eventsub.EventSubClient.subscribe_channel_subscription_end`
         - User authorization grant
             - :func:`~twitchio.ext.eventsub.EventSubClient.subscribe_user_authorization_granted`
 
+        - HypeTrainBeginProgressData now has the :attr:`~twitchio.ext.eventsub.HypeTrainBeginProgressData.level`
+
+
     - Bug fixes
         Correct typo in :class:`~twitchio.ext.eventsub.HypeTrainBeginProgressData` attribute :attr:`~twitchio.ext.eventsub.HypeTrainBeginProgressData.expires`
-        
-- ext.pubsub
-    - Bug fixes      
-        - "type" of :class:`~twitchio.ext.pubsub.PubSubModerationActionChannelTerms` now uses the correct type data
-
 
 2.4.0
 ======

twitchio/client.py

@@ -30,7 +30,7 @@
 import sys
 from typing import Union, Callable, List, Optional, Tuple, Any, Coroutine, Dict
 
-from twitchio.errors import HTTPException
+from twitchio.errors import HTTPException, AuthenticationError
 from . import models
 from .websocket import WSConnection
 from .http import TwitchHTTP
@@ -155,7 +155,8 @@ def run(self):
         connects to the twitch IRC server, and cleans up when done.
         """
         try:
-            self.loop.create_task(self.connect())
+            task = self.loop.create_task(self.connect())
+            self.loop.run_until_complete(task)  # this'll raise if the connect fails
             self.loop.run_forever()
         except KeyboardInterrupt:
             pass

twitchio/ext/eventsub/models.py

@@ -682,6 +682,8 @@ class HypeTrainBeginProgressData(EventData):
         The top contributions of the Hype Train
     last_contribution: :class:`HypeTrainContributor`
         The last contributor to the Hype Train
+    level: :class:`int`
+        The current level of the Hype Train
     """
 
     __slots__ = (
@@ -693,6 +695,7 @@ class HypeTrainBeginProgressData(EventData):
         "last_contribution",
         "started",
         "expires",
+        "level",
     )
 
     def __init__(self, client: EventSubClient, data: dict):
@@ -704,6 +707,7 @@ def __init__(self, client: EventSubClient, data: dict):
         self.expires = _parse_datetime(data["expires_at"])
         self.top_contributions = [HypeTrainContributor(client, d) for d in data["top_contributions"]]
         self.last_contribution = HypeTrainContributor(client, data["last_contribution"])
+        self.level: int = data["level"]
 
 
 class HypeTrainEndData(EventData):

twitchio/websocket.py

@@ -122,7 +122,12 @@ async def _connect(self):
         if self.is_alive:
             await self._websocket.close()  # If for some reason we are in a weird state, close it before retrying.
         if not self._client._http.nick:
-            data = await self._client._http.validate(token=self._token)
+            try:
+                data = await self._client._http.validate(token=self._token)
+            except AuthenticationError:
+                await self._client._http.session.close()
+                self._client._closing.set()  # clean up and error out (this is called to avoid calling Client.close in start()
+                raise
             self.nick = data["login"]
             self.user_id = int(data["user_id"])
         else:
@@ -137,10 +142,9 @@ async def _connect(self):
 
             await asyncio.sleep(retry)
             return asyncio.create_task(self._connect())
-        if time.time() > self._last_ping + 240 or self._reconnect_requested:
-            # Re-authenticate as we have surpassed a PING request or Twitch issued a RECONNECT.
-            await self.authenticate(self._initial_channels)
-            self._reconnect_requested = False
+
+        await self.authenticate(self._initial_channels)
+
         self._keeper = asyncio.create_task(self._keep_alive())  # Create our keep alive.
         self._ws_ready_event.set()