tina4-python 0.2.160__tar.gz → 0.2.162__tar.gz

{tina4_python-0.2.160 → tina4_python-0.2.162}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: tina4-python
-Version: 0.2.160
+Version: 0.2.162
 Summary: Tina4Python - This is not another framework for Python
 Author-email: Andre van Zuydam <andrevanzuydam@gmail.com>
 Requires-Python: <4.0,>=3.12

{tina4_python-0.2.160 → tina4_python-0.2.162}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "tina4-python"
-version = "0.2.160"
+version = "0.2.162"
 description = "Tina4Python - This is not another framework for Python"
 authors = [
     {name = "Andre van Zuydam",email = "andrevanzuydam@gmail.com"}

{tina4_python-0.2.160 → tina4_python-0.2.162}/tina4_python/Webserver.py

@@ -317,7 +317,17 @@ class Webserver:
             self.send_header("Access-Control-Allow-Credentials", "true", headers)
 
             headers_bytes = await self.get_headers(headers, self.response_protocol, HTTP_OK)
-            return headers_bytes if not asgi_response else (None, headers)
+            class _Tina4Response:
+                def __init__(self, content: str = "", http_code: int = HTTP_OK, content_type: str = "text/plain", headers: dict | None = None):
+                    self.content = content
+                    self.http_code = http_code
+                    self.content_type = content_type
+                    self.headers = headers or {}
+
+            if not asgi_response:
+                return headers_bytes
+
+            return _Tina4Response(content="", http_code=HTTP_OK, content_type="text/plain", headers={}), headers
 
         # ------------------------------------------------------------------
         # Query string parsing with nested support
@@ -534,9 +544,9 @@ class Webserver:
             # Route or WebSocket
             # ------------------------------------------------------------------
             if "sec-websocket-key" in lowercase_headers:
-                await self.get_response(self.method, reader, writer)
+                await self.get_response(self.method, scope={'type': 'websocket'}, reader=reader, writer=writer)
             else:
-                response_bytes = await self.get_response(self.method, reader, writer)
+                response_bytes = await self.get_response(self.method, scope={'type': 'http'}, reader=reader, writer=writer)
                 if response_bytes:
                     writer.write(response_bytes)
                     await writer.drain()
@@ -592,4 +602,4 @@ class Webserver:
         """
         if self.server:
             self.server.close()
-            self.running = False
+            self.running = False

{tina4_python-0.2.160 → tina4_python-0.2.162}/tina4_python/Websocket.py

@@ -32,12 +32,12 @@ class Websocket:
             else:
                 if os.name == "nt":
                     connection = await self.server.AioServer.accept(
-                        sock=TransportSocket(self.request.transport.transport._sock), # not working properly
+                        sock=TransportSocket(self.request.asgi_writer.transport._sock), # not working properly
                         headers=self.request.headers
                     )
                 else:
                     connection = await self.server.AioServer.accept(
-                        sock=self.request.transport.get_extra_info('socket').dup(),
+                        sock=self.request.asgi_writer.get_extra_info('socket').dup(),
                         headers=self.request.headers
                     )
             return connection

{tina4_python-0.2.160 → tina4_python-0.2.162}/tina4_python/__init__.py

@@ -413,8 +413,19 @@ async def app(scope, receive, send):
             if message["type"] != "websocket":
                 response_headers = []
                 for header in tina4_headers:
-                    header = header.split(":")
-                    response_headers.append([header[0].strip().encode(), header[1].strip().encode()])
+                    # ensure header is a str
+                    if isinstance(header, bytes):
+                        header = header.decode()
+                    else:
+                        header = str(header)
+
+                    # split only on the first ':' to preserve ':' in values (e.g. URLs with ports)
+                    name, sep, value = header.partition(":")
+                    if not sep:
+                        # malformed header, skip it
+                        continue
+
+                    response_headers.append([name.strip().encode(), value.lstrip().encode()])
 
                 await send({
                     'type': 'http.response.start',