优化IOS
This commit is contained in:
@@ -76,35 +76,50 @@ class Handler(BaseHTTPRequestHandler):
|
||||
def _download(self):
|
||||
path = STATE["serve"]
|
||||
size = os.path.getsize(path)
|
||||
offset = 0
|
||||
header = self.headers.get("Range")
|
||||
# 老版本/别的实现可能整个忽略 Range,直接把整份文件送过来。
|
||||
# 客户端必须能识别这种服务端并回落单流下载。
|
||||
if STATE.get("ignore_range"):
|
||||
header = None
|
||||
# 与 sender.rs::parse_range 同一套语义:开区间与闭区间都接受,
|
||||
# 不支持后缀 Range,越界一律拒绝。
|
||||
offset, end = 0, max(size - 1, 0)
|
||||
if header:
|
||||
assert header.startswith("bytes="), "只支持 bytes= 形式的 Range"
|
||||
assert header.endswith("-"), "sender.rs 只支持单段开区间 Range"
|
||||
offset = int(header[len("bytes="):-1])
|
||||
assert 0 <= offset < size, "Range 越界"
|
||||
remaining = size - offset
|
||||
start_text, _, end_text = header[len("bytes="):].partition("-")
|
||||
assert start_text, "不支持后缀 Range"
|
||||
offset = int(start_text)
|
||||
end = int(end_text) if end_text else size - 1
|
||||
assert 0 <= offset < size and offset <= end < size, "Range 越界"
|
||||
remaining = 0 if size == 0 else end - offset + 1
|
||||
|
||||
self.send_response(206 if offset else 200)
|
||||
self.send_response(206 if header else 200)
|
||||
self.send_header("Content-Type", "application/octet-stream")
|
||||
self.send_header("Content-Length", str(remaining))
|
||||
self.send_header("Accept-Ranges", "bytes")
|
||||
if offset:
|
||||
self.send_header("Content-Range", "bytes %d-%d/%d" % (offset, size - 1, size))
|
||||
if header:
|
||||
self.send_header("Content-Range", "bytes %d-%d/%d" % (offset, end, size))
|
||||
self.send_header("X-QFT-Filename", b64url_encode(os.path.basename(path).encode("utf-8")))
|
||||
self.send_header("Connection", "close")
|
||||
# 并行下载会在一条连接上连续发多个 Range 请求,
|
||||
# sender.rs 对这种请求保持 keep-alive
|
||||
self.send_header("Connection", "keep-alive")
|
||||
self.end_headers()
|
||||
with open(path, "rb") as fh:
|
||||
fh.seek(offset)
|
||||
while True:
|
||||
block = fh.read(256 * 1024)
|
||||
left = remaining
|
||||
while left > 0:
|
||||
block = fh.read(min(256 * 1024, left))
|
||||
if not block:
|
||||
break
|
||||
self.wfile.write(block)
|
||||
left -= len(block)
|
||||
|
||||
# -------------------------------------------------- POST
|
||||
|
||||
def do_POST(self):
|
||||
# 配对是唯一不校验令牌的端点——它的作用正是换取令牌
|
||||
if self.path == "/qft/pair":
|
||||
return self._pair()
|
||||
if not self._authorized():
|
||||
return
|
||||
if self.path == "/qft/upload/init":
|
||||
@@ -115,6 +130,20 @@ class Handler(BaseHTTPRequestHandler):
|
||||
return self._upload_finish()
|
||||
return self._json(404, {"ok": False})
|
||||
|
||||
def _pair(self):
|
||||
"""receiver.rs::handle_pair:6 位十六进制秘密换会话令牌,错 5 次作废。"""
|
||||
max_failures = 5
|
||||
if STATE["pair_failures"] >= max_failures:
|
||||
return self._json(429, {"ok": False, "error": "配对码已因多次输入错误作废"})
|
||||
if self.headers.get("X-QFT-Code") != STATE["code"]:
|
||||
STATE["pair_failures"] += 1
|
||||
return self._json(403, {
|
||||
"ok": False,
|
||||
"remaining": max_failures - STATE["pair_failures"],
|
||||
})
|
||||
STATE["pair_failures"] = 0
|
||||
return self._json(200, {"ok": True, "token": STATE["token"]})
|
||||
|
||||
def _upload_init(self):
|
||||
name = b64url_decode(self.headers["X-QFT-Filename"]).decode("utf-8")
|
||||
size = int(self.headers["X-QFT-Size"])
|
||||
@@ -187,7 +216,7 @@ class Handler(BaseHTTPRequestHandler):
|
||||
|
||||
|
||||
def udp_responder(token, http_port, stop):
|
||||
"""QFTDISC2:<token> → QFTHERE2:<token>:<port>,对应 sender.rs 的发现线程。"""
|
||||
"""receiver.rs 的 UDP 线程:既回 QFTDISC2,也回不带令牌的 QFTBROWSE3。"""
|
||||
sock = socket.socket(socket.AF_INET, socket.SOCK_DGRAM)
|
||||
sock.setsockopt(socket.SOL_SOCKET, socket.SO_REUSEADDR, 1)
|
||||
try:
|
||||
@@ -197,6 +226,9 @@ def udp_responder(token, http_port, stop):
|
||||
sock.settimeout(0.25)
|
||||
expected = ("QFTDISC2:%s" % token).encode("ascii")
|
||||
reply = ("QFTHERE2:%s:%d" % (token, http_port)).encode("ascii")
|
||||
announce = ("QFTNODE3:" + json.dumps(
|
||||
{"n": "MOCK-PC", "p": "macos", "t": http_port, "r": True},
|
||||
separators=(",", ":"))).encode("utf-8")
|
||||
while not stop.is_set():
|
||||
try:
|
||||
data, peer = sock.recvfrom(512)
|
||||
@@ -204,7 +236,9 @@ def udp_responder(token, http_port, stop):
|
||||
continue
|
||||
except OSError:
|
||||
break
|
||||
if data == expected:
|
||||
if data == b"QFTBROWSE3":
|
||||
sock.sendto(announce, peer)
|
||||
elif data == expected:
|
||||
sock.sendto(reply, peer)
|
||||
sock.close()
|
||||
|
||||
@@ -216,9 +250,13 @@ def main():
|
||||
parser.add_argument("--save-dir", required=True, help="接收上传的目录")
|
||||
parser.add_argument("--port", type=int, default=0)
|
||||
parser.add_argument("--udp", action="store_true", help="同时启动 UDP 发现应答")
|
||||
parser.add_argument("--code", default="a1b2c3", help="/qft/pair 使用的 6 位十六进制秘密")
|
||||
parser.add_argument("--ignore-range", action="store_true",
|
||||
help="模拟不支持分段下载的电脑端,永远返回 200 整份文件")
|
||||
args = parser.parse_args()
|
||||
|
||||
STATE.update(token=args.token, serve=args.serve, save_dir=args.save_dir, uploads={})
|
||||
STATE.update(token=args.token, serve=args.serve, save_dir=args.save_dir, uploads={},
|
||||
code=args.code, pair_failures=0, ignore_range=args.ignore_range)
|
||||
os.makedirs(args.save_dir, exist_ok=True)
|
||||
|
||||
server = ThreadingHTTPServer(("127.0.0.1", args.port), Handler)
|
||||
|
||||
Reference in New Issue
Block a user