Merge branch 'main' into enterprise

Author: scogswell

adafruit_espatcontrol/adafruit_espatcontrol.py

@@ -254,7 +254,7 @@ def cipmux(self) -> int:
                 return int(reply[8:])
         raise RuntimeError("Bad response to CIPMUX?")
 
-    def socket_connect(
+    def socket_connect(  # pylint: disable=too-many-branches
         self,
         conntype: str,
         remote: str,
@@ -265,7 +265,31 @@ def socket_connect(
     ) -> bool:
         """Open a socket. conntype can be TYPE_TCP, TYPE_UDP, or TYPE_SSL. Remote
         can be an IP address or DNS (we'll do the lookup for you. Remote port
-        is integer port on other side. We can't set the local port"""
+        is integer port on other side. We can't set the local port.
+
+        Note that this method is usually called by the requests-package, which
+        does not know anything about conntype. So it is mandatory to set
+        the conntype manually before calling this method if the conntype-parameter
+        is not provided.
+
+        If requests are done using ESPAT_WiFiManager, the conntype is set there
+        depending on the protocol (http/https)."""
+
+        # if caller does not provide conntype, use default conntype from
+        # object if set, otherwise fall back to old buggy logic
+        if not conntype and self._conntype:
+            conntype = self._conntype
+        elif not conntype:
+            # old buggy code from espatcontrol_socket
+            # added here for compatibility with old code
+            if remote_port == 80:
+                conntype = self.TYPE_TCP
+            elif remote_port == 443:
+                conntype = self.TYPE_SSL
+            # to cater for MQTT over TCP
+            elif remote_port == 1883:
+                conntype = self.TYPE_TCP
+
         # lets just do one connection at a time for now
         if conntype == self.TYPE_UDP:
             # always disconnect for TYPE_UDP
@@ -295,7 +319,7 @@ def socket_connect(
         replies = self.at_response(cmd, timeout=10, retries=retries).split(b"\r\n")
         for reply in replies:
             if reply == b"CONNECT" and (
-                (conntype == self.TYPE_TCP or conntype == self.TYPE_SSL)
+                conntype in (self.TYPE_TCP, self.TYPE_SSL)
                 and self.status == self.STATUS_SOCKETOPEN
                 or conntype == self.TYPE_UDP
             ):
@@ -626,6 +650,16 @@ def mode(self, mode: int) -> None:
             raise RuntimeError("Invalid Mode")
         self.at_response("AT+CWMODE=%d" % mode, timeout=3)
 
+    @property
+    def conntype(self) -> Union[str, None]:
+        """The configured connection-type"""
+        return self._conntype
+
+    @conntype.setter
+    def conntype(self, conntype: str) -> None:
+        """set connection-type for subsequent socket_connect()"""
+        self._conntype = conntype
+
     @property
     def local_ip(self) -> Union[str, None]:
         """Our local IP address as a dotted-quad string"""

adafruit_espatcontrol/adafruit_espatcontrol_socket.py

@@ -67,16 +67,6 @@ def connect(self, address: Tuple[str, int], conntype: Optional[str] = None) -> N
         is an extra that may indicate SSL or not, depending on the underlying interface"""
         host, port = address
 
-        # Determine the conntype from port if not specified.
-        if conntype is None:
-            if port == 80:
-                conntype = "TCP"
-            elif port == 443:
-                conntype = "SSL"
-            # to cater for MQTT over TCP
-            elif port == 1883:
-                conntype = "TCP"
-
         if not _the_interface.socket_connect(
             conntype, host, port, keepalive=10, retries=3
         ):

adafruit_espatcontrol/adafruit_espatcontrol_wifimanager.py

@@ -15,11 +15,11 @@
 
 import adafruit_requests as requests
 import adafruit_espatcontrol.adafruit_espatcontrol_socket as socket
+from adafruit_espatcontrol.adafruit_espatcontrol import ESP_ATcontrol
 
 try:
     from typing import Dict, Any, Optional, Union, Tuple
     from circuitpython_typing.led import FillBasedLED
-    from adafruit_espatcontrol.adafruit_espatcontrol import ESP_ATcontrol
 except ImportError:
     pass
 
@@ -87,6 +87,14 @@ def connect(self, timeout: int = 15, retries: int = 3) -> None:
             print("Failed to connect\n", error)
             raise
 
+    def set_conntype(self, url: str) -> None:
+        """set the connection-type according to protocol"""
+        self._esp.conntype = (
+            ESP_ATcontrol.TYPE_SSL
+            if url.startswith("https")
+            else ESP_ATcontrol.TYPE_TCP
+        )
+
     def disconnect(self) -> None:
         """
         Disconnect the Wifi from the AP if any
@@ -108,7 +116,7 @@ def get(self, url: str, **kw: Any) -> requests.Response:
         if not self._esp.is_connected:
             self.connect()
         self.pixel_status((0, 0, 100))
-        requests.set_socket(socket, self._esp)
+        self.set_conntype(url)
         return_val = requests.get(url, **kw)
         self.pixel_status(0)
         return return_val
@@ -132,7 +140,7 @@ def post(self, url: str, **kw: Any) -> requests.Response:
                 print("post(): not connected, trying to connect")
             self.connect()
         self.pixel_status((0, 0, 100))
-        requests.set_socket(socket, self._esp)
+        self.set_conntype(url)
         return_val = requests.post(url, **kw)
         self.pixel_status(0)
 
@@ -153,7 +161,7 @@ def put(self, url: str, **kw: Any) -> requests.Response:
         if not self._esp.is_connected:
             self.connect()
         self.pixel_status((0, 0, 100))
-        requests.set_socket(socket, self._esp)
+        self.set_conntype(url)
         return_val = requests.put(url, **kw)
         self.pixel_status(0)
         return return_val
@@ -173,7 +181,7 @@ def patch(self, url: str, **kw: Any) -> requests.Response:
         if not self._esp.is_connected:
             self.connect()
         self.pixel_status((0, 0, 100))
-        requests.set_socket(socket, self._esp)
+        self.set_conntype(url)
         return_val = requests.patch(url, **kw)
         self.pixel_status(0)
         return return_val
@@ -193,7 +201,7 @@ def delete(self, url: str, **kw: Any) -> requests.Response:
         if not self._esp.is_connected:
             self.connect()
         self.pixel_status((0, 0, 100))
-        requests.set_socket(socket, self._esp)
+        self.set_conntype(url)
         return_val = requests.delete(url, **kw)
         self.pixel_status(0)
         return return_val