omlish 0.0.0.dev218__py3-none-any.whl → 0.0.0.dev220__py3-none-any.whl

omlish/http/coro/server.py

@@ -65,7 +65,7 @@ import typing as ta
 
 from ...lite.check import check
 from ...sockets.addresses import SocketAddress
-from ...sockets.handlers import SocketHandler  # noqa
+from ...sockets.handlers import SocketHandler_
 from ...sockets.io import SocketIoPair
 from ..handlers import HttpHandler
 from ..handlers import HttpHandlerRequest
@@ -205,6 +205,10 @@ class CoroHttpServer:
                     return h
             return None
 
+        def close(self) -> None:
+            if isinstance(d := self.data, HttpHandlerResponseStreamedData):
+                d.close()
+
     #
 
     def _build_response_head_bytes(self, a: _Response) -> bytes:
@@ -420,35 +424,45 @@ class CoroHttpServer:
         while True:
             gen = self.coro_handle_one()
 
-            o = next(gen)
             i: ta.Optional[bytes]
+            o: ta.Any = next(gen)
             while True:
-                if isinstance(o, self.AnyLogIo):
-                    i = None
-                    yield o
+                try:
+                    if isinstance(o, self.AnyLogIo):
+                        i = None
+                        yield o
 
-                elif isinstance(o, self.AnyReadIo):
-                    i = check.isinstance((yield o), bytes)
+                    elif isinstance(o, self.AnyReadIo):
+                        i = check.isinstance((yield o), bytes)
 
-                elif isinstance(o, self._Response):
-                    i = None
+                    elif isinstance(o, self._Response):
+                        i = None
 
-                    r = self._preprocess_response(o)
-                    hb = self._build_response_head_bytes(r)
-                    check.none((yield self.WriteIo(hb)))
+                        r = self._preprocess_response(o)
+                        hb = self._build_response_head_bytes(r)
+                        check.none((yield self.WriteIo(hb)))
 
-                    for b in self._yield_response_data(r):
-                        yield self.WriteIo(b)
+                        for b in self._yield_response_data(r):
+                            yield self.WriteIo(b)
 
-                else:
-                    raise TypeError(o)
+                        o.close()
+                        o = None
 
-                try:
-                    o = gen.send(i)
-                except EOFError:
-                    return
-                except StopIteration:
-                    break
+                    else:
+                        raise TypeError(o)  # noqa
+
+                    try:
+                        o = gen.send(i)
+                    except EOFError:
+                        return
+                    except StopIteration:
+                        break
+
+                except Exception:  # noqa
+                    if hasattr(o, 'close'):
+                        o.close()
+
+                    raise
 
     def coro_handle_one(self) -> ta.Generator[
         ta.Union[AnyLogIo, AnyReadIo, _Response],
@@ -530,34 +544,40 @@ class CoroHttpServer:
             yield self._build_error_response(err)
             return
 
-        # Build internal response
+        try:
+            # Build internal response
 
-        response_headers = handler_response.headers or {}
-        response_data = handler_response.data
+            response_headers = handler_response.headers or {}
+            response_data = handler_response.data
 
-        headers: ta.List[CoroHttpServer._Header] = [
-            *self._make_default_headers(),
-        ]
+            headers: ta.List[CoroHttpServer._Header] = [
+                *self._make_default_headers(),
+            ]
 
-        for k, v in response_headers.items():
-            headers.append(self._Header(k, v))
+            for k, v in response_headers.items():
+                headers.append(self._Header(k, v))
 
-        if handler_response.close_connection and 'Connection' not in headers:
-            headers.append(self._Header('Connection', 'close'))
+            if handler_response.close_connection and 'Connection' not in headers:
+                headers.append(self._Header('Connection', 'close'))
 
-        yield self._Response(
-            version=parsed.version,
-            code=http.HTTPStatus(handler_response.status),
-            headers=headers,
-            data=response_data,
-            close_connection=handler_response.close_connection,
-        )
+            yield self._Response(
+                version=parsed.version,
+                code=http.HTTPStatus(handler_response.status),
+                headers=headers,
+                data=response_data,
+                close_connection=handler_response.close_connection,
+            )
+
+        except Exception:  # noqa
+            handler_response.close()
+
+            raise
 
 
 ##
 
 
-class CoroHttpServerSocketHandler:  # SocketHandler
+class CoroHttpServerSocketHandler(SocketHandler_):
     def __init__(
             self,
             server_factory: CoroHttpServerFactory,

omlish/http/handlers.py

@@ -1,5 +1,6 @@
 # ruff: noqa: UP006 UP007
 # @omlish-lite
+import abc
 import dataclasses as dc
 import http.server
 import typing as ta
@@ -32,12 +33,20 @@ class HttpHandlerResponse:
     data: ta.Optional[HttpHandlerResponseData] = None
     close_connection: ta.Optional[bool] = None
 
+    def close(self) -> None:
+        if isinstance(d := self.data, HttpHandlerResponseStreamedData):
+            d.close()
+
 
 @dc.dataclass(frozen=True)
 class HttpHandlerResponseStreamedData:
     iter: ta.Iterable[bytes]
     length: ta.Optional[int] = None
 
+    def close(self) -> None:
+        if hasattr(d := self.iter, 'close'):
+            d.close()  # noqa
+
 
 class HttpHandlerError(Exception):
     pass
@@ -45,3 +54,9 @@ class HttpHandlerError(Exception):
 
 class UnsupportedMethodHttpHandlerError(Exception):
     pass
+
+
+class HttpHandler_(abc.ABC):  # noqa
+    @abc.abstractmethod
+    def __call__(self, req: HttpHandlerRequest) -> HttpHandlerResponse:
+        raise NotImplementedError

omlish/http/sessions.py

@@ -9,8 +9,8 @@ import typing as ta
 import zlib
 
 from .. import lang
-from .. import secrets as sec
 from ..funcs import pairs as fpa
+from ..secrets import all as sec
 from .cookies import dump_cookie
 from .cookies import parse_cookie
 from .json import JSON_TAGGER

omlish/http/simple.py

@@ -0,0 +1,101 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import concurrent.futures as cf
+import contextlib
+import functools
+import typing as ta
+
+from ..lite.check import check
+from ..sockets.addresses import SocketAndAddress
+from ..sockets.bind import CanSocketBinder
+from ..sockets.bind import SocketBinder
+from ..sockets.server.handlers import ExecutorSocketServerHandler
+from ..sockets.server.handlers import SocketHandlerSocketServerHandler
+from ..sockets.server.handlers import SocketServerHandler
+from ..sockets.server.handlers import SocketWrappingSocketServerHandler
+from ..sockets.server.handlers import StandardSocketServerHandler
+from ..sockets.server.server import SocketServer
+from ..sockets.server.threading import ThreadingSocketServerHandler
+from .coro.server import CoroHttpServer
+from .coro.server import CoroHttpServerSocketHandler
+from .handlers import HttpHandler
+from .parsing import HttpRequestParser
+from .versions import HttpProtocolVersion
+from .versions import HttpProtocolVersions
+
+
+if ta.TYPE_CHECKING:
+    import ssl
+
+
+@contextlib.contextmanager
+def make_simple_http_server(
+        bind: CanSocketBinder,
+        handler: HttpHandler,
+        *,
+        server_version: HttpProtocolVersion = HttpProtocolVersions.HTTP_1_1,
+        ssl_context: ta.Optional['ssl.SSLContext'] = None,
+        executor: ta.Optional[cf.Executor] = None,
+        use_threads: bool = False,
+) -> ta.Iterator[SocketServer]:
+    check.arg(not (executor is not None and use_threads))
+
+    #
+
+    with contextlib.ExitStack() as es:
+        server_factory = functools.partial(
+            CoroHttpServer,
+            handler=handler,
+            parser=HttpRequestParser(
+                server_version=server_version,
+            ),
+        )
+
+        socket_handler = CoroHttpServerSocketHandler(
+            server_factory,
+        )
+
+        #
+
+        server_handler: SocketServerHandler = SocketHandlerSocketServerHandler(
+            socket_handler,
+        )
+
+        #
+
+        if ssl_context is not None:
+            server_handler = SocketWrappingSocketServerHandler(
+                server_handler,
+                SocketAndAddress.socket_wrapper(functools.partial(
+                    ssl_context.wrap_socket,
+                    server_side=True,
+                )),
+            )
+
+        #
+
+        server_handler = StandardSocketServerHandler(
+            server_handler,
+        )
+
+        #
+
+        if executor is not None:
+            server_handler = ExecutorSocketServerHandler(
+                server_handler,
+                executor,
+            )
+
+        elif use_threads:
+            server_handler = es.enter_context(ThreadingSocketServerHandler(
+                server_handler,
+            ))
+
+        #
+
+        server = es.enter_context(SocketServer(
+            SocketBinder.of(bind),
+            server_handler,
+        ))
+
+        yield server

omlish/io/fileno.py

@@ -0,0 +1,11 @@
+# ruff: noqa: UP006 UP007
+# @omlish-lite
+import dataclasses as dc
+
+
+@dc.dataclass(frozen=True)
+class Fileno:
+    fd: int
+
+    def fileno(self) -> int:
+        return self.fd

omlish/lang/__init__.py

@@ -6,11 +6,12 @@ from .cached import (  # noqa
 
 from .classes import (  # noqa
     Abstract,
+    AbstractTypeError,
     AnySensitive,
     Callable,
     Descriptor,
     Final,
-    FinalError,
+    FinalTypeError,
     LazySingleton,
     Marker,
     Namespace,
@@ -26,6 +27,7 @@ from .classes import (  # noqa
     SimpleMetaDict,
     Singleton,
     Virtual,
+    get_abstract_methods,
     is_abstract,
     is_abstract_class,
     is_abstract_method,
@@ -52,6 +54,7 @@ from .cmp import (  # noqa
 
 from .contextmanagers import (  # noqa
     AsyncContextManager,
+    AsyncExitStacked,
     ContextManaged,
     ContextManager,
     ContextWrapped,

omlish/lang/cached.py

@@ -158,7 +158,6 @@ class _CachedFunction(ta.Generic[T]):
 
 
 class _CachedFunctionDescriptor(_CachedFunction[T]):
-
     def __init__(
             self,
             fn: ta.Callable[P, T],

omlish/lang/classes/__init__.py

@@ -1,5 +1,7 @@
 from .abstract import (  # noqa
     Abstract,
+    AbstractTypeError,
+    get_abstract_methods,
     is_abstract,
     is_abstract_class,
     is_abstract_method,
@@ -10,7 +12,7 @@ from .abstract import (  # noqa
 from .restrict import (  # noqa
     AnySensitive,
     Final,
-    FinalError,
+    FinalTypeError,
     NoBool,
     NotInstantiable,
     NotPicklable,

omlish/lang/classes/abstract.py

@@ -11,6 +11,8 @@ _ABSTRACT_METHODS_ATTR = '__abstractmethods__'
 _IS_ABSTRACT_METHOD_ATTR = '__isabstractmethod__'
 _FORCE_ABSTRACT_ATTR = '__forceabstract__'
 
+_INTERNAL_ABSTRACT_ATTRS = frozenset([_FORCE_ABSTRACT_ATTR])
+
 
 def make_abstract(obj: T) -> T:
     if callable(obj):
@@ -27,6 +29,10 @@ def make_abstract(obj: T) -> T:
         return obj
 
 
+class AbstractTypeError(TypeError):
+    pass
+
+
 class Abstract(abc.ABC):  # noqa
     __slots__ = ()
 
@@ -50,7 +56,7 @@ class Abstract(abc.ABC):  # noqa
                 ams.update(set(getattr(b, _ABSTRACT_METHODS_ATTR, [])) - seen)
                 seen.update(dir(b))
             if ams:
-                raise TypeError(
+                raise AbstractTypeError(
                     f'Cannot subclass abstract class {cls.__name__} with abstract methods: '
                     f'{", ".join(map(str, sorted(ams)))}',
                 )
@@ -78,6 +84,13 @@ def is_abstract(obj: ta.Any) -> bool:
     return is_abstract_method(obj) or is_abstract_class(obj)
 
 
+def get_abstract_methods(cls: type, *, include_internal: bool = False) -> frozenset[str]:
+    ms = frozenset(getattr(cls, _ABSTRACT_METHODS_ATTR))
+    if not include_internal:
+        ms -= _INTERNAL_ABSTRACT_ATTRS
+    return ms
+
+
 def unabstract_class(
         members: ta.Iterable[str | tuple[str, ta.Any]],
 ):  # -> ta.Callable[[type[T]], type[T]]:

omlish/lang/classes/restrict.py

@@ -9,7 +9,7 @@ from .abstract import is_abstract
 ##
 
 
-class FinalError(TypeError):
+class FinalTypeError(TypeError):
     def __init__(self, _type: type) -> None:
         super().__init__()
 
@@ -28,11 +28,11 @@ class Final(Abstract):
         abstracts: set[ta.Any] = set()
         for base in cls.__bases__:
             if base is Abstract:
-                raise FinalError(base)
+                raise FinalTypeError(base)
             elif base is Final:
                 continue
             elif Final in base.__mro__:
-                raise FinalError(base)
+                raise FinalTypeError(base)
             else:
                 abstracts.update(getattr(base, '__abstractmethods__', []))
 
@@ -40,9 +40,9 @@ class Final(Abstract):
             try:
                 v = cls.__dict__[a]
             except KeyError:
-                raise FinalError(a) from None
+                raise FinalTypeError(a) from None
             if is_abstract(v):
-                raise FinalError(a)
+                raise FinalTypeError(a)
 
 
 ##

omlish/lang/classes/virtual.py

@@ -28,7 +28,6 @@ def _make_not_instantiable():
 
 
 class _VirtualMeta(abc.ABCMeta):
-
     def __new__(mcls, name, bases, namespace):
         if 'Virtual' not in globals():
             return super().__new__(mcls, name, bases, namespace)

omlish/lang/clsdct.py

@@ -36,7 +36,6 @@ def get_caller_cls_dct(offset: int = 0) -> ta.MutableMapping[str, ta.Any]:
 
 
 class ClassDctFn:
-
     def __init__(self, fn: ta.Callable, offset: int | None = None, *, wrap=True) -> None:
         super().__init__()
 

omlish/lang/contextmanagers.py

@@ -19,7 +19,6 @@ T = ta.TypeVar('T')
 
 
 class ContextManaged:
-
     def __enter__(self) -> ta.Self:
         return self
 
@@ -33,7 +32,6 @@ class ContextManaged:
 
 
 class NopContextManaged(ContextManaged):
-
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         raise TypeError
 
@@ -42,7 +40,6 @@ NOP_CONTEXT_MANAGED = NopContextManaged()
 
 
 class NopContextManager:
-
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         raise TypeError
 
@@ -57,7 +54,6 @@ NOP_CONTEXT_MANAGER = NopContextManager()
 
 
 class ContextManager(abc.ABC, ta.Generic[T]):
-
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
 
@@ -87,7 +83,6 @@ class ContextManager(abc.ABC, ta.Generic[T]):
 
 
 class AsyncContextManager(abc.ABC, ta.Generic[T]):
-
     def __init_subclass__(cls, **kwargs: ta.Any) -> None:
         super().__init_subclass__(**kwargs)
 
@@ -191,7 +186,6 @@ def attr_setting(obj, attr, val, *, default=None):  # noqa
 
 
 class ExitStacked:
-
     @property
     def _exit_stack(self) -> contextlib.ExitStack:
         try:
@@ -229,7 +223,6 @@ class ExitStacked:
 
 
 class AsyncExitStacked:
-
     @property
     def _exit_stack(self) -> contextlib.AsyncExitStack:
         try:
@@ -276,7 +269,6 @@ ContextWrappable: ta.TypeAlias = ta.ContextManager | str | ta.Callable[..., ta.C
 
 
 class ContextWrapped:
-
     def __init__(self, fn: ta.Callable, cm: str | ContextWrappable) -> None:
         super().__init__()
 

omlish/lang/descriptors.py

@@ -197,7 +197,6 @@ decorator = _decorator
 
 
 class AccessForbiddenError(Exception):
-
     def __init__(self, name: str | None = None, *args: ta.Any, **kwargs: ta.Any) -> None:
         super().__init__(*((name,) if name is not None else ()), *args, **kwargs)  # noqa
         self.name = name

omlish/lang/maybes.py

@@ -11,7 +11,6 @@ class ValueNotPresentException(BaseException):
 
 
 class Maybe(abc.ABC, ta.Generic[T]):
-
     @property
     @abc.abstractmethod
     def present(self) -> bool:

omlish/lang/objects.py

@@ -140,9 +140,7 @@ def dir_dict(o: ta.Any) -> dict[str, ta.Any]:
 
 
 class SimpleProxy(ta.Generic[T]):
-
     class Descriptor:
-
         def __init__(self, attr: str) -> None:
             super().__init__()
             self._attr = attr

omlish/secrets/__init__.py

@@ -1,24 +0,0 @@
-from .secrets import (  # noqa
-    CachingSecrets,
-    CompositeSecrets,
-    EMPTY_SECRETS,
-    EmptySecrets,
-    EnvVarSecrets,
-    FnSecrets,
-    LoggingSecrets,
-    MappingSecrets,
-    Secret,
-    SecretRef,
-    SecretRefOrStr,
-    Secrets,
-    secret_field,
-    secret_repr,
-)
-
-
-##
-
-
-from ..lang.imports import _register_conditional_import  # noqa
-
-_register_conditional_import('..marshal', '.marshal', __package__)

omlish/secrets/all.py

@@ -0,0 +1,16 @@
+from .secrets import (  # noqa
+    CachingSecrets,
+    CompositeSecrets,
+    EMPTY_SECRETS,
+    EmptySecrets,
+    EnvVarSecrets,
+    FnSecrets,
+    LoggingSecrets,
+    MappingSecrets,
+    Secret,
+    SecretRef,
+    SecretRefOrStr,
+    Secrets,
+    secret_field,
+    secret_repr,
+)

omlish/secrets/secrets.py

@@ -335,3 +335,9 @@ class EnvVarSecrets(Secrets):
             return dct.pop(ekey)
         else:
             return dct[ekey]
+
+
+##
+
+
+lang.imports._register_conditional_import('..marshal', '.marshal', __package__)  # noqa

omlish/secrets/ssl.py

@@ -0,0 +1,9 @@
+# @omlish-lite
+# ruff: noqa: UP006 UP007
+import dataclasses as dc
+
+
+@dc.dataclass(frozen=True)
+class SslCert:
+    key_file: str
+    cert_file: str

omlish/secrets/tempssl.py

@@ -0,0 +1,50 @@
+# @omlish-lite
+# ruff: noqa: UP006 UP007
+import os.path
+import subprocess
+import tempfile
+import typing as ta
+
+from .ssl import SslCert
+
+
+class TempSslCert(ta.NamedTuple):
+    cert: SslCert
+    temp_dir: str
+
+
+def generate_temp_localhost_ssl_cert() -> TempSslCert:
+    temp_dir = tempfile.mkdtemp()
+
+    proc = subprocess.run(
+        [
+            'openssl',
+            'req',
+            '-x509',
+            '-newkey', 'rsa:2048',
+
+            '-keyout', 'key.pem',
+            '-out', 'cert.pem',
+
+            '-days', '365',
+
+            '-nodes',
+
+            '-subj', '/CN=localhost',
+            '-addext', 'subjectAltName = DNS:localhost,IP:127.0.0.1',
+        ],
+        cwd=temp_dir,
+        capture_output=True,
+        check=False,
+    )
+
+    if proc.returncode:
+        raise RuntimeError(f'Failed to generate temp ssl cert: {proc.stderr=}')
+
+    return TempSslCert(
+        SslCert(
+            key_file=os.path.join(temp_dir, 'key.pem'),
+            cert_file=os.path.join(temp_dir, 'cert.pem'),
+        ),
+        temp_dir,
+    )