omserv 0.0.0.dev24__tar.gz → 0.0.0.dev26__tar.gz

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omserv
-Version: 0.0.0.dev24
+Version: 0.0.0.dev26
 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.dev24
+Requires-Dist: omlish==0.0.0.dev26
 Provides-Extra: all
 Requires-Dist: h11~=0.14; extra == "all"
 Requires-Dist: h2~=4.1; extra == "all"

{omserv-0.0.0.dev24 → omserv-0.0.0.dev26}/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.dev24 → omserv-0.0.0.dev26}/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.dev26/omserv/_manifests.json

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

{omserv-0.0.0.dev24 → omserv-0.0.0.dev26}/omserv/nginx/build.py

@@ -10,7 +10,7 @@ from omlish import check
 from omlish import lang
 
 
-NGINX_VERSION = '1.27.0'
+NGINX_VERSION = '1.27.1'
 NGINX_SRC_URL = f'https://nginx.org/download/nginx-{NGINX_VERSION}.tar.gz'
 
 NGINX_VTS_VERSION = '0.2.2'

omserv-0.0.0.dev26/omserv/nginx/patches/nginx-1.27.1_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.dev26/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.dev24 → omserv-0.0.0.dev26}/omserv/server/protocols/h11.py

@@ -107,7 +107,8 @@ class H11Protocol(Protocol):
         self.client = client
         self.config = config
         self.connection: h11.Connection | H11WsConnection = h11.Connection(
-            h11.SERVER, max_incomplete_event_size=self.config.h11_max_incomplete_size,
+            h11.SERVER,
+            max_incomplete_event_size=self.config.h11_max_incomplete_size,
         )
         self.context = context
         self.keep_alive_requests = 0
@@ -176,31 +177,30 @@ class H11Protocol(Protocol):
                 await self.send(Closed())
                 break
 
-            else:
-                if isinstance(event, h11.Request):
-                    await self.send(Updated(idle=False))
-                    await self._check_protocol(event)
-                    await self._create_stream(event)
+            if isinstance(event, h11.Request):
+                await self.send(Updated(idle=False))
+                await self._check_protocol(event)
+                await self._create_stream(event)
 
-                elif event is h11.PAUSED:
-                    await self.can_read.clear()
-                    await self.can_read.wait()
+            elif event is h11.PAUSED:
+                await self.can_read.clear()
+                await self.can_read.wait()
 
-                elif isinstance(event, h11.ConnectionClosed) or event is h11.NEED_DATA:
-                    break
+            elif isinstance(event, h11.ConnectionClosed) or event is h11.NEED_DATA:
+                break
 
-                elif self.stream is None:
-                    break
+            elif self.stream is None:
+                break
 
-                elif isinstance(event, h11.Data):
-                    await self.stream.handle(Body(stream_id=STREAM_ID, data=event.data))
+            elif isinstance(event, h11.Data):
+                await self.stream.handle(Body(stream_id=STREAM_ID, data=event.data))
 
-                elif isinstance(event, h11.EndOfMessage):
-                    await self.stream.handle(EndBody(stream_id=STREAM_ID))
+            elif isinstance(event, h11.EndOfMessage):
+                await self.stream.handle(EndBody(stream_id=STREAM_ID))
 
-                elif isinstance(event, Data):
-                    # WebSocket pass through
-                    await self.stream.handle(event)
+            elif isinstance(event, Data):
+                # WebSocket pass through
+                await self.stream.handle(event)
 
     async def _create_stream(self, request: h11.Request) -> None:
         upgrade_value = ''
@@ -229,6 +229,7 @@ class H11Protocol(Protocol):
                 STREAM_ID,
             )
             self.connection = H11WsConnection(ta.cast(h11.Connection, self.connection))
+
         else:
             self.stream = HttpStream(
                 self.app,
@@ -255,6 +256,7 @@ class H11Protocol(Protocol):
                 raw_path=request.target,
             ),
         )
+
         self.keep_alive_requests += 1
         await self.context.mark_request()
 
@@ -283,6 +285,7 @@ class H11Protocol(Protocol):
 
     async def _maybe_recycle(self) -> None:
         await self._close_stream()
+
         if (
                 not self.context.terminated.is_set()
                 and self.connection.our_state is h11.DONE
@@ -297,6 +300,7 @@ class H11Protocol(Protocol):
                 self.scope = None
                 await self.can_read.set()
                 await self.send(Updated(idle=True))
+
         else:
             await self.can_read.set()
             await self.send(Closed())
@@ -316,7 +320,7 @@ class H11Protocol(Protocol):
             elif sanitised_name in {'content-length', 'transfer-encoding'}:
                 has_body = True
 
-        # h2c Upgrade requests with a body are a pain as the body must be fully recieved in HTTP/1.1 before the upgrade
+        # h2c Upgrade requests with a body are a pain as the body must be fully received in HTTP/1.1 before the upgrade
         # response and HTTP/2 takes over, so Hypercorn ignores the upgrade and responds in HTTP/1.1. Use a preflight
         # OPTIONS request to initiate the upgrade if really required (or just use h2).
         if upgrade_value.lower() == 'h2c' and not has_body:

{omserv-0.0.0.dev24 → omserv-0.0.0.dev26}/omserv/server/protocols/h2.py

@@ -138,13 +138,16 @@ class H2Protocol(Protocol):
             self.connection.initiate_upgrade_connection(settings)
         else:
             self.connection.initiate_connection()
+
         await self._flush()
+
         if headers is not None:
             event = h2.events.RequestReceived()
             event.stream_id = 1
             event.headers = headers
             await self._create_stream(event)
             await self.streams[event.stream_id].handle(EndBody(stream_id=event.stream_id))
+
         self.task_spawner.spawn(self.send_task)
 
     async def send_task(self) -> None:
@@ -178,6 +181,7 @@ class H2Protocol(Protocol):
                 await self._flush()
                 del self.stream_buffers[stream_id]
                 self.priority.remove_stream(stream_id)
+
         except (h2.exceptions.StreamClosedError, KeyError, h2.exceptions.ProtocolError):
             # Stream or connection has closed whilst waiting to send data, not a problem - just force close it.
             await self.stream_buffers[stream_id].close()
@@ -316,6 +320,7 @@ class H2Protocol(Protocol):
                 weight=event.weight,
                 exclusive=event.exclusive,
             )
+
         except priority.MissingStreamError:
             # Received PRIORITY frame before HEADERS frame
             self.priority.insert_stream(
@@ -345,6 +350,7 @@ class H2Protocol(Protocol):
                 self.stream_send,
                 request.stream_id,
             )
+
         else:
             self.streams[request.stream_id] = HttpStream(
                 self.app,
@@ -356,7 +362,9 @@ class H2Protocol(Protocol):
                 self.stream_send,
                 request.stream_id,
             )
+
         self.stream_buffers[request.stream_id] = StreamBuffer(self.context.event_class)
+
         try:
             self.priority.insert_stream(request.stream_id)
         except priority.DuplicateStreamError:
@@ -372,16 +380,21 @@ class H2Protocol(Protocol):
             method=method,
             raw_path=raw_path,
         ))
+
         self.keep_alive_requests += 1
         await self.context.mark_request()
 
     async def _create_server_push(
-        self, stream_id: int, path: bytes, headers: list[tuple[bytes, bytes]],
+        self,
+            stream_id: int,
+            path: bytes,
+            headers: list[tuple[bytes, bytes]],
     ) -> None:
         push_stream_id = self.connection.get_next_available_stream_id()
         request_headers = [(b':method', b'GET'), (b':path', path)]
         request_headers.extend(headers)
         request_headers.extend(response_headers(self.config, 'h2'))
+
         try:
             self.connection.push_stream(
                 stream_id=stream_id,
@@ -389,9 +402,11 @@ class H2Protocol(Protocol):
                 request_headers=request_headers,
             )
             await self._flush()
+
         except h2.exceptions.ProtocolError:
             # Client does not accept push promises or we are trying to push on a push promises request.
             pass
+
         else:
             event = h2.events.RequestReceived()
             event.stream_id = push_stream_id

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

@@ -1,6 +1,6 @@
 Metadata-Version: 2.1
 Name: omserv
-Version: 0.0.0.dev24
+Version: 0.0.0.dev26
 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.dev24
+Requires-Dist: omlish==0.0.0.dev26
 Provides-Extra: all
 Requires-Dist: h11~=0.14; extra == "all"
 Requires-Dist: h2~=4.1; extra == "all"

{omserv-0.0.0.dev24 → omserv-0.0.0.dev26}/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
@@ -23,10 +24,12 @@ omserv/nginx/build.py
 omserv/nginx/configs.py
 omserv/nginx/stubstatus.py
 omserv/nginx/patches/__init__.py
+omserv/nginx/patches/nginx-1.27.1_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
@@ -47,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.dev24 → omserv-0.0.0.dev26}/omserv.egg-info/requires.txt

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

{omserv-0.0.0.dev24 → omserv-0.0.0.dev26}/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.dev24'
+version = '0.0.0.dev26'
 classifiers = [
     'License :: OSI Approved :: BSD License',
     'Development Status :: 2 - Pre-Alpha',
@@ -22,7 +22,7 @@ classifiers = [
 ]
 description = 'omserv'
 dependencies = [
-    'omlish == 0.0.0.dev24',
+    'omlish == 0.0.0.dev26',
 ]
 
 [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',
+]