webex-bot 0.6.0__py2.py3-none-any.whl → 0.6.1__py2.py3-none-any.whl

webex_bot/__init__.py

@@ -1,4 +1,4 @@
 """Top-level package for Webex Bot."""
 
 __author__ = """Finbarr Brady"""
-__version__ = '0.6.0'
+__version__ = '0.6.1'

webex_bot/websockets/webex_websocket_client.py

@@ -10,6 +10,7 @@ import certifi
 import requests
 import websockets
 from webexpythonsdk import WebexAPI
+from websockets.exceptions import InvalidStatusCode
 
 try:
     from websockets_proxy import Proxy, proxy_connect
@@ -193,6 +194,9 @@ class WebexWebsocketClient(object):
                 logger.error('could not get/create device info')
                 raise Exception("No WDM device info")
 
+        # Pull out URL now so we can log it on failure
+        ws_url = self.device_info.get('webSocketUrl')
+
         async def _websocket_recv():
             message = await self.websocket.recv()
             logger.debug("WebSocket Received Message(raw): %s\n" % message)
@@ -204,10 +208,17 @@ class WebexWebsocketClient(object):
                 logger.warning(
                     f"An exception occurred while processing message. Ignoring. {messageProcessingException}")
 
-        @backoff.on_exception(backoff.expo, websockets.ConnectionClosedError, max_time=MAX_BACKOFF_TIME)
-        @backoff.on_exception(backoff.expo, websockets.ConnectionClosedOK, max_time=MAX_BACKOFF_TIME)
-        @backoff.on_exception(backoff.expo, websockets.ConnectionClosed, max_time=MAX_BACKOFF_TIME)
-        @backoff.on_exception(backoff.expo, socket.gaierror, max_time=MAX_BACKOFF_TIME)
+        @backoff.on_exception(
+            backoff.expo,
+            (
+                websockets.ConnectionClosedError,
+                websockets.ConnectionClosedOK,
+                websockets.ConnectionClosed,
+                socket.gaierror,
+                InvalidStatusCode,
+            ),
+            max_time=MAX_BACKOFF_TIME
+        )
         async def _connect_and_listen():
             ws_url = self.device_info['webSocketUrl']
             logger.info(f"Opening websocket connection to {ws_url}")
@@ -237,6 +248,16 @@ class WebexWebsocketClient(object):
 
         try:
             asyncio.get_event_loop().run_until_complete(_connect_and_listen())
+        except InvalidStatusCode as e:
+            logger.error(f"WebSocket handshake to {ws_url} failed with status {e.status_code}")
+            if e.status_code == 404:
+                logger.info("Refreshing WDM device info and retrying...")
+                self._get_device_info(check_existing=False)
+                # update ws_url before retry
+                ws_url = self.device_info.get('webSocketUrl')
+                asyncio.get_event_loop().run_until_complete(_connect_and_listen())
+            else:
+                raise
         except Exception as runException:
             logger.error(f"runException: {runException}")
             if self._get_device_info(check_existing=False) is None:

{webex_bot-0.6.0.dist-info → webex_bot-0.6.1.dist-info}/METADATA

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: webex_bot
-Version: 0.6.0
+Version: 0.6.1
 Summary: Python package for a Webex Bot based on websockets.
 Home-page: https://github.com/fbradyirl/webex_bot
 Author: Finbarr Brady
@@ -438,6 +438,12 @@ to
 bot = WebexBot(teams_bot_token=os.getenv("WEBEX_ACCESS_TOKEN")
 ```
 
+
+### 0.6.1 (2025-May-19)
+
+* Handle and retry on InvalidStatusCode in Websocket loop
+
+
 [1]: https://github.com/aaugustin/websockets
 
 [2]: https://github.com/WebexCommunity/WebexPythonSDK

{webex_bot-0.6.0.dist-info → webex_bot-0.6.1.dist-info}/RECORD

@@ -1,4 +1,4 @@
-webex_bot/__init__.py,sha256=S5gT3L7JqYWDSwjnLQa_VGARrFqlB4Q6IF_ElUCnWWs,95
+webex_bot/__init__.py,sha256=2HF6-vT6Wd0GCEqkCYKsotewyurOtnZ_YySZS14u8C4,95
 webex_bot/exceptions.py,sha256=qs9yVitfJtvxwBMC8uCvTDOxUQ_oZjWFf1dU8Oaue14,740
 webex_bot/formatting.py,sha256=jvPKym-z8CIJygpPVTVbt6vFXQo9_HQHpRDJB-nh-SI,382
 webex_bot/webex_bot.py,sha256=pLNmcAP7J9ZG9QnEDZLYZJa_y1qtO5vudhT0fAi2stA,21282
@@ -10,9 +10,9 @@ webex_bot/models/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,
 webex_bot/models/command.py,sha256=MyThlDaEkGlj1fDE_i_wr79O3QboakimRme8yI744yo,5327
 webex_bot/models/response.py,sha256=d4k2ohR5SUVzvuQzcnm7jQQVTMB0gH9Kz9y09vkoAaU,2545
 webex_bot/websockets/__init__.py,sha256=47DEQpj8HBSa-_TImW-5JCeuQeRkm5NMpJWZG3hSuFU,0
-webex_bot/websockets/webex_websocket_client.py,sha256=kYepNP4gK0dddPndtK6ltCg52TYMhMtMHVKkxO15jTs,10618
-webex_bot-0.6.0.dist-info/licenses/LICENSE,sha256=93eGb10xmgkBP2Fh_n0E9YDXe0c0oz-FsnAimXG0S4Y,1072
-webex_bot-0.6.0.dist-info/METADATA,sha256=cOLj7txCMm0F0rwwtSmNb9Vf0T54sO6Jx3U6h--dPC0,14348
-webex_bot-0.6.0.dist-info/WHEEL,sha256=AeO2BvogYWm3eGaHCvhzmUYt8ia7KfURiHzO_1atlys,109
-webex_bot-0.6.0.dist-info/top_level.txt,sha256=q1Y0RtYYinR7oXSwL93cK59c2KN_CbMVca8MLWeF63M,10
-webex_bot-0.6.0.dist-info/RECORD,,
+webex_bot/websockets/webex_websocket_client.py,sha256=srq5PNFvsinUTWNVyQiH4xKQfSLN2jFolMXcU6vxwuo,11265
+webex_bot-0.6.1.dist-info/licenses/LICENSE,sha256=93eGb10xmgkBP2Fh_n0E9YDXe0c0oz-FsnAimXG0S4Y,1072
+webex_bot-0.6.1.dist-info/METADATA,sha256=N9coULEQIURUhGust5oho0qQMHpd9FPp8ys0dgqPh4g,14434
+webex_bot-0.6.1.dist-info/WHEEL,sha256=_z0Kb-VmhLeNt2nZ-PsoQBjD25rP0tBwgAyRYD7oTKI,109
+webex_bot-0.6.1.dist-info/top_level.txt,sha256=q1Y0RtYYinR7oXSwL93cK59c2KN_CbMVca8MLWeF63M,10
+webex_bot-0.6.1.dist-info/RECORD,,

{webex_bot-0.6.0.dist-info → webex_bot-0.6.1.dist-info}/WHEEL

@@ -1,5 +1,5 @@
 Wheel-Version: 1.0
-Generator: setuptools (79.0.1)
+Generator: setuptools (80.7.1)
 Root-Is-Purelib: true
 Tag: py2-none-any
 Tag: py3-none-any