kryten-webqueue 0.1.6__tar.gz → 0.2.1__tar.gz

{kryten_webqueue-0.1.6 → kryten_webqueue-0.2.1}/PKG-INFO

@@ -1,6 +1,6 @@
 Metadata-Version: 2.4
 Name: kryten-webqueue
-Version: 0.1.6
+Version: 0.2.1
 Summary: Netflix/Tubi-style catalog browser and pay-to-play queue management for CyTube
 Author: grobertson
 License-Expression: MIT

{kryten_webqueue-0.1.6 → kryten_webqueue-0.2.1}/config.example.json

@@ -5,7 +5,7 @@
   "secret_key": "CHANGE_ME_long_random_string",
   "session_ttl_hours": 24,
 
-  "api_gate_url": "http://127.0.0.1:24444",
+  "api_gate_url": "https://www.dropsugar.co:8443/",
   "api_gate_token": "CHANGE_ME",
 
   "mediacms_url": "https://www.dropsugar.com",

{kryten_webqueue-0.1.6 → kryten_webqueue-0.2.1}/deploy/nginx-queue.conf

@@ -1,9 +1,17 @@
 server {
-    listen 443 ssl http2;
+    listen 443 ssl;
+    http2 on;
     server_name queue.dropsugar.co;
 
     ssl_certificate     /etc/letsencrypt/live/queue.dropsugar.co/fullchain.pem;
     ssl_certificate_key /etc/letsencrypt/live/queue.dropsugar.co/privkey.pem;
+    ssl_protocols       TLSv1.2 TLSv1.3;
+    ssl_ciphers         ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305;
+    ssl_prefer_server_ciphers off;
+    ssl_session_cache   shared:SSL:10m;
+    ssl_session_timeout 1d;
+
+    add_header Strict-Transport-Security "max-age=31536000" always;
 
     # WebSocket upgrade
     location /ws {
@@ -21,6 +29,8 @@ server {
     # API + pages
     location / {
         proxy_pass http://127.0.0.1:2010;
+        proxy_http_version 1.1;
+        proxy_set_header Connection "";
         proxy_set_header Host $host;
         proxy_set_header X-Real-IP $remote_addr;
         proxy_set_header X-Forwarded-For $proxy_add_x_forwarded_for;
@@ -45,5 +55,5 @@ server {
 server {
     listen 80;
     server_name queue.dropsugar.co;
-    return 301 https://$server_name$request_uri;
+    return 301 https://$host$request_uri;
 }

kryten_webqueue-0.2.1/kryten_webqueue/__main__.py

@@ -0,0 +1,16 @@
+import os
+import uvicorn
+
+from .config import Config
+from .app import create_app
+
+
+def main():
+    config_path = os.environ.get("WQ_CONFIG", "/etc/kryten-webqueue/config.json")
+    config = Config.from_file(config_path)
+    app = create_app(config)
+    uvicorn.run(app, host=config.host, port=config.port)
+
+
+if __name__ == "__main__":
+    main()

{kryten_webqueue-0.1.6 → kryten_webqueue-0.2.1}/kryten_webqueue/routes/pages.py

@@ -36,7 +36,7 @@ async def login_page(request: Request):
     user = _get_user_or_none(request)
     if user:
         return RedirectResponse("/catalog/browse")
-    return templates.TemplateResponse("auth/login.html", {"request": request, "user": None})
+    return templates.TemplateResponse(request, "auth/login.html", {"user": None})
 
 
 @router.get("/catalog/browse", response_class=HTMLResponse)
@@ -47,8 +47,7 @@ async def catalog_browse_page(request: Request, category: str | None = None, pag
     db = request.app.state.db
     items = await db.browse(category=category, page=page)
     categories = await db.get_categories()
-    return templates.TemplateResponse("catalog/browse.html", {
-        "request": request,
+    return templates.TemplateResponse(request, "catalog/browse.html", {
         "user": user,
         "items": items,
         "categories": categories,
@@ -63,7 +62,7 @@ async def queue_page(request: Request):
     user = _get_user_or_none(request)
     if not user:
         return RedirectResponse("/auth/login")
-    return templates.TemplateResponse("queue/index.html", {"request": request, "user": user})
+    return templates.TemplateResponse(request, "queue/index.html", {"user": user})
 
 
 @router.get("/user/dashboard", response_class=HTMLResponse)
@@ -71,7 +70,7 @@ async def user_dashboard_page(request: Request):
     user = _get_user_or_none(request)
     if not user:
         return RedirectResponse("/auth/login")
-    return templates.TemplateResponse("user/dashboard.html", {"request": request, "user": user})
+    return templates.TemplateResponse(request, "user/dashboard.html", {"user": user})
 
 
 @router.get("/admin", response_class=HTMLResponse)
@@ -79,4 +78,4 @@ async def admin_page(request: Request):
     user = _get_user_or_none(request)
     if not user or user.get("rank", 0) < 3:
         return RedirectResponse("/auth/login")
-    return templates.TemplateResponse("admin/index.html", {"request": request, "user": user})
+    return templates.TemplateResponse(request, "admin/index.html", {"user": user})

{kryten_webqueue-0.1.6 → kryten_webqueue-0.2.1}/pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "kryten-webqueue"
-version = "0.1.6"
+version = "0.2.1"
 description = "Netflix/Tubi-style catalog browser and pay-to-play queue management for CyTube"
 readme = "README.md"
 license = "MIT"
@@ -41,5 +41,10 @@ build-backend = "hatchling.build"
 [tool.hatch.build.targets.wheel]
 packages = ["kryten_webqueue"]
 
+[tool.hatch.build.targets.wheel.shared-data]
+"deploy/nginx-queue.conf" = "share/kryten-webqueue/nginx-queue.conf"
+"deploy/kryten-webqueue.service" = "share/kryten-webqueue/kryten-webqueue.service"
+"config.example.json" = "share/kryten-webqueue/config.example.json"
+
 [tool.pytest.ini_options]
 asyncio_mode = "auto"

kryten_webqueue-0.1.6/kryten_webqueue/__main__.py

@@ -1,10 +0,0 @@
-import os
-import uvicorn
-
-from .config import Config
-from .app import create_app
-
-config_path = os.environ.get("WQ_CONFIG", "/etc/kryten-webqueue/config.json")
-config = Config.from_file(config_path)
-app = create_app(config)
-uvicorn.run(app, host=config.host, port=config.port)