Spaces:

Starchik1
/

Chat

Sleeping

App Files Files Community

Starchik1 commited on Nov 6, 2025

Commit

ceacad5

verified ·

1 Parent(s): bcd5aaa

Update main.py

Browse files

Files changed (1) hide show

main.py +273 -93

main.py CHANGED Viewed

@@ -9,7 +9,19 @@ import io
 app = Flask(__name__)
 app.config['SECRET_KEY'] = 'messenger-secret-key'
-socketio = SocketIO(app, cors_allowed_origins="*")
 # Хранилища данных
 users = {}
@@ -525,9 +537,34 @@ HTML_TEMPLATE = '''
             justify-content: center;
             font-size: 16px;
         }
     </style>
 </head>
 <body>
     <!-- Login Screen -->
     <div id="loginScreen" class="login-screen">
         <div style="text-align: center; margin-bottom: 30px;">
@@ -583,7 +620,7 @@ HTML_TEMPLATE = '''
     <div id="callScreen" class="call-screen">
         <div class="video-container">
             <div id="remoteVideoContainer" class="no-video remote-video">
-                <div>Нет видео</div>
             </div>
             <video id="localVideo" class="local-video" autoplay playsinline muted></video>
             <div class="call-info">
@@ -619,7 +656,7 @@ HTML_TEMPLATE = '''
     <script src="https://cdn.socket.io/4.5.0/socket.io.min.js"></script>
     <script>
-        const socket = io();
         let currentUser = null;
         let mediaRecorder = null;
         let audioChunks = [];
@@ -632,6 +669,8 @@ HTML_TEMPLATE = '''
         let callTimerInterval = null;
         let isMuted = false;
         let isVideoEnabled = true;
         // WebRTC configuration
         const rtcConfig = {
@@ -645,75 +684,155 @@ HTML_TEMPLATE = '''
             ]
         };
-        // Socket events
-        socket.on('registration_success', (data) => {
-            currentUser = data;
-            document.getElementById('loginScreen').style.display = 'none';
-            document.getElementById('chatScreen').style.display = 'flex';
-        });
-        socket.on('user_list_update', (data) => {
-            document.getElementById('onlineCount').textContent = data.count;
-            updateUsersList(data.users || []);
-        });
-        socket.on('new_message', (message) => {
-            displayMessage(message);
-        });
-        socket.on('new_voice_message', (data) => {
-            displayVoiceMessage(data);
-        });
-        socket.on('incoming_call', (data) => {
-            showIncomingCall(data.from_user, data.call_id, data.isVideo);
-        });
-        socket.on('call_answered', (data) => {
-            if (data.answer) {
-                startCall(data.isVideo, false);
-            } else {
-                alert('Пользователь отклонил звонок');
-                hideCallScreen();
-            }
-        });
-        socket.on('call_ended', () => {
-            alert('Звонок завершен');
-            endCall();
-        });
-        socket.on('webrtc_offer', async (data) => {
-            if (!peerConnection) {
-                await createPeerConnection(false);
-            }
-            await peerConnection.setRemoteDescription(new RTCSessionDescription(data.offer));
-            const answer = await peerConnection.createAnswer();
-            await peerConnection.setLocalDescription(answer);
-            socket.emit('webrtc_answer', {
-                answer: answer,
-                to_user: data.from_user,
-                call_id: data.call_id
             });
-        });
-        socket.on('webrtc_answer', async (data) => {
-            if (peerConnection) {
-                await peerConnection.setRemoteDescription(new RTCSessionDescription(data.answer));
-            }
-        });
-        socket.on('webrtc_ice_candidate', async (data) => {
-            if (peerConnection) {
-                await peerConnection.addIceCandidate(new RTCIceCandidate(data.candidate));
             }
-        });
         // UI Functions
         function registerUser() {
             const username = document.getElementById('usernameInput').value.trim();
             if (username) {
                 socket.emit('register', username);
             } else {
                 alert('Введите имя пользователя');
@@ -724,12 +843,14 @@ HTML_TEMPLATE = '''
             const input = document.getElementById('messageInput');
             const text = input.value.trim();
-            if (text) {
                 socket.emit('message', {
                     sender: currentUser.username,
                     text: text
                 });
                 input.value = '';
             }
         }
@@ -843,11 +964,15 @@ HTML_TEMPLATE = '''
                     reader.onload = function() {
                         const base64Audio = reader.result.split(',')[1];
-                        socket.emit('voice_message', {
-                            audio_data: base64Audio,
-                            sender: currentUser.username,
-                            duration: duration
-                        });
                     };
                     reader.readAsDataURL(audioBlob);
@@ -881,6 +1006,11 @@ HTML_TEMPLATE = '''
         // Call Functions
         function startCallWithUser(targetUser, isVideo) {
             currentCall = {
                 id: Date.now().toString(),
                 target: targetUser,
@@ -912,22 +1042,28 @@ HTML_TEMPLATE = '''
         function acceptCall() {
             document.getElementById('incomingCallOverlay').style.display = 'none';
-            socket.emit('call_answer', {
-                call_id: currentCall.id,
-                answer: true,
-                to_user: currentCall.target,
-                isVideo: currentCall.isVideo
-            });
-            startCall(currentCall.isVideo, true);
         }
         function rejectCall() {
-            socket.emit('call_answer', {
-                call_id: currentCall.id,
-                answer: false,
-                to_user: currentCall.target
-            });
             document.getElementById('incomingCallOverlay').style.display = 'none';
             currentCall = null;
@@ -958,11 +1094,13 @@ HTML_TEMPLATE = '''
                     const offer = await peerConnection.createOffer();
                     await peerConnection.setLocalDescription(offer);
-                    socket.emit('webrtc_offer', {
-                        offer: offer,
-                        to_user: currentCall.target,
-                        call_id: currentCall.id
-                    });
                 }
                 // Start call timer
@@ -985,6 +1123,7 @@ HTML_TEMPLATE = '''
             // Handle incoming stream
             peerConnection.ontrack = (event) => {
                 remoteStream = event.streams[0];
                 const remoteVideo = document.getElementById('remoteVideoContainer');
@@ -1009,7 +1148,7 @@ HTML_TEMPLATE = '''
             // Handle ICE candidates
             peerConnection.onicecandidate = (event) => {
-                if (event.candidate && currentCall) {
                     socket.emit('webrtc_ice_candidate', {
                         candidate: event.candidate,
                         to_user: currentCall.target
@@ -1023,6 +1162,10 @@ HTML_TEMPLATE = '''
                     document.getElementById('callStatus').textContent = 'Разговор';
                 }
             };
         }
         function showCallScreen(isVideo, status) {
@@ -1038,7 +1181,7 @@ HTML_TEMPLATE = '''
         function hideCallScreen() {
             document.getElementById('callScreen').style.display = 'none';
-            document.getElementById('remoteVideoContainer').innerHTML = '<div>Нет видео</div>';
             document.getElementById('remoteVideoContainer').className = 'no-video remote-video';
             if (callTimerInterval) {
@@ -1070,7 +1213,7 @@ HTML_TEMPLATE = '''
                 localStream = null;
             }
-            if (currentCall) {
                 socket.emit('call_end', {
                     to_user: currentCall.target,
                     call_id: currentCall.id
@@ -1134,6 +1277,18 @@ HTML_TEMPLATE = '''
                 sidebar.classList.remove('open');
             }
         });
     </script>
 </body>
 </html>
@@ -1153,21 +1308,34 @@ def handle_connect():
 @socketio.on('disconnect')
 def handle_disconnect():
     for user_id, user_data in list(users.items()):
         if user_data.get('sid') == request.sid:
             # End any active calls
             for call_id, call_data in list(active_calls.items()):
-                if call_data['from_user'] == user_data['username'] or call_data['to_user'] == user_data['username']:
-                    emit('call_ended', room=call_data['to_sid'])
                     del active_calls[call_id]
             del users[user_id]
             break
-    emit('user_list_update', {
-        'count': len(users),
-        'users': [user_data['username'] for user_data in users.values()]
-    }, broadcast=True)
 @socketio.on('register')
 def handle_register(username):
@@ -1267,7 +1435,14 @@ def handle_call_end(data):
     call_id = data.get('call_id')
     if call_id in active_calls:
         call_data = active_calls[call_id]
-        emit('call_ended', room=call_data['to_sid'])
         del active_calls[call_id]
 @socketio.on('webrtc_offer')
@@ -1337,8 +1512,13 @@ def cleanup_temp_files():
 if __name__ == '__main__':
     try:
         print("Запуск мобильного мессенджера...")
-        print("Откройте: http://localhost:5000")
-        print("TURN сервер: relay1.expressturn.com:3480")
-        socketio.run(app, host='0.0.0.0', port=5000, debug=True)
     finally:
         cleanup_temp_files()

 app = Flask(__name__)
 app.config['SECRET_KEY'] = 'messenger-secret-key'
+app.config['DEBUG'] = False
+# Настройки для production среды
+socketio = SocketIO(
+    app,
+    cors_allowed_origins="*",
+    ping_timeout=60,
+    ping_interval=25,
+    logger=True,
+    engineio_logger=False,
+    async_mode='eventlet',
+    max_http_buffer_size=100 * 1024 * 1024  # 100MB для больших файлов
+)
 # Хранилища данных
 users = {}
             justify-content: center;
             font-size: 16px;
         }
+        .connection-status {
+            position: fixed;
+            top: 10px;
+            right: 10px;
+            padding: 5px 10px;
+            border-radius: 15px;
+            font-size: 12px;
+            z-index: 3000;
+        }
+        .connected {
+            background: #4CAF50;
+            color: white;
+        }
+        .disconnected {
+            background: #FF4444;
+            color: white;
+        }
     </style>
 </head>
 <body>
+    <!-- Connection Status -->
+    <div id="connectionStatus" class="connection-status disconnected" style="display: none;">
+        Подключение...
+    </div>
     <!-- Login Screen -->
     <div id="loginScreen" class="login-screen">
         <div style="text-align: center; margin-bottom: 30px;">
     <div id="callScreen" class="call-screen">
         <div class="video-container">
             <div id="remoteVideoContainer" class="no-video remote-video">
+                <div>Ожидание подключения...</div>
             </div>
             <video id="localVideo" class="local-video" autoplay playsinline muted></video>
             <div class="call-info">
     <script src="https://cdn.socket.io/4.5.0/socket.io.min.js"></script>
     <script>
+        let socket;
         let currentUser = null;
         let mediaRecorder = null;
         let audioChunks = [];
         let callTimerInterval = null;
         let isMuted = false;
         let isVideoEnabled = true;
+        let reconnectAttempts = 0;
+        const MAX_RECONNECT_ATTEMPTS = 5;
         // WebRTC configuration
         const rtcConfig = {
             ]
         };
+        function initializeSocket() {
+            // Получаем базовый URL для корректного подключения к WebSocket
+            const protocol = window.location.protocol === 'https:' ? 'wss:' : 'ws:';
+            const host = window.location.host;
+            socket = io({
+                transports: ['websocket', 'polling'],
+                upgrade: true,
+                rememberUpgrade: true,
+                timeout: 10000,
+                pingTimeout: 60000,
+                pingInterval: 25000,
+                reconnection: true,
+                reconnectionAttempts: MAX_RECONNECT_ATTEMPTS,
+                reconnectionDelay: 1000,
+                reconnectionDelayMax: 5000
+            });
+            // Socket events
+            socket.on('connect', () => {
+                console.log('Connected to server');
+                updateConnectionStatus(true);
+                reconnectAttempts = 0;
+                // Re-register if we have a current user
+                if (currentUser) {
+                    socket.emit('register', currentUser.username);
+                }
+            });
+            socket.on('disconnect', (reason) => {
+                console.log('Disconnected from server:', reason);
+                updateConnectionStatus(false);
+                if (reason === 'io server disconnect') {
+                    // Server intentionally disconnected, try to reconnect
+                    setTimeout(() => {
+                        if (reconnectAttempts < MAX_RECONNECT_ATTEMPTS) {
+                            socket.connect();
+                            reconnectAttempts++;
+                        }
+                    }, 1000);
+                }
+            });
+            socket.on('connect_error', (error) => {
+                console.error('Connection error:', error);
+                updateConnectionStatus(false);
+            });
+            socket.on('registration_success', (data) => {
+                currentUser = data;
+                document.getElementById('loginScreen').style.display = 'none';
+                document.getElementById('chatScreen').style.display = 'flex';
+                updateConnectionStatus(true);
+            });
+            socket.on('user_list_update', (data) => {
+                document.getElementById('onlineCount').textContent = data.count;
+                updateUsersList(data.users || []);
+            });
+            socket.on('new_message', (message) => {
+                displayMessage(message);
+            });
+            socket.on('new_voice_message', (data) => {
+                displayVoiceMessage(data);
             });
+            socket.on('incoming_call', (data) => {
+                showIncomingCall(data.from_user, data.call_id, data.isVideo);
+            });
+            socket.on('call_answered', (data) => {
+                if (data.answer) {
+                    startCall(data.isVideo, false);
+                } else {
+                    alert('Пользователь отклонил звонок');
+                    hideCallScreen();
+                }
+            });
+            socket.on('call_ended', () => {
+                alert('Звонок завершен');
+                endCall();
+            });
+            socket.on('webrtc_offer', async (data) => {
+                console.log('Received WebRTC offer');
+                if (!peerConnection) {
+                    await createPeerConnection(false);
+                }
+                try {
+                    await peerConnection.setRemoteDescription(new RTCSessionDescription(data.offer));
+                    const answer = await peerConnection.createAnswer();
+                    await peerConnection.setLocalDescription(answer);
+                    socket.emit('webrtc_answer', {
+                        answer: answer,
+                        to_user: data.from_user,
+                        call_id: data.call_id
+                    });
+                } catch (error) {
+                    console.error('Error handling WebRTC offer:', error);
+                }
+            });
+            socket.on('webrtc_answer', async (data) => {
+                console.log('Received WebRTC answer');
+                if (peerConnection) {
+                    try {
+                        await peerConnection.setRemoteDescription(new RTCSessionDescription(data.answer));
+                    } catch (error) {
+                        console.error('Error setting remote description:', error);
+                    }
+                }
+            });
+            socket.on('webrtc_ice_candidate', async (data) => {
+                if (peerConnection && data.candidate) {
+                    try {
+                        await peerConnection.addIceCandidate(new RTCIceCandidate(data.candidate));
+                    } catch (error) {
+                        console.error('Error adding ICE candidate:', error);
+                    }
+                }
+            });
+        }
+        function updateConnectionStatus(connected) {
+            const statusElement = document.getElementById('connectionStatus');
+            statusElement.style.display = 'block';
+            if (connected) {
+                statusElement.textContent = '✓ Подключено';
+                statusElement.className = 'connection-status connected';
+            } else {
+                statusElement.textContent = '✗ Отключено';
+                statusElement.className = 'connection-status disconnected';
             }
+        }
         // UI Functions
         function registerUser() {
             const username = document.getElementById('usernameInput').value.trim();
             if (username) {
+                if (!socket || !socket.connected) {
+                    initializeSocket();
+                }
                 socket.emit('register', username);
             } else {
                 alert('Введите имя пользователя');
             const input = document.getElementById('messageInput');
             const text = input.value.trim();
+            if (text && socket && socket.connected) {
                 socket.emit('message', {
                     sender: currentUser.username,
                     text: text
                 });
                 input.value = '';
+            } else if (!socket || !socket.connected) {
+                alert('Нет подключения к серверу');
             }
         }
                     reader.onload = function() {
                         const base64Audio = reader.result.split(',')[1];
+                        if (socket && socket.connected) {
+                            socket.emit('voice_message', {
+                                audio_data: base64Audio,
+                                sender: currentUser.username,
+                                duration: duration
+                            });
+                        } else {
+                            alert('Нет подключения для отправки голосового сообщения');
+                        }
                     };
                     reader.readAsDataURL(audioBlob);
         // Call Functions
         function startCallWithUser(targetUser, isVideo) {
+            if (!socket || !socket.connected) {
+                alert('Нет подключения к серверу');
+                return;
+            }
             currentCall = {
                 id: Date.now().toString(),
                 target: targetUser,
         function acceptCall() {
             document.getElementById('incomingCallOverlay').style.display = 'none';
+            if (socket && socket.connected) {
+                socket.emit('call_answer', {
+                    call_id: currentCall.id,
+                    answer: true,
+                    to_user: currentCall.target,
+                    isVideo: currentCall.isVideo
+                });
+                startCall(currentCall.isVideo, true);
+            } else {
+                alert('Нет подключения к серверу');
+            }
         }
         function rejectCall() {
+            if (socket && socket.connected) {
+                socket.emit('call_answer', {
+                    call_id: currentCall.id,
+                    answer: false,
+                    to_user: currentCall.target
+                });
+            }
             document.getElementById('incomingCallOverlay').style.display = 'none';
             currentCall = null;
                     const offer = await peerConnection.createOffer();
                     await peerConnection.setLocalDescription(offer);
+                    if (socket && socket.connected) {
+                        socket.emit('webrtc_offer', {
+                            offer: offer,
+                            to_user: currentCall.target,
+                            call_id: currentCall.id
+                        });
+                    }
                 }
                 // Start call timer
             // Handle incoming stream
             peerConnection.ontrack = (event) => {
+                console.log('Received remote track:', event.track.kind);
                 remoteStream = event.streams[0];
                 const remoteVideo = document.getElementById('remoteVideoContainer');
             // Handle ICE candidates
             peerConnection.onicecandidate = (event) => {
+                if (event.candidate && currentCall && socket && socket.connected) {
                     socket.emit('webrtc_ice_candidate', {
                         candidate: event.candidate,
                         to_user: currentCall.target
                     document.getElementById('callStatus').textContent = 'Разговор';
                 }
             };
+            peerConnection.oniceconnectionstatechange = () => {
+                console.log('ICE connection state:', peerConnection.iceConnectionState);
+            };
         }
         function showCallScreen(isVideo, status) {
         function hideCallScreen() {
             document.getElementById('callScreen').style.display = 'none';
+            document.getElementById('remoteVideoContainer').innerHTML = '<div>Ожидание подключения...</div>';
             document.getElementById('remoteVideoContainer').className = 'no-video remote-video';
             if (callTimerInterval) {
                 localStream = null;
             }
+            if (currentCall && socket && socket.connected) {
                 socket.emit('call_end', {
                     to_user: currentCall.target,
                     call_id: currentCall.id
                 sidebar.classList.remove('open');
             }
         });
+        // Initialize socket on load
+        window.addEventListener('load', function() {
+            initializeSocket();
+        });
+        // Handle page visibility changes
+        document.addEventListener('visibilitychange', function() {
+            if (!document.hidden && (!socket || !socket.connected)) {
+                initializeSocket();
+            }
+        });
     </script>
 </body>
 </html>
 @socketio.on('disconnect')
 def handle_disconnect():
+    print(f'Client disconnected: {request.sid}')
+    # Find and remove the disconnected user
+    disconnected_user = None
     for user_id, user_data in list(users.items()):
         if user_data.get('sid') == request.sid:
+            disconnected_user = user_data['username']
             # End any active calls
             for call_id, call_data in list(active_calls.items()):
+                if call_data['from_user'] == disconnected_user or call_data['to_user'] == disconnected_user:
+                    try:
+                        emit('call_ended', room=call_data['to_sid'])
+                    except:
+                        pass
+                    try:
+                        emit('call_ended', room=call_data['from_sid'])
+                    except:
+                        pass
                     del active_calls[call_id]
             del users[user_id]
             break
+    if disconnected_user:
+        emit('user_list_update', {
+            'count': len(users),
+            'users': [user_data['username'] for user_data in users.values()]
+        }, broadcast=True)
 @socketio.on('register')
 def handle_register(username):
     call_id = data.get('call_id')
     if call_id in active_calls:
         call_data = active_calls[call_id]
+        try:
+            emit('call_ended', room=call_data['to_sid'])
+        except:
+            pass
+        try:
+            emit('call_ended', room=call_data['from_sid'])
+        except:
+            pass
         del active_calls[call_id]
 @socketio.on('webrtc_offer')
 if __name__ == '__main__':
     try:
         print("Запуск мобильного мессенджера...")
+        print("Порт: 7860")
+        socketio.run(
+            app,
+            host='0.0.0.0',
+            port=7860,
+            debug=False,
+            allow_unsafe_werkzeug=True
+        )
     finally:
         cleanup_temp_files()