Fix some buggy bugs

Author: Katistic

vrcpy/client.py

@@ -111,8 +111,7 @@ async def _ws_loop(self):
             auth = auth["token"]
 
             self.ws = await self.request.session.ws_connect(
-                "wss://pipeline.vrchat.cloud/?authToken="+auth,
-                proxy=self.request.proxy)
+                "wss://pipeline.vrchat.cloud/?authToken="+auth)
 
             self.loop.create_task(self.on_connect())
 
@@ -443,8 +442,13 @@ async def run():
             await self.login(username, password, mfa)
             await self.start()
 
-        self.loop.run_until_complete(run())
-        self.loop.run_until_complete(self.logout())
+        try:
+            self.loop.run_until_complete(run())
+        except KeyboardInterrupt as e:
+            self.loop.run_until_complete(self.logout())
+        except Exception as e:
+            self.loop.run_until_complete(self.logout())
+            raise e.__class__(str(e))
 
     # Websocket Stuff
 

vrcpy/request.py

@@ -27,8 +27,9 @@ async def _caller(self, method, path, *args, **kwargs):
                 self.api_key = j["apiKey"]
 
         if "params" in kwargs:
-            if type(kwargs["params"][param]) == bool:
-                kwargs["params"][param] = str(kwargs["params"][param]).lower()
+            for param in kwargs["params"]:
+                if type(kwargs["params"][param]) == bool:
+                    kwargs["params"][param] = str(kwargs["params"][param]).lower()
 
             kwargs["params"]["apiKey"] = self.api_key
         else:
@@ -40,7 +41,7 @@ async def _caller(self, method, path, *args, **kwargs):
 
     async def _call(self, method, path, *args, **kwargs):
         if self.session is None:
-            self.session = aiohttp.ClientSession()
+            self.session = aiohttp.ClientSession(headers={"user-agent": self.user_agent})
 
         resp = None
         for attempt in range(self.request_retries + 1):
@@ -51,14 +52,14 @@ async def _call(self, method, path, *args, **kwargs):
                 if type(e) in RequestErrors.errors + ClientErrors.errors:
                     raise e.__class__(str(e))
 
-                if attempt == retries:
+                if attempt == self.request_retries:
                     raise RequestErrors.RequestError(
-                        "{} ({} retries)".format(e, retries)
+                        "{} ({} retries)".format(e, self.request_retries)
                     )
 
         return resp
 
-    async def close(self):
+    async def close_session(self):
         await self.session.close()
 
     async def get(self, path, *args, **kwargs):