Vovaman#4 realized

Author: Vovaman

HISTORY.md

@@ -1,7 +1,15 @@
-0.1.6
+0.1.8
 -----
-First release.
+Partial support for wss protocol is added.
+Author: [huytranle](https://github.com/huytranle)
+> :warning: **Disclaimer!** Server and client certificates verification
+> is not supported in this version.
+> Waiting for new micropython release...
 
 0.1.7
 -----
-Websocket can send custom headers to server in ``handshake`` function. Author: [pluzmedia](https://github.com/pluzmedia)
+Websocket can send custom headers to server in ``handshake`` function. Author: [pluzmedia](https://github.com/pluzmedia)
+
+0.1.6
+-----
+First release.

README.md

@@ -1,27 +1,27 @@
 # micropython-async_websocket_client
-This module is designed for ESP32 (and other) controllers.  
-Goal: create and keep alive connection channel with websocket server.   
-You may send captured data from controlled devices through this channel to server and accept managing signals on your controller.  
-This data channel works as background task while main control cycle is running too.  
+This module is designed for ESP32 (and other) controllers.
+Goal: create and keep alive connection channel with websocket server.
+You may send captured data from controlled devices through this channel to server and accept managing signals on your controller.
+This data channel works as background task while main control cycle is running too.
 The break of websocket channel doesn't corrupt main cycle of control.
 
-This project based on:  
-https://github.com/danni/uwebsockets  
+This project based on:
+https://github.com/danni/uwebsockets
 https://github.com/peterhinch/micropython-async
 
 **My gratitudes to authors**.
 
 # requirements
-This module is designed and tested on [ESP32S-WROOM-32](https://ru.wikipedia.org/wiki/%D0%A4%D0%B0%D0%B9%D0%BB:ESP32_Espressif_ESP-WROOM-32_Dev_Board.jpg).  
-Development and tests were done based on [esp32-20220117-v1.18.bin](https://micropython.org/resources/firmware/esp32-20220117-v1.18.bin).  
+This module is designed and tested on [ESP32S-WROOM-32](https://ru.wikipedia.org/wiki/%D0%A4%D0%B0%D0%B9%D0%BB:ESP32_Espressif_ESP-WROOM-32_Dev_Board.jpg).
+Development and tests were done based on [esp32-20220618-v1.19.1.bin](https://micropython.org/resources/firmware/esp32-20220618-v1.19.1.bin).
 
 # installation
 <details>
     <summary>Run this commands on your controller:</summary>
 
-    You have to reflash your board with [micropython](https://micropython.org/).  
-    Details are explained in https://github.com/Vovaman/start_ESP32_with_micropython.  
-    You may use VSCode as explained in link above or use `picocom` tool (also explained) to connect your board and run python console (REPL) on it.  
+    You have to reflash your board with [micropython](https://micropython.org/).
+    Details are explained in https://github.com/Vovaman/start_ESP32_with_micropython.
+    You may use VSCode as explained in link above or use `picocom` tool (also explained) to connect your board and run python console (REPL) on it.
     So, after you are in your board...
 </details>
 
@@ -34,6 +34,6 @@ Development and tests were done based on [esp32-20220117-v1.18.bin](https://micr
 >>> upip.install('micropython-async-websocket-client')
 ```
 
-All needed dependencies are in esp32-20220117-v1.18.bin.
+All needed dependencies are in esp32-20220618-v1.19.1.bin.
 # example
 Sample using of this module is in https://github.com/Vovaman/example_async_websocket.

async_websocket_client/ws.py

@@ -48,20 +48,14 @@ def urlparse(self, uri):
         """Parse ws or wss:// URLs"""
         match = URL_RE.match(uri)
         if match:
-            protocol = match.group(1)
-            host = match.group(2)
-            port = match.group(3)
-            path = match.group(4)
-
-            if protocol == 'wss':
-                if port is None:
-                    port = 443
-            elif protocol == 'ws':
-                if port is None:
-                    port = 80
-            else:
+            protocol, host, port, path = match.group(1), match.group(2), match.group(3), match.group(4)
+
+            if protocol not in ['ws', 'wss']:
                 raise ValueError('Scheme {} is invalid'.format(protocol))
 
+            if port is None:
+                port = (80, 443)[protocol == 'wss']
+
             return URI(protocol, host, int(port), path)
 
     async def a_readline(self):
@@ -108,6 +102,10 @@ def send_header(header, *args):
             hostname=self.uri.hostname,
             port=self.uri.port)
         )
+
+        for key, value in headers:
+            send_header(b'%s: %s', key, value)
+
         send_header(b'')
 
         line = await self.a_readline()

setup.py

@@ -18,7 +18,7 @@
 
 setuptools.setup(
     name="micropython-async_websocket_client",
-    version="0.1.7",
+    version="0.1.8",
     description='Asynchronous websocket client for ESP32 controller.',
     long_description_content_type="text/markdown",
     long_description=README + '\n\n' + HISTORY,
@@ -34,5 +34,5 @@
         "License :: OSI Approved :: Apache Software License",
         "Operating System :: OS Independent",
     ],
-    packages=["async_websocket_client"]    
+    packages=["async_websocket_client"]
 )