Add aio/http.py module

.github/workflows/ci.yml

@@ -250,7 +250,8 @@ jobs:
 
 
   windows:
-    runs-on: windows-2022 # latest
+    # https://github.com/actions/runner-images/issues/12034 Python 3.8.10 is no longer available on windows-2022
+    runs-on: windows-2025
     strategy:
       matrix:
         arch: [x86, x64]
@@ -265,8 +266,9 @@ jobs:
           aws-region: ${{ env.AWS_DEFAULT_REGION }}
       - name: Build ${{ env.PACKAGE_NAME }} + consumers
         run: |
+          where python
           python -c "from urllib.request import urlretrieve; urlretrieve('${{ env.BUILDER_HOST }}/${{ env.BUILDER_SOURCE }}/${{ env.BUILDER_VERSION }}/builder.pyz?run=${{ env.RUN }}', 'builder.pyz')"
-          python builder.pyz build -p ${{ env.PACKAGE_NAME }} --python "C:\\hostedtoolcache\\windows\\Python\\3.8.10\\${{ matrix.arch }}\\python.exe"
+          python builder.pyz build -p ${{ env.PACKAGE_NAME }} --python "C:\\hostedtoolcache\\windows\\Python\\3.9.13\\${{ matrix.arch }}\\python.exe"
 
   macos:
     runs-on: macos-14 # latest

awscrt/__init__.py

@@ -7,6 +7,7 @@
     'auth',
     'crypto',
     'http',
+    'http_asyncio',
     'io',
     'mqtt',
     'mqtt5',

awscrt/http.py

@@ -190,7 +190,8 @@ def _generic_new(
             proxy_options: Optional['HttpProxyOptions'] = None,
             expected_version: Optional[HttpVersion] = None,
             initial_settings: Optional[List[Http2Setting]] = None,
-            on_remote_settings_changed: Optional[Callable[[List[Http2Setting]], None]] = None) -> "concurrent.futures.Future":
+            on_remote_settings_changed: Optional[Callable[[List[Http2Setting]], None]] = None,
+            asyncio_connection=False) -> "concurrent.futures.Future":
         """
         Initialize the generic part of the HttpClientConnection class.
         """
@@ -217,7 +218,8 @@ def _generic_new(
                 tls_connection_options=tls_connection_options,
                 connect_future=future,
                 expected_version=expected_version,
-                on_remote_settings_changed=on_remote_settings_changed)
+                on_remote_settings_changed=on_remote_settings_changed,
+                asyncio_connection=asyncio_connection)
 
             _awscrt.http_client_connection_new(
                 bootstrap,
@@ -407,7 +409,6 @@ def _init_common(self,
         # keep HttpRequest alive until stream completes
         self._request: 'HttpRequest' = request
         self._version: HttpVersion = connection.version
-
         self._binding = _awscrt.http_client_stream_new(self, connection, request, http2_manual_write)
 
     @property
@@ -462,6 +463,9 @@ def write_data(self,
         body_stream: InputStream = InputStream.wrap(data_stream, allow_none=True)
 
         def on_write_complete(error_code: int) -> None:
+            if future.cancelled():
+                # the future was cancelled, so we don't need to set the result or exception
+                return
             if error_code:
                 future.set_exception(awscrt.exceptions.from_code(error_code))
             else:
@@ -809,7 +813,8 @@ def __init__(
             tls_connection_options: Optional[TlsConnectionOptions] = None,
             connect_future: Optional[Future] = None,
             expected_version: Optional[HttpVersion] = None,
-            on_remote_settings_changed: Optional[Callable[[List[Http2Setting]], None]] = None) -> None:
+            on_remote_settings_changed: Optional[Callable[[List[Http2Setting]], None]] = None,
+            asyncio_connection=False) -> None:
         self._shutdown_future = None
         self._host_name = host_name
         self._port = port
@@ -818,23 +823,31 @@ def __init__(
         self._connect_future = connect_future
         self._expected_version = expected_version
         self._on_remote_settings_changed_from_user = on_remote_settings_changed
+        self._asyncio_connection = asyncio_connection
 
     def _on_connection_setup(self, binding: Any, error_code: int, http_version: HttpVersion) -> None:
         if self._connect_future is None:
             return
-
+        if error_code != 0:
+            self._connect_future.set_exception(awscrt.exceptions.from_code(error_code))
+            return
         if self._expected_version and self._expected_version != http_version:
             # unexpected protocol version
             # AWS_ERROR_HTTP_UNSUPPORTED_PROTOCOL
             self._connect_future.set_exception(awscrt.exceptions.from_code(2060))
             return
-        if error_code != 0:
-            self._connect_future.set_exception(awscrt.exceptions.from_code(error_code))
-            return
-        if http_version == HttpVersion.Http2:
-            connection = Http2ClientConnection()
+        if self._asyncio_connection:
+            # Import is done here to avoid circular import issues
+            from awscrt.http_asyncio import HttpClientConnectionAsync, Http2ClientConnectionAsync
+            if http_version == HttpVersion.Http2:
+                connection = Http2ClientConnectionAsync()
+            else:
+                connection = HttpClientConnectionAsync()
         else:
-            connection = HttpClientConnection()
+            if http_version == HttpVersion.Http2:
+                connection = Http2ClientConnection()
+            else:
+                connection = HttpClientConnection()
 
         connection._host_name = self._host_name
         connection._port = self._port