From 0248f64501b14cf07ecb3334b32277dacd86f729 Mon Sep 17 00:00:00 2001
From: nggit <contact@anggit.com>
Date: Tue, 11 Feb 2025 22:20:46 +0700
Subject: [PATCH 1/4] expose app object

---
 examples/import.py | 4 ++--
 httpout/httpout.py | 4 +---
 tests/test_http.py | 2 +-
 3 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/examples/import.py b/examples/import.py
index 01628da..cb3883b 100644
--- a/examples/import.py
+++ b/examples/import.py
@@ -1,3 +1,3 @@
 
-from httpout import globals, context  # noqa: F401
-from httpout import app  # noqa: F401
+from httpout import globals, context, app  # noqa: F401
+from httpout import foo  # noqa: F401
diff --git a/httpout/httpout.py b/httpout/httpout.py
index 5144f5b..56c638a 100644
--- a/httpout/httpout.py
+++ b/httpout/httpout.py
@@ -134,9 +134,7 @@ def ho_import(name, globals=None, locals=None, fromlist=(), level=0):
                                 module.__dict__[child] = module.__server__[
                                     child
                                 ]
-                            elif child in worker and (
-                                    child != 'app' or
-                                    '__server__' not in globals):
+                            elif child in worker:
                                 module.__dict__[child] = worker[child]
                             else:
                                 raise ImportError(
diff --git a/tests/test_http.py b/tests/test_http.py
index d5b5188..6ace667 100644
--- a/tests/test_http.py
+++ b/tests/test_http.py
@@ -82,7 +82,7 @@ def test_import_error(self):
         )
         self.assertEqual(
             body,
-            b'5B\r\n<ul><li>ImportError: cannot import name &#x27;app&#x27; '
+            b'5B\r\n<ul><li>ImportError: cannot import name &#x27;foo&#x27; '
             b'from &#x27;httpout&#x27;</li></ul>\n\r\n0\r\n\r\n'
         )
 

From 7bccb85a5b209990405d1172f4814e1330a3445d Mon Sep 17 00:00:00 2001
From: nggit <contact@anggit.com>
Date: Tue, 11 Feb 2025 22:21:29 +0700
Subject: [PATCH 2/4] update artifact v4

---
 .github/workflows/build_and_release.yml  | 6 +++---
 .github/workflows/tests_and_coverage.yml | 9 +++++++--
 2 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/.github/workflows/build_and_release.yml b/.github/workflows/build_and_release.yml
index 3c1e21e..91592e6 100644
--- a/.github/workflows/build_and_release.yml
+++ b/.github/workflows/build_and_release.yml
@@ -28,7 +28,7 @@ jobs:
           python -m build --sdist --no-isolation
           for f in dist/httpout-*.tar.gz; do gzip -t "$f"; done
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: dist
           path: dist/httpout-*.tar.gz
@@ -77,7 +77,7 @@ jobs:
               unzip -l "$f" | grep '\shttpout/utils/modules\..*\.so$';
           done
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
           name: dist
           path: dist/httpout-*.whl
@@ -95,7 +95,7 @@ jobs:
     permissions:
       id-token: write  # IMPORTANT: this permission is mandatory for trusted publishing
     steps:
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
         with:
           name: dist
           path: dist
diff --git a/.github/workflows/tests_and_coverage.yml b/.github/workflows/tests_and_coverage.yml
index 8c2c295..435b05b 100644
--- a/.github/workflows/tests_and_coverage.yml
+++ b/.github/workflows/tests_and_coverage.yml
@@ -85,8 +85,9 @@ jobs:
           contains(env.FILES_MODIFIED, '.py') &&
           matrix.python_version == '3.13' && startsWith(matrix.os, 'windows-')
 
-      - uses: actions/upload-artifact@v3
+      - uses: actions/upload-artifact@v4
         with:
+          name: artifact-${{ matrix.os }}
           path: artifact
           include-hidden-files: true
         if: ${{ contains(env.FILES_MODIFIED, '.py') && matrix.python_version == '3.13' }}
@@ -113,7 +114,11 @@ jobs:
           python -m pip install --upgrade tremolo
         if: ${{ contains(env.FILES_MODIFIED, '.py') }}
 
-      - uses: actions/download-artifact@v3
+      - uses: actions/download-artifact@v4
+        with:
+          path: artifact
+          pattern: artifact-*
+          merge-multiple: true
         if: ${{ contains(env.FILES_MODIFIED, '.py') }}
 
       - name: Combine and view report

From 509e901767ba3422fade305e11282d2ea8a4e94f Mon Sep 17 00:00:00 2001
From: nggit <contact@anggit.com>
Date: Wed, 12 Feb 2025 06:39:03 +0700
Subject: [PATCH 3/4] clean up

---
 httpout/__main__.py | 14 +++++++++-----
 httpout/httpout.py  |  5 ++---
 2 files changed, 11 insertions(+), 8 deletions(-)

diff --git a/httpout/__main__.py b/httpout/__main__.py
index 5c7e773..6c0db50 100644
--- a/httpout/__main__.py
+++ b/httpout/__main__.py
@@ -41,9 +41,12 @@ def usage(**context):
     print('                            Intended for development')
     print('  --log-level               Defaults to "DEBUG". See')
     print('                            https://docs.python.org/3/library/logging.html#levels')  # noqa: E501
+    print('  --log-fmt                 Python\'s log format. If empty defaults to "%(message)s"')  # noqa: E501
     print('  --loop                    A fully qualified event loop name')
     print('                            E.g. "asyncio" or "asyncio.SelectorEventLoop"')  # noqa: E501
     print('                            It expects the respective module to already be present')  # noqa: E501
+    print('  --shutdown-timeout        Maximum number of seconds to wait after SIGTERM is')  # noqa: E501
+    print('                            sent to a worker process. Defaults to 30 (seconds)')  # noqa: E501
     print('  --version                 Print the httpout version and exit')
     print('  --help                    Show this help and exit')
     print()
@@ -68,11 +71,12 @@ def bind(value='', **context):
 
 def version(**context):
     print(
-        'httpout %s (tremolo %s, %s %d.%d.%d, %s)' % (__version__,
-                                                      tremolo.__version__,
-                                                      sys.implementation.name,
-                                                      *sys.version_info[:3],
-                                                      sys.platform)
+        'httpout %s (tremolo %s, %s %d.%d.%d, %s)' %
+        (__version__,
+         tremolo.__version__,
+         sys.implementation.name,
+         *sys.version_info[:3],
+         sys.platform)
     )
     return 0
 
diff --git a/httpout/httpout.py b/httpout/httpout.py
index 56c638a..bade490 100644
--- a/httpout/httpout.py
+++ b/httpout/httpout.py
@@ -223,10 +223,9 @@ async def _on_request(self, **server):
             server['request'] = HTTPRequest(request, server)
             server['response'] = HTTPResponse(response)
 
-            if (request.protocol.options['ws'] and
-                    b'upgrade' in request.headers and
-                    b'connection' in request.headers and
+            if (g.options['ws'] and
                     b'sec-websocket-key' in request.headers and
+                    b'upgrade' in request.headers and
                     request.headers[b'upgrade'].lower() == b'websocket'):
                 server['websocket'] = WebSocket(request, response)
             else:

From ead3bc3f6819930c45b7e0af42fe3ef614d9e612 Mon Sep 17 00:00:00 2001
From: nggit <contact@anggit.com>
Date: Wed, 12 Feb 2025 06:42:04 +0700
Subject: [PATCH 4/4] bump minimum tremolo version to 0.2.0

---
 pyproject.toml   | 2 +-
 requirements.txt | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/pyproject.toml b/pyproject.toml
index 8c1c43d..1f4fbc9 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -15,7 +15,7 @@ description = """\
 requires-python = '>=3.7'
 dependencies = [
     'awaiter',
-    'tremolo>=0.1.2',
+    'tremolo>=0.2.0',
 ]
 license = { text = 'MIT License' }
 classifiers = [
diff --git a/requirements.txt b/requirements.txt
index 9abf900..ca13626 100644
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,2 +1,2 @@
 awaiter
-tremolo>=0.1.2
+tremolo>=0.2.0