Videospace3

Sleeping

App Files Files Community

Aleksmorshen commited on 12 days ago

Commit

eb179ca

verified ·

1 Parent(s): 186a8b9

Update app.py

Browse files

Files changed (1) hide show

app.py +275 -221

app.py CHANGED Viewed

@@ -14,7 +14,7 @@ socketio = SocketIO(app)
 ROOMS_DB = os.path.join(app.root_path, 'rooms.json')
 USERS_DB = os.path.join(app.root_path, 'users.json')
-# Загрузка данных из JSON
 def load_json(file_path, default={}):
     try:
         if os.path.exists(file_path):
@@ -25,7 +25,6 @@ def load_json(file_path, default={}):
         print(f"Error loading JSON from {file_path}: {e}")
         return default
-# Сохранение данных в JSON
 def save_json(file_path, data):
     try:
         with open(file_path, 'w', encoding='utf-8') as f:
@@ -33,20 +32,16 @@ def save_json(file_path, data):
     except OSError as e:
         print(f"Error saving JSON to {file_path}: {e}")
-# Инициализация баз данных
 rooms = load_json(ROOMS_DB)
 users = load_json(USERS_DB)
-# Генерация токена
 def generate_token():
     return ''.join(random.choices(string.ascii_letters + string.digits, k=15))
-# Хеширование пароля
 def hash_password(password):
     return hashlib.sha256(password.encode('utf-8')).hexdigest()
-# Главная страница (регистрация/вход)
 @app.route('/', methods=['GET', 'POST'])
 def index():
     if 'username' in session:
@@ -79,7 +74,7 @@ def index():
     <title>Видеоконференция</title>
     <style>
        /* ... (стили из предыдущих ответов, без изменений) ... */
-       :root {
             --primary-color: #6200ee; /* Основной цвет */
             --secondary-color: #3700b3; /* Вторичный цвет */
             --background-color: #ffffff; /* Цвет фона */
@@ -207,7 +202,7 @@ def dashboard():
     <title>Панель управления</title>
     <style>
         /* ... (стили из предыдущих ответов, без изменений) ... */
-        :root {
             --primary-color: #6200ee;
             --secondary-color: #3700b3;
             --background-color: #ffffff;
@@ -335,13 +330,15 @@ def room(token):
     video_url = rooms[token]['video_url']
     video_state = rooms[token]['video_state']
-    return render_template_string('''<!DOCTYPE html>
 <html lang="ru">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Комната {{ token }}</title>
     <style>
         :root {
             --primary-color: #4CAF50; /* Зеленый */
             --secondary-color: #388E3C; /* Темно-зеленый */
@@ -660,27 +657,26 @@ def room(token):
     <div class="main-container">
         <div class="video-section">
-              <div id="shared-video-container">
-                  {% if video_url %}
-                      <iframe id="shared-video" src="{{ video_url }}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
-                        <div id="video-controls">
-                            <button id="play-pause" data-state="paused"><i class="material-icons">play_arrow</i></button>
-                            <button id="seek-backward"><i class="material-icons">replay_10</i></button>
-                            <button id="seek-forward"><i class="material-icons">forward_10</i></button>
-                        </div>
-                   {% endif %}
-               </div>
-                {% if is_admin %}
-                 <div class="admin-video-controls">
                     <input type="text" id="video-url-input" placeholder="URL видео (YouTube, Rutube, VK)">
                     <button id="set-video-url">Установить</button>
-                  </div>
-                {% endif %}
             <button class="leave-button" onclick="leaveRoom()">Покинуть комнату</button>
         </div>
-          <div class="video-grid-wrapper">
             <div class="video-grid" id="video-grid"></div>
         </div>
     </div>
@@ -695,12 +691,10 @@ def room(token):
         const iceConfig = {
             iceServers: [{ urls: 'stun:stun.l.google.com:19032' }]
         };
         let videoState = {{ video_state|tojson }};
-        // Функции для работы с общим видео
-        function setupSharedVideo() {
             const video = document.getElementById('shared-video');
             if (!video) return;
@@ -777,11 +771,9 @@ def room(token):
             }
         }
         socket.on('video_url_updated', (data) => {
-            const videoContainer = $('#shared-video-container'); // Используем jQuery
-            // Очищаем контейнер и создаем новый iframe
             videoContainer.empty();
             const newIframe = $('<iframe>', {
@@ -791,42 +783,32 @@ def room(token):
                 allow: 'accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share',
                 allowfullscreen: true
             });
-            // Добавляем iframe в контейнер
             videoContainer.append(newIframe);
-            // Добавляем кнопки управления
-             const videoControls = $('<div>', { id: 'video-controls' });
             videoControls.append($('<button>', { id: 'play-pause', 'data-state': 'paused' }).html('<i class="material-icons">play_arrow</i>'));
             videoControls.append($('<button>', { id: 'seek-backward' }).html('<i class="material-icons">replay_10</i>'));
             videoControls.append($('<button>', { id: 'seek-forward' }).html('<i class="material-icons">forward_10</i>'));
             videoContainer.append(videoControls);
             videoState = { playing: false, time: 0 };
-            setupSharedVideo();
         });
         socket.on('video_controlled', (data) => {
-            videoState = data.state;
-            if (data.action === 'play_pause') {
-                playPauseVideo(data.state.playing);
-            } else if (data.action === 'seek') {
-                seekVideo(data.state.time);
-            }
-            const playPauseButton = document.getElementById('play-pause');
             if (playPauseButton) {
                 playPauseButton.innerHTML = `<i class="material-icons">${data.state.playing ? 'pause' : 'play_arrow'}</i>`;
             }
         });
-        $(document).ready(() => {
-            setupSharedVideo();
-        });
-        socket.on('initial_video_state', (data) => {
-            videoState = data.state;
-            setupSharedVideo();
-        });
         function createControls(user, videoContainer) {
             const controls = document.createElement('div');
@@ -860,222 +842,233 @@ def room(token):
             const muteUserButton = document.createElement('button');
             muteUserButton.innerHTML = 'Mute';
             muteUserButton.title = `Mute ${targetUser}`;
-            muteUserButton.            muteUserButton.onclick = () => {
               socket.emit('admin_mute', { token, targetUser, byUser: username });
             };
-            adminControls.appendChild(muteUserButton);
             videoContainer.appendChild(adminControls);
         }
-        // Функции управления звуком/видео (локально)
         function toggleAudio(user, button) {
-          const muted = button.dataset.muted === 'true';
-          button.dataset.muted = !muted; // Инвертируем состояние
-          button.innerHTML = `<i class="material-icons">${!muted ? 'mic' : 'mic_off'}</i>`;
-          if (user === username) {
-              localStream.getAudioTracks().forEach(track => track.enabled = muted); // Меняем состояние трека
-          }
         }
         function toggleVideo(user, button) {
-            const muted = button.dataset.videoMuted === 'true';
-            button.dataset.videoMuted = !muted;
-            button.innerHTML = `<i class="material-icons">${!muted ? 'videocam' : 'videocam_off'}</i>`;
             if (user === username) {
-                localStream.getVideoTracks().forEach(track => track.enabled = muted);
             }
         }
-        // Получение локального видео/аудио потока
-        navigator.mediaDevices.getUserMedia({ video: true, audio: true })
-            .then(stream => {
-                localStream = stream;
-                addVideoStream(stream, username, true);
-                socket.emit('join', { token: token, username: username });
-            })
-            .catch(err => console.error('Ошибка доступа к камере/микрофону:', err));
-        // Добавление видео в сетку
-        function addVideoStream(stream, user, muted = false) {
-            console.log('Добавление видео для', user);
             const existingVideo = document.querySelector(`video[data-user="${user}"]`);
-            if (existingVideo) return;
-            const videoContainer = document.createElement('div'); // Контейнер
             videoContainer.classList.add('video-container');
             const video = document.createElement('video');
             video.srcObject = stream;
-            video.setAttribute('playsinline', '');
-            video.setAttribute('autoplay', '');
             video.addEventListener('loadedmetadata', () => {
-                video.play().catch(e => console.error('Autoplay error:', e));
             });
-            if (muted) video.muted = true;
-            video.dataset.user = user;
-             // Добавляем индикатор пользователя
             const userIndicator = document.createElement('div');
             userIndicator.classList.add('user-indicator');
             userIndicator.textContent = user;
             videoContainer.appendChild(userIndicator);
-            createControls(user, videoContainer); // Создаем кнопки управления
-            videoContainer.appendChild(video); // Видео внутрь контейнера
-            document.getElementById('video-grid').appendChild(videoContainer); // Добавляем контейнер
         }
-        // Создание соединения
-        function createPeerConnection(user) {
-          if (peers[user]) {
-            return peers[user].peerConnection; // Return existing connection
-          }
-          console.log('Создание RTCPeerConnection для', user);
-          const peerConnection = new RTCPeerConnection(iceConfig);
-          peers[user] = { peerConnection: peerConnection, iceCandidates: [] };
-          localStream.getTracks().forEach(track => peerConnection.addTrack(track, localStream));
-          peerConnection.ontrack = event => {
-            console.log('Получен поток от', user);
-            addVideoStream(event.streams[0], user);
-          };
-          // Обработка состояния соединения
-          peerConnection.oniceconnectionstatechange = () => {
-            console.log(`ICE connection state changed to ${peerConnection.iceConnectionState} for user ${user}`);
-            if (peerConnection.iceConnectionState === 'failed' || peerConnection.iceConnectionState === 'disconnected') {
-              console.warn(`Connection with ${user} failed or disconnected.`);
-              if(peers[user]){
-                  peers[user].peerConnection.close();
-                  delete peers[user];
-                  const video = document.querySelector(`video[data-user="${user}"]`);
-                  if (video) video.parentElement.remove();
-              }
-            }
-          };
-          peerConnection.onicecandidate = event => {
-            if (event.candidate) {
-              console.log('Отправка ICE-кандидата для', user);
-              socket.emit('signal', {
-                token: token,
-                from: username,
-                to: user,
-                signal: { type: 'candidate', candidate: event.candidate }
-              });
             }
-          };
-          return peerConnection;
         }
-        // Обработка входящих сигналов
         socket.on('signal', data => {
-          if (data.from === username) return;
-          console.log('Получен сигнал от', data.from, ':', data.signal.type);
-          let peerEntry = peers[data.from];
-          if (!peerEntry) {
-            createPeerConnection(data.from);
-            peerEntry = peers[data.from];
-          }
-          let peerConnection = peerEntry.peerConnection;
-          if (data.signal.type === 'offer') {
-            console.log('Обработка предложения от', data.from);
-            peerConnection.setRemoteDescription(new RTCSessionDescription(data.signal))
-              .then(() => peerConnection.createAnswer())
-              .then(answer => peerConnection.setLocalDescription(answer))
-              .then(() => {
-                socket.emit('signal', {
-                  token: token,
-                  from: username,
-                  to: data.from,
-                  signal: peerConnection.localDescription
-                });
-                //Добавление ICE-кандидатов из буффера
-                while (peerEntry.iceCandidates.length > 0) {
-                  const candidate = peerEntry.iceCandidates.shift();
-                  peerConnection.addIceCandidate(new RTCIceCandidate(candidate))
-                    .catch(err => console.error("Error adding ice candidate from buffer", err));
-                }
-              })
-              .catch(err => console.error('Ошибка обработки предложения:', err));
-          } else if (data.signal.type === 'answer') {
-            console.log('Обработка ответа от', data.from);
-            peerConnection.setRemoteDescription(new RTCSessionDescription(data.signal))
-              .then(() => {
-                //Добавление ICE-кандидатов из буффера
-                while (peerEntry.iceCandidates.length > 0) {
-                  const candidate = peerEntry.iceCandidates.shift();
-                  peerConnection.addIceCandidate(new RTCIceCandidate(candidate))
-                    .catch(err => console.error("Error adding ice candidate from buffer", err));
                 }
-              })
-              .catch(err => console.error('Ошибка установки ответа:', err));
-          } else if (data.signal.type === 'candidate') {
-            console.log('Обработка ICE-кандидата от', data.from);
-            if (peerConnection.remoteDescription) {
-                peerConnection.addIceCandidate(new RTCIceCandidate(data.signal.candidate))
-                    .catch(err => console.error('Ошибка добавления ICE-кандидата:', err));
-            } else {
-              // Если remote description еще не установлен, добавляем в буфер
-              peerEntry.iceCandidates.push(data.signal.candidate);
-              console.log("Ice candidate buffered for", data.from)
             }
-          }
         });
         socket.on('user_joined', data => {
-            console.log('Пользователь', data.username, 'присоединился');
-            document.getElementById('users').innerText = 'Пользователи: ' + data.users.join(', ');
-             if (data.username !== username) {
                 const peerConnection = createPeerConnection(data.username);
                 peerConnection.createOffer()
                     .then(offer => peerConnection.setLocalDescription(offer))
                     .then(() => {
                         socket.emit('signal', {
-                            token: token,
-                            from: username,
                             to: data.username,
                             signal: peerConnection.localDescription
                         });
                     })
-                    .catch(err => console.error('Ошибка создания предложения:', err));
             }
         });
-        socket.on('user_left', data => {
-          console.log('Пользователь', data.username, 'покинул комнату');
-          document.getElementById('users').innerText = 'Пользователи: ' + data.users.join(', ');
-          if (peers[data.username]) {
-            peers[data.username].peerConnection.close();
-            delete peers[data.username];
-            const video = document.querySelector(`video[data-user="${data.username}"]`);
-            if (video) video.parentElement.remove();
-          }
-        });
         socket.on('init_users', data => {
-            console.log('Инициализация пользователей:', data.users);
-            data.users.forEach(user => {
-                 if (user !== username) {
-                   createPeerConnection(user);
                 }
-            });
         });
-         socket.on('admin_muted', data => {
             if (data.targetUser === username) {
                 localStream.getAudioTracks().forEach(track => track.enabled = false);
                 const muteButton = document.querySelector(`.controls button[data-muted][data-user="${username}"]`);
                 if (muteButton) {
                     muteButton.dataset.muted = 'true';
@@ -1085,9 +1078,9 @@ def room(token):
         });
         function leaveRoom() {
-            socket.emit('leave', { token: token, username: username });
             if (localStream) {
-              localStream.getTracks().forEach(track => track.stop());
             }
             for (let user in peers) {
                 peers[user].peerConnection.close();
@@ -1095,47 +1088,56 @@ def room(token):
             window.location.href = '/dashboard';
         }
     </script>
 </body>
 </html>
 ''', token=token, session=session, is_admin=is_admin, video_url=video_url, video_state=video_state)
-# WebSocket события
 @socketio.on('join')
 def handle_join(data):
     token = data['token']
     username = data['username']
     if token in rooms and len(rooms[token]['users']) < rooms[token]['max_users']:
         join_room(token)
         if username not in rooms[token]['users']:
-            rooms[token]['users'].append(username)
-            save_json(ROOMS_DB, rooms)
         emit('initial_video_state', {'state': rooms[token]['video_state']}, to=request.sid)
         emit('user_joined', {'username': username, 'users': rooms[token]['users']}, room=token)
         emit('init_users', {'users': rooms[token]['users']}, to=request.sid)
     else:
-        emit('error_message', {'message': 'Комната переполнена'}, to=request.sid)
 @socketio.on('leave')
 def handle_leave(data):
     token = data['token']
     username = data['username']
     if token in rooms and username in rooms[token]['users']:
         leave_room(token)
         rooms[token]['users'].remove(username)
         if rooms[token]['admin'] == username:
-             del rooms[token]
         save_json(ROOMS_DB, rooms)
         emit('user_left', {'username': username, 'users': rooms[token]['users']}, room=token)
 @socketio.on('signal')
 def handle_signal(data):
-    emit('signal', data, room=data['token'], skip_sid=request.sid)
 @socketio.on('admin_mute')
 def handle_admin_mute(data):
@@ -1150,8 +1152,20 @@ def handle_admin_mute(data):
 def handle_set_video_url(data):
     token = data['token']
     video_url = data['video_url']
     if token in rooms and rooms[token]['admin'] == session.get('username'):
         rooms[token]['video_url'] = video_url
         rooms[token]['video_state'] = {'playing': False, 'time': 0}
         save_json(ROOMS_DB, rooms)
@@ -1162,7 +1176,7 @@ def handle_video_control(data):
     token = data['token']
     action = data['action']
     if token not in rooms:
-      return
     if action == 'play_pause':
         rooms[token]['video_state']['playing'] = data['state']['playing']
@@ -1172,5 +1186,45 @@ def handle_video_control(data):
     save_json(ROOMS_DB, rooms)
     emit('video_controlled', {'action': action, 'state': rooms[token]['video_state']}, room=token)
 if __name__ == '__main__':
     socketio.run(app, host='0.0.0.0', port=7860, debug=True, allow_unsafe_werkzeug=True)

 ROOMS_DB = os.path.join(app.root_path, 'rooms.json')
 USERS_DB = os.path.join(app.root_path, 'users.json')
+# Загрузка и сохранение JSON (с обработкой ошибок)
 def load_json(file_path, default={}):
     try:
         if os.path.exists(file_path):
         print(f"Error loading JSON from {file_path}: {e}")
         return default
 def save_json(file_path, data):
     try:
         with open(file_path, 'w', encoding='utf-8') as f:
     except OSError as e:
         print(f"Error saving JSON to {file_path}: {e}")
 rooms = load_json(ROOMS_DB)
 users = load_json(USERS_DB)
 def generate_token():
     return ''.join(random.choices(string.ascii_letters + string.digits, k=15))
 def hash_password(password):
     return hashlib.sha256(password.encode('utf-8')).hexdigest()
+# ... (остальные функции: index, dashboard, logout - без изменений) ...
 @app.route('/', methods=['GET', 'POST'])
 def index():
     if 'username' in session:
     <title>Видеоконференция</title>
     <style>
        /* ... (стили из предыдущих ответов, без изменений) ... */
+              :root {
             --primary-color: #6200ee; /* Основной цвет */
             --secondary-color: #3700b3; /* Вторичный цвет */
             --background-color: #ffffff; /* Цвет фона */
     <title>Панель управления</title>
     <style>
         /* ... (стили из предыдущих ответов, без изменений) ... */
+               :root {
             --primary-color: #6200ee;
             --secondary-color: #3700b3;
             --background-color: #ffffff;
     video_url = rooms[token]['video_url']
     video_state = rooms[token]['video_state']
+    return render_template_string('''
+<!DOCTYPE html>
 <html lang="ru">
 <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
     <title>Комната {{ token }}</title>
     <style>
+/* ... (стили из последнего полного листинга, с небольшими изменениями) ... */
         :root {
             --primary-color: #4CAF50; /* Зеленый */
             --secondary-color: #388E3C; /* Темно-зеленый */
     <div class="main-container">
         <div class="video-section">
+            <div id="shared-video-container">
+                {% if video_url %}
+                    <iframe id="shared-video" src="{{ video_url }}" frameborder="0" allow="accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share" allowfullscreen></iframe>
+                    <div id="video-controls">
+                        <button id="play-pause" data-state="paused"><i class="material-icons">play_arrow</i></button>
+                        <button id="seek-backward"><i class="material-icons">replay_10</i></button>
+                        <button id="seek-forward"><i class="material-icons">forward_10</i></button>
+                    </div>
+                {% endif %}
+            </div>
+            {% if is_admin %}
+                <div class="admin-video-controls">
                     <input type="text" id="video-url-input" placeholder="URL видео (YouTube, Rutube, VK)">
                     <button id="set-video-url">Установить</button>
+                </div>
+            {% endif %}
             <button class="leave-button" onclick="leaveRoom()">Покинуть комнату</button>
         </div>
+        <div class="video-grid-wrapper">
             <div class="video-grid" id="video-grid"></div>
         </div>
     </div>
         const iceConfig = {
             iceServers: [{ urls: 'stun:stun.l.google.com:19032' }]
         };
         let videoState = {{ video_state|tojson }};
+        // ... (функции setupSharedVideo, playPauseVideo, seekVideo - без изменений) ...
+         function setupSharedVideo() {
             const video = document.getElementById('shared-video');
             if (!video) return;
             }
         }
+        // Обработчики событий сокетов, связанных с общим видео (без изменений)
         socket.on('video_url_updated', (data) => {
+            const videoContainer = $('#shared-video-container');
             videoContainer.empty();
             const newIframe = $('<iframe>', {
                 allow: 'accelerometer; autoplay; clipboard-write; encrypted-media; gyroscope; picture-in-picture; web-share',
                 allowfullscreen: true
             });
             videoContainer.append(newIframe);
+            const videoControls = $('<div>', { id: 'video-controls' });
             videoControls.append($('<button>', { id: 'play-pause', 'data-state': 'paused' }).html('<i class="material-icons">play_arrow</i>'));
             videoControls.append($('<button>', { id: 'seek-backward' }).html('<i class="material-icons">replay_10</i>'));
             videoControls.append($('<button>', { id: 'seek-forward' }).html('<i class="material-icons">forward_10</i>'));
             videoContainer.append(videoControls);
             videoState = { playing: false, time: 0 };
+            setupSharedVideo(); // Важно!
         });
         socket.on('video_controlled', (data) => {
+          videoState = data.state;
+          if (data.action === 'play_pause') {
+              playPauseVideo(data.state.playing);
+          } else if (data.action === 'seek') {
+              seekVideo(data.state.time);
+          }
+          const playPauseButton = document.getElementById('play-pause');
             if (playPauseButton) {
                 playPauseButton.innerHTML = `<i class="material-icons">${data.state.playing ? 'pause' : 'play_arrow'}</i>`;
             }
         });
+        // Функции для WebRTC (с исправлениями)
         function createControls(user, videoContainer) {
             const controls = document.createElement('div');
             const muteUserButton = document.createElement('button');
             muteUserButton.innerHTML = 'Mute';
             muteUserButton.title = `Mute ${targetUser}`;
+            muteUserButton.onclick = () => {
               socket.emit('admin_mute', { token, targetUser, byUser: username });
             };
+            adminControls.            appendChild(muteUserButton);
             videoContainer.appendChild(adminControls);
         }
         function toggleAudio(user, button) {
+            const muted = button.dataset.muted === 'true';
+            button.dataset.muted = !muted;
+            button.innerHTML = `<i class="material-icons">${!muted ? 'mic' : 'mic_off'}</i>`;
+            if (user === username) {
+                localStream.getAudioTracks().forEach(track => track.enabled = !muted);
+            }
         }
         function toggleVideo(user, button) {
+            const videoMuted = button.dataset.videoMuted === 'true';
+            button.dataset.videoMuted = !videoMuted;
+            button.innerHTML = `<i class="material-icons">${!videoMuted ? 'videocam' : 'videocam_off'}</i>`;
             if (user === username) {
+                localStream.getVideoTracks().forEach(track => track.enabled = !videoMuted);
             }
         }
+        function addVideoStream(stream, user, isLocal = false) {
+            console.log('Adding video stream for', user);
             const existingVideo = document.querySelector(`video[data-user="${user}"]`);
+            if (existingVideo) {
+                console.log('Video already exists for', user, 'Replacing stream.');
+                existingVideo.srcObject = stream; // Заменяем поток, если видео уже есть
+                return;
+            }
+            const videoContainer = document.createElement('div');
             videoContainer.classList.add('video-container');
             const video = document.createElement('video');
             video.srcObject = stream;
+            video.dataset.user = user;
+            video.setAttribute('playsinline', '');  // iOS
+            video.setAttribute('autoplay', '');   // Важно для автоматического воспроизведения
+            if (isLocal) {
+                video.muted = true; // Локальное видео мьютим
+            }
             video.addEventListener('loadedmetadata', () => {
+                video.play().catch(e => console.error("Autoplay failed:", e));
             });
             const userIndicator = document.createElement('div');
             userIndicator.classList.add('user-indicator');
             userIndicator.textContent = user;
             videoContainer.appendChild(userIndicator);
+            createControls(user, videoContainer); // Создаем кнопки
+            videoContainer.appendChild(video);
+            document.getElementById('video-grid').appendChild(videoContainer);
         }
+        navigator.mediaDevices.getUserMedia({ video: true, audio: true })
+            .then(stream => {
+                localStream = stream;
+                addVideoStream(stream, username, true); // Добавляем локальное видео *сразу*
+                socket.emit('join', { token, username });
+            })
+            .catch(err => console.error("Error accessing media devices:", err));
+        function createPeerConnection(remoteUser) {
+            if (peers[remoteUser]) {
+                return peers[remoteUser].peerConnection; // Already exists
             }
+            const peerConnection = new RTCPeerConnection(iceConfig);
+            peers[remoteUser] = { peerConnection: peerConnection, iceCandidates: [] };
+            // Добавляем *все* треки из localStream в peerConnection
+            localStream.getTracks().forEach(track => {
+                peerConnection.addTrack(track, localStream);
+            });
+            peerConnection.ontrack = event => {
+                console.log('Received remote stream from', remoteUser);
+                addVideoStream(event.streams[0], remoteUser); // Добавляем удаленное видео
+            };
+            peerConnection.oniceconnectionstatechange = () => {
+              console.log(`ICE state change for ${remoteUser}: ${peerConnection.iceConnectionState}`);
+                if (peerConnection.iceConnectionState === 'failed' || peerConnection.iceConnectionState === 'disconnected') {
+                    console.warn(`Connection with ${remoteUser} failed or disconnected.`);
+                    if (peers[remoteUser]) {
+                        peers[remoteUser].peerConnection.close();
+                        delete peers[remoteUser];
+                         const videoElement = document.querySelector(`video[data-user="${remoteUser}"]`);
+                        if (videoElement) {
+                          videoElement.parentElement.remove(); // Удаляем контейнер
+                        }
+                    }
+                }
+            };
+            peerConnection.onicecandidate = event => {
+                if (event.candidate) {
+                    socket.emit('signal', {
+                        to: remoteUser,
+                        from: username,
+                        token: token,
+                        signal: { type: 'candidate', candidate: event.candidate }
+                    });
+                }
+            };
+            return peerConnection;
         }
         socket.on('signal', data => {
+            if (data.from === username) return; // Ignore signals from self
+            let peerEntry = peers[data.from];
+            if (!peerEntry) {
+                // Если нет соединения, создаем новое
+                createPeerConnection(data.from);
+                peerEntry = peers[data.from]; // Get updated peerEntry
+            }
+            const peerConnection = peerEntry.peerConnection;
+            if (data.signal.type === 'offer') {
+                peerConnection.setRemoteDescription(new RTCSessionDescription(data.signal))
+                    .then(() => peerConnection.createAnswer())
+                    .then(answer => peerConnection.setLocalDescription(answer))
+                    .then(() => {
+                        socket.emit('signal', {
+                            to: data.from,
+                            from: username,
+                            token: token,
+                            signal: peerConnection.localDescription
+                        });
+                        // Add buffered candidates
+                        while(peerEntry.iceCandidates.length > 0){
+                            const candidate = peerEntry.iceCandidates.shift();
+                            peerConnection.addIceCandidate(new RTCIceCandidate(candidate))
+                            .catch(err => console.error("Failed to add buffered ICE candidate:", err));
+                        }
+                    })
+                    .catch(err => console.error("Error handling offer:", err));
+            } else if (data.signal.type === 'answer') {
+                peerConnection.setRemoteDescription(new RTCSessionDescription(data.signal))
+                .then(() => {
+                   // Add buffered candidates
+                    while(peerEntry.iceCandidates.length > 0){
+                        const candidate = peerEntry.iceCandidates.shift();
+                        peerConnection.addIceCandidate(new RTCIceCandidate(candidate))
+                        .catch(err => console.error("Failed to add buffered ICE candidate:", err));
+                    }
+                })
+                .catch(err => console.error("Error handling answer:", err));
+            } else if (data.signal.type === 'candidate') {
+                if (peerConnection.remoteDescription) {
+                    peerConnection.addIceCandidate(new RTCIceCandidate(data.signal.candidate))
+                        .catch(err => console.error("Error adding ice candidate:", err));
+                } else {
+                    // Buffer the candidate
+                    peerEntry.iceCandidates.push(data.signal.candidate);
+                    console.log("Candidate buffered for", data.from);
                 }
             }
         });
         socket.on('user_joined', data => {
+            console.log('User joined:', data.username);
+            document.getElementById('users').innerText = 'Users: ' + data.users.join(', ');
+            // Create offer for the newly joined user
+            if (data.username !== username) {
                 const peerConnection = createPeerConnection(data.username);
                 peerConnection.createOffer()
                     .then(offer => peerConnection.setLocalDescription(offer))
                     .then(() => {
                         socket.emit('signal', {
                             to: data.username,
+                            from: username,
+                            token: token,
                             signal: peerConnection.localDescription
                         });
                     })
+                    .catch(err => console.error("Error creating offer:", err));
             }
         });
         socket.on('init_users', data => {
+          console.log("Initial users:", data.users);
+          // Create peer connections for existing users.
+          data.users.forEach(user => {
+            if (user !== username) {
+              createPeerConnection(user);
+            }
+          });
+        });
+        socket.on('user_left', data => {
+            console.log('User left:', data.username);
+            document.getElementById('users').innerText = 'Users: ' + data.users.join(', ');
+            if (peers[data.username]) {
+                peers[data.username].peerConnection.close();
+                delete peers[data.username];
+                const videoElement = document.querySelector(`video[data-user="${data.username}"]`);
+                if(videoElement){
+                  videoElement.parentElement.remove(); // Remove the container
                 }
+            }
         });
+        socket.on('admin_muted', data => {
             if (data.targetUser === username) {
                 localStream.getAudioTracks().forEach(track => track.enabled = false);
                 const muteButton = document.querySelector(`.controls button[data-muted][data-user="${username}"]`);
                 if (muteButton) {
                     muteButton.dataset.muted = 'true';
         });
         function leaveRoom() {
+            socket.emit('leave', { token, username });
             if (localStream) {
+                localStream.getTracks().forEach(track => track.stop());
             }
             for (let user in peers) {
                 peers[user].peerConnection.close();
             window.location.href = '/dashboard';
         }
+         $(document).ready(() => {
+            setupSharedVideo(); // Важно! Инициализация после загрузки DOM
+        });
     </script>
 </body>
 </html>
 ''', token=token, session=session, is_admin=is_admin, video_url=video_url, video_state=video_state)
+# WebSocket events
 @socketio.on('join')
 def handle_join(data):
     token = data['token']
     username = data['username']
+    print(f"User {username} joining room {token}")
     if token in rooms and len(rooms[token]['users']) < rooms[token]['max_users']:
         join_room(token)
         if username not in rooms[token]['users']:
+          rooms[token]['users'].append(username)
+          save_json(ROOMS_DB, rooms)
         emit('initial_video_state', {'state': rooms[token]['video_state']}, to=request.sid)
+        # Broadcast to everyone (including the new user)
         emit('user_joined', {'username': username, 'users': rooms[token]['users']}, room=token)
+        # Send the list of users directly to the new user
         emit('init_users', {'users': rooms[token]['users']}, to=request.sid)
     else:
+        emit('error_message', {'message': 'Room is full or does not exist'}, to=request.sid)
 @socketio.on('leave')
 def handle_leave(data):
     token = data['token']
     username = data['username']
+    print(f"User {username} leaving room {token}")
     if token in rooms and username in rooms[token]['users']:
         leave_room(token)
         rooms[token]['users'].remove(username)
         if rooms[token]['admin'] == username:
+            del rooms[token]
         save_json(ROOMS_DB, rooms)
         emit('user_left', {'username': username, 'users': rooms[token]['users']}, room=token)
 @socketio.on('signal')
 def handle_signal(data):
+    # Send the signal to the specified recipient
+    emit('signal', data, room=data['token'], include_self=False)
 @socketio.on('admin_mute')
 def handle_admin_mute(data):
 def handle_set_video_url(data):
     token = data['token']
     video_url = data['video_url']
+    print(f"Setting video URL for room {token} to {video_url}")
     if token in rooms and rooms[token]['admin'] == session.get('username'):
+        # Sanitize the URL (basic example - prevent script injection)
+        if '<script' in video_url.lower():
+            print("Invalid video URL - contains script tags")
+            return  # Reject the URL
+        #  YouTube, Rutube, or VK Video URL.
+        video_url = convert_to_embed_url(video_url)
+        if not video_url:
+          print("Invalid video URL - not from a supported platform")
+          return
         rooms[token]['video_url'] = video_url
         rooms[token]['video_state'] = {'playing': False, 'time': 0}
         save_json(ROOMS_DB, rooms)
     token = data['token']
     action = data['action']
     if token not in rooms:
+        return
     if action == 'play_pause':
         rooms[token]['video_state']['playing'] = data['state']['playing']
     save_json(ROOMS_DB, rooms)
     emit('video_controlled', {'action': action, 'state': rooms[token]['video_state']}, room=token)
+def convert_to_embed_url(url):
+    """Converts a YouTube, Rutube, or VK Video URL to an embeddable URL."""
+    try:
+        if "youtube.com" in url or "youtu.be" in url:
+            if "watch?v=" in url:
+                video_id = url.split("watch?v=")[1].split("&")[0]
+            elif "youtu.be" in url:
+                video_id = url.split("youtu.be/")[1].split("?")[0]
+            else:
+                return None  # Invalid YouTube URL
+            return f"https://www.youtube.com/embed/{video_id}?autoplay=1&controls=0"
+        elif "rutube.ru" in url:
+            if "/video/" in url:
+                video_id = url.split("/video/")[1].split("/")[0]
+            elif "/play/embed/" in url:  # Already embedded
+                return url + "?autoplay=1" # Keep autoplay
+            else:
+                return None
+            return f"https://rutube.ru/play/embed/{video_id}?autoplay=1"
+        elif "vk.com" in url:
+            if "video" in url and "z=" in url:
+              video_id = url.split("z=video")[1].split("%")[0]
+              return f"https://vk.com/video_ext.php?oid={video_id}&hd=2&autoplay=1" #hd=2 is optional
+            elif "video_ext.php" in url: # Already embedded
+                return url.replace("autoplay=0", "autoplay=1") # Ensure autoplay
+            else:
+                return None
+        return None  # Unsupported platform
+    except Exception as e:
+        print(f"Error converting URL: {e}")
+        return None
 if __name__ == '__main__':
     socketio.run(app, host='0.0.0.0', port=7860, debug=True, allow_unsafe_werkzeug=True)