omserv 0.0.0.dev23__tar.gz → 0.0.0.dev25__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omserv
-Version: 0.0.0.dev23
+Version: 0.0.0.dev25
 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.dev25
 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.dev25}/README.rst

@@ -8,3 +8,6 @@ Core packages installable from git via:
 .. code-block::
 
   pip install 'git+https://github.com/wrmsr/omlish@master#subdirectory=.pkg/<pkg>'
+
+Core packages have no required dependencies, but numerous optional ones - see their respective ``pyproject.toml`` files
+for details.

{omserv-0.0.0.dev23 → omserv-0.0.0.dev25}/omserv/__about__.py

@@ -26,3 +26,16 @@ class Setuptools(SetuptoolsBase):
         'include': [Project.name, f'{Project.name}.*'],
         'exclude': [*SetuptoolsBase.find_packages['exclude']],
     }
+
+    package_data = {
+        **SetuptoolsBase.package_data,
+
+        '*': [
+            *SetuptoolsBase.package_data['*'],
+
+            '*.ico',
+            '*.j2',
+
+            '*.patch',
+        ],
+    }

omserv-0.0.0.dev25/omserv/_manifests.json

@@ -0,0 +1 @@
+[]

omserv-0.0.0.dev25/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.dev25/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.dev25/omserv/nginx/patches/nginx-1.27.0_http_status.patch

@@ -0,0 +1,109 @@
+diff --git a/src/event/ngx_event.c b/src/event/ngx_event.c
+index ef525d9..46ca5ee 100644
+--- a/src/event/ngx_event.c
++++ b/src/event/ngx_event.c
+@@ -75,6 +75,13 @@ ngx_atomic_t         *ngx_stat_writing = &ngx_stat_writing0;
+ static ngx_atomic_t   ngx_stat_waiting0;
+ ngx_atomic_t         *ngx_stat_waiting = &ngx_stat_waiting0;
+ 
++static ngx_atomic_t   ngx_stat_2xx0;
++ngx_atomic_t         *ngx_stat_2xx = &ngx_stat_2xx0;
++static ngx_atomic_t   ngx_stat_4xx0;
++ngx_atomic_t         *ngx_stat_4xx = &ngx_stat_4xx0;
++static ngx_atomic_t   ngx_stat_5xx0;
++ngx_atomic_t         *ngx_stat_5xx = &ngx_stat_5xx0;
++
+ #endif
+ 
+ 
+@@ -563,7 +570,10 @@ ngx_event_module_init(ngx_cycle_t *cycle)
+            + cl          /* ngx_stat_active */
+            + cl          /* ngx_stat_reading */
+            + cl          /* ngx_stat_writing */
+-           + cl;         /* ngx_stat_waiting */
++           + cl          /* ngx_stat_waiting */
++           + cl          /* ngx_stat_2xx */
++           + cl          /* ngx_stat_4xx */
++           + cl;         /* ngx_stat_5xx */
+ 
+ #endif
+ 
+@@ -610,6 +620,9 @@ ngx_event_module_init(ngx_cycle_t *cycle)
+     ngx_stat_reading = (ngx_atomic_t *) (shared + 7 * cl);
+     ngx_stat_writing = (ngx_atomic_t *) (shared + 8 * cl);
+     ngx_stat_waiting = (ngx_atomic_t *) (shared + 9 * cl);
++    ngx_stat_2xx = (ngx_atomic_t *) (shared + 10 * cl);
++    ngx_stat_4xx = (ngx_atomic_t *) (shared + 11 * cl);
++    ngx_stat_5xx = (ngx_atomic_t *) (shared + 12 * cl);
+ 
+ #endif
+ 
+diff --git a/src/event/ngx_event.h b/src/event/ngx_event.h
+index deac04e..48b7622 100644
+--- a/src/event/ngx_event.h
++++ b/src/event/ngx_event.h
+@@ -475,6 +475,10 @@ extern ngx_atomic_t  *ngx_stat_reading;
+ extern ngx_atomic_t  *ngx_stat_writing;
+ extern ngx_atomic_t  *ngx_stat_waiting;
+ 
++extern ngx_atomic_t  *ngx_stat_2xx;
++extern ngx_atomic_t  *ngx_stat_4xx;
++extern ngx_atomic_t  *ngx_stat_5xx;
++
+ #endif
+ 
+ 
+diff --git a/src/http/modules/ngx_http_stub_status_module.c b/src/http/modules/ngx_http_stub_status_module.c
+index db68b76..631427d 100644
+--- a/src/http/modules/ngx_http_stub_status_module.c
++++ b/src/http/modules/ngx_http_stub_status_module.c
+@@ -87,7 +87,7 @@ ngx_http_stub_status_handler(ngx_http_request_t *r)
+     ngx_int_t          rc;
+     ngx_buf_t         *b;
+     ngx_chain_t        out;
+-    ngx_atomic_int_t   ap, hn, ac, rq, rd, wr, wa;
++    ngx_atomic_int_t   ap, hn, ac, rq, rd, wr, wa, st2xx, st4xx, st5xx;
+ 
+     if (!(r->method & (NGX_HTTP_GET|NGX_HTTP_HEAD))) {
+         return NGX_HTTP_NOT_ALLOWED;
+@@ -124,12 +124,16 @@ ngx_http_stub_status_handler(ngx_http_request_t *r)
+     wr = *ngx_stat_writing;
+     wa = *ngx_stat_waiting;
+ 
++    st2xx = *ngx_stat_2xx;
++    st4xx = *ngx_stat_4xx;
++    st5xx = *ngx_stat_5xx;
++
+     b->last = ngx_sprintf(b->last, "Active connections: %uA \n", ac);
+ 
+-    b->last = ngx_cpymem(b->last, "server accepts handled requests\n",
+-                         sizeof("server accepts handled requests\n") - 1);
++    b->last = ngx_cpymem(b->last, "server accepts handled requests 2xx 4xx 5xx\n",
++                         sizeof("server accepts handled requests 2xx 4xx 5xx\n") - 1);
+ 
+-    b->last = ngx_sprintf(b->last, " %uA %uA %uA \n", ap, hn, rq);
++    b->last = ngx_sprintf(b->last, " %uA %uA %uA %uA %uA %uA \n", ap, hn, rq, st2xx, st4xx, st5xx);
+ 
+     b->last = ngx_sprintf(b->last, "Reading: %uA Writing: %uA Waiting: %uA \n",
+                           rd, wr, wa);
+diff --git a/src/http/ngx_http_request.c b/src/http/ngx_http_request.c
+index 3cca57c..46ff1fe 100644
+--- a/src/http/ngx_http_request.c
++++ b/src/http/ngx_http_request.c
+@@ -3797,6 +3797,16 @@ ngx_http_log_request(ngx_http_request_t *r)
+     ngx_http_handler_pt        *log_handler;
+     ngx_http_core_main_conf_t  *cmcf;
+ 
++#if (NGX_STAT_STUB)
++    if (r->headers_out.status >= 200 && r->headers_out.status < 300) {
++        (void) ngx_atomic_fetch_add(ngx_stat_2xx, 1);
++    } else if (r->headers_out.status >= 400 && r->headers_out.status < 500) {
++        (void) ngx_atomic_fetch_add(ngx_stat_4xx, 1);
++    } else if (r->headers_out.status >= 500 && r->headers_out.status < 600) {
++        (void) ngx_atomic_fetch_add(ngx_stat_5xx, 1);
++    }
++#endif
++
+     cmcf = ngx_http_get_module_main_conf(r, ngx_http_core_module);
+ 
+     log_handler = cmcf->phases[NGX_HTTP_LOG_PHASE].handlers.elts;

omserv-0.0.0.dev25/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.dev25/omserv/server/LICENSE

@@ -0,0 +1,14 @@
+Copyright P G Jones 2018.
+
+Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated
+documentation files (the "Software"), to deal in the Software without restriction, including without limitation the
+rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit
+persons to whom the Software is furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all copies or substantial portions of the
+Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE
+WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR
+COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omserv
-Version: 0.0.0.dev23
+Version: 0.0.0.dev25
 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.dev25
 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.dev25}/omserv.egg-info/SOURCES.txt

@@ -4,6 +4,7 @@ README.rst
 pyproject.toml
 omserv/__about__.py
 omserv/__init__.py
+omserv/_manifests.json
 omserv/dbs.py
 omserv/secrets.py
 omserv.egg-info/PKG-INFO
@@ -18,10 +19,17 @@ 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/nginx/patches/nginx-1.27.0_http_status.patch
 omserv/node/__init__.py
 omserv/node/models.py
 omserv/node/registry.py
 omserv/node/sql.py
+omserv/server/LICENSE
 omserv/server/__init__.py
 omserv/server/config.py
 omserv/server/debug.py
@@ -42,6 +50,7 @@ omserv/server/protocols/h2.py
 omserv/server/protocols/protocols.py
 omserv/server/protocols/types.py
 omserv/server/resources/__init__.py
+omserv/server/resources/favicon.ico
 omserv/server/streams/__init__.py
 omserv/server/streams/httpstream.py
 omserv/server/streams/utils.py

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

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

{omserv-0.0.0.dev23 → omserv-0.0.0.dev25}/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.dev25'
 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.dev25',
 ]
 
 [project.optional-dependencies]
@@ -40,7 +40,6 @@ server = [
 ]
 
 [tool.setuptools]
-include-package-data = false
 
 [tool.setuptools.packages.find]
 include = [
@@ -51,3 +50,16 @@ exclude = [
     '*.tests',
     '*.tests.*',
 ]
+
+[tool.setuptools.package-data]
+'*' = [
+    '*.c',
+    '*.cc',
+    '*.h',
+    '*.json',
+    '*.sql',
+    'LICENSE',
+    '*.ico',
+    '*.j2',
+    '*.patch',
+]