Nail/contractor
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

v1.0.138: single httpx client for all chunks

Browse Source
This commit is contained in:
naeel
2026-06-23 09:12:21 +04:00
parent f04f698bd8
commit 948ec626c9
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
deploy/convert_server.py
+4 -4
View File
@@ -310,15 +310,15 @@ class Handler(BaseHTTPRequestHandler):
self._send_error_cors(400, "no file in request") self._send_error_cors(400, "no file in request")
return return
# Режем на чанки по 12KB (hex = 24KB, влезает в лимит Lucee ~50KB) # Режем на чанки и шлём через один клиент
CHUNK = 12000 CHUNK = 12000
upload_id = str(uuid.uuid4()) upload_id = str(uuid.uuid4())
raw = file_data raw = file_data
total = (len(raw) + CHUNK - 1) // CHUNK total = (len(raw) + CHUNK - 1) // CHUNK
with httpx.Client(http2=True, timeout=30) as client:
for i in range(total): for i in range(total):
chunk = raw[i*CHUNK:(i+1)*CHUNK] chunk = raw[i*CHUNK:(i+1)*CHUNK]
with httpx.Client(http2=True, timeout=30) as client:
r = client.post( r = client.post(
f"{LUCEE_URL}/chunk.cfm?action=put", f"{LUCEE_URL}/chunk.cfm?action=put",
json={ json={
@@ -333,11 +333,11 @@ class Handler(BaseHTTPRequestHandler):
self._send_error_cors(502, f"chunk {i+1}/{total} failed: HTTP {r.status_code}") self._send_error_cors(502, f"chunk {i+1}/{total} failed: HTTP {r.status_code}")
return return
# Собрать чанки в Lucee # Собрать чанки
with httpx.Client(http2=True, timeout=60) as client:
resp = client.post( resp = client.post(
f"{LUCEE_URL}/chunk.cfm?action=assemble", f"{LUCEE_URL}/chunk.cfm?action=assemble",
json={"upload_id": upload_id, "contract_id": contract_id}, json={"upload_id": upload_id, "contract_id": contract_id},
timeout=60
) )
if resp.status_code == 200: if resp.status_code == 200:
self.send_response(200) self.send_response(200)