Update main.py

main.py

@@ -1,40 +1,76 @@
-from fastapi import FastAPI, WebSocket, WebSocketDisconnect
-from fastapi.responses import HTMLResponse
+from flask import Flask, request, jsonify, Response
+from flask_executor import Executor
 import uuid
+import time
+import logging
+from collections import defaultdict, deque
+from threading import Lock
 
-app = FastAPI()
-transfers = {}
+app = Flask(__name__)
+executor = Executor(app)
 
-class ConnectionManager:
-    def __init__(self):
-        self.active_connections = {}
+# Хранилище для передачи чанков
+transfers = defaultdict(deque)
+locks = defaultdict(Lock)
+metadata = {}
+CHUNK_TIMEOUT = 300  # 5 минут
 
-    async def connect(self, transfer_id: str, websocket: WebSocket):
-        await websocket.accept()
-        if transfer_id not in self.active_connections:
-            self.active_connections[transfer_id] = []
-        self.active_connections[transfer_id].append(websocket)
+@app.route('/create_transfer', methods=['POST'])
+def create_transfer():
+    transfer_id = str(uuid.uuid4())
+    metadata[transfer_id] = {
+        'filename': request.json.get('filename', 'file'),
+        'created_at': time.time(),
+        'completed': False
+    }
+    return jsonify({'transfer_id': transfer_id})
 
-    def disconnect(self, transfer_id: str, websocket: WebSocket):
-        self.active_connections[transfer_id].remove(websocket)
+@app.route('/upload/<transfer_id>', methods=['POST'])
+def upload_chunk(transfer_id):
+    if transfer_id not in metadata:
+        return jsonify({'error': 'Invalid transfer ID'}), 404
+    
+    with locks[transfer_id]:
+        chunk = request.data
+        if chunk:
+            transfers[transfer_id].append(chunk)
+        else:
+            metadata[transfer_id]['completed'] = True
+    
+    return jsonify({'status': 'ok'})
 
-manager = ConnectionManager()
+@app.route('/stream/<transfer_id>')
+def stream_chunks(transfer_id):
+    def generate():
+        last_activity = time.time()
+        
+        while True:
+            with locks[transfer_id]:
+                if transfers[transfer_id]:
+                    chunk = transfers[transfer_id].popleft()
+                    last_activity = time.time()
+                    yield chunk
+                elif metadata.get(transfer_id, {}).get('completed', False):
+                    break
+                elif time.time() - last_activity > CHUNK_TIMEOUT:
+                    break
+            
+            time.sleep(0.1)  # Задержка для уменьшения нагрузки
+        
+        # Очистка данных
+        if transfer_id in metadata:
+            del metadata[transfer_id]
+            del transfers[transfer_id]
+            del locks[transfer_id]
 
-@app.post("/create_transfer")
-async def create_transfer():
-    transfer_id = str(uuid.uuid4())
-    transfers[transfer_id] = {"status": "waiting"}
-    return {"transfer_id": transfer_id}
+    return Response(
+        generate(),
+        mimetype='application/octet-stream',
+        headers={
+            'Content-Disposition': f'attachment; filename="{metadata[transfer_id]["filename"]}"',
+            'Transfer-Encoding': 'chunked'
+        }
+    )
 
-@app.websocket("/ws/{transfer_id}")
-async def websocket_endpoint(websocket: WebSocket, transfer_id: str):
-    await manager.connect(transfer_id, websocket)
-    try:
-        while True:
-            data = await websocket.receive_bytes()
-            # Пересылаем данные всем подключенным получателям
-            for connection in manager.active_connections.get(transfer_id, []):
-                if connection != websocket:
-                    await connection.send_bytes(data)
-    except WebSocketDisconnect:
-        manager.disconnect(transfer_id, websocket)
+if __name__ == '__main__':
+    app.run(debug=True)