add plugin log download

homebridge · Dec 10, 2023 · b27f52c · b27f52c
1 parent 39ce09f
commit b27f52c
Show file tree

Hide file tree

Showing 5 changed files with 73 additions and 15 deletions.
diff --git a/package-lock.json b/package-lock.json
diff --git a/ui/package-lock.json b/ui/package-lock.json
diff --git a/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.html b/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.html
@@ -10,12 +10,16 @@ <h5 class="modal-title">Logs: {{ plugin.displayName || plugin.name }}</h5>
     <div #pluginlogoutput class="w-100 bg-black plugin-log-output terminal align-self-end w-100 h-100 mb-0 p-2"></div>
   </div>
   <div class="modal-footer justify-content-between">
-    <div class="text-left"> </div>
-    <div class="text-center">
+    <div class="text-left">
       <button type="button" class="btn btn-elegant" data-dismiss="modal" (click)="activeModal.dismiss('Dismiss')">
         {{ 'form.button_close' | translate }}
       </button>
     </div>
-    <div class="text-right"></div>
+    <div class="text-center"></div>
+    <div class="text-right">
+      <button class="btn btn-primary" (click)="downloadLogFile()">
+        {{ 'logs.label_download' | translate }}
+      </button>
+    </div>
   </div>
 </div>
diff --git a/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.ts b/ui/src/app/core/manage-plugins/plugin-log-modal/plugin-log-modal.component.ts
@@ -1,3 +1,4 @@
+import { HttpErrorResponse, HttpResponse } from '@angular/common/http';
 import {
   Component,
   ElementRef,
@@ -7,11 +8,13 @@ import {
   OnInit,
   ViewChild,
 } from '@angular/core';
-import { NgbActiveModal } from '@ng-bootstrap/ng-bootstrap';
+import { NgbActiveModal, NgbModal } from '@ng-bootstrap/ng-bootstrap';
 import { TranslateService } from '@ngx-translate/core';
+import { saveAs } from 'file-saver';
 import { ToastrService } from 'ngx-toastr';
 import { Subject } from 'rxjs';
 import { ApiService } from '@/app/core/api.service';
+import { ConfirmComponent } from '@/app/core/components/confirm/confirm.component';
 import { LogService } from '@/app/core/log.service';
 
 @Component({
@@ -28,6 +31,7 @@ export class PluginLogModalComponent implements OnInit, OnDestroy {
     public activeModal: NgbActiveModal,
     private $api: ApiService,
     private $log: LogService,
+    private $modal: NgbModal,
     private $toastr: ToastrService,
     private $translate: TranslateService,
   ) { }
@@ -43,7 +47,6 @@ export class PluginLogModalComponent implements OnInit, OnDestroy {
 
   getPluginLog() {
     // Get the plugin name as configured in the config file
-    console.log(this.plugin);
     this.$api.get(`/config-editor/plugin/${encodeURIComponent(this.plugin.name)}`).subscribe(
       (result) => {
         const logAlias = this.plugin.name === 'homebridge-config-ui-x' ? 'Homebridge UI' : (result[0]?.name || this.plugin.name);
@@ -56,6 +59,57 @@ export class PluginLogModalComponent implements OnInit, OnDestroy {
     );
   }
 
+  downloadLogFile() {
+    const ref = this.$modal.open(ConfirmComponent);
+    ref.componentInstance.title = this.$translate.instant('logs.title_download_log_file');
+    ref.componentInstance.message = this.$translate.instant('logs.message_download_warning');
+    ref.componentInstance.confirmButtonLabel = this.$translate.instant('logs.label_download');
+    ref.componentInstance.faIconClass = 'fas fa-fw fa-user-secret primary-text';
+
+    ref.result.then(() => {
+      this.$api.get('/platform-tools/hb-service/log/download')
+        .subscribe(
+          (res: HttpResponse<any>) => {
+            if (!res.body) {
+              return;
+            }
+            const lines = res.body.split('\n');
+            let finalOutput = '';
+            let includeNextLine = false;
+
+            lines.forEach((line: string) => {
+              if (includeNextLine) {
+                if (line.match(/36m\[.*?]/)) {
+                  includeNextLine = false;
+                } else {
+                  finalOutput += line + '\r\n';
+                  return;
+                }
+              }
+
+              if (line.includes(`36m[${this.plugin.name}]`)) {
+                finalOutput += line + '\r\n';
+                includeNextLine = true;
+              }
+            });
+
+            saveAs(finalOutput, `${this.plugin.name}.log.txt`);
+          },
+          async (err: HttpErrorResponse) => {
+            let message: string;
+            try {
+              message = JSON.parse(await err.error.text()).message;
+            } catch (e) {
+              // do nothing
+            }
+            this.$toastr.error(message || 'Failed to download log file', this.$translate.instant('toast.title_error'));
+          },
+        );
+    }).catch(() => {
+      // do nothing
+    });
+  }
+
   ngOnDestroy() {
     this.$log.destroyTerminal();
   }

diff --git a/...p/modules/status/widgets/homebridge-status-widget/homebridge-status-widget.component.html b/...p/modules/status/widgets/homebridge-status-widget/homebridge-status-widget.component.html
@@ -1,7 +1,7 @@
 <div class="flex-column d-flex align-items-stretch h-100 w-100 pb-1">
   <div style="cursor: move;" class="drag-handler pl-2 pt-1 pb-1 pr-2">Homebridge</div>
   <div class="d-flex flex-wrap w-100 pr-3 pl-2 justify-content-start gridster-item-content overflow-auto no-scrollbars">
-    <div class="hb-status-item d-flex flex-row mr-4">
+    <div class="hb-status-item d-flex flex-row" style="min-width:max(25%, 250px);">
       <div class="d-flex">
         <div class="mb-0 px-3 py-1 hb-status-icon">
           <i class="fas fa-fw primary-text" [ngClass]="{
@@ -32,7 +32,7 @@
       </div>
     </div>
 
-    <div class="hb-status-item d-flex flex-row mr-4 pr-4">
+    <div class="hb-status-item d-flex flex-row" style="min-width:max(25%, 250px);">
       <div class="d-flex">
         <div class="mb-0 px-3 py-1 hb-status-icon">
           <i class="fas fa-fw fa-cog fa-spin primary-text" *ngIf="!homebridgePkg.installedVersion"></i>
@@ -65,7 +65,7 @@
       </div>
     </div>
 
-    <div class="hb-status-item d-flex flex-row mr-4 pr-4">
+    <div class="hb-status-item d-flex flex-row" style="min-width:max(25%, 250px);">
       <div class="d-flex">
         <div class="mb-0 px-3 py-1 hb-status-icon">
           <i class="fas fa-fw fa-cog fa-spin primary-text" *ngIf="!homebridgeUiPkg.installedVersion"></i>
@@ -98,7 +98,7 @@
       </div>
     </div>
 
-    <div class="hb-status-item d-flex flex-row mr-4 pr-4">
+    <div class="hb-status-item d-flex flex-row" style="min-width:max(25%, 250px);">
       <div class="d-flex">
         <div class="mb-0 px-3 py-1 hb-status-icon">
           <i class="fas fa-fw fa-arrow-alt-circle-up primary-text" *ngIf="homebridgePluginStatus.length"></i>