omserv 0.0.0.dev23__tar.gz → 0.0.0.dev24__tar.gz

{omserv-0.0.0.dev23/omserv.egg-info → omserv-0.0.0.dev24}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omserv
-Version: 0.0.0.dev23
+Version: 0.0.0.dev24
 Summary: omserv
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev23
+Requires-Dist: omlish==0.0.0.dev24
 Provides-Extra: all
 Requires-Dist: h11~=0.14; extra == "all"
 Requires-Dist: h2~=4.1; extra == "all"

omserv-0.0.0.dev24/omserv/nginx/build.py

@@ -0,0 +1,122 @@
+import multiprocessing
+import os.path
+import shutil
+import subprocess
+import sys
+import tempfile
+import urllib.request
+
+from omlish import check
+from omlish import lang
+
+
+NGINX_VERSION = '1.27.0'
+NGINX_SRC_URL = f'https://nginx.org/download/nginx-{NGINX_VERSION}.tar.gz'
+
+NGINX_VTS_VERSION = '0.2.2'
+NGINX_VTS_SRC_URL = f'https://github.com/vozlt/nginx-module-vts/archive/refs/tags/v{NGINX_VTS_VERSION}.tar.gz'
+
+
+def build_nginx() -> None:
+    build_dir = tempfile.mkdtemp('-omlish-nginx-build')
+    print(f'{build_dir=}')
+
+    #
+
+    nginx_src_file = urllib.request.urlretrieve(NGINX_SRC_URL)[0]  # noqa
+    print(f'{nginx_src_file=}')
+
+    nginx_vts_src_file = urllib.request.urlretrieve(NGINX_VTS_SRC_URL)[0]  # noqa
+    print(f'{nginx_vts_src_file=}')
+
+    subprocess.check_call(['tar', 'xvzf', nginx_src_file, '-C', build_dir])
+    nginx_dir = os.path.join(build_dir, f'nginx-{NGINX_VERSION}')
+
+    subprocess.check_call(['tar', 'xvzf', nginx_vts_src_file, '-C', build_dir])
+    nginx_vts_dir = os.path.join(build_dir, f'nginx-module-vts-{NGINX_VTS_VERSION}')
+
+    #
+
+    patch_prefix = f'nginx-{NGINX_VERSION}_'
+    for r in lang.get_relative_resources('patches', globals=globals()).values():
+        if r.is_file and r.name.startswith(patch_prefix) and r.name.endswith('.patch'):
+            print(r.name)
+
+            patch_src = r.read_bytes()
+            subprocess.run(
+                ['git', 'apply'],
+                cwd=nginx_dir,
+                input=patch_src,
+                check=True,
+            )
+
+    #
+
+    cflags = [
+        '-g',
+        '-O2',
+        '-fstack-protector',
+    ]
+    ldflags = []
+
+    if sys.platform == 'darwin':
+        openssl_prefix = subprocess.check_output(['brew', '--prefix', 'openssl']).decode().strip()
+        pcre_prefix = subprocess.check_output(['brew', '--prefix', 'pcre']).decode().strip()
+        cflags.extend([
+            f'-I{openssl_prefix}/include',
+            f'-I{pcre_prefix}/include',
+        ])
+        ldflags.extend([
+            f'-L{openssl_prefix}/lib',
+            f'-L{pcre_prefix}/lib',
+        ])
+
+    subprocess.check_call([
+        check.not_none(shutil.which('sh')),
+
+        'configure',
+
+        f'--with-cc-opt={" ".join(cflags)}',
+        f'--with-ld-opt={" ".join(ldflags)}',
+
+        '--with-compat',
+        '--with-threads',
+        '--with-debug',
+        '--with-ipv6',
+        '--with-pcre',
+        '--with-pcre-jit',
+
+        '--with-http_auth_request_module',
+        '--with-http_gunzip_module',
+        '--with-http_gzip_static_module',
+        '--with-http_ssl_module',
+        '--with-http_stub_status_module',
+        '--with-http_v2_module',
+
+        '--with-stream',
+        '--with-stream_ssl_module',
+        '--with-stream_ssl_preread_module',
+
+        f'--add-module={nginx_vts_dir}',
+    ], cwd=nginx_dir)
+
+    #
+
+    make_jobs = max(multiprocessing.cpu_count() // 2, 1)
+    subprocess.check_call([
+        'make',
+        f'-j{make_jobs}',
+    ], cwd=nginx_dir)
+
+    #
+
+    exe_file = os.path.join(nginx_dir, 'objs', 'nginx')
+    print(exe_file)
+
+
+def _main() -> None:
+    build_nginx()
+
+
+if __name__ == '__main__':
+    _main()

omserv-0.0.0.dev24/omserv/nginx/configs.py

@@ -0,0 +1,86 @@
+"""
+TODO:
+ - omnibus/jmespath
+
+https://nginx.org/en/docs/dev/development_guide.html
+https://nginx.org/en/docs/dev/development_guide.html#config_directives
+https://nginx.org/en/docs/example.html
+
+https://github.com/yandex/gixy
+"""
+import dataclasses as dc
+import typing as ta
+
+from omlish import check
+from omlish import lang
+from omlish.text.indent import IndentWriter
+
+
+@dc.dataclass()
+class Items(lang.Final):
+    lst: list['Item']
+
+    @classmethod
+    def of(cls, obj: ta.Any) -> 'Items':
+        if isinstance(obj, Items):
+            return obj
+        return cls([Item.of(e) for e in check.isinstance(obj, list)])
+
+
+@dc.dataclass()
+class Item(lang.Final):
+    name: str
+    args: list[str] | None = None
+    block: Items | None = None
+
+    @classmethod
+    def of(cls, obj: ta.Any) -> 'Item':
+        if isinstance(obj, Item):
+            return obj
+        args = check.isinstance(obj, tuple)
+        name, args = check.isinstance(args[0], str), args[1:]
+        if args and not isinstance(args[-1], str):
+            block, args = Items.of(args[-1]), args[:-1]
+        else:
+            block = None
+        return Item(name, [check.isinstance(e, str) for e in args], block=block)
+
+
+def render(wr: IndentWriter, obj: ta.Any) -> None:
+    if isinstance(obj, Item):
+        wr.write(obj.name)
+        for e in obj.args or ():
+            wr.write(' ')
+            wr.write(e)
+        if obj.block:
+            wr.write(' {\n')
+            with wr.indent():
+                render(wr, obj.block)
+            wr.write('}\n')
+        else:
+            wr.write(';\n')
+
+    elif isinstance(obj, Items):
+        for e2 in obj.lst:
+            render(wr, e2)
+
+    else:
+        raise TypeError(obj)
+
+
+def _main() -> None:
+    conf = Items.of([
+        ('user', 'www', 'www'),
+        ('worker_processes', '2'),
+        ('events', [
+            ('worker_connections', '2000'),
+        ]),
+    ])
+
+    wr = IndentWriter()
+    render(wr, conf)
+    print(wr.getvalue())
+
+
+if __name__ == '__main__':
+    _main()

omserv-0.0.0.dev24/omserv/nginx/stubstatus.py

@@ -0,0 +1,73 @@
+import dataclasses as dc
+import re
+import textwrap
+import typing as ta
+
+
+@dc.dataclass(frozen=True, kw_only=True)
+class StubStatus:
+    active: int
+
+    # std: accepts handled requests
+    # ext: 2xx 4xx 5xx
+    counts: ta.Mapping[str, int]
+
+    reading: int
+    writing: int
+    waiting: int
+
+
+_ACTIVE_PAT = re.compile(r'^Active connections: (?P<active>\d+)')
+_RWW_PAT = re.compile(r'^Reading: (?P<reading>\d+) Writing: (?P<writing>\d+) Waiting: (?P<waiting>\d+)')
+
+
+def parse_stub_status(s: str) -> StubStatus:
+    # Active connections: 1
+    # server accepts handled requests 2xx 4xx 5xx
+    #  20 20 20 18 1 0
+    # Reading: 0 Writing: 1 Waiting: 0
+
+    lines = [l for l in s.splitlines() for l in [l.strip()] if l]
+    if len(lines) < 4:
+        raise Exception('Not enough lines')
+
+    if (active_m := _ACTIVE_PAT.match(lines[0])) is None:
+        raise Exception('Failed to match active line')
+    active = int(active_m.groupdict()['active'])
+
+    if (rww_m := _RWW_PAT.match(lines[3])) is None:
+        raise Exception('Failed to match rww line')
+    reading = int(rww_m.groupdict()['reading'])
+    writing = int(rww_m.groupdict()['writing'])
+    waiting = int(rww_m.groupdict()['waiting'])
+
+    ct_lbl = lines[1].split()[1:]
+    ct_val = lines[2].split()
+    if len(ct_lbl) != len(ct_val):
+        raise Exception('Counts label/value mismatch')
+    counts = {l: int(v) for l, v in zip(ct_lbl, ct_val)}
+
+    return StubStatus(
+        active=active,
+
+        counts=counts,
+
+        reading=reading,
+        writing=writing,
+        waiting=waiting,
+    )
+
+
+def _main() -> None:
+    s = textwrap.dedent("""
+        Active connections: 1
+        server accepts handled requests 2xx 4xx 5xx
+         20 20 20 18 1 0
+        Reading: 0 Writing: 1 Waiting: 0
+    """)
+    ss = parse_stub_status(s)
+    print(ss)
+
+
+if __name__ == '__main__':
+    _main()

{omserv-0.0.0.dev23 → omserv-0.0.0.dev24/omserv.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omserv
-Version: 0.0.0.dev23
+Version: 0.0.0.dev24
 Summary: omserv
 Author: wrmsr
 License: BSD-3-Clause
@@ -12,7 +12,7 @@ Classifier: Operating System :: OS Independent
 Classifier: Operating System :: POSIX
 Requires-Python: ~=3.12
 License-File: LICENSE
-Requires-Dist: omlish==0.0.0.dev23
+Requires-Dist: omlish==0.0.0.dev24
 Provides-Extra: all
 Requires-Dist: h11~=0.14; extra == "all"
 Requires-Dist: h2~=4.1; extra == "all"

{omserv-0.0.0.dev23 → omserv-0.0.0.dev24}/omserv.egg-info/SOURCES.txt

@@ -18,6 +18,11 @@ omserv/apps/markers.py
 omserv/apps/routes.py
 omserv/apps/sessions.py
 omserv/apps/templates.py
+omserv/nginx/__init__.py
+omserv/nginx/build.py
+omserv/nginx/configs.py
+omserv/nginx/stubstatus.py
+omserv/nginx/patches/__init__.py
 omserv/node/__init__.py
 omserv/node/models.py
 omserv/node/registry.py

{omserv-0.0.0.dev23 → omserv-0.0.0.dev24}/omserv.egg-info/requires.txt

@@ -1,4 +1,4 @@
-omlish==0.0.0.dev23
+omlish==0.0.0.dev24
 
 [all]
 h11~=0.14

{omserv-0.0.0.dev23 → omserv-0.0.0.dev24}/pyproject.toml

@@ -12,7 +12,7 @@ authors = [
 urls = {source = 'https://github.com/wrmsr/omlish'}
 license = {text = 'BSD-3-Clause'}
 requires-python = '~=3.12'
-version = '0.0.0.dev23'
+version = '0.0.0.dev24'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omserv'
 dependencies = [
-    'omlish == 0.0.0.dev23',
+    'omlish == 0.0.0.dev24',
 ]
 
 [project.optional-dependencies]