fix RECONNECT crash

Author: IAmTomahawkx

docs/changelog.rst

@@ -4,6 +4,7 @@ Master
 ======
 - TwitchIO
     - Additions
+        - Added :func:`~twitchio.Client.event_reconnect` to :class:`~twitchio.Client`
         - Add attribute docs to :class:`~twitchio.PartialUser` and :class:`~twitchio.User`
         - Added following new :class:`~twitchio.PartialUser` methods:
             - :func:`twitchio.PartialUser.create_custom_reward`
@@ -39,6 +40,7 @@ Master
         - Updated IRC parser to not remove multiple spaces when clumped together
         - Fixed :func:`twitchio.Client.start` exiting immediatly
         - Chatters will now update correctly when someone leaves chat
+        - Fixed a crash when twitch sends a RECONNECT notice
 
 - ext.commands
     - Bug fixes

docs/twitchio.rst

@@ -24,6 +24,7 @@ Event Reference
 -----------------
 
 .. automethod:: Client.event_ready()
+.. automethod:: Client.event_reconnect()
 .. automethod:: Client.event_raw_data(data: str)
 .. automethod:: Client.event_message(message: Message)
 .. automethod:: Client.event_join(channel: Channel, user: User)

twitchio/client.py

@@ -969,6 +969,13 @@ async def event_ready():
         """
         pass
 
+    async def event_reconnect(self):
+        """|coro|
+
+        Event called when twitch sends a RECONNECT notice.
+        The library will automatically handle reconnecting when such an event is received
+        """
+
     async def event_raw_data(self, data: str):
         """|coro|
 

twitchio/parse.py

@@ -39,13 +39,13 @@
     "PRIVMSG(ECHO)",
     "USERSTATE",
     "MODE",
-    "RECONNECT",
     "WHISPER",
     "USERNOTICE",
 )
 ACTIONS2 = ("USERSTATE", "ROOMSTATE", "PRIVMSG", "USERNOTICE", "WHISPER")
 USER_SUB = re.compile(r":(?P<user>.*)!")
 MESSAGE_RE = re.compile(r":(?P<useraddr>\S+) (?P<action>\S+) #(?P<channel>\S+)( :(?P<message>.*))?$")
+FAST_RETURN = {"RECONNECT": {"code": 0, "action": "RECONNECT"}, "PING": {"action": "PING"}}
 
 logger = logging.getLogger("twitchio.parser")
 
@@ -58,11 +58,18 @@ def parser(data: str, nick: str):
     user = None
     badges = None
 
-    if action == "PING":
-        return dict(action="PING")
+    _group_len = len(groups)
+
+    if action in FAST_RETURN:
+        return FAST_RETURN[action]
+
+    elif groups[1] in FAST_RETURN:
+        return FAST_RETURN[groups[1]]
 
     elif (
-        groups[1] in ACTIONS or groups[2] in ACTIONS or (len(groups) > 3 and groups[3] in {"PRIVMSG", "PRIVMSG(ECHO)"})
+        groups[1] in ACTIONS
+        or (_group_len > 2 and groups[2] in ACTIONS)
+        or (_group_len > 3 and groups[3] in {"PRIVMSG", "PRIVMSG(ECHO)"})
     ):
         result = re.search(MESSAGE_RE, data)
         if not result:

twitchio/websocket.py

@@ -148,7 +148,7 @@ async def _keep_alive(self):
 
         if not self._last_ping:
             self._last_ping = time.time()
-        while not self._websocket.closed:
+        while not self._websocket.closed and not self._reconnect_requested:
             msg = await self._websocket.receive()  # Receive data...
 
             if msg.type is aiohttp.WSMsgType.CLOSED:
@@ -165,6 +165,7 @@ async def _keep_alive(self):
                         continue
                     task = asyncio.create_task(self._process_data(event))
                     task.add_done_callback(partial(self._task_callback, event))  # Process our raw data
+
         asyncio.create_task(self._connect())
 
     def _task_callback(self, data, task):
@@ -487,6 +488,9 @@ async def _mode(self, parsed):  # TODO
     async def _reconnect(self, parsed):
         log.debug("ACTION: RECONNECT:: Twitch has gracefully closed the connection and will reconnect.")
         self._reconnect_requested = True
+        self._keeper.cancel()
+        self._loop.create_task(self._connect())
+        self.dispatch("reconnect")
 
     def dispatch(self, event: str, *args, **kwargs):
         log.debug(f"Dispatching event: {event}")