rearrange

fetch.py

@@ -32,34 +32,6 @@ async def lifespan(app: FastAPI):
 app = FastAPI(lifespan=lifespan)
 
 
-@app.middleware("http")
-async def log_request(request: Request, call_next: Any):
-    ts = datetime.now().strftime("%y%m%d%H%M%S%f")
-    data = {
-        # "day": int(ts[:6]),
-        "dt": int(ts[:-3]),
-        "url": request.url,
-        "query_params": request.query_params,
-        "user-agent": request.headers.get("user-agent"),
-        "client": request.headers.get("x-forwarded-for"),
-        "private_ip": request.client.host,
-        "method": request.method,
-        "headers": str(request.headers),
-    }
-    output = json.dumps(
-        obj=data,
-        default=str,
-        indent=None,
-        separators=(", ", ":"),
-    )
-    with open(LOGFILE, "a") as f:
-        separator = "\n" if f.tell() else ""
-        f.write(separator + output)
-
-    response = await call_next(request)
-    return response
-
-
 @app.get("/")
 def read_root(request: Request):
     """Main URL returning an executable installer script.
@@ -106,6 +78,30 @@ def read_root(request: Request):
     return PlainTextResponse("\n".join(script))
 
 
+@app.middleware("http")
+async def log_request(request: Request, call_next: Any):
+    ts = datetime.now().strftime("%y%m%d%H%M%S%f")
+    data = {
+        # "day": int(ts[:6]),
+        "dt": int(ts[:-3]),
+        "url": request.url,
+        "query_params": request.query_params,
+        "user-agent": request.headers.get("user-agent"),
+        "client": request.headers.get("x-forwarded-for"),
+        "private_ip": request.client.host,
+        "method": request.method,
+        "headers": str(request.headers),
+    }
+    output = json.dumps(
+        obj=data, default=str, indent=None, separators=(", ", ":"), newline="\n"
+    )
+    with open(LOGFILE, "a") as f:
+        f.write(output)
+
+    response = await call_next(request)
+    return response
+
+
 @app.get("/a", response_class=PrettyJSONResponse)
 def get_analytics(n: int = 5):
     if n == 0:
@@ -113,7 +109,7 @@ def get_analytics(n: int = 5):
     else:
         cmd = f"tail -{n} {LOGFILE.as_posix()} | tac"
     json_lines = subprocess.run(cmd.split(), capture_output=True).stdout
-    content = json.loads(f"[{json_lines.replace(b"\n", b",").decode()}]")
+    content = json.loads(f"[ {json_lines.replace(b"\n", b",").decode()} ]")
     return content
 
 

pyproject.toml

@@ -1,6 +1,6 @@
 [project]
 name = "fetch"
-version = "0.4.0"
+version = "0.4.1"
 description = "Puppy Installer"
 authors = [
     { name = "Alex Kislukhin" }