merge master

.github/ISSUE_TEMPLATE/bug_report.md

@@ -27,6 +27,7 @@ If applicable, add screenshots to help explain your problem.
  - Hardware [e.g. Raspberry Pi, if you have layout issues please also include your screen resolution]
  - OS Info [e.g. Raspbian Buster Lite, please also indicate if you used OctoPi]
  - OctoDash Version [e.g. v1.0.0]
+ - OctoPrint Version [e.g. v1.0.0]
 
 **Additional context**
 Add any other context about the problem here.

README.md

@@ -33,7 +33,7 @@ wget -qO- https://github.com/UnchartedBull/OctoDash/raw/master/scripts/install.s
 
 For more options and information have a look at the [wiki](https://github.com/UnchartedBull/OctoDash/wiki/Installation).
 
-No Screen? [No Problem](https://github.com/UnchartedBull/OctoDash/wiki/Installation#setup-without-keyboard). 
+No Keyboard? [No Problem](https://github.com/UnchartedBull/OctoDash/wiki/Installation#setup-without-keyboard). 
 
 Having issues during the installation? Please have a look at the [Troubleshooting Guide](https://github.com/UnchartedBull/OctoDash/wiki/Troubleshooting) first.
 

package.json

@@ -76,32 +76,32 @@
         "@fortawesome/angular-fontawesome": "^0.5.0",
         "@fortawesome/fontawesome-svg-core": "^1.2.25",
         "@fortawesome/free-solid-svg-icons": "^5.11.2",
-        "ajv": "^6.10.2",
+        "ajv": "^6.11.0",
         "angular-svg-round-progressbar": "^3.0.1",
         "electron-store": "^5.1.0",
         "hammerjs": "^2.0.8",
         "lodash": "^4.17.15",
-        "ngx-spinner": "^8.0.3",
-        "rxjs": "~6.5.3",
+        "ngx-spinner": "^8.1.0",
+        "rxjs": "~6.5.4",
         "tslib": "^1.9.0",
         "zone.js": "~0.9.1"
     },
     "devDependencies": {
-        "@angular-devkit/build-angular": "^0.803.20",
-        "@angular/cli": "~8.3.20",
+        "@angular-devkit/build-angular": "^0.803.23",
+        "@angular/cli": "~8.3.23",
         "@angular/compiler-cli": "^8.2.2",
         "@angular/language-service": "~8.2.14",
         "@types/ajv": "^1.0.0",
         "@types/lodash": "^4.14.149",
-        "@types/node": "~12.12.14",
-        "codelyzer": "^5.2.0",
-        "electron": "^7.1.3",
+        "@types/node": "~13.1.8",
+        "codelyzer": "^5.2.1",
+        "electron": "^7.1.9",
         "electron-builder": "^22.2.0",
         "electron-reload": "^1.5.0",
         "npm-run-all": "^4.1.5",
-        "ts-node": "~8.5.4",
+        "ts-node": "~8.6.2",
         "tslint": "~5.20.1",
         "typescript": "~3.5.3",
-        "wait-on": "^3.3.0"
+        "wait-on": "^4.0.0"
     }
 }

src/app/config/config.service.ts

@@ -181,6 +181,11 @@ export class ConfigService {
     return this.config.octodash.turnScreenOffSleep;
   }
 
+  public isPSUControlEnabled(): boolean {
+    // TODO: implement in next config change
+    return false;
+  }
+
   public getFilamentThickness(): number {
     return this.config.filament.thickness;
   }

src/app/notification/notification.component.ts

@@ -1,8 +1,6 @@
 import { Component, OnDestroy } from '@angular/core';
 import { Subscription } from 'rxjs';
-import { NotificationService, Message } from './notification.service';
-import { PrinterService } from '../printer.service';
-import { Router } from '@angular/router';
+import { NotificationService, Notification } from './notification.service';
 
 @Component({
   selector: 'app-notification',
@@ -13,41 +11,27 @@ export class NotificationComponent implements OnDestroy {
 
   private subscriptions: Subscription = new Subscription();
 
-  public notification: Message = {
+  public notification: Notification = {
     heading: '',
     text: '',
     type: ''
   };
   public show = false;
 
-  public constructor(private notificationService: NotificationService, private printerService: PrinterService, private router: Router) {
-    this.subscriptions.add(this.notificationService.getObservable().subscribe((message: Message) => this.setMessage(message)));
+  public constructor(private notificationService: NotificationService) {
+    this.subscriptions.add(this.notificationService.getObservable().subscribe((message: Notification) => this.setNotification(message)));
   }
 
   public hideNotification() {
     this.show = false;
   }
 
-  public setMessage(message: Message) {
-    if (message.printerStatusError) {
-      this.printerService.isPrinterOffline().then((printerOffline) => {
-        if (printerOffline) {
-          this.hideNotification();
-          console.clear();
-          this.router.navigate(['/standby']);
-        } else {
-          this.notification = message;
-          this.show = true;
-        }
-      });
-    } else {
-      this.notification = message;
-      this.show = true;
-    }
+  public setNotification(notification: Notification) {
+    this.notification = notification;
+    this.show = true;
   }
 
   public ngOnDestroy() {
     this.subscriptions.unsubscribe();
   }
-
 }

src/app/notification/notification.service.ts

@@ -7,17 +7,30 @@ import { shareReplay } from 'rxjs/operators';
 })
 export class NotificationService {
 
-  private observable: Observable<Message>;
-  private observer: Observer<Message>;
+  private observable: Observable<Notification>;
+  private observer: Observer<Notification>;
+  private hideNotifications = false;
 
   constructor() {
-    this.observable = new Observable((observer: Observer<Message>) => {
+    this.observable = new Observable((observer: Observer<Notification>) => {
       this.observer = observer;
     }).pipe(shareReplay(1));
   }
 
-  setError(heading: string, text: string, printerStatusError = false) {
-    this.observer.next({ heading, text, type: 'error', printerStatusError });
+  enableNotifications() {
+    console.clear();
+    this.hideNotifications = false;
+  }
+
+  disableNotifications() {
+    console.clear();
+    this.hideNotifications = true;
+  }
+
+  setError(heading: string, text: string) {
+    if (!this.hideNotifications) {
+      this.observer.next({ heading, text, type: 'error' });
+    }
   }
 
   setUpdate(heading: string, text: string) {
@@ -29,9 +42,8 @@ export class NotificationService {
   }
 }
 
-export interface Message {
+export interface Notification {
   heading: string;
   text: string;
   type: string;
-  printerStatusError?: boolean;
 }

src/app/printer.service.ts

@@ -6,6 +6,7 @@ import { shareReplay } from 'rxjs/operators';
 import { OctoprintPrinterStatusAPI } from './octoprint-api/printerStatusAPI';
 import { NotificationService } from './notification/notification.service';
 import { OctoprintConnectionAPI } from './octoprint-api/connectionAPI';
+import { Router } from '@angular/router';
 
 @Injectable({
   providedIn: 'root'
@@ -16,7 +17,11 @@ export class PrinterService {
   httpPOSTRequest: Subscription;
   observable: Observable<PrinterStatusAPI>;
 
-  constructor(private http: HttpClient, private configService: ConfigService, private notificationService: NotificationService) {
+  constructor(
+    private http: HttpClient,
+    private configService: ConfigService,
+    private notificationService: NotificationService,
+    private router: Router) {
     this.observable = new Observable((observer: Observer<PrinterStatusAPI>) => {
       timer(500, this.configService.getAPIInterval()).subscribe(_ => {
         if (this.httpGETRequest) {
@@ -38,7 +43,14 @@ export class PrinterService {
             observer.next(printerStatus);
           }, (error: HttpErrorResponse) => {
             if (error.status === 409) {
-              this.notificationService.setError('Can\'t retrieve printer status!', error.message, true);
+              this.isPrinterOffline().then((printerOffline) => {
+                if (printerOffline) {
+                  this.router.navigate(['/standby']);
+                  this.notificationService.disableNotifications();
+                } else {
+                  this.notificationService.setError('Can\'t retrieve printer status!', error.message);
+                }
+              });
             } else {
               const printerStatus: PrinterStatusAPI = {
                 status: `error (${error.status})`,

src/app/standby/standby.component.ts

@@ -1,9 +1,11 @@
 import { Component, OnInit } from '@angular/core';
 import { ConfigService } from '../config/config.service';
-import { Subscription } from 'rxjs';
 import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { Router } from '@angular/router';
 import { AppService } from '../app.service';
+import { NotificationService } from '../notification/notification.service';
+import { OctoprintConnectionAPI } from '../octoprint-api/connectionAPI';
+import { PsuControlService } from '../plugin-service/psu-control.service';
 
 @Component({
   selector: 'app-standby',
@@ -14,9 +16,14 @@ export class StandbyComponent implements OnInit {
 
   connecting = false;
   error = '';
-  httpPOSTRequest: Subscription;
 
-  constructor(private configService: ConfigService, private http: HttpClient, private router: Router, private service: AppService) { }
+  constructor(
+    private configService: ConfigService,
+    private http: HttpClient,
+    private router: Router,
+    private service: AppService,
+    private notificationService: NotificationService,
+    private psuControlService: PsuControlService) { }
 
   ngOnInit() {
     if (this.configService.getAutomaticScreenSleep()) {
@@ -26,30 +33,46 @@ export class StandbyComponent implements OnInit {
 
   reconnect() {
     this.connecting = true;
-    if (this.httpPOSTRequest) {
-      this.httpPOSTRequest.unsubscribe();
+    if (this.configService.isPSUControlEnabled()) {
+      this.psuControlService.changePSUState(true);
     }
+    this.http.get(this.configService.getURL('connection'), this.configService.getHTTPHeaders())
+      .subscribe(
+        (data: OctoprintConnectionAPI) => {
+          if (data.current.state === 'Closed') {
+            this.http.post(this.configService.getURL('connection'), connectPayload, this.configService.getHTTPHeaders())
+              .subscribe(
+                () => {
+                  this.disableStandby();
+                },
+                () => {
+                  this.connecting = false;
+                  this.error =
+                    'OctoPrint can\'t connect to your printer. Please make sure that the connection works, then come back and try again.';
+                });
+          } else {
+            this.disableStandby();
+          }
+        },
+        (error: HttpErrorResponse) => {
+          this.connecting = false;
+          this.error = 'There is something really wrong, OctoDash can\'t get a response from OctoPrint. Please check your setup!';
+        });
     const connectPayload: ConnectCommand = {
       command: 'connect',
       save: false
     };
-    this.httpPOSTRequest = this.http.post(this.configService.getURL('connection'), connectPayload, this.configService.getHTTPHeaders())
-      .subscribe(
-        () => {
-          setTimeout(() => {
-            this.connecting = false;
-            if (this.configService.getAutomaticScreenSleep()) {
-              this.service.turnDisplayOn();
-            }
-            this.router.navigate(['/main-screen']);
-          }, 4000);
-        },
-        () => {
-          this.connecting = false;
-          this.error =
-            'OctoPrint can\'t connect to your printer. Please make sure that the connection works, then come back and try again.';
-        }
-      );
+  }
+
+  disableStandby() {
+    setTimeout(() => {
+      this.connecting = false;
+      if (this.configService.getAutomaticScreenSleep()) {
+        this.service.turnDisplayOn();
+      }
+      this.notificationService.enableNotifications();
+      this.router.navigate(['/main-screen']);
+    }, 2000);
   }
 }