Leo Vasanko
9854dd01cc
This is a major upgrade with assorted things included. - Navigation flows improved, search appears in URL history, cleared when navigating to another folder - More efficient file list format for faster loads - Efficient updates, never re-send full root another time (except at connection) - Large number of watching and filelist updates (inotify issues remain) - File size coloring - Fixed ZIP generation random glitches (thread race condition) - Code refactoring, cleanup, typing fixes - More tests Reviewed-on: #3
117 lines
3.5 KiB
Python
117 lines
3.5 KiB
Python
import asyncio
|
|
import typing
|
|
from secrets import token_bytes
|
|
|
|
import msgspec
|
|
from sanic import Blueprint
|
|
|
|
from cista import __version__, config, watching
|
|
from cista.fileio import FileServer
|
|
from cista.protocol import ControlTypes, FileRange, StatusMsg
|
|
from cista.util.apphelpers import asend, websocket_wrapper
|
|
|
|
bp = Blueprint("api", url_prefix="/api")
|
|
fileserver = FileServer()
|
|
|
|
|
|
@bp.before_server_start
|
|
async def start_fileserver(app, _):
|
|
await fileserver.start()
|
|
|
|
|
|
@bp.after_server_stop
|
|
async def stop_fileserver(app, _):
|
|
await fileserver.stop()
|
|
|
|
|
|
@bp.websocket("upload")
|
|
@websocket_wrapper
|
|
async def upload(req, ws):
|
|
alink = fileserver.alink
|
|
while True:
|
|
req = None
|
|
text = await ws.recv()
|
|
if not isinstance(text, str):
|
|
raise ValueError(
|
|
f"Expected JSON control, got binary len(data) = {len(text)}",
|
|
)
|
|
req = msgspec.json.decode(text, type=FileRange)
|
|
pos = req.start
|
|
data = None
|
|
while pos < req.end and (data := await ws.recv()) and isinstance(data, bytes):
|
|
sentsize = await alink(("upload", req.name, pos, data, req.size))
|
|
pos += typing.cast(int, sentsize)
|
|
if pos != req.end:
|
|
d = f"{len(data)} bytes" if isinstance(data, bytes) else data
|
|
raise ValueError(f"Expected {req.end - pos} more bytes, got {d}")
|
|
# Report success
|
|
res = StatusMsg(status="ack", req=req)
|
|
print("ack", res)
|
|
await asend(ws, res)
|
|
|
|
|
|
@bp.websocket("download")
|
|
@websocket_wrapper
|
|
async def download(req, ws):
|
|
alink = fileserver.alink
|
|
while True:
|
|
req = None
|
|
text = await ws.recv()
|
|
if not isinstance(text, str):
|
|
raise ValueError(
|
|
f"Expected JSON control, got binary len(data) = {len(text)}",
|
|
)
|
|
req = msgspec.json.decode(text, type=FileRange)
|
|
pos = req.start
|
|
while pos < req.end:
|
|
end = min(req.end, pos + (1 << 20))
|
|
data = typing.cast(bytes, await alink(("download", req.name, pos, end)))
|
|
await asend(ws, data)
|
|
pos += len(data)
|
|
# Report success
|
|
res = StatusMsg(status="ack", req=req)
|
|
await asend(ws, res)
|
|
|
|
|
|
@bp.websocket("control")
|
|
@websocket_wrapper
|
|
async def control(req, ws):
|
|
while True:
|
|
cmd = msgspec.json.decode(await ws.recv(), type=ControlTypes)
|
|
await asyncio.to_thread(cmd)
|
|
await asend(ws, StatusMsg(status="ack", req=cmd))
|
|
|
|
|
|
@bp.websocket("watch")
|
|
@websocket_wrapper
|
|
async def watch(req, ws):
|
|
await ws.send(
|
|
msgspec.json.encode(
|
|
{
|
|
"server": {
|
|
"name": config.config.name or config.config.path.name,
|
|
"version": __version__,
|
|
"public": config.config.public,
|
|
},
|
|
"user": {
|
|
"username": req.ctx.username,
|
|
"privileged": req.ctx.user.privileged,
|
|
}
|
|
if req.ctx.user
|
|
else None,
|
|
}
|
|
).decode()
|
|
)
|
|
uuid = token_bytes(16)
|
|
try:
|
|
with watching.state.lock:
|
|
q = watching.pubsub[uuid] = asyncio.Queue()
|
|
# Init with disk usage and full tree
|
|
await ws.send(watching.format_space(watching.state.space))
|
|
await ws.send(watching.format_root(watching.state.root))
|
|
# Send updates
|
|
while True:
|
|
await ws.send(await q.get())
|
|
finally:
|
|
del watching.pubsub[uuid]
|