working (#171)

main.js

@@ -60,12 +60,18 @@ function createWindow() {
     if (config && config.octodash && config.octodash.temperatureSensor !== null) {
         queryTemperatureSensor();
     }
-
+    setTimeout(sendVersionInfo, 42 * 1000);
     window.on('closed', () => {
         window = null;
     });
 }
 
+function sendVersionInfo() {
+    window.webContents.send("versionInformation", {
+        version: process.env.npm_package_version
+    })
+}
+
 function queryTemperatureSensor() {
     if (process.platform !== "linux") {
         sensor.initialize({

src/app/app.component.html

@@ -1,4 +1,4 @@
-<app-error></app-error>
+<app-notification></app-notification>
 <div class="container">
     <router-outlet></router-outlet>
 </div>

src/app/app.module.ts

@@ -9,7 +9,7 @@ import { AppRoutingModule } from './app.routing.module';
 import { AppComponent } from './app.component';
 import { BottomBarComponent } from './bottom-bar/bottom-bar.component';
 import { ControlComponent } from './control/control.component';
-import { ErrorComponent } from './error/error.component';
+import { NotificationComponent } from './notification/notification.component';
 import { FilamentComponent } from './filament/filament.component';
 import { FilesComponent } from './files/files.component';
 import { InvalidConfigComponent } from './config/invalid-config/invalid-config.component';
@@ -24,7 +24,7 @@ import { PrinterStatusComponent } from './printer-status/printer-status.componen
 
 import { AppService } from './app.service';
 import { ConfigService } from './config/config.service';
-import { ErrorService } from './error/error.service';
+import { NotificationService } from './notification/notification.service';
 import { JobService } from './job.service';
 import { PrinterService } from './printer.service';
 
@@ -55,7 +55,7 @@ export class MyHammerConfig extends HammerGestureConfig {
     InvalidConfigComponent,
     NoConfigComponent,
     PrintControlComponent,
-    ErrorComponent,
+    NotificationComponent,
     MainMenuComponent,
     ControlComponent,
     MainScreenComponent,
@@ -77,7 +77,7 @@ export class MyHammerConfig extends HammerGestureConfig {
   providers: [
     AppService,
     ConfigService,
-    ErrorService,
+    NotificationService,
     PrinterService,
     JobService,
     {

src/app/app.service.ts

@@ -1,5 +1,7 @@
 import { Injectable } from '@angular/core';
 import { ConfigService } from './config/config.service';
+import { NotificationService } from './notification/notification.service';
+import { HttpClient } from '@angular/common/http';
 
 @Injectable({
   providedIn: 'root'
@@ -8,14 +10,41 @@ export class AppService {
 
   private updateError: string[];
   private loadedFile = false;
+  private ipc: any;
+  private version: string;
+
+  constructor(private configService: ConfigService, private notificationService: NotificationService, private http: HttpClient) {
+    if (window.require && configService.config.octodash.temperatureSensor !== null) {
+      try {
+        this.ipc = window.require('electron').ipcRenderer;
+        this.ipc.on('versionInformation', ({ }, versionInformation: VersionInformation) => {
+          this.version = versionInformation.version;
+          this.checkUpdate();
+        });
+      } catch (e) {
+        this.notificationService.setError('Can\'t retrieve version information', 'Please open an issue for GitHub as this shouldn\'t happen.');
+      }
+    }
 
-  constructor(private configService: ConfigService) {
     this.updateError = [
       '.printer should have required property \'xySpeed\'',
       '.printer should have required property \'zSpeed\'',
       '.octodash should have required property \'customActions\''];
   }
 
+  private checkUpdate(): void {
+    this.http.get('https://api.github.com/repos/UnchartedBull/OctoDash/releases/latest').subscribe(
+      (data: GitHubRealeaseInformation) => {
+        if (this.version !== data.name.replace('v', '')) {
+          this.notificationService.setUpdate('It\'s time for an update',
+            `Version ${data.name} is available now, while you're on v${this.version}. Consider updating :)`);
+        }
+      },
+      () => null
+    );
+    setTimeout(this.checkUpdate.bind(this), 21.6 * 1000000);
+  }
+
   public getUpdateError(): string[] {
     return this.updateError;
   }
@@ -96,3 +125,12 @@ export class AppService {
   }
 
 }
+
+interface VersionInformation {
+  version: string;
+}
+
+interface GitHubRealeaseInformation {
+  name: string;
+  [key: string]: any;
+}

src/app/files.service.ts

@@ -1,7 +1,7 @@
 import { Injectable } from '@angular/core';
 import { ConfigService } from './config/config.service';
 import { HttpClient, HttpErrorResponse } from '@angular/common/http';
-import { ErrorService } from './error/error.service';
+import { NotificationService } from './notification/notification.service';
 import { Subscription } from 'rxjs';
 import { OctoprintFolderAPI, OctoprintFilesAPI, OctoprintFolderContentAPI } from './octoprint-api/filesAPI';
 import { AppService } from './app.service';
@@ -18,7 +18,7 @@ export class FilesService {
   constructor(
     private configService: ConfigService,
     private http: HttpClient,
-    private errorService: ErrorService,
+    private notificationService: NotificationService,
     private service: AppService) { }
 
   public getFolder(folderPath: string = '/'): Promise<Array<File | Folder>> {
@@ -62,14 +62,14 @@ export class FilesService {
           },
           (error: HttpErrorResponse) => {
             if (error.status === 404) {
-              this.errorService.setError('Can\'t find specified folder!', error.message);
+              this.notificationService.setError('Can\'t find specified folder!', error.message);
               if (folderPath !== '/') {
                 this.getFolder(folderPath.substring(0, folderPath.lastIndexOf('/')));
               } else {
                 reject();
               }
             } else {
-              this.errorService.setError('Can\'t retrieve folder!', error.message);
+              this.notificationService.setError('Can\'t retrieve folder!', error.message);
               reject();
             }
           }
@@ -99,10 +99,10 @@ export class FilesService {
           },
           (error: HttpErrorResponse) => {
             if (error.status === 404) {
-              this.errorService.setError('Can\'t find specified file!', error.message);
+              this.notificationService.setError('Can\'t find specified file!', error.message);
               reject();
             } else {
-              this.errorService.setError('Can\'t retrieve folder!', error.message);
+              this.notificationService.setError('Can\'t retrieve folder!', error.message);
               reject();
             }
           }
@@ -122,7 +122,7 @@ export class FilesService {
       loadFileBody, this.configService.getHTTPHeaders()).subscribe(
         () => null,
         (error: HttpErrorResponse) => {
-          this.errorService.setError('Can\'t load the file!', error.message);
+          this.notificationService.setError('Can\'t load the file!', error.message);
         }
       );
   }
@@ -139,7 +139,7 @@ export class FilesService {
       printFileBody, this.configService.getHTTPHeaders()).subscribe(
         () => null,
         (error: HttpErrorResponse) => {
-          this.errorService.setError('Can\'t start print!', error.message);
+          this.notificationService.setError('Can\'t start print!', error.message);
         }
       );
   }
@@ -152,7 +152,7 @@ export class FilesService {
       this.configService.getHTTPHeaders()).subscribe(
         () => null,
         (error: HttpErrorResponse) => {
-          this.errorService.setError('Can\'t delete file!', error.message);
+          this.notificationService.setError('Can\'t delete file!', error.message);
         }
       );
   }

src/app/job-status/job-status.component.ts

@@ -2,7 +2,7 @@ import { Component, OnInit, OnDestroy } from '@angular/core';
 import { JobService, Job } from '../job.service';
 import { Subscription } from 'rxjs';
 import { AppService } from '../app.service';
-import { ErrorService } from '../error/error.service';
+import { NotificationService } from '../notification/notification.service';
 
 @Component({
   selector: 'app-job-status',
@@ -14,7 +14,7 @@ export class JobStatusComponent implements OnInit, OnDestroy {
   private subscriptions: Subscription = new Subscription();
   public job: Job;
 
-  constructor(private jobService: JobService, private service: AppService, private errorService: ErrorService) { }
+  constructor(private jobService: JobService, private service: AppService, private notificationService: NotificationService) { }
 
   ngOnInit() {
     this.subscriptions.add(this.jobService.getObservable().subscribe((job: Job) => this.job = job));
@@ -29,7 +29,7 @@ export class JobStatusComponent implements OnInit, OnDestroy {
   }
 
   public preheat(): void {
-    this.errorService.setError('Operation not yet supported', 'sorry about that one ... will come in the future!');
+    this.notificationService.setError('Operation not yet supported', 'sorry about that one ... will come in the future!');
   }
 
   public cancelLoadedFile(): void {

src/app/job.service.ts

@@ -4,7 +4,7 @@ import { ConfigService } from './config/config.service';
 import { HttpClient, HttpErrorResponse } from '@angular/common/http';
 import { shareReplay } from 'rxjs/operators';
 import { OctoprintJobAPI, JobCommand } from './octoprint-api/jobAPI';
-import { ErrorService } from './error/error.service';
+import { NotificationService } from './notification/notification.service';
 import { AppService } from './app.service';
 
 @Injectable({
@@ -20,7 +20,7 @@ export class JobService {
   constructor(
     private configService: ConfigService,
     private http: HttpClient,
-    private errorService: ErrorService,
+    private notificationService: NotificationService,
     private service: AppService) {
     this.observable = new Observable((observer: Observer<any>) => {
       this.observer = observer;
@@ -49,7 +49,7 @@ export class JobService {
             }
             observer.next(job);
           }, (error: HttpErrorResponse) => {
-            this.errorService.setError('Can\'t retrieve jobs!', error.message);
+            this.notificationService.setError('Can\'t retrieve jobs!', error.message);
           });
 
       });
@@ -74,9 +74,9 @@ export class JobService {
     this.httpPOSTRequest = this.http.post(this.configService.getURL('job'), cancelPayload, this.configService.getHTTPHeaders()).subscribe(
       () => null, (error: HttpErrorResponse) => {
         if (error.status === 409) {
-          this.errorService.setError('Can\'t cancel Job!', 'There is no running job, that could be cancelled (409)');
+          this.notificationService.setError('Can\'t cancel Job!', 'There is no running job, that could be cancelled (409)');
         } else {
-          this.errorService.setError('Can\'t cancel Job!', error.message);
+          this.notificationService.setError('Can\'t cancel Job!', error.message);
         }
       }
     );
@@ -93,9 +93,9 @@ export class JobService {
     this.httpPOSTRequest = this.http.post(this.configService.getURL('job'), pausePayload, this.configService.getHTTPHeaders()).subscribe(
       () => null, (error: HttpErrorResponse) => {
         if (error.status === 409) {
-          this.errorService.setError('Can\'t pause Job!', 'There is no running job, that could be paused (409)');
+          this.notificationService.setError('Can\'t pause Job!', 'There is no running job, that could be paused (409)');
         } else {
-          this.errorService.setError('Can\'t pause Job!', error.message);
+          this.notificationService.setError('Can\'t pause Job!', error.message);
         }
       }
     );
@@ -112,9 +112,9 @@ export class JobService {
     this.httpPOSTRequest = this.http.post(this.configService.getURL('job'), pausePayload, this.configService.getHTTPHeaders()).subscribe(
       () => null, (error: HttpErrorResponse) => {
         if (error.status === 409) {
-          this.errorService.setError('Can\'t resume Job!', 'There is no paused job, that could be resumed (409)');
+          this.notificationService.setError('Can\'t resume Job!', 'There is no paused job, that could be resumed (409)');
         } else {
-          this.errorService.setError('Can\'t resume Job!', error.message);
+          this.notificationService.setError('Can\'t resume Job!', error.message);
         }
       }
     );
@@ -130,9 +130,9 @@ export class JobService {
     this.httpPOSTRequest = this.http.post(this.configService.getURL('job'), pausePayload, this.configService.getHTTPHeaders()).subscribe(
       () => null, (error: HttpErrorResponse) => {
         if (error.status === 409) {
-          this.errorService.setError('Can\'t start Job!', 'There is already a job running (409)');
+          this.notificationService.setError('Can\'t start Job!', 'There is already a job running (409)');
         } else {
-          this.errorService.setError('Can\'t start Job!', error.message);
+          this.notificationService.setError('Can\'t start Job!', error.message);
         }
       }
     );