added log search feature

package.json

@@ -40,10 +40,15 @@
     "@tauri-apps/plugin-fs": "2.0.0-beta.2",
     "@tauri-apps/plugin-shell": "2.0.0-beta.2",
     "@tauri-apps/plugin-upload": "2.0.0-beta.2",
+    "@xterm/addon-fit": "^0.10.0",
+    "@xterm/addon-search": "0.15.0",
+    "@xterm/addon-web-links": "^0.11.0",
+    "@xterm/xterm": "^5.5.0",
     "bootstrap": "^5.3.2",
     "bootstrap-icons": "^1.11.2",
     "buffer": "^6.0.3",
     "chalk": "5.3.0",
+    "crypto-browserify": "3.12.0",
     "filesize": "^10.1.0",
     "find-matching-bracket": "1.0.3",
     "lodash-es": "^4.17.21",
@@ -53,16 +58,16 @@
     "ng-let": "^16.0.2",
     "ngx-autosize": "2.0.4",
     "path-browserify": "^1.0.1",
+    "process": "0.11.10",
     "rxjs": "^7.4.0",
     "semver": "^7.5.4",
+    "stream-browserify": "3.0.0",
     "tslib": "^2.6.2",
-    "@xterm/xterm": "^5.3.0",
-    "@xterm/addon-fit": "^0.9.0",
-    "@xterm/addon-web-links": "^0.10.0",
+    "vm-browserify": "1.1.2",
     "zone.js": "~0.14.2"
   },
   "devDependencies": {
-    "@angular-builders/custom-webpack": "^17.0.1",
+    "@angular-builders/custom-webpack": "^17.0.2",
     "@angular-devkit/build-angular": "^17.3.2",
     "@angular-eslint/builder": "17.3.0",
     "@angular-eslint/eslint-plugin": "17.3.0",
@@ -88,9 +93,8 @@
     "karma-coverage": "^2.2.1",
     "karma-jasmine": "^5.1.0",
     "karma-jasmine-html-reporter": "^2.1.0",
-    "node-polyfill-webpack-plugin": "^2.0.1",
     "typescript": "^5.2.2",
-    "webpack": "^5.88.2"
+    "webpack": "^5.91.0"
   },
   "browserslist": [
     "chrome >= 91",

src-tauri/src/conn_pool/connection.rs

@@ -165,6 +165,7 @@ impl DeviceConnectionUserInfo {
         if exit_code != 0 {
             return Err(Error::Message {
                 message: format!("id command failed with exit code {}", exit_code),
+                unhandled: false,
             });
         }
         return Ok(DeviceConnectionUserInfo::parse(&buf));

src-tauri/src/conn_pool/pool.rs

@@ -31,12 +31,14 @@ impl DeviceConnectionPool {
                 c.reset_last_ok();
                 Ok(c)
             }
-            Err(_) => Err(self
-                .last_error
-                .lock()
-                .unwrap()
-                .take()
-                .unwrap_or(Error::Timeout)),
+            Err(e) => {
+                return Err(self.last_error.lock().unwrap().take().unwrap_or_else(|| {
+                    Error::Message {
+                        message: format!("Unknown error getting connection from pool: {e:?}"),
+                        unhandled: true,
+                    }
+                }));
+            }
         };
     }
 }

src-tauri/src/error.rs

@@ -32,6 +32,7 @@ pub enum Error {
     },
     Message {
         message: String,
+        unhandled: bool,
     },
     PassphraseRequired,
     NotFound,
@@ -43,11 +44,13 @@ impl Error {
     pub fn new<S: Into<String>>(message: S) -> Error {
         return Error::Message {
             message: message.into(),
+            unhandled: false,
         };
     }
     pub fn bad_config() -> Error {
         return Error::Message {
             message: String::from("Bad configuration"),
+            unhandled: false,
         };
     }
     pub fn io(kind: ErrorKind) -> Error {
@@ -90,6 +93,7 @@ impl From<serde_json::Error> for Error {
     fn from(value: serde_json::Error) -> Self {
         return Error::Message {
             message: format!("JSON Error: {:?}", value),
+            unhandled: false,
         };
     }
 }
@@ -134,6 +138,7 @@ impl From<SshError> for Error {
         return match value {
             SshError::RequestDenied(s) => Error::Message {
                 message: format!("SSH Error: {s}"),
+                unhandled: false,
             },
             SshError::TryAgain => Error::IO {
                 code: ErrorKind::WouldBlock,
@@ -164,6 +169,7 @@ impl From<SshError> for Error {
                 }
                 Error::Message {
                     message: format!("SSH Error: {s}"),
+                    unhandled: false,
                 }
             }
             SshError::Sftp(e) => e.into(),
@@ -180,7 +186,10 @@ impl From<SftpError> for Error {
         {
             return from_sftp_error_code(code, message);
         }
-        return Error::Message { message };
+        return Error::Message {
+            message,
+            unhandled: false,
+        };
     }
 }
 
@@ -205,7 +214,10 @@ fn from_sftp_error_code(code: u32, message: String) -> Error {
             message: String::from("SSH_FX_WRITE_PROTECT"),
             unhandled: true,
         },
-        _ => Error::Message { message },
+        _ => Error::Message {
+            message,
+            unhandled: false,
+        },
     };
 }
 

src-tauri/src/lib.rs

@@ -8,6 +8,7 @@ use log::LevelFilter;
 #[cfg(feature = "mobile")]
 use native_dialog::{MessageDialog, MessageType};
 use tauri::{AppHandle, Manager, RunEvent, Runtime};
+use tauri::webview::PageLoadEvent;
 
 use crate::app_dirs::{GetConfDir, GetSshDir, SetConfDir, SetSshDir};
 use crate::device_manager::DeviceManager;
@@ -56,9 +57,11 @@ pub fn run() {
         .manage(SessionManager::default())
         .manage(SpawnManager::default())
         .manage(ShellManager::default())
-        .on_page_load(|wnd, _payload| {
-            let spawns = wnd.state::<SpawnManager>();
-            spawns.clear();
+        .on_page_load(|wnd, payload| {
+            if payload.event() == PageLoadEvent::Started {
+                let spawns = wnd.state::<SpawnManager>();
+                spawns.clear();
+            }
         })
         .build(tauri::generate_context!())
         .and_then(|app| {

src-tauri/src/spawn_manager/manager.rs

@@ -20,6 +20,7 @@ impl SpawnManager {
         for x in old_items {
             if let Some(proc) = x.upgrade() {
                 log::debug!("Terminating {proc:?}");
+                proc.interrupt();
             }
         }
     }

src/app/core/services/remote-log.service.ts

@@ -33,6 +33,10 @@ export class RemoteLogService {
     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) {

src/app/debug/dmesg/dmesg.component.html

@@ -1,3 +1,16 @@
-<div class="h-100">
-  <app-log-reader [source]="logs"></app-log-reader>
+<div class="w-100 h-100 d-flex flex-row">
+  <div class="h-100 d-flex flex-column p-2">
+    <button class="btn btn-sm btn-secondary mt-2" ngbTooltip="Search" (click)="logReader.toggleSearchBar()">
+      <i class="bi bi-search"></i>
+    </button>
+    <hr>
+    <button class="btn btn-sm btn-secondary mb-2" ngbTooltip="Clear" (click)="clearBuffer()">
+      <i class="bi bi-trash"></i>
+    </button>
+    <button class="btn btn-sm btn-secondary mb-2" ngbTooltip="Scroll to bottom"
+            [disabled]="logReader.reachedBottom" (click)="logReader.scrollToBottom()">
+      <i class="bi bi-chevron-bar-down"></i>
+    </button>
+  </div>
+  <app-log-reader class="flex-fill" [source]="logs" #logReader></app-log-reader>
 </div>

src/app/debug/dmesg/dmesg.component.ts

@@ -5,35 +5,44 @@ import {from, identity, mergeMap, Observable} from "rxjs";
 import {LogMessage, RemoteLogService} from "../../core/services/remote-log.service";
 
 @Component({
-  selector: 'app-dmesg',
-  templateUrl: './dmesg.component.html',
-  styleUrls: ['./dmesg.component.scss']
+    selector: 'app-dmesg',
+    templateUrl: './dmesg.component.html',
+    styleUrls: ['./dmesg.component.scss']
 })
 export class DmesgComponent {
 
-  logs?: Observable<LogMessage>;
+    logs?: Observable<LogMessage>;
 
-  private deviceField: Device | null = null;
+    private deviceField: Device | null = null;
 
-  constructor(private cmd: RemoteCommandService, private log: RemoteLogService) {
-  }
+    constructor(private cmd: RemoteCommandService, private log: RemoteLogService) {
+    }
 
 
-  get device(): Device | null {
-    return this.deviceField;
-  }
+    get device(): Device | null {
+        return this.deviceField;
+    }
 
-  @Input()
-  set device(device: Device | null) {
-    this.deviceField = device;
-    this.logs = undefined;
-    if (device) {
-      this.reload(device);
+    @Input()
+    set device(device: Device | null) {
+        this.deviceField = device;
+        this.logs = undefined;
+        if (device) {
+            this.reload(device);
+        }
     }
-  }
 
-  private reload(device: Device) {
-    this.logs = from(this.log.dmesg(device)).pipe(mergeMap(identity));
-  }
+    async clearBuffer(): Promise<void> {
+        const device = this.device;
+        if (!device) {
+            return;
+        }
+        await this.log.dmesgClear(device);
+        this.reload(device);
+    }
+
+    private reload(device: Device) {
+        this.logs = from(this.log.dmesg(device)).pipe(mergeMap(identity));
+    }
 
 }

src/app/debug/log-reader/log-reader.component.html

@@ -5,4 +5,21 @@
   </div>
   <div class="position-absolute w-100 h-100 terminal-container" #termwin>
   </div>
+  <div
+    class="position-absolute d-flex align-items-center flex-row bg-panel border-start border-end border-bottom terminal-search-bar p-2 me-5"
+    *ngIf="showSearchBar">
+    <input type="text" class="form-control form-control-sm me-2" (input)="searchTextChange.next(searchInput.value)"
+           #searchInput>
+    <small class="text-nowrap" *ngIf="matchesStatus as match">{{ match.resultIndex + 1 }}
+      / {{ match.resultCount }}</small>
+    <button class="btn btn-sm" (click)="searchPrevious()"
+            [disabled]="!matchesStatus || matchesStatus.resultIndex <= 0 || matchesStatus.resultIndex >= matchesStatus.resultCount">
+      <i class="bi bi-arrow-up"></i>
+    </button>
+    <button class="btn btn-sm" (click)="searchNext()"
+            [disabled]="!matchesStatus || matchesStatus.resultIndex + 1 >= matchesStatus.resultCount">
+      <i class="bi bi-arrow-down"></i>
+    </button>
+    <button class="btn btn-sm" (click)="closeSearchBar()"><i class="bi bi-x-lg"></i></button>
+  </div>
 </div>