yhttp 9.5.0__tar.gz → 9.6.0__tar.gz

{yhttp-9.5.0/yhttp.egg-info → yhttp-9.6.0}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yhttp
-Version: 9.5.0
+Version: 9.6.0
 Summary: A very micro http framework.
 Home-page: http://github.com/yhttp/yhttp
 Author: Vahid Mardani

{yhttp-9.5.0 → yhttp-9.6.0}/tests/test_static.py

@@ -1,6 +1,11 @@
 from os import path
+from types import SimpleNamespace
 
 from bddrest import status, response, when
+import pytest
+
+from yhttp.core.headerset import HeaderSet
+from yhttp.core.static import file as staticfile
 
 
 def test_staticfile(app, httpreq, tmpdir):
@@ -17,6 +22,117 @@ def test_staticfile(app, httpreq, tmpdir):
         assert response == 'foo'
 
 
+def test_staticfile_byte_ranges(app, httpreq, tmpdir):
+    filename = path.join(tmpdir, 'range.txt')
+    with open(filename, 'wb') as f:
+        f.write(b'0123456789')
+
+    app.staticfile(r'/range\.txt', filename)
+
+    with httpreq('/range.txt', headers={'Range': 'bytes=2-5'}):
+        assert status == 206
+        assert response.headers['accept-ranges'] == 'bytes'
+        assert response.headers['content-range'] == 'bytes 2-5/10'
+        assert response.headers['content-length'] == '4'
+        assert response == '2345'
+
+    with httpreq('/range.txt', headers={'Range': 'bytes=-3'}):
+        assert status == 206
+        assert response.headers['content-range'] == 'bytes 7-9/10'
+        assert response == '789'
+
+    with httpreq('/range.txt', headers={'Range': 'bytes=20-'}):
+        assert status == 416
+        assert response.headers['content-range'] == 'bytes */10'
+
+    with httpreq('/range.txt', headers={'Range': 'bytes=-0'}):
+        assert status == 416
+        assert response.headers['content-range'] == 'bytes */10'
+
+    with httpreq('/range.txt', headers={'Range': 'invalid'}):
+        assert status == 200
+        assert response.headers['content-length'] == '10'
+        assert response == '0123456789'
+
+    with httpreq(
+        '/range.txt', headers={'Range': 'bytes=0-1,4-5'}
+    ):
+        assert status == 200
+        assert response == '0123456789'
+
+
+@pytest.mark.parametrize('range_header', [
+    'bytes=10',
+    'bytes=-',
+    'bytes=3-1',
+    'bytes=abc-def',
+    'bytes=--1',
+])
+def test_malformed_or_unsupported_ranges_send_full_file(
+    app, httpreq, tmpdir, range_header,
+):
+    filename = path.join(tmpdir, 'range.txt')
+    with open(filename, 'wb') as f:
+        f.write(b'0123456789')
+    app.staticfile(r'/range\.txt', filename)
+
+    with httpreq('/range.txt', headers={'Range': range_header}):
+        assert status == 200
+        assert response == '0123456789'
+
+
+def test_empty_static_file(app, httpreq, tmpdir):
+    filename = path.join(tmpdir, 'empty.txt')
+    open(filename, 'wb').close()
+    app.staticfile(r'/empty\.txt', filename)
+
+    with httpreq('/empty.txt'):
+        assert status == 200
+        assert response.headers['content-length'] == '0'
+        assert response == ''
+
+
+def test_staticfile_short_read_after_size_lookup(tmpdir):
+    filename = path.join(tmpdir, 'short.txt')
+    with open(filename, 'wb') as f:
+        f.write(b'content')
+
+    handler = staticfile(filename)
+    request = SimpleNamespace(
+        verb='get', environ={},
+        response=SimpleNamespace(headers=HeaderSet()),
+    )
+    open(filename, 'wb').close()
+
+    assert list(handler(request)) == []
+
+
+def test_staticdirectory_byte_ranges(app, httpreq, tmpdir):
+    filename = path.join(tmpdir, 'range.txt')
+    with open(filename, 'wb') as f:
+        f.write(b'0123456789')
+    app.staticdirectory('/static', tmpdir)
+
+    with httpreq('/static/range.txt', headers={'Range': 'bytes=3-'}):
+        assert status == 206
+        assert response.headers['content-range'] == 'bytes 3-9/10'
+        assert response == '3456789'
+
+
+def test_range_request_with_if_range_sends_full_file(app, httpreq, tmpdir):
+    filename = path.join(tmpdir, 'range.txt')
+    with open(filename, 'wb') as f:
+        f.write(b'0123456789')
+    app.staticfile(r'/range\.txt', filename)
+
+    with httpreq('/range.txt', headers={
+        'Range': 'bytes=2-5',
+        'If-Range': '"unknown-validator"',
+    }):
+        assert status == 200
+        assert response == '0123456789'
+
+
 def test_staticdirectory(app, httpreq, mktmptree):
     temproot = mktmptree({
         'bar': {

{yhttp-9.5.0 → yhttp-9.6.0}/yhttp/core/static.py

@@ -8,21 +8,94 @@ from . import statuses
 CHUNKSIZE = 1024 * 10
 
 
+def _byte_range(request, length):
+    """Return the selected byte interval, or None when Range is ignored."""
+    if request.verb != 'get' or 'HTTP_IF_RANGE' in request.environ:
+        return None
+
+    value = request.environ.get('HTTP_RANGE')
+    if not value or '=' not in value:
+        return None
+
+    unit, spec = value.split('=', 1)
+    if unit.strip().lower() != 'bytes' or ',' in spec:
+        # Multiple ranges are optional; ignore them and send the full entity.
+        return None
+
+    spec = spec.strip()
+    if '-' not in spec:
+        return None
+    first, last = (part.strip() for part in spec.split('-', 1))
+    if not first and not last:
+        return None
+
+    try:
+        if not first:
+            suffix_length = int(last)
+            if suffix_length < 0:
+                return None
+            if suffix_length == 0 or length == 0:
+                return False
+            return max(0, length - suffix_length), length - 1
+
+        start = int(first)
+        if last:
+            end = int(last)
+            if end < start:
+                return None
+        else:
+            end = length - 1
+    except ValueError:
+        return None
+
+    if start >= length:
+        return False
+    return start, min(end, length - 1)
+
+
+def _stream_file(request, filename, length, contenttype):
+    response = request.response
+    response.contenttype = contenttype
+    response.headers['accept-ranges'] = 'bytes'
+
+    byte_range = _byte_range(request, length)
+    if byte_range is False:
+        response.status = '416 Range Not Satisfiable'
+        response.headers['content-range'] = f'bytes */{length}'
+        response.length = 0
+        yield b''
+        return
+
+    if byte_range is None:
+        response.length = length
+        start, end = 0, length - 1
+    else:
+        start, end = byte_range
+        response.status = '206 Partial Content'
+        response.headers['content-range'] = f'bytes {start}-{end}/{length}'
+        response.length = end - start + 1
+
+    if not response.length:
+        yield b''
+        return
+
+    with open(filename, 'rb') as f:
+        f.seek(start)
+        remaining = response.length
+        while remaining:
+            chunk = f.read(min(CHUNKSIZE, remaining))
+            if not chunk:
+                break
+            remaining -= len(chunk)
+            yield chunk
+
+
 def file(filename):
     length = path.getsize(filename)
     type_ = guess_type(path.split(filename)[1])[0]
 
     def get(request):
-        response = request.response
-        response.length = length
-        response.contenttype = type_
-        with open(filename, 'rb') as f:
-            while True:
-                chunk = f.read(CHUNKSIZE)
-                if not chunk:
-                    break
-
-                yield chunk
+        yield from _stream_file(request, filename, length, type_)
 
     return get
 
@@ -145,14 +218,11 @@ def directory(rootpath, default=False, autoindex=True, fallback=False):
             if not path.exists(target):
                 raise statuses.notfound()
 
-        response.length = path.getsize(target)
-        response.contenttype = guess_type(path.split(target)[1])[0]
-        with open(target, 'rb') as f:
-            while True:
-                chunk = f.read(CHUNKSIZE)
-                if not chunk:
-                    break
-
-                yield chunk
+        yield from _stream_file(
+            request,
+            target,
+            path.getsize(target),
+            guess_type(path.split(target)[1])[0],
+        )
 
     return get

yhttp-9.6.0/yhttp/core/version.py

@@ -0,0 +1 @@
+__version__ = '9.6.0'

{yhttp-9.5.0 → yhttp-9.6.0/yhttp.egg-info}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: yhttp
-Version: 9.5.0
+Version: 9.6.0
 Summary: A very micro http framework.
 Home-page: http://github.com/yhttp/yhttp
 Author: Vahid Mardani

yhttp-9.5.0/yhttp/core/version.py

@@ -1 +0,0 @@
-__version__ = '9.5.0'