From b60ccec74c31e08ddd6cbc8e58305dcbd547b275 Mon Sep 17 00:00:00 2001
From: Mariotaku <mariotaku.lee@gmail.com>
Date: Tue, 24 Dec 2024 20:32:44 +0900
Subject: [PATCH] improved device select for apps, files and info

---
 package-lock.json                             | 136 +++++------
 src-tauri/src/conn_pool/connection.rs         |   3 +-
 src-tauri/src/plugins/cmd.rs                  |  19 +-
 .../device-editor/device-editor.component.ts  |   2 +-
 src/app/apps/apps.component.html              |  14 +-
 src/app/apps/apps.component.ts                |   6 +-
 src/app/apps/apps.module.ts                   |   2 +
 src/app/core/services/file.session.ts         |  13 +
 .../core/services/remote-command.service.ts   |  16 +-
 src/app/core/services/remote-log.service.ts   | 227 +++++++++---------
 src/app/files/files.component.html            |   2 +-
 src/app/files/files.component.ts              |  83 +++----
 src/app/info/info.component.html              |  10 +-
 src/app/info/info.component.ts                |  35 ++-
 src/app/info/info.module.ts                   |   2 +
 src/app/types/file-session.ts                 |   2 +
 16 files changed, 314 insertions(+), 258 deletions(-)

diff --git a/package-lock.json b/package-lock.json
index bbe18a00..3071b869 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -20,11 +20,11 @@
         "@ng-bootstrap/ng-bootstrap": "16.0.0",
         "@popperjs/core": "2.11.8",
         "@sentry/angular-ivy": "7.114.0",
-        "@tauri-apps/api": "^2.0.0-rc.3",
-        "@tauri-apps/plugin-dialog": "2.0.0-rc.0",
-        "@tauri-apps/plugin-fs": "2.0.0-rc.1",
-        "@tauri-apps/plugin-shell": "2.0.0-rc.0",
-        "@tauri-apps/plugin-upload": "2.0.0-rc.0",
+        "@tauri-apps/api": "^2.0.1",
+        "@tauri-apps/plugin-dialog": "2.0.0",
+        "@tauri-apps/plugin-fs": "2.0.0",
+        "@tauri-apps/plugin-shell": "2.0.0",
+        "@tauri-apps/plugin-upload": "2.0.0",
         "@xterm/addon-fit": "0.10.0",
         "@xterm/addon-search": "0.15.0",
         "@xterm/addon-web-links": "0.11.0",
@@ -61,7 +61,7 @@
         "@angular-eslint/template-parser": "17.4.0",
         "@angular/cli": "17.3.6",
         "@angular/compiler-cli": "17.3.7",
-        "@tauri-apps/cli": "^2.0.0-rc.7",
+        "@tauri-apps/cli": "^2.0.0",
         "@types/jasmine": "4.6.4",
         "@types/jest": "29.5.10",
         "@types/lodash-es": "4.17.12",
@@ -4565,18 +4565,18 @@
       "dev": true
     },
     "node_modules/@tauri-apps/api": {
-      "version": "2.0.0-rc.3",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.0.0-rc.3.tgz",
-      "integrity": "sha512-k1erUfnoOFJwL5VNFZz0BQZ2agNstG7CNOjwpdWMl1vOaVuSn4DhJtXB0Deh9lZaaDlfrykKOyZs9c3XXpMi5Q==",
+      "version": "2.1.1",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/api/-/api-2.1.1.tgz",
+      "integrity": "sha512-fzUfFFKo4lknXGJq8qrCidkUcKcH2UHhfaaCNt4GzgzGaW2iS26uFOg4tS3H4P8D6ZEeUxtiD5z0nwFF0UN30A==",
       "funding": {
         "type": "opencollective",
         "url": "https://opencollective.com/tauri"
       }
     },
     "node_modules/@tauri-apps/cli": {
-      "version": "2.0.0-rc.7",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-2.0.0-rc.7.tgz",
-      "integrity": "sha512-FdNcr75EIPfA69gWxpk3xv78og8CVbEa8ih2Rvp9k1tyAyryOth0Ps+jNEqP/WtfFwITWTYm4JqOubSCHoFjpQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli/-/cli-2.1.0.tgz",
+      "integrity": "sha512-K2VhcKqBhAeS5pNOVdnR/xQRU6jwpgmkSL2ejHXcl0m+kaTggT0WRDQnFtPq6NljA7aE03cvwsbCAoFG7vtkJw==",
       "dev": true,
       "bin": {
         "tauri": "tauri.js"
@@ -4589,22 +4589,22 @@
         "url": "https://opencollective.com/tauri"
       },
       "optionalDependencies": {
-        "@tauri-apps/cli-darwin-arm64": "2.0.0-rc.7",
-        "@tauri-apps/cli-darwin-x64": "2.0.0-rc.7",
-        "@tauri-apps/cli-linux-arm-gnueabihf": "2.0.0-rc.7",
-        "@tauri-apps/cli-linux-arm64-gnu": "2.0.0-rc.7",
-        "@tauri-apps/cli-linux-arm64-musl": "2.0.0-rc.7",
-        "@tauri-apps/cli-linux-x64-gnu": "2.0.0-rc.7",
-        "@tauri-apps/cli-linux-x64-musl": "2.0.0-rc.7",
-        "@tauri-apps/cli-win32-arm64-msvc": "2.0.0-rc.7",
-        "@tauri-apps/cli-win32-ia32-msvc": "2.0.0-rc.7",
-        "@tauri-apps/cli-win32-x64-msvc": "2.0.0-rc.7"
+        "@tauri-apps/cli-darwin-arm64": "2.1.0",
+        "@tauri-apps/cli-darwin-x64": "2.1.0",
+        "@tauri-apps/cli-linux-arm-gnueabihf": "2.1.0",
+        "@tauri-apps/cli-linux-arm64-gnu": "2.1.0",
+        "@tauri-apps/cli-linux-arm64-musl": "2.1.0",
+        "@tauri-apps/cli-linux-x64-gnu": "2.1.0",
+        "@tauri-apps/cli-linux-x64-musl": "2.1.0",
+        "@tauri-apps/cli-win32-arm64-msvc": "2.1.0",
+        "@tauri-apps/cli-win32-ia32-msvc": "2.1.0",
+        "@tauri-apps/cli-win32-x64-msvc": "2.1.0"
       }
     },
     "node_modules/@tauri-apps/cli-darwin-arm64": {
-      "version": "2.0.0-rc.7",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.0.0-rc.7.tgz",
-      "integrity": "sha512-DUdO1TCj+cViFkOWtYotq4UNBGfHvl1xLK85n2rmpsCeveGxO9pf1CihOtADuVonHl6ETa9x/uaSTCMeMsKEbA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-arm64/-/cli-darwin-arm64-2.1.0.tgz",
+      "integrity": "sha512-ESc6J6CE8hl1yKH2vJ+ALF+thq4Be+DM1mvmTyUCQObvezNCNhzfS6abIUd3ou4x5RGH51ouiANeT3wekU6dCw==",
       "cpu": [
         "arm64"
       ],
@@ -4618,9 +4618,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-darwin-x64": {
-      "version": "2.0.0-rc.7",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.0.0-rc.7.tgz",
-      "integrity": "sha512-T36ncxLyfgKBsPXdgCfw7WeOtHwDrfkvjJoovlBH5nAejlxZC4g4pYm7/Qvpc++FRmQhcHJXP8Y+fBOSEZrfog==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-darwin-x64/-/cli-darwin-x64-2.1.0.tgz",
+      "integrity": "sha512-TasHS442DFs8cSH2eUQzuDBXUST4ECjCd0yyP+zZzvAruiB0Bg+c8A+I/EnqCvBQ2G2yvWLYG8q/LI7c87A5UA==",
       "cpu": [
         "x64"
       ],
@@ -4634,9 +4634,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-linux-arm-gnueabihf": {
-      "version": "2.0.0-rc.7",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.0.0-rc.7.tgz",
-      "integrity": "sha512-afLBeWgpm++9oKsYNShqKsBCHLLgMJy+rodHIiUd9LB4VqjU/1bYfZdia0PxKjnEuOz27mG9Be5v0SDdsZsLww==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm-gnueabihf/-/cli-linux-arm-gnueabihf-2.1.0.tgz",
+      "integrity": "sha512-aP7ZBGNL4ny07Cbb6kKpUOSrmhcIK2KhjviTzYlh+pPhAptxnC78xQGD3zKQkTi2WliJLPmBYbOHWWQa57lQ9w==",
       "cpu": [
         "arm"
       ],
@@ -4650,9 +4650,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-linux-arm64-gnu": {
-      "version": "2.0.0-rc.7",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.0.0-rc.7.tgz",
-      "integrity": "sha512-sjT/URsuJ2ImJGe9fH0b8reewGq5R1E5t4DZRF0ZVpCpUC1yTpml0kuPWt4S0rGws/beRICPaZWW8OuColIFtQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-gnu/-/cli-linux-arm64-gnu-2.1.0.tgz",
+      "integrity": "sha512-ZTdgD5gLeMCzndMT2f358EkoYkZ5T+Qy6zPzU+l5vv5M7dHVN9ZmblNAYYXmoOuw7y+BY4X/rZvHV9pcGrcanQ==",
       "cpu": [
         "arm64"
       ],
@@ -4666,9 +4666,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-linux-arm64-musl": {
-      "version": "2.0.0-rc.7",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.0.0-rc.7.tgz",
-      "integrity": "sha512-s7OG30ffEBKF5BiMEIVmtd/UNHC956ihEOfZYRJwBZ9cL8qoPLjEMZYMCGB/767M4igXy1bhKaVnl8pZpk+RNw==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-arm64-musl/-/cli-linux-arm64-musl-2.1.0.tgz",
+      "integrity": "sha512-NzwqjUCilhnhJzusz3d/0i0F1GFrwCQbkwR6yAHUxItESbsGYkZRJk0yMEWkg3PzFnyK4cWTlQJMEU52TjhEzA==",
       "cpu": [
         "arm64"
       ],
@@ -4682,9 +4682,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-linux-x64-gnu": {
-      "version": "2.0.0-rc.7",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.0.0-rc.7.tgz",
-      "integrity": "sha512-Qj9ibUvq2CwJE5JQ7M/DfOw44xcf59rUGsMGuku/bSKLPu6UXEFyUFjUURcnOgcZkq9o86no7ONoKdMxm4viKQ==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-gnu/-/cli-linux-x64-gnu-2.1.0.tgz",
+      "integrity": "sha512-TyiIpMEtZxNOQmuFyfJwaaYbg3movSthpBJLIdPlKxSAB2BW0VWLY3/ZfIxm/G2YGHyREkjJvimzYE0i37PnMA==",
       "cpu": [
         "x64"
       ],
@@ -4698,9 +4698,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-linux-x64-musl": {
-      "version": "2.0.0-rc.7",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.0.0-rc.7.tgz",
-      "integrity": "sha512-75ucw3b7MVnyVNvoW+xqB1N8VGjx1vqP7HshAs+p1fSkeCOy2NvtMP7t8pdRlGQ59exH6vGvnQ/LxC5HgDP2Xg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-linux-x64-musl/-/cli-linux-x64-musl-2.1.0.tgz",
+      "integrity": "sha512-/dQd0TlaxBdJACrR72DhynWftzHDaX32eBtS5WBrNJ+nnNb+znM3gON6nJ9tSE9jgDa6n1v2BkI/oIDtypfUXw==",
       "cpu": [
         "x64"
       ],
@@ -4714,9 +4714,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-win32-arm64-msvc": {
-      "version": "2.0.0-rc.7",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.0.0-rc.7.tgz",
-      "integrity": "sha512-KaWY7kVbpmJCn5INtcPX+tji7CqwmqtGechith65VIlEUUs+KyOkMdmgbsJvqe0N58VMHLFzEVfx1xtlaKGDUA==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-arm64-msvc/-/cli-win32-arm64-msvc-2.1.0.tgz",
+      "integrity": "sha512-NdQJO7SmdYqOcE+JPU7bwg7+odfZMWO6g8xF9SXYCMdUzvM2Gv/AQfikNXz5yS7ralRhNFuW32i5dcHlxh4pDg==",
       "cpu": [
         "arm64"
       ],
@@ -4730,9 +4730,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-win32-ia32-msvc": {
-      "version": "2.0.0-rc.7",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.0.0-rc.7.tgz",
-      "integrity": "sha512-J2xVw7gcP1JY1Pj6lE+MuAUKtanD7tXyjBD6W8R2S7sD06Job9PHoonOQhm/vWlhQVtRkWPNX7K7MXbdoI/Z9w==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-ia32-msvc/-/cli-win32-ia32-msvc-2.1.0.tgz",
+      "integrity": "sha512-f5h8gKT/cB8s1ticFRUpNmHqkmaLutT62oFDB7N//2YTXnxst7EpMIn1w+QimxTvTk2gcx6EcW6bEk/y2hZGzg==",
       "cpu": [
         "ia32"
       ],
@@ -4746,9 +4746,9 @@
       }
     },
     "node_modules/@tauri-apps/cli-win32-x64-msvc": {
-      "version": "2.0.0-rc.7",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.0.0-rc.7.tgz",
-      "integrity": "sha512-0dQzFCUGjrpJBsj/JpV2XRUbH6nDbhW4NKpx6DUnFrwPe7YQwz2eexo7FAu2pLTW8HEPCPd0NvXGOCUrWM/klg==",
+      "version": "2.1.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/cli-win32-x64-msvc/-/cli-win32-x64-msvc-2.1.0.tgz",
+      "integrity": "sha512-P/+LrdSSb5Xbho1LRP4haBjFHdyPdjWvGgeopL96OVtrFpYnfC+RctB45z2V2XxqFk3HweDDxk266btjttfjGw==",
       "cpu": [
         "x64"
       ],
@@ -4762,35 +4762,35 @@
       }
     },
     "node_modules/@tauri-apps/plugin-dialog": {
-      "version": "2.0.0-rc.0",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.0.0-rc.0.tgz",
-      "integrity": "sha512-DPOXYe8SQ6Radk/67EOdaomlxL7oF99JO/ZUaPp1IBEs3Wro7lhlz63CfdKIBfKIZTLJLzP1R7/EiPL/GTA3Bg==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-dialog/-/plugin-dialog-2.0.0.tgz",
+      "integrity": "sha512-ApNkejXP2jpPBSifznPPcHTXxu9/YaRW+eJ+8+nYwqp0lLUtebFHG4QhxitM43wwReHE81WAV1DQ/b+2VBftOA==",
       "dependencies": {
-        "@tauri-apps/api": "^2.0.0-rc.0"
+        "@tauri-apps/api": "^2.0.0"
       }
     },
     "node_modules/@tauri-apps/plugin-fs": {
-      "version": "2.0.0-rc.1",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-fs/-/plugin-fs-2.0.0-rc.1.tgz",
-      "integrity": "sha512-r6N5dqBNXy9YAK9XbiEqAq3ZKBIN+TWevE7ZFmSRdvdSB1urrLweYu4wxycY2kDaDPzSeeOIJhCmqdNrFT9OSA==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-fs/-/plugin-fs-2.0.0.tgz",
+      "integrity": "sha512-BNEeQQ5aH8J5SwYuWgRszVyItsmquRuzK2QRkVj8Z0sCsLnSvJFYI3JHRzzr3ltZGq1nMPtblrlZzuKqVzRawA==",
       "dependencies": {
-        "@tauri-apps/api": "^2.0.0-rc.1"
+        "@tauri-apps/api": "^2.0.0"
       }
     },
     "node_modules/@tauri-apps/plugin-shell": {
-      "version": "2.0.0-rc.0",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.0.0-rc.0.tgz",
-      "integrity": "sha512-bhUcQcrqZoK8H1DFXapr5r1Z75oh6Kd5Tltz97XpZFLREEqp+KhN2Fvyh8r/fKAyenYsTYUIsDsyGdjdueuF9g==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-shell/-/plugin-shell-2.0.0.tgz",
+      "integrity": "sha512-OpW2+ycgJLrEoZityWeWYk+6ZWP9VyiAfbO+N/O8VfLkqyOym8kXh7odKDfINx9RAotkSGBtQM4abyKfJDkcUg==",
       "dependencies": {
-        "@tauri-apps/api": "^2.0.0-rc.0"
+        "@tauri-apps/api": "^2.0.0"
       }
     },
     "node_modules/@tauri-apps/plugin-upload": {
-      "version": "2.0.0-rc.0",
-      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-upload/-/plugin-upload-2.0.0-rc.0.tgz",
-      "integrity": "sha512-wlRzL4syShxMlvuM7YfeG3Mcj4Ii2UkuQ8HaBh3YnBl0bPoKuVOGP/PaJ3FF84z1pgMfA5Pb1eSG34hlMCYLsw==",
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/@tauri-apps/plugin-upload/-/plugin-upload-2.0.0.tgz",
+      "integrity": "sha512-MdBZn4RCVmFDjuC2rbpFGjAZAbePkxrc9T35+SKJJgfXbXYw0YOzvUTsDiU7F3NzDWepO+6EbVN3Upzi9rqt/A==",
       "dependencies": {
-        "@tauri-apps/api": "^2.0.0-rc.0"
+        "@tauri-apps/api": "^2.0.0"
       }
     },
     "node_modules/@tsconfig/node10": {
diff --git a/src-tauri/src/conn_pool/connection.rs b/src-tauri/src/conn_pool/connection.rs
index 99333c90..b3a563c1 100644
--- a/src-tauri/src/conn_pool/connection.rs
+++ b/src-tauri/src/conn_pool/connection.rs
@@ -5,7 +5,7 @@ use std::path::Path;
 use std::sync::Mutex;
 use std::time::Duration;
 
-use libssh_rs::{AuthStatus, Session, SshKey, SshOption};
+use libssh_rs::{AuthStatus, LogLevel, Session, SshKey, SshOption};
 use regex::Regex;
 use uuid::Uuid;
 
@@ -21,6 +21,7 @@ impl DeviceConnection {
         session.set_option(SshOption::Hostname(device.host.clone()))?;
         session.set_option(SshOption::Port(device.port.clone()))?;
         session.set_option(SshOption::User(Some(device.username.clone())))?;
+        session.set_option(SshOption::LogLevel(LogLevel::Protocol))?;
 
         session.connect()?;
 
diff --git a/src-tauri/src/plugins/cmd.rs b/src-tauri/src/plugins/cmd.rs
index 3938ae80..d15ea510 100644
--- a/src-tauri/src/plugins/cmd.rs
+++ b/src-tauri/src/plugins/cmd.rs
@@ -7,7 +7,7 @@ use crate::error::Error;
 use crate::event_channel::{EventChannel, EventHandler};
 use crate::session_manager::{Proc, ProcCallback, ProcData, SessionManager};
 use crate::spawn_manager::SpawnManager;
-use serde::Deserialize;
+use serde::{Deserialize, Serialize};
 use tauri::{
     plugin::{Builder, TauriPlugin},
     AppHandle, Manager, Runtime, State,
@@ -20,7 +20,7 @@ async fn exec<R: Runtime>(
     command: String,
     stdin: Option<ByteString>,
     encoding: Option<Encoding>,
-) -> Result<ByteString, Error> {
+) -> Result<ExecOutput, Error> {
     let encoding = encoding.unwrap_or(Encoding::Binary);
     return tokio::task::spawn_blocking(move || {
         let sessions = app.state::<SessionManager>();
@@ -32,8 +32,8 @@ async fn exec<R: Runtime>(
                 ch.stdin().write_all(&stdin.as_ref())?;
                 ch.send_eof()?;
             }
-            let mut buf = Vec::<u8>::new();
-            ch.stdout().read_to_end(&mut buf)?;
+            let mut stdout = Vec::<u8>::new();
+            ch.stdout().read_to_end(&mut stdout)?;
             let mut stderr = Vec::<u8>::new();
             ch.stderr().read_to_end(&mut stderr)?;
             let exit_code = ch.get_exit_status().unwrap_or(0);
@@ -48,7 +48,10 @@ async fn exec<R: Runtime>(
                     unhandled: true,
                 });
             }
-            return Ok(ByteString::parse(&buf, encoding).unwrap());
+            return Ok(ExecOutput {
+                stdout: ByteString::parse(&stdout, encoding).unwrap(),
+                stderr: ByteString::parse(&stderr, encoding).unwrap(),
+            });
         });
     })
     .await
@@ -113,6 +116,12 @@ struct TxPayload {
     data: Option<Vec<u8>>,
 }
 
+#[derive(Serialize, Debug)]
+struct ExecOutput {
+    stdout: ByteString,
+    stderr: ByteString,
+}
+
 impl<R: Runtime> ProcCallback for ProcCallbackImpl<R> {
     fn rx(&self, fd: u32, data: &[u8]) {
         self.channel.rx(ProcData {
diff --git a/src/app/add-device/device-editor/device-editor.component.ts b/src/app/add-device/device-editor/device-editor.component.ts
index 5a4aed50..44f74707 100644
--- a/src/app/add-device/device-editor/device-editor.component.ts
+++ b/src/app/add-device/device-editor/device-editor.component.ts
@@ -284,7 +284,7 @@ export class DeviceEditorComponent implements OnInit {
         const file = await showOpenDialog({
             multiple: false,
             defaultPath: sshDir,
-        }).then(result => result?.path);
+        }).then(result => result);
         if (typeof (file) !== 'string' || !file) {
             return;
         }
diff --git a/src/app/apps/apps.component.html b/src/app/apps/apps.component.html
index e6228787..50209559 100644
--- a/src/app/apps/apps.component.html
+++ b/src/app/apps/apps.component.html
@@ -1,7 +1,13 @@
 <div class="w-100 h-100 d-flex flex-column overflow-hidden" xmlns="http://www.w3.org/1999/html">
   <nav class="manager-toolbar navbar bg-panel border-bottom px-2">
-    <div class="me-auto">
-      <ul ngbNav #nav="ngbNav" class="nav-pills" [(activeId)]="tabId">
+    <div class="d-flex flex-row w-100">
+      <select class="form-select w-auto" [value]="device?.name" (change)="deviceManager.setDefault(deviceSelect.value)"
+              #deviceSelect>
+        @for (dev of devices$ | async; track dev.name) {
+          <option [ngValue]="dev.name" [selected]="dev.name === device?.name">{{ dev.name }}</option>
+        }
+      </select>
+      <ul ngbNav #nav="ngbNav" class="nav-pills flex-nowrap ms-2" [(activeId)]="tabId">
         <li ngbNavItem="installed">
           <a ngbNavLink>Installed</a>
           <ng-template ngbNavContent>
@@ -15,9 +21,7 @@
           </ng-template>
         </li>
       </ul>
-    </div>
-    <div>
-      <button class="btn btn-primary" (click)="openInstallChooser()">
+      <button class="btn btn-primary text-nowrap ms-auto" (click)="openInstallChooser()">
         <i class="bi bi-folder-fill me-2"></i>Install
       </button>
     </div>
diff --git a/src/app/apps/apps.component.ts b/src/app/apps/apps.component.ts
index c08273cf..f5e3d565 100644
--- a/src/app/apps/apps.component.ts
+++ b/src/app/apps/apps.component.ts
@@ -23,6 +23,7 @@ export class AppsComponent implements OnInit, OnDestroy {
     packages$?: Observable<PackageInfo[] | null>;
     instPackages?: Record<string, RawPackageInfo>;
     device: Device | null = null;
+    devices$?: Observable<Device[]|null>;
     tabId: string = 'installed';
 
     @ViewChild('storageInfo') storageInfo?: StatStorageInfoComponent;
@@ -31,13 +32,14 @@ export class AppsComponent implements OnInit, OnDestroy {
     private packagesSubscription?: Subscription;
 
     constructor(
+        public deviceManager: DeviceManagerService,
         private modalService: NgbModal,
-        private deviceManager: DeviceManagerService,
         private appManager: AppManagerService,
     ) {
     }
 
     ngOnInit(): void {
+        this.devices$ = this.deviceManager.devices$;
         this.deviceSubscription = this.deviceManager.selected$.subscribe((device) => {
             this.device = device;
             if (device) {
@@ -77,7 +79,7 @@ export class AppsComponent implements OnInit, OnDestroy {
             filters: [{name: 'IPK package', extensions: ['ipk']}],
             multiple: false,
             defaultPath: await downloadDir(),
-        }).then(result => result?.path);
+        }).then(result => result);
         if (!path) {
             return;
         }
diff --git a/src/app/apps/apps.module.ts b/src/app/apps/apps.module.ts
index 9332ad56..88854e67 100644
--- a/src/app/apps/apps.module.ts
+++ b/src/app/apps/apps.module.ts
@@ -9,6 +9,7 @@ import {NgbDropdownModule, NgbNavModule, NgbPaginationModule, NgbProgressbar} fr
 import {SharedModule} from "../shared/shared.module";
 import {NgLetModule} from "ng-let";
 import {HbchannelRemoveComponent} from './hbchannel-remove/hbchannel-remove.component';
+import {FormsModule} from "@angular/forms";
 
 @NgModule({
   declarations: [
@@ -27,6 +28,7 @@ import {HbchannelRemoveComponent} from './hbchannel-remove/hbchannel-remove.comp
         NgbDropdownModule,
         NgbProgressbar,
         NgOptimizedImage,
+        FormsModule,
     ]
 })
 export class AppsModule {
diff --git a/src/app/core/services/file.session.ts b/src/app/core/services/file.session.ts
index e401497f..48365dfa 100644
--- a/src/app/core/services/file.session.ts
+++ b/src/app/core/services/file.session.ts
@@ -4,8 +4,12 @@ import * as path from 'path';
 import {basename} from '@tauri-apps/api/path'
 import {ProgressCallback, RemoteFileService} from "./remote-file.service";
 import {IOError} from "./backend-client";
+import {trimEnd} from "lodash-es";
 
 export class FileSessionImpl implements FileSession {
+
+    private cachedHome?: string;
+
     constructor(private cmd: RemoteCommandService, private file: RemoteFileService, private device: Device) {
     }
 
@@ -68,6 +72,15 @@ export class FileSessionImpl implements FileSession {
         }
     }
 
+    async home(): Promise<string> {
+        if (!this.cachedHome) {
+            const def = '/media/developer';
+            let path = await this.cmd.exec(this.device, 'echo -n $HOME', 'utf-8');
+            this.cachedHome = trimEnd(path, ' /') || def;
+        }
+        return this.cachedHome;
+    }
+
 }
 
 export namespace FileError {
diff --git a/src/app/core/services/remote-command.service.ts b/src/app/core/services/remote-command.service.ts
index 90d79751..70354d7f 100644
--- a/src/app/core/services/remote-command.service.ts
+++ b/src/app/core/services/remote-command.service.ts
@@ -35,12 +35,17 @@ export class RemoteCommandService extends BackendClient {
      */
     public async exec(device: DeviceLike, command: string, outputEncoding: 'utf-8', stdinData?: string | Uint8Array): Promise<string>;
 
-    public async exec<T = Buffer | string>(device: DeviceLike, command: string, outputEncoding?: 'buffer' | 'utf-8', stdinData?: string | Uint8Array):
-        Promise<T> {
+    public async exec(device: DeviceLike, command: string, outputEncoding?: 'utf-8', stdinData?: string | Uint8Array,
+                      wantStderr?: true): Promise<ExecOutput<string>>;
+
+    public async exec<T = Buffer | string>(device: DeviceLike, command: string, outputEncoding?: 'buffer' | 'utf-8',
+                                           stdinData?: string | Uint8Array, wantStderr: boolean = false):
+        Promise<T | ExecOutput<T>> {
         const stdin = typeof stdinData === 'string' ? [...this.encoder.encode(stdinData)] : stdinData;
         try {
             const encoding = RemoteCommandService.byteStringEncoding(outputEncoding);
-            return await this.invoke('exec', {device, command, stdin, encoding});
+            const output: ExecOutput<T> = await this.invoke('exec', {device, command, stdin, encoding});
+            return wantStderr ? output : output.stdout;
         } catch (e) {
             if (BackendError.isCompatible(e)) {
                 if (e.reason === 'ExitStatus') {
@@ -186,6 +191,11 @@ declare interface SpawnClosed {
     type: 'Closed';
 }
 
+declare interface ExecOutput<T> {
+    stdout: T;
+    stderr: T;
+}
+
 type SpawnResult = SpawnExited | SpawnSignaled | SpawnClosed;
 
 export class ExecutionError extends Error {
diff --git a/src/app/core/services/remote-log.service.ts b/src/app/core/services/remote-log.service.ts
index 37e28231..e8c5bc8b 100644
--- a/src/app/core/services/remote-log.service.ts
+++ b/src/app/core/services/remote-log.service.ts
@@ -8,124 +8,125 @@ import {DateTime} from "luxon";
 import {isNonNull} from "../../shared/operators";
 
 @Injectable({
-  providedIn: 'root'
+    providedIn: 'root'
 })
 export class RemoteLogService {
-  constructor(private cmd: RemoteCommandService) {
-  }
-
-
-  async logread(device: Device, lastLines: number = 0): Promise<Observable<LogMessage>> {
-    const subject = await this.cmd.popen(device, `tail -f -n ${lastLines} /var/log/messages`, 'utf-8');
-    return subject.pipe(map(output => this.parsePmLog(output.data)),
-      filter((msg): msg is LogMessage => isNonNull(msg)),
-      finalize(() => subject.write()));
-  }
-
-  async dmesg(device: Device): Promise<Observable<LogMessage>> {
-    const subject = await this.cmd.popen(device, `dmesg -w -x`, 'utf-8');
-    return subject.pipe(map(output => this.parseDmesg(output.data)),
-      filter((msg): msg is LogMessage => isNonNull(msg)),
-      finalize(() => subject.write()));
-  }
-
-  async logClear(device: DeviceLike): Promise<void> {
-    await this.cmd.exec(device, 'echo > /var/log/messages', 'utf-8');
-  }
-
-  async dmesgClear(device: DeviceLike): Promise<void> {
-    await this.cmd.exec(device, 'dmesg -c', 'utf-8');
-  }
-
-  private parsePmLog(line: string): LogMessage | null {
-    line = line.trim();
-    if (!line) {
-      return null;
+    constructor(private cmd: RemoteCommandService) {
     }
-    const match = line.match(/^(?<datetime>[\w:.\-]+) \[(?<monotonic>\d+\.\d+)] (?<facility>\S+)\.(?<level>\S+) (?<process>\S+) \[((?<pid>\S):(?<tid>\S))?] (?<context>\S+) (?<msgid>\S+) (?<remaining>\{.+)$/);
-    if (!match) {
-      const now = DateTime.now();
-      return {
-        datetime: now,
-        monotonic: now.toMillis() / 1000.0,
-        process: 'unknown',
-        context: 'unknown',
-        level: 'info',
-        message: line
-      };
+
+
+    async logread(device: Device, lastLines: number = 0): Promise<Observable<LogMessage>> {
+        const subject = await this.cmd.popen(device, `tail -f -n ${lastLines} /var/log/messages`, 'utf-8');
+        return subject.pipe(map(output => this.parsePmLog(output.data)),
+            filter((msg): msg is LogMessage => isNonNull(msg)),
+            finalize(() => subject.write()));
+    }
+
+    async dmesg(device: Device): Promise<Observable<LogMessage>> {
+        const subject = await this.cmd.popen(device, `dmesg -w -x`, 'utf-8');
+        return subject.pipe(map(output => this.parseDmesg(output.data)),
+            filter((msg): msg is LogMessage => isNonNull(msg)),
+            finalize(() => subject.write()));
+    }
+
+    async logClear(device: DeviceLike): Promise<void> {
+        await this.cmd.exec(device, 'echo > /var/log/messages', 'utf-8');
+    }
+
+    async dmesgClear(device: DeviceLike): Promise<void> {
+        await this.cmd.exec(device, 'dmesg -c', 'utf-8');
+    }
+
+    private parsePmLog(line: string): LogMessage | null {
+        line = line.trim();
+        if (!line) {
+            return null;
+        }
+        const match = line.match(/^(?<datetime>[\w:.\-]+) \[(?<monotonic>\d+\.\d+)] (?<facility>\S+)\.(?<level>\S+) (?<process>\S+) \[((?<pid>\S):(?<tid>\S))?] (?<context>\S+) (?<msgid>\S+) (?<remaining>\{.+)$/);
+        if (!match) {
+            const now = DateTime.now();
+            return {
+                datetime: now,
+                monotonic: now.toMillis() / 1000.0,
+                process: 'unknown',
+                context: 'unknown',
+                level: 'info',
+                message: line
+            };
+        }
+        const groups: PmLogGroups = match.groups as PmLogGroups;
+        const extrasEnd = matchBracket(groups.remaining, 0);
+        let extras: Record<string, any> | undefined;
+        try {
+            extras = JSON.parse(groups.remaining.substring(0, extrasEnd + 1))
+        } catch (e) {
+            // Ignore
+        }
+        const message = groups.remaining.substring(extrasEnd + 1).trim();
+
+        return {
+            datetime: DateTime.fromISO(groups.datetime),
+            monotonic: parseFloat(groups.monotonic),
+            level: groups.level,
+            context: groups.context,
+            msgid: groups.msgid,
+            process: groups.process,
+            message, extras,
+        };
     }
-    const groups: PmLogGroups = match.groups as PmLogGroups;
-    const extrasEnd = matchBracket(groups.remaining, 0);
-    let extras: Record<string, any> | undefined;
-    try {
-      extras = JSON.parse(groups.remaining.substring(0, extrasEnd + 1))
-    } catch (e) {
-      // Ignore
+
+    private parseDmesg(line: string): LogMessage | null {
+        const match = line.match(/^(?<facility>\S+)\s*:(?<level>\S+)\s*:\s*\[\s*(?<monotonic>\d+\.\d+)]\s+(:?(?<context>.+?): )?(?<remaining>.+)$/);
+        if (!match) {
+            return null;
+        }
+        const groups: DmesgGroups = match.groups as DmesgGroups;
+        return {
+            datetime: DateTime.now(),
+            monotonic: parseFloat(groups.monotonic),
+            level: groups.level,
+            context: groups.context,
+            process: 'unknown',
+            message: groups.remaining,
+        };
     }
-    const message = groups.remaining.substring(extrasEnd + 1).trim();
-
-    return {
-      datetime: DateTime.fromISO(groups.datetime),
-      monotonic: parseFloat(groups.monotonic),
-      level: groups.level,
-      context: groups.context,
-      msgid: groups.msgid,
-      process: groups.process,
-      message, extras,
-    };
-  }
-
-  private parseDmesg(line: string): LogMessage | null {
-    const match = line.match(/^(?<facility>\S+)\s*:(?<level>\S+)\s*:\s*\[\s*(?<monotonic>\d+\.\d+)]\s+(:?(?<context>.+?): )?(?<remaining>.+)$/);
-    if (!match) {
-      return null;
+
+    async pmLogShow(device: DeviceLike): Promise<[string, LogLevel][]> {
+        return this.cmd.exec(device, 'PmLogCtl show', 'utf-8', undefined, true).then(({stdout, stderr}) => {
+            const lines = stdout || stderr;
+            return Array.from<RegExpMatchArray>(lines.matchAll(/^PmLogCtl: Context '([^']+)' = (.+)$/mg))
+                .map((m): [string, LogLevel] => m.slice(1) as [string, LogLevel]);
+        });
+    }
+
+    async pmLogSetLevel(device: DeviceLike, context: string, value: PrefLogLevel): Promise<string[]> {
+        return await this.cmd.exec(device, `PmLogCtl set ${escapeSingleQuoteString(context)} ${value}`, 'utf-8').then((lines) => {
+            return Array.from<RegExpMatchArray>(lines.matchAll(/^PmLogCtl: Setting context level for '([^']+)'/mg))
+                .map((m): string => m[1]);
+        });
     }
-    const groups: DmesgGroups = match.groups as DmesgGroups;
-    return {
-      datetime: DateTime.now(),
-      monotonic: parseFloat(groups.monotonic),
-      level: groups.level,
-      context: groups.context,
-      process: 'unknown',
-      message: groups.remaining,
-    };
-  }
-
-  async pmLogShow(device: DeviceLike): Promise<[string, LogLevel][]> {
-    return this.cmd.exec(device, 'PmLogCtl show', 'utf-8').then((lines) => {
-      return Array.from<RegExpMatchArray>(lines.matchAll(/^PmLogCtl: Context '([^']+)' = (.+)$/mg))
-        .map((m): [string, LogLevel] => m.slice(1) as [string, LogLevel]);
-    });
-  }
-
-  async pmLogSetLevel(device: DeviceLike, context: string, value: PrefLogLevel): Promise<string[]> {
-    return await this.cmd.exec(device, `PmLogCtl set ${escapeSingleQuoteString(context)} ${value}`, 'utf-8').then((lines) => {
-      return Array.from<RegExpMatchArray>(lines.matchAll(/^PmLogCtl: Setting context level for '([^']+)'/mg))
-        .map((m): string => m[1]);
-    });
-  }
 }
 
 declare interface PmLogGroups extends Record<string, undefined | string> {
-  datetime: string;
-  monotonic: string;
-  facility: string;
-  level: LogLevel;
-  process: string;
-  pid?: string;
-  tid?: string;
-  context: string;
-  msgid: string;
-  remaining: string;
+    datetime: string;
+    monotonic: string;
+    facility: string;
+    level: LogLevel;
+    process: string;
+    pid?: string;
+    tid?: string;
+    context: string;
+    msgid: string;
+    remaining: string;
 }
 
 declare interface DmesgGroups extends Record<string, undefined | string> {
-  facility: string;
-  level: LogLevel;
-  monotonic: string;
-  context?: string;
+    facility: string;
+    level: LogLevel;
+    monotonic: string;
+    context?: string;
 
-  remaining: string;
+    remaining: string;
 }
 
 export type LogLevel = 'emerg' | 'alert' | 'crit' | 'err' | 'warning' | 'notice' | 'info' | 'debug';
@@ -133,12 +134,12 @@ export type LogLevel = 'emerg' | 'alert' | 'crit' | 'err' | 'warning' | 'notice'
 export type PrefLogLevel = LogLevel | 'none';
 
 export interface LogMessage {
-  datetime: DateTime,
-  monotonic: number,
-  level: LogLevel;
-  process: string;
-  context?: string;
-  msgid?: string;
-  message: string;
-  extras?: Record<string, any>;
+    datetime: DateTime,
+    monotonic: number,
+    level: LogLevel;
+    process: string;
+    context?: string;
+    msgid?: string;
+    message: string;
+    extras?: Record<string, any>;
 }
diff --git a/src/app/files/files.component.html b/src/app/files/files.component.html
index fdc0954e..3f993328 100644
--- a/src/app/files/files.component.html
+++ b/src/app/files/files.component.html
@@ -17,7 +17,7 @@
               <select class="breadcrumb-item form-select form-select-sm border-0 border-end rounded-end-0"
                       [value]="device.name" (change)="deviceManager.setDefault(deviceSelect.value)" #deviceSelect>
                 @for (item of (deviceManager.devices$ | async); track item.name) {
-                  <option [value]="item.name">{{ item.name }}</option>
+                  <option [value]="item.name" [selected]="item.name === device.name">{{ item.name }}</option>
                 }
               </select>
             </li>
diff --git a/src/app/files/files.component.ts b/src/app/files/files.component.ts
index f7659cae..7044183b 100644
--- a/src/app/files/files.component.ts
+++ b/src/app/files/files.component.ts
@@ -1,15 +1,13 @@
 import {Component, OnDestroy, OnInit} from '@angular/core';
 import {DeviceManagerService} from "../core/services";
 import {Device, FileItem, FileSession} from "../types";
-import {BehaviorSubject, Observable, Subject, Subscription} from "rxjs";
+import {from, Observable, Subscription, tap} from "rxjs";
 import {MessageDialogComponent} from "../shared/components/message-dialog/message-dialog.component";
 import {NgbModal} from "@ng-bootstrap/ng-bootstrap";
 import {ProgressDialogComponent} from "../shared/components/progress-dialog/progress-dialog.component";
 import {open as openPath} from '@tauri-apps/plugin-shell';
 import {open as showOpenDialog, save as showSaveDialog} from '@tauri-apps/plugin-dialog';
 import * as path from "path";
-import {RemoteCommandService} from "../core/services/remote-command.service";
-import {trimEnd} from "lodash-es";
 import {downloadDir} from "@tauri-apps/api/path";
 import {CreateDirectoryMessageComponent} from "./create-directory-message/create-directory-message.component";
 
@@ -20,6 +18,10 @@ class FilesState {
     constructor(public dir: string, public items?: FileItem[], public error?: Error) {
         this.breadcrumb = dir === '/' ? [''] : dir.split('/');
     }
+
+    get completed(): boolean {
+        return !!this.items || !!this.error;
+    }
 }
 
 @Component({
@@ -30,29 +32,23 @@ class FilesState {
 export class FilesComponent implements OnInit, OnDestroy {
     device: Device | null = null;
     session: FileSession | null = null;
-    home?: string;
     history?: HistoryStack;
-    files$: Observable<FilesState>;
+    files$?: Observable<FilesState>;
 
     selectedItems: FileItem[] | null = null;
 
-    private filesSubject: Subject<FilesState>;
     private subscription?: Subscription;
 
     constructor(
         private modalService: NgbModal,
-        public deviceManager: DeviceManagerService,
-        private cmd: RemoteCommandService,
+        public deviceManager: DeviceManagerService
     ) {
-        this.filesSubject = new BehaviorSubject<FilesState>(new FilesState(''));
-        this.files$ = this.filesSubject.asObservable();
     }
 
     ngOnInit(): void {
         this.subscription = this.deviceManager.selected$.subscribe(async (selected) => {
-            this.filesSubject.next(new FilesState(''));
+            this.files$ = undefined;
             this.history = undefined;
-            this.home = undefined;
             this.device = selected;
             this.session = selected && this.deviceManager.fileSession(selected);
             if (!selected) {
@@ -74,39 +70,39 @@ export class FilesComponent implements OnInit, OnDestroy {
         return this.history?.current || null;
     }
 
+    ls(dir: string = ''): Observable<FilesState> {
+        const session = this.session;
+        const comparator = this.compareName;
+
+        async function* task() {
+            if (!session) {
+                throw new Error('No device selected');
+            }
+            if (!dir) {
+                yield new FilesState('');
+                dir = await session.home();
+            }
+            yield new FilesState(dir);
+            console.log('ls', dir);
+            let list = await session!.ls(dir);
+            yield new FilesState(dir, list.sort(comparator), undefined);
+        }
+
+        return from(task());
+    }
+
     async cd(dir: string = '', pushHistory: boolean = false): Promise<void> {
         if (!this.device) return;
-        if (!dir) {
-            console.log('cd ~');
-            this.filesSubject.next(new FilesState(''));
-            if (!this.home) {
-                try {
-                    this.home = await this.homeDir();
-                } catch (e) {
-                    this.filesSubject.next(new FilesState('', undefined, e as Error));
-                    return;
-                }
+        this.files$ = this.ls(dir).pipe(tap((state) => {
+            if (!pushHistory || !state.completed || this.history?.current === state.dir) {
+                return;
             }
-            dir = this.home;
-        } else {
-            console.log('cd', dir);
-            this.filesSubject.next(new FilesState(dir));
-        }
-        let list: FileItem[];
-        try {
-            list = await this.session!.ls(dir);
-        } catch (e) {
-            this.filesSubject.next(new FilesState(dir, undefined, e as Error));
-            return;
-        }
-        if (pushHistory && this.history?.current !== dir) {
             if (!this.history) {
-                this.history = new HistoryStack(dir);
+                this.history = new HistoryStack(state.dir);
             } else {
-                this.history.push(dir);
+                this.history.push(state.dir);
             }
-        }
-        this.filesSubject.next(new FilesState(dir, list.sort(this.compareName), undefined));
+        }));
         this.selectedItems = null;
     }
 
@@ -126,13 +122,6 @@ export class FilesComponent implements OnInit, OnDestroy {
         await this.cd(path);
     }
 
-    async homeDir(): Promise<string> {
-        const def = '/media/developer';
-        if (!this.device) return def;
-        let path = await this.cmd.exec(this.device, 'echo -n $HOME', 'utf-8');
-        return trimEnd(path, ' /') || def;
-    }
-
     compareName(this: void, a: FileItem, b: FileItem): number {
         const dirDiff = (b.type == 'd' ? 1000 : 0) - (a.type == 'd' ? 1000 : 0);
         if (dirDiff) return dirDiff;
@@ -301,7 +290,7 @@ export class FilesComponent implements OnInit, OnDestroy {
         const returnValue = await showOpenDialog({
             multiple: true,
             defaultPath: await downloadDir(),
-        }).then(resp => resp?.map(v => v.path));
+        });
         if (!returnValue) return;
         const progressRef = ProgressDialogComponent.open(this.modalService);
         const progress: ProgressDialogComponent = progressRef.componentInstance;
diff --git a/src/app/info/info.component.html b/src/app/info/info.component.html
index 8e7472db..2d2a9006 100644
--- a/src/app/info/info.component.html
+++ b/src/app/info/info.component.html
@@ -1,3 +1,11 @@
+<div class="manager-toolbar navbar bg-panel border-bottom d-flex flex-row flex-nowrap px-2">
+  <select class="form-select" [value]="device?.name" (change)="deviceManager.setDefault(deviceSelect.value)"
+          #deviceSelect>
+    @for (item of (deviceManager.devices$ | async); track item.name) {
+      <option [ngValue]="item.name" [selected]="item.name === device?.name">{{ item.name }}</option>
+    }
+  </select>
+</div>
 <div class="p-3" *ngIf="device as device">
   <app-error-card [error]="infoError" title="Unable to get device info" (retry)="loadInfo()"
                   *ngIf="device && infoError">
@@ -63,7 +71,7 @@ <h5 class="card-title">Developer Mode</h5>
     <div class="card-body">
       <h5 class="card-title">Homebrew Channel</h5>
       <p class="card-text" *ngIf="homebrewAppInfo">
-        <strong>Version: </strong><span>{{homebrewAppInfo.version}}</span>
+        <strong>Version: </strong><span>{{ homebrewAppInfo.version }}</span>
         <ng-container *ngIf="homebrewAppConfig as config">
           <br>
           <strong>Rooted: </strong><span *ngIf="config.root else unrooted">Yes</span>
diff --git a/src/app/info/info.component.ts b/src/app/info/info.component.ts
index bb1c2d6d..05cc975a 100644
--- a/src/app/info/info.component.ts
+++ b/src/app/info/info.component.ts
@@ -1,6 +1,6 @@
-import {Component, Injector} from '@angular/core';
+import {Component, Injector, OnDestroy, OnInit} from '@angular/core';
 import {NgbModal} from '@ng-bootstrap/ng-bootstrap';
-import {noop} from 'rxjs';
+import {noop, Subscription} from 'rxjs';
 import {Device, RawPackageInfo} from '../types';
 import {
     AppManagerService,
@@ -19,13 +19,14 @@ import {MessageDialogComponent} from "../shared/components/message-dialog/messag
 import {RemoteFileService} from "../core/services/remote-file.service";
 import {open as openPath} from "@tauri-apps/plugin-shell";
 import {APP_ID_HBCHANNEL} from "../shared/constants";
+import {fromPromise} from "rxjs/internal/observable/innerFrom";
 
 @Component({
     selector: 'app-info',
     templateUrl: './info.component.html',
     styleUrls: ['./info.component.scss']
 })
-export class InfoComponent {
+export class InfoComponent implements OnInit, OnDestroy {
     device: Device | null = null;
     deviceInfo: DeviceInfo | null = null;
     devModeInfo: DevModeStatus | null = null;
@@ -34,16 +35,21 @@ export class InfoComponent {
     homebrewRepoManifest?: RepositoryItem;
     homebrewRepoHasUpdate: boolean = false;
     infoError: any;
+    deviceSubscription!: Subscription;
+    infoSubscription?: Subscription;
 
     constructor(
         private modalService: NgbModal,
-        private deviceManager: DeviceManagerService,
+        public deviceManager: DeviceManagerService,
         private files: RemoteFileService,
         private appManager: AppManagerService,
         private appsRepo: AppsRepoService,
         private devMode: DevModeService
     ) {
-        deviceManager.selected$.subscribe((selected) => {
+    }
+
+    ngOnInit(): void {
+        this.deviceSubscription = this.deviceManager.selected$.subscribe((selected) => {
             this.device = selected;
             this.deviceInfo = null;
             this.devModeInfo = null;
@@ -53,18 +59,25 @@ export class InfoComponent {
         });
     }
 
+    ngOnDestroy() {
+        this.deviceSubscription.unsubscribe();
+        this.infoSubscription?.unsubscribe();
+    }
+
     loadInfo(): void {
         const device = this.device;
         if (!device) return;
         this.infoError = null;
-        this.deviceManager.getDeviceInfo(device)
-            .then((info) => {
+        this.infoSubscription?.unsubscribe();
+        this.infoSubscription = fromPromise(this.deviceManager.getDeviceInfo(device)).subscribe({
+            next: (info) => {
                 this.deviceInfo = info;
-                return Promise.allSettled([this.loadDevModeInfo(device), this.loadHomebrewInfo(device)]);
-            })
-            .catch((e) => {
+                Promise.allSettled([this.loadDevModeInfo(device), this.loadHomebrewInfo(device)]).then(noop);
+            },
+            error: (e) => {
                 this.infoError = e;
-            });
+            }
+        });
     }
 
     async renewDevMode(): Promise<void> {
diff --git a/src/app/info/info.module.ts b/src/app/info/info.module.ts
index 5453b716..3bd19beb 100644
--- a/src/app/info/info.module.ts
+++ b/src/app/info/info.module.ts
@@ -6,6 +6,7 @@ import {InfoComponent} from "./info.component";
 import {SharedModule} from "../shared/shared.module";
 import {DevmodeCountdownPipe} from './devmode-countdown.pipe';
 import {NgbDropdownModule} from "@ng-bootstrap/ng-bootstrap";
+import {FormsModule} from "@angular/forms";
 
 
 @NgModule({
@@ -18,6 +19,7 @@ import {NgbDropdownModule} from "@ng-bootstrap/ng-bootstrap";
         InfoRoutingModule,
         SharedModule,
         NgbDropdownModule,
+        FormsModule,
     ]
 })
 export class InfoModule {
diff --git a/src/app/types/file-session.ts b/src/app/types/file-session.ts
index 85c16e35..7c6df7e3 100644
--- a/src/app/types/file-session.ts
+++ b/src/app/types/file-session.ts
@@ -41,4 +41,6 @@ export declare interface FileSession {
 
     uploadBatch(strings: string[], pwd: string, fileCb: (name: string, index: number, total: number) => void,
                 progressCb: ProgressCallback, failCb: (name: string, e: Error) => Promise<boolean>): Promise<void>;
+
+    home(): Promise<string>;
 }