From 5def7c7962db09d8297b0591767af6b919b9d498 Mon Sep 17 00:00:00 2001
From: UnchartedBull <timon.gaebelein@icloud.com>
Date: Tue, 30 Jun 2020 16:25:45 +0200
Subject: [PATCH 1/9] updated update notifier

---
 src/app/app.service.ts                     |  11 +++++------
 src/app/main-menu/main-menu.component.html |   1 +
 src/app/main-menu/main-menu.component.scss |  10 ++++++++++
 src/app/main-menu/main-menu.component.ts   |   4 ++++
 src/app/settings/settings.component.html   |  20 +++++++++++++-------
 src/app/settings/settings.component.scss   |   9 ++++++++-
 src/app/settings/settings.component.ts     |   2 +-
 src/assets/made-in-berlin.png              | Bin 10671 -> 8496 bytes
 8 files changed, 42 insertions(+), 15 deletions(-)

diff --git a/src/app/app.service.ts b/src/app/app.service.ts
index 14a70c27f..1f7216161 100644
--- a/src/app/app.service.ts
+++ b/src/app/app.service.ts
@@ -14,6 +14,7 @@ export class AppService {
   private ipc: any;
   private version: string;
   private latestVersion: string;
+  public updateAvailable = false;
 
   public constructor(
     private configService: ConfigService,
@@ -62,18 +63,16 @@ export class AppService {
     });
 
     this.ipc.on("customStylesError", (_, customCSSError: string): void => {
-      this.notificationService.setError("Can't get custom styles!", customCSSError);
+      this.notificationService.setError("Can't load custom styles!", customCSSError);
     });
   }
 
   private checkUpdate(): void {
     this.http.get("https://api.github.com/repos/UnchartedBull/OctoDash/releases/latest").subscribe(
       (data: GitHubReleaseInformation): void => {
-        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 :)`
-          );
+        //FIXME
+        if (this.version !== data.name.replace("va", "")) {
+          this.updateAvailable = true;
         }
         this.latestVersion = data.name.replace("v", "");
       },
diff --git a/src/app/main-menu/main-menu.component.html b/src/app/main-menu/main-menu.component.html
index b232f5dae..53ff1f1da 100644
--- a/src/app/main-menu/main-menu.component.html
+++ b/src/app/main-menu/main-menu.component.html
@@ -3,6 +3,7 @@
     >OctoDash<span class="main-menu__heading" style="color: #1ec02c; display: inline;">.</span></span
   >
   <img src="assets/settings.svg" class="main-menu__settings-icon" (click)="showSettings()" />
+  <div class="main-menu__update-notifier" *ngIf="service.updateAvailable"></div>
   <table class="main-menu__options">
     <tr>
       <td routerLink="/files" matRipple [matRippleUnbounded]="false" [matRippleCentered]="true">
diff --git a/src/app/main-menu/main-menu.component.scss b/src/app/main-menu/main-menu.component.scss
index d2e79c192..cf8658a0e 100644
--- a/src/app/main-menu/main-menu.component.scss
+++ b/src/app/main-menu/main-menu.component.scss
@@ -51,4 +51,14 @@
       margin-bottom: 1.7vw;
     }
   }
+
+  &__update-notifier {
+    width: 2.2vw;
+    height: 2.2vw;
+    border-radius: 4vw;
+    background-color: #e84118;
+    position: absolute;
+    right: 1.9vw;
+    top: 13vh;
+  }
 }
diff --git a/src/app/main-menu/main-menu.component.ts b/src/app/main-menu/main-menu.component.ts
index 546c54f10..bb3e87465 100644
--- a/src/app/main-menu/main-menu.component.ts
+++ b/src/app/main-menu/main-menu.component.ts
@@ -1,11 +1,15 @@
 import { Component } from "@angular/core";
 
+import { AppService } from "../app.service";
+
 @Component({
   selector: "app-main-menu",
   templateUrl: "./main-menu.component.html",
   styleUrls: ["./main-menu.component.scss"],
 })
 export class MainMenuComponent {
+  public constructor(public service: AppService) {}
+
   public settings = false;
 
   public showSettings(): void {
diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html
index 83affa201..cc5a58280 100644
--- a/src/app/settings/settings.component.html
+++ b/src/app/settings/settings.component.html
@@ -5,17 +5,23 @@
       <div class="settings__content" #settingsMain>
         <span class="settings__heading">settings</span>
         <ul class="settings__list">
-          <li (click)="changePage(1, 0, 'forward')">General <fa-icon [icon]="['fas', 'chevron-right']"></fa-icon></li>
-          <li (click)="changePage(2, 0, 'forward')">OctoDash <fa-icon [icon]="['fas', 'chevron-right']"></fa-icon></li>
-          <li (click)="changePage(3, 0, 'forward')">Plugins <fa-icon [icon]="['fas', 'chevron-right']"></fa-icon></li>
-          <li (click)="changePage(4, 0, 'forward')">Credits <fa-icon [icon]="['fas', 'chevron-right']"></fa-icon></li>
+          <li (click)="changePage(1, 0, 'forward')">general <fa-icon [icon]="['fas', 'chevron-right']"></fa-icon></li>
+          <li (click)="changePage(2, 0, 'forward')">octodash <fa-icon [icon]="['fas', 'chevron-right']"></fa-icon></li>
+          <li (click)="changePage(3, 0, 'forward')">plugins <fa-icon [icon]="['fas', 'chevron-right']"></fa-icon></li>
+          <li (click)="changePage(4, 0, 'forward')">about <fa-icon [icon]="['fas', 'chevron-right']"></fa-icon></li>
         </ul>
+        <span
+          class="settings__update-available"
+          (click)="changePage(4, 0, 'forward')"
+          [ngStyle]="{ opacity: service.updateAvailable ? '0.7' : '0' }"
+          >update available!</span
+        >
         <span class="settings__save" (click)="updateConfig()">save</span>
         <span class="settings__made"
-          >Made with <fa-icon [icon]="['fas', 'heart']" class="settings__made-heart"> </fa-icon> by
+          >made with <fa-icon [icon]="['fas', 'heart']" class="settings__made-heart"> </fa-icon> by
           /u/UnchartedBull</span
         >
-        <span class="settings__version">OctoDash v{{ version }}</span>
+        <!-- <span class="settings__version">OctoDash v{{ version }}</span> -->
       </div>
       <div class="settings__content settings__content-inactive" #settingsGeneral>
         <span class="settings__heading" (click)="changePage(0, 1, 'backward')">
@@ -537,7 +543,7 @@
       </div>
       <div class="settings__content settings__content-inactive" #settingsCredits>
         <span class="settings__heading" (click)="changePage(0, 4, 'backward')">
-          <fa-icon [icon]="['fas', 'chevron-left']" class="settings__heading-back"> </fa-icon>credits
+          <fa-icon [icon]="['fas', 'chevron-left']" class="settings__heading-back"> </fa-icon>about
         </span>
         <div class="settings__scroll">
           <span class="settings__heading-2">License</span>
diff --git a/src/app/settings/settings.component.scss b/src/app/settings/settings.component.scss
index c4582d02a..e717dfd1b 100644
--- a/src/app/settings/settings.component.scss
+++ b/src/app/settings/settings.component.scss
@@ -18,7 +18,7 @@
     position: absolute;
     top: 10vh;
     left: 20vw;
-    height: 80vh;
+    height: 81vh;
     width: 60vw;
     background-color: #353b48;
     border-radius: 2vw;
@@ -271,6 +271,13 @@
       padding-left: 4vw;
     }
   }
+
+  &__update-available {
+    font-size: 0.4rem;
+    display: block;
+    margin-top: -1vh;
+    margin-bottom: -2.5vh;
+  }
 }
 
 .filament-feed-speed-info {
diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts
index b2a361879..7eb2c6dfa 100644
--- a/src/app/settings/settings.component.ts
+++ b/src/app/settings/settings.component.ts
@@ -36,7 +36,7 @@ export class SettingsComponent implements OnInit {
   public constructor(
     private configService: ConfigService,
     private notificationService: NotificationService,
-    private service: AppService
+    public service: AppService
   ) {
     this.config = this.configService.getCurrentConfig();
     this.config = this.configService.revertConfigForInput(this.config);
diff --git a/src/assets/made-in-berlin.png b/src/assets/made-in-berlin.png
index e3dd578689016005111ae66fdd0ee1f6b687e5e5..d901c07dbd7424b1509d7018433af394c07eec7d 100644
GIT binary patch
literal 8496
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

literal 10671
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


From ff00ac178f29c23ca7f3e4f54e861c3a51b0a9f5 Mon Sep 17 00:00:00 2001
From: UnchartedBull <timon.gaebelein@icloud.com>
Date: Wed, 1 Jul 2020 16:17:30 +0200
Subject: [PATCH 2/9] added about screen

---
 src/app/app.service.ts                   |  2 +-
 src/app/settings/settings.component.html |  9 +++++
 src/app/settings/settings.component.scss | 43 ++++++++++++++++++++++++
 3 files changed, 53 insertions(+), 1 deletion(-)

diff --git a/src/app/app.service.ts b/src/app/app.service.ts
index 1f7216161..792f6d660 100644
--- a/src/app/app.service.ts
+++ b/src/app/app.service.ts
@@ -78,7 +78,7 @@ export class AppService {
       },
       (): void => null
     );
-    setTimeout(this.checkUpdate.bind(this), 21.6 * 1000000);
+    setTimeout(this.checkUpdate.bind(this), 3600000);
   }
 
   public getVersion(): string {
diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html
index cc5a58280..b4bcbadd4 100644
--- a/src/app/settings/settings.component.html
+++ b/src/app/settings/settings.component.html
@@ -546,6 +546,15 @@
           <fa-icon [icon]="['fas', 'chevron-left']" class="settings__heading-back"> </fa-icon>about
         </span>
         <div class="settings__scroll">
+          <img src="assets/icon/icon-main-title.svg" class="settings__about-icon" />
+          <span class="settings__about-version">v1.5.0</span>
+          <button class="settings__about-update settings__about-update-not-available" *ngIf="!service.updateAvailable">
+            no update available
+          </button>
+          <button class="settings__about-update settings__about-update-available" *ngIf="service.updateAvailable">
+            install v{{ service.latestVersion }}
+          </button>
+          <span class="settings__about-copyright">&#169; 2019-2020 UnchartedBull</span>
           <span class="settings__heading-2">License</span>
           <p class="settings__text">
             Licensed under the Apache 2.0 License. <br />
diff --git a/src/app/settings/settings.component.scss b/src/app/settings/settings.component.scss
index e717dfd1b..f35c85338 100644
--- a/src/app/settings/settings.component.scss
+++ b/src/app/settings/settings.component.scss
@@ -278,6 +278,49 @@
     margin-top: -1vh;
     margin-bottom: -2.5vh;
   }
+
+  &__about {
+    &-icon {
+      height: 35vh;
+      margin: auto;
+      display: block;
+    }
+
+    &-version {
+      display: block;
+      text-align: center;
+      font-size: 0.45em;
+      margin-top: 1.5vh;
+      opacity: 0.7;
+    }
+
+    &-update {
+      display: block;
+      padding: 1.4vh 2vw;
+      border-radius: 1vw;
+      box-shadow: 0 10px 19px -8px rgba(0, 0, 0, 0.75);
+      font-size: 0.7rem;
+      outline: 0;
+      border: 0;
+      margin: 3vh auto;
+
+      &-not-available {
+        background-color: #718093;
+        opacity: 0.8;
+      }
+
+      &-available {
+        background-color: #44bd32;
+      }
+    }
+
+    &-copyright {
+      display: block;
+      text-align: center;
+      font-size: 0.4rem;
+      margin-top: 5vh;
+    }
+  }
 }
 
 .filament-feed-speed-info {

From 47458936d9758943ddea720059683484942f691b Mon Sep 17 00:00:00 2001
From: UnchartedBull <timon.gaebelein@icloud.com>
Date: Fri, 10 Jul 2020 18:03:29 +0200
Subject: [PATCH 3/9] cleanup + start working on update screen

---
 main.js                                       | 21 ++++++-
 package.json                                  |  1 +
 src/app/app.component.ts                      |  9 +++
 src/app/app.module.ts                         |  2 +
 src/app/app.service.ts                        | 50 ++++++++--------
 src/app/config/config.service.ts              | 27 +++------
 src/app/files.service.ts                      |  8 +--
 src/app/job.service.ts                        |  8 +--
 src/app/main-menu/main-menu.component.html    |  2 +-
 .../main-screen/main-screen.component.html    |  7 ++-
 src/app/settings/settings.component.html      |  9 ++-
 src/app/settings/settings.component.ts        | 36 ++++++------
 src/app/update/update.component.html          |  8 +++
 src/app/update/update.component.scss          | 57 +++++++++++++++++++
 src/app/update/update.component.ts            | 45 +++++++++++++++
 15 files changed, 212 insertions(+), 78 deletions(-)
 create mode 100644 src/app/update/update.component.html
 create mode 100644 src/app/update/update.component.scss
 create mode 100644 src/app/update/update.component.ts

diff --git a/main.js b/main.js
index d4841cec2..87d26cb27 100644
--- a/main.js
+++ b/main.js
@@ -68,10 +68,10 @@ function createWindow() {
     window.setFullScreen(true);
   }
 
-  // setTimeout(sendVersionInfo, 30 * 1000);
   activateAppInfoListener();
   activateScreenSleepListener();
   activateReloadListener();
+  activateUpdateListener();
 
   window.on("closed", () => {
     window = null;
@@ -109,6 +109,12 @@ function activateAppInfoListener() {
   });
 }
 
+function activateUpdateListener() {
+  ipcMain.on("update", (_, updateInfo) => {
+    downloadUpdate(updateInfo);
+  });
+}
+
 function sendCustomStyles() {
   fs.readFile(path.join(app.getPath("userData"), "custom-styles.css"), "utf-8", (err, data) => {
     if (err) {
@@ -135,6 +141,19 @@ function sendVersionInfo() {
   });
 }
 
+function downloadUpdate(updateInfo) {
+  exec("arch", (err, stdout, stderr) => {
+    if (err) {
+      console.log(err);
+    }
+    if (stderr) {
+      console.error(stderr);
+    }
+    console.log(stdout);
+    console.log(updateInfo);
+  });
+}
+
 app.on("ready", createWindow);
 
 app.on("window-all-closed", () => {
diff --git a/package.json b/package.json
index 8f0e65c07..4dfdb4fa7 100644
--- a/package.json
+++ b/package.json
@@ -54,6 +54,7 @@
     "lint": "eslint ./src/ -c .eslintrc.js --ext .ts",
     "lint:fix": "eslint ./src/ -c .eslintrc.js --ext .ts --fix",
     "electron": "electron .",
+    "electron:dev": "electron . --serve --big",
     "electron:serve": "wait-on http-get://localhost:4200/ && electron . --serve",
     "electron:serve:big": "wait-on http-get://localhost:4200/ && electron . --serve --big",
     "pack": "npm run ng:build && electron-builder build -l",
diff --git a/src/app/app.component.ts b/src/app/app.component.ts
index ca944e8e6..cdefd7777 100644
--- a/src/app/app.component.ts
+++ b/src/app/app.component.ts
@@ -5,6 +5,15 @@ import _ from "lodash";
 import { AppService } from "./app.service";
 import { ConfigService } from "./config/config.service";
 
+declare global {
+  interface Window {
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    require: any;
+    // eslint-disable-next-line @typescript-eslint/no-explicit-any
+    process: any;
+  }
+}
+
 @Component({
   selector: "app-root",
   templateUrl: "./app.component.html",
diff --git a/src/app/app.module.ts b/src/app/app.module.ts
index 25a333234..cd8c126bd 100644
--- a/src/app/app.module.ts
+++ b/src/app/app.module.ts
@@ -32,6 +32,7 @@ import { PrinterStatusComponent } from "./printer-status/printer-status.componen
 import { PrinterService } from "./printer.service";
 import { SettingsComponent } from "./settings/settings.component";
 import { StandbyComponent } from "./standby/standby.component";
+import { UpdateComponent } from "./update/update.component";
 import { URLSafePipe } from "./url.pipe";
 
 @NgModule({
@@ -54,6 +55,7 @@ import { URLSafePipe } from "./url.pipe";
     SettingsComponent,
     URLSafePipe,
     StandbyComponent,
+    UpdateComponent,
   ],
   imports: [
     BrowserModule,
diff --git a/src/app/app.service.ts b/src/app/app.service.ts
index 792f6d660..3a622db51 100644
--- a/src/app/app.service.ts
+++ b/src/app/app.service.ts
@@ -12,8 +12,9 @@ export class AppService {
   private loadedFile = false;
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private ipc: any;
-  private version: string;
-  private latestVersion: string;
+  public version: string;
+  public latestVersion: string;
+  private latestVersionAssetsURL: string;
   public updateAvailable = false;
 
   public constructor(
@@ -21,20 +22,18 @@ export class AppService {
     private notificationService: NotificationService,
     private http: HttpClient
   ) {
-    if (window.require) {
-      try {
-        this.ipc = window.require("electron").ipcRenderer;
-        this.enableVersionListener();
-        this.enableCustomCSSListener();
-        setTimeout(() => {
-          this.ipc.send("appInfo");
-        }, 0);
-      } catch (e) {
-        this.notificationService.setError(
-          "Can't retrieve version information",
-          "Please open an issue for GitHub as this shouldn't happen."
-        );
-      }
+    try {
+      this.ipc = window.require("electron").ipcRenderer;
+      this.enableVersionListener();
+      this.enableCustomCSSListener();
+      setTimeout(() => {
+        this.ipc.send("appInfo");
+      }, 0);
+    } catch (e) {
+      this.notificationService.setError(
+        "Can't connect to backend",
+        "Please restart your system. If the issue persists open an issue on GitHub."
+      );
     }
     this.updateError = [];
   }
@@ -75,6 +74,7 @@ export class AppService {
           this.updateAvailable = true;
         }
         this.latestVersion = data.name.replace("v", "");
+        this.latestVersionAssetsURL = data.assets_url;
       },
       (): void => null
     );
@@ -113,6 +113,10 @@ export class AppService {
     return this.loadedFile;
   }
 
+  public getLatestVersionAssetsURL(): string {
+    return this.latestVersionAssetsURL;
+  }
+
   public convertByteToMegabyte(byte: number): string {
     return (byte / 1000000).toFixed(1);
   }
@@ -135,16 +139,8 @@ export class AppService {
     return roundedHours + ":" + ("0" + roundedMinutes).slice(-2);
   }
 
-  public convertFilamentLengthToAmount(filamentLength: number): number {
-    return (
-      Math.round(
-        (Math.PI *
-          (this.configService.getFilamentThickness() / 2) *
-          filamentLength *
-          this.configService.getFilamentDensity()) /
-          100
-      ) / 10
-    );
+  public convertFilamentVolumeToWeight(filamentVolume: number): number {
+    return Math.round(filamentVolume * this.configService.getFilamentDensity() * 10) / 10;
   }
 }
 
@@ -154,5 +150,7 @@ interface VersionInformation {
 
 interface GitHubReleaseInformation {
   name: string;
+  // eslint-disable-next-line camelcase
+  assets_url: string;
   [key: string]: string;
 }
diff --git a/src/app/config/config.service.ts b/src/app/config/config.service.ts
index 2a4d8ce0f..a43153e70 100644
--- a/src/app/config/config.service.ts
+++ b/src/app/config/config.service.ts
@@ -1,18 +1,9 @@
-import { HttpClient, HttpHeaders } from "@angular/common/http";
+import { HttpHeaders } from "@angular/common/http";
 import { Injectable } from "@angular/core";
 import Ajv from "ajv";
 import _ from "lodash";
 
-import { environment } from "../../environments/environment";
-
-declare global {
-  interface Window {
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    require: any;
-    // eslint-disable-next-line @typescript-eslint/no-explicit-any
-    process: any;
-  }
-}
+import { NotificationService } from "../notification/notification.service";
 
 @Injectable({
   providedIn: "root",
@@ -29,20 +20,18 @@ export class ConfigService {
 
   private httpHeaders: HttpHeader;
 
-  public constructor(private http: HttpClient) {
+  public constructor(private notificationService: NotificationService) {
     const ajv = new Ajv({ allErrors: true });
     this.validator = ajv.compile(schema);
-    if (window && window.process && window.process.type) {
+    try {
       const Store = window.require("electron-store");
       this.store = new Store();
       this.initialize(this.store.get("config"));
-    } else {
-      console.warn(
-        "Detected non-electron environment. Fallback to assets/config.json. Any changes are non-persistent!"
+    } catch (e) {
+      this.notificationService.setError(
+        "Can't read config file!",
+        "Please restart your system. If the issue persists open an issue on GitHub."
       );
-      this.http.get(environment.config).subscribe((config: Config): void => {
-        this.initialize(config);
-      });
     }
   }
 
diff --git a/src/app/files.service.ts b/src/app/files.service.ts
index 46ef6da0f..157e3d59d 100644
--- a/src/app/files.service.ts
+++ b/src/app/files.service.ts
@@ -61,7 +61,7 @@ export class FilesService {
                 let filamentLength = 0;
                 if (fileOrFolder.gcodeAnalysis) {
                   _.forEach(fileOrFolder.gcodeAnalysis.filament, (tool): void => {
-                    filamentLength += tool.length;
+                    filamentLength += tool.volume;
                   });
                 }
 
@@ -82,7 +82,7 @@ export class FilesService {
                   ...(fileOrFolder.gcodeAnalysis
                     ? {
                         printTime: this.service.convertSecondsToHours(fileOrFolder.gcodeAnalysis.estimatedPrintTime),
-                        filamentWeight: this.service.convertFilamentLengthToAmount(filamentLength),
+                        filamentWeight: this.service.convertFilamentVolumeToWeight(filamentLength),
                       }
                     : {}),
                 } as unknown) as File);
@@ -139,7 +139,7 @@ export class FilesService {
             let filamentLength = 0;
             if (data.gcodeAnalysis) {
               _.forEach(data.gcodeAnalysis.filament, (tool): void => {
-                filamentLength += tool.length;
+                filamentLength += tool.volume;
               });
             }
             const file = ({
@@ -151,7 +151,7 @@ export class FilesService {
                 ? {
                     date: this.service.convertDateToString(new Date(data.date * 1000)),
                     printTime: this.service.convertSecondsToHours(data.gcodeAnalysis.estimatedPrintTime),
-                    filamentWeight: this.service.convertFilamentLengthToAmount(filamentLength),
+                    filamentWeight: this.service.convertFilamentVolumeToWeight(filamentLength),
                   }
                 : {}),
               thumbnail: data.thumbnail
diff --git a/src/app/job.service.ts b/src/app/job.service.ts
index b083bca5a..50cea574f 100644
--- a/src/app/job.service.ts
+++ b/src/app/job.service.ts
@@ -53,7 +53,7 @@ export class JobService {
                     progress: Math.round((data.progress.filepos / data.job.file.size) * 100),
                     ...(data.job.filament !== null
                       ? {
-                          filamentAmount: this.service.convertFilamentLengthToAmount(
+                          filamentAmount: this.service.convertFilamentVolumeToWeight(
                             this.getTotalAmountOfFilament(data.job.filament)
                           ),
                         }
@@ -102,10 +102,10 @@ export class JobService {
     let filamentLength = 0;
     for (const property in filamentAmount) {
       if (
-        Object.prototype.hasOwnProperty.call(filamentAmount, "property") &&
-        Object.prototype.hasOwnProperty.call(filamentAmount[property], "length")
+        Object.prototype.hasOwnProperty.call(filamentAmount, property) &&
+        Object.prototype.hasOwnProperty.call(filamentAmount[property], "volume")
       ) {
-        filamentLength += filamentAmount[property].length;
+        filamentLength += filamentAmount[property].volume;
       }
     }
     return filamentLength;
diff --git a/src/app/main-menu/main-menu.component.html b/src/app/main-menu/main-menu.component.html
index 53ff1f1da..6482e15b9 100644
--- a/src/app/main-menu/main-menu.component.html
+++ b/src/app/main-menu/main-menu.component.html
@@ -21,4 +21,4 @@
     </tr>
   </table>
 </div>
-<app-settings *ngIf="settings" (closeFunction)="hideSettings($event)"></app-settings>
+<app-settings *ngIf="settings" (closeFunction)="hideSettings()"></app-settings>
diff --git a/src/app/main-screen/main-screen.component.html b/src/app/main-screen/main-screen.component.html
index 01fa8007d..516091925 100644
--- a/src/app/main-screen/main-screen.component.html
+++ b/src/app/main-screen/main-screen.component.html
@@ -1,11 +1,14 @@
-<div *ngIf="isPrinting() || isFileLoaded()">
+<!-- FIXME -->
+<div *ngIf="(false && isPrinting()) || isFileLoaded()">
+  <!-- <div *ngIf="isPrinting() || isFileLoaded()"> -->
   <app-print-control *ngIf="isPrinting()"></app-print-control>
   <app-job-status></app-job-status>
   <app-printer-status></app-printer-status>
   <app-layer-progress></app-layer-progress>
   <app-bottom-bar></app-bottom-bar>
 </div>
-<div *ngIf="!isPrinting() && !isFileLoaded()">
+<div *ngIf="true || (!isPrinting() && !isFileLoaded())">
+  <!-- <div *ngIf="!isPrinting() && !isFileLoaded()"> -->
   <app-main-menu></app-main-menu>
   <app-printer-status></app-printer-status>
   <app-bottom-bar></app-bottom-bar>
diff --git a/src/app/settings/settings.component.html b/src/app/settings/settings.component.html
index b4bcbadd4..794c7596b 100644
--- a/src/app/settings/settings.component.html
+++ b/src/app/settings/settings.component.html
@@ -547,11 +547,15 @@
         </span>
         <div class="settings__scroll">
           <img src="assets/icon/icon-main-title.svg" class="settings__about-icon" />
-          <span class="settings__about-version">v1.5.0</span>
+          <span class="settings__about-version">v{{ service.version }}</span>
           <button class="settings__about-update settings__about-update-not-available" *ngIf="!service.updateAvailable">
             no update available
           </button>
-          <button class="settings__about-update settings__about-update-available" *ngIf="service.updateAvailable">
+          <button
+            class="settings__about-update settings__about-update-available"
+            *ngIf="service.updateAvailable"
+            (click)="showUpdate()"
+          >
             install v{{ service.latestVersion }}
           </button>
           <span class="settings__about-copyright">&#169; 2019-2020 UnchartedBull</span>
@@ -601,3 +605,4 @@
     </div>
   </div>
 </div>
+<app-update *ngIf="update" (closeFunction)="hideUpdate()"></app-update>
diff --git a/src/app/settings/settings.component.ts b/src/app/settings/settings.component.ts
index 7eb2c6dfa..01e4f07d6 100644
--- a/src/app/settings/settings.component.ts
+++ b/src/app/settings/settings.component.ts
@@ -10,7 +10,7 @@ import { NotificationService } from "../notification/notification.service";
   styleUrls: ["./settings.component.scss"],
 })
 export class SettingsComponent implements OnInit {
-  @Output() private closeFunction = new EventEmitter<string>();
+  @Output() closeFunction = new EventEmitter<void>();
   @ViewChild("settingsMain") private settingsMain: ElementRef;
   @ViewChild("settingsGeneral") private settingsGeneral: ElementRef;
   @ViewChild("settingsOctoDash") private settingsOctoDash: ElementRef;
@@ -27,11 +27,11 @@ export class SettingsComponent implements OnInit {
     "Bottom Left",
     "Bottom Right",
   ];
-  public version: string;
   private overwriteNoSave = false;
   private pages = [];
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private ipc: any;
+  public update = false;
 
   public constructor(
     private configService: ConfigService,
@@ -40,23 +40,13 @@ export class SettingsComponent implements OnInit {
   ) {
     this.config = this.configService.getCurrentConfig();
     this.config = this.configService.revertConfigForInput(this.config);
-    this.getVersion();
-    if (window.require) {
-      try {
-        this.ipc = window.require("electron").ipcRenderer;
-      } catch (e) {
-        this.notificationService.setError(
-          "Can't connect to backend",
-          "Please open an issue for GitHub as this shouldn't happen."
-        );
-      }
-    }
-  }
-
-  private getVersion(): void {
-    this.version = this.service.getVersion();
-    if (this.version === undefined) {
-      setTimeout(this.getVersion.bind(this), 3500);
+    try {
+      this.ipc = window.require("electron").ipcRenderer;
+    } catch (e) {
+      this.notificationService.setError(
+        "Can't connect to backend",
+        "Please restart your system. If the issue persists open an issue on GitHub."
+      );
     }
   }
 
@@ -114,4 +104,12 @@ export class SettingsComponent implements OnInit {
     this.configService.updateConfig();
     this.ipc.send("reload", "");
   }
+
+  public showUpdate(): void {
+    this.update = true;
+  }
+
+  public hideUpdate(): void {
+    this.update = false;
+  }
 }
diff --git a/src/app/update/update.component.html b/src/app/update/update.component.html
new file mode 100644
index 000000000..01e6cb07d
--- /dev/null
+++ b/src/app/update/update.component.html
@@ -0,0 +1,8 @@
+<div class="update-container">
+  <span class="update-heading">downloading update ...</span>
+  <div class="update-progress-bar__wrapper">
+    <div class="update-progress-bar" id="updateDownloadProgress">0.4 MB/s</div>
+  </div>
+  <span class="update-size__total">115.5MB</span>
+  <span class="update-time__remaining">01:25 minutes left</span>
+</div>
diff --git a/src/app/update/update.component.scss b/src/app/update/update.component.scss
new file mode 100644
index 000000000..b6bb6e10e
--- /dev/null
+++ b/src/app/update/update.component.scss
@@ -0,0 +1,57 @@
+.update {
+  &-container {
+    position: absolute;
+    z-index: 20;
+    top: 10vh;
+    left: 20vw;
+    height: 81vh;
+    width: 60vw;
+    background-color: #353b48;
+    border-radius: 2vw;
+  }
+
+  &-progress-bar {
+    height: 5.5vh;
+    border-radius: 2vh;
+    background-color: #44bd32;
+    width: 25vw;
+    transition: width 0.7s ease-in-out;
+    font-size: 0.5rem;
+    text-align: right;
+    vertical-align: center;
+    padding-top: 1.5vh;
+    padding-right: 1vw;
+
+    &__wrapper {
+      background-color: #718093;
+      width: 50vw;
+      margin: 14vh auto 3vh;
+      display: block;
+      height: 7vh;
+      background-color: transparent;
+      border: 3px solid #f5f6fa;
+      border-radius: 3vh;
+    }
+  }
+
+  &-heading {
+    display: block;
+    text-align: center;
+    margin-top: 12vh;
+  }
+
+  &-size__total {
+    display: block;
+    text-align: right;
+    font-size: 0.6rem;
+    margin-right: 5vw;
+    margin-top: -2vh;
+    opacity: 0.6;
+  }
+
+  &-time__remaining {
+    display: block;
+    text-align: center;
+    margin-top: 10vh;
+  }
+}
diff --git a/src/app/update/update.component.ts b/src/app/update/update.component.ts
new file mode 100644
index 000000000..adb97f344
--- /dev/null
+++ b/src/app/update/update.component.ts
@@ -0,0 +1,45 @@
+import { Component, EventEmitter, OnInit, Output } from "@angular/core";
+
+import { AppService } from "../app.service";
+import { NotificationService } from "../notification/notification.service";
+
+@Component({
+  selector: "app-update",
+  templateUrl: "./update.component.html",
+  styleUrls: ["./update.component.scss"],
+})
+export class UpdateComponent implements OnInit {
+  @Output() closeFunction = new EventEmitter<void>(true);
+
+  // eslint-disable-next-line @typescript-eslint/no-explicit-any
+  private ipc: any;
+
+  constructor(public service: AppService, private notificationService: NotificationService) {
+    try {
+      this.ipc = window.require("electron").ipcRenderer;
+    } catch (e) {
+      this.notificationService.setError(
+        "Can't connect to backend",
+        "Please restart your system. If the issue persists open an issue on GitHub."
+      );
+    }
+  }
+
+  ngOnInit(): void {
+    if (!this.service.latestVersion || this.service.getLatestVersionAssetsURL()) {
+      this.notificationService.setWarning(
+        "Can't initiate update!",
+        "Some information is missing, please try again in an hour or update manually."
+      );
+      this.closeFunction.emit();
+    } else {
+      this.update(this.service.getLatestVersionAssetsURL());
+    }
+  }
+
+  private update(assetsURL: string): void {
+    this.ipc.send("update", {
+      assetsURL: assetsURL,
+    });
+  }
+}

From d7334a4c378c2eb1897b42cc89f15e1f67024660 Mon Sep 17 00:00:00 2001
From: UnchartedBull <timon.gaebelein@icloud.com>
Date: Fri, 10 Jul 2020 22:20:12 +0200
Subject: [PATCH 4/9] error handling

---
 main.js                                        | 11 +++++------
 src/app/main-screen/main-screen.component.html |  8 ++++----
 src/app/update/update.component.ts             | 16 +++++++++++++++-
 3 files changed, 24 insertions(+), 11 deletions(-)

diff --git a/main.js b/main.js
index 87d26cb27..c01de1497 100644
--- a/main.js
+++ b/main.js
@@ -142,12 +142,11 @@ function sendVersionInfo() {
 }
 
 function downloadUpdate(updateInfo) {
-  exec("arch", (err, stdout, stderr) => {
-    if (err) {
-      console.log(err);
-    }
-    if (stderr) {
-      console.error(stderr);
+  exec("archs", (err, stdout, stderr) => {
+    if (err || stderr) {
+      window.webContents.send("updateError", {
+        error: err ? err : { message: stderr },
+      });
     }
     console.log(stdout);
     console.log(updateInfo);
diff --git a/src/app/main-screen/main-screen.component.html b/src/app/main-screen/main-screen.component.html
index 516091925..07eec8f31 100644
--- a/src/app/main-screen/main-screen.component.html
+++ b/src/app/main-screen/main-screen.component.html
@@ -1,14 +1,14 @@
 <!-- FIXME -->
-<div *ngIf="(false && isPrinting()) || isFileLoaded()">
-  <!-- <div *ngIf="isPrinting() || isFileLoaded()"> -->
+<!-- <div *ngIf="(false && isPrinting()) || isFileLoaded()"> -->
+<div *ngIf="isPrinting() || isFileLoaded()">
   <app-print-control *ngIf="isPrinting()"></app-print-control>
   <app-job-status></app-job-status>
   <app-printer-status></app-printer-status>
   <app-layer-progress></app-layer-progress>
   <app-bottom-bar></app-bottom-bar>
 </div>
-<div *ngIf="true || (!isPrinting() && !isFileLoaded())">
-  <!-- <div *ngIf="!isPrinting() && !isFileLoaded()"> -->
+<!-- <div *ngIf="true || (!isPrinting() && !isFileLoaded())"> -->
+<div *ngIf="!isPrinting() && !isFileLoaded()">
   <app-main-menu></app-main-menu>
   <app-printer-status></app-printer-status>
   <app-bottom-bar></app-bottom-bar>
diff --git a/src/app/update/update.component.ts b/src/app/update/update.component.ts
index adb97f344..b35016f20 100644
--- a/src/app/update/update.component.ts
+++ b/src/app/update/update.component.ts
@@ -26,20 +26,34 @@ export class UpdateComponent implements OnInit {
   }
 
   ngOnInit(): void {
-    if (!this.service.latestVersion || this.service.getLatestVersionAssetsURL()) {
+    if (!this.service.latestVersion || !this.service.getLatestVersionAssetsURL()) {
       this.notificationService.setWarning(
         "Can't initiate update!",
         "Some information is missing, please try again in an hour or update manually."
       );
       this.closeFunction.emit();
     } else {
+      this.setupListeners();
       this.update(this.service.getLatestVersionAssetsURL());
     }
   }
 
+  private setupListeners(): void {
+    this.ipc.on("updateError", (_, updateError: UpdateError): void => {
+      this.notificationService.setError("Can't install update!", updateError.error.message);
+    });
+  }
+
   private update(assetsURL: string): void {
     this.ipc.send("update", {
       assetsURL: assetsURL,
     });
   }
 }
+
+interface UpdateError {
+  error: {
+    message: string;
+    stack?: string;
+  };
+}

From 2872a33d6459c2ac4713282e284e2e68b9aceb59 Mon Sep 17 00:00:00 2001
From: UnchartedBull <timon.gaebelein@icloud.com>
Date: Wed, 15 Jul 2020 19:11:54 +0200
Subject: [PATCH 5/9] automatically retrieve download url for arch

---
 main.js                                       |  38 +-
 package-lock.json                             | 462 ++++++++++++++----
 package.json                                  |   1 +
 .../main-screen/main-screen.component.html    |   8 +-
 src/app/update/update.component.ts            |   1 +
 5 files changed, 415 insertions(+), 95 deletions(-)

diff --git a/main.js b/main.js
index c01de1497..bfd9c9832 100644
--- a/main.js
+++ b/main.js
@@ -1,17 +1,19 @@
 /* eslint-disable no-undef */
 /* eslint-disable @typescript-eslint/no-var-requires */
 const { app, BrowserWindow, ipcMain } = require("electron");
-const url = require("url");
-const path = require("path");
+const electronStore = require("electron-store");
 const fs = require("fs");
-const Store = require("electron-store");
+const got = require('got');
+const path = require("path");
+const url = require("url");
 
-const store = new Store();
 const exec = require("child_process").exec;
 
+const store = new electronStore();
+
 const args = process.argv.slice(1);
-const dev = args.some((val) => val === "--serve");
 const big = args.some((val) => val === "--big");
+const dev = args.some((val) => val === "--serve");
 
 app.commandLine.appendSwitch("touch-events", "enabled");
 app.allowRendererProcessReuse = true;
@@ -142,14 +144,34 @@ function sendVersionInfo() {
 }
 
 function downloadUpdate(updateInfo) {
-  exec("archs", (err, stdout, stderr) => {
+  exec("arch", (err, stdout, stderr) => {
     if (err || stderr) {
       window.webContents.send("updateError", {
         error: err ? err : { message: stderr },
       });
     }
-    console.log(stdout);
-    console.log(updateInfo);
+    got(updateInfo.assetsURL)
+    .then((releaseFiles) => {
+      let downloadURL;
+      for (let package of JSON.parse(releaseFiles.body)) {
+        //FIXME
+        // if (package.name.includes(stdout)) downloadURL = package.browser_download_url;
+        if (package.name.includes("armv7l")) downloadURL = package.browser_download_url;
+      }
+      if (downloadURL) {
+        console.log(downloadURL)
+      } else {
+        window.webContents.send("updateError", {
+          error: {
+            message: `Can't find matching package for architecture ${stdout}.`
+          }
+        })
+      }
+    })
+    .catch((error) => {
+      error.message = `Can't load releases. ${error.message}`;
+      window.webContents.send("updateError", {error});
+    })
   });
 }
 
diff --git a/package-lock.json b/package-lock.json
index e8a99d6c3..fdd423980 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -1825,6 +1825,68 @@
         "sumchecker": "^3.0.1"
       },
       "dependencies": {
+        "@sindresorhus/is": {
+          "version": "0.14.0",
+          "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
+          "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
+          "dev": true
+        },
+        "@szmarczak/http-timer": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
+          "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
+          "dev": true,
+          "requires": {
+            "defer-to-connect": "^1.0.1"
+          }
+        },
+        "cacheable-request": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
+          "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
+          "dev": true,
+          "requires": {
+            "clone-response": "^1.0.2",
+            "get-stream": "^5.1.0",
+            "http-cache-semantics": "^4.0.0",
+            "keyv": "^3.0.0",
+            "lowercase-keys": "^2.0.0",
+            "normalize-url": "^4.1.0",
+            "responselike": "^1.0.2"
+          },
+          "dependencies": {
+            "get-stream": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
+              "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+              "dev": true,
+              "requires": {
+                "pump": "^3.0.0"
+              }
+            },
+            "lowercase-keys": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+              "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+              "dev": true
+            }
+          }
+        },
+        "decompress-response": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+          "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+          "dev": true,
+          "requires": {
+            "mimic-response": "^1.0.0"
+          }
+        },
+        "defer-to-connect": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
+          "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
+          "dev": true
+        },
         "fs-extra": {
           "version": "8.1.0",
           "resolved": "https://registry.npmjs.org/fs-extra/-/fs-extra-8.1.0.tgz",
@@ -1835,6 +1897,73 @@
             "jsonfile": "^4.0.0",
             "universalify": "^0.1.0"
           }
+        },
+        "got": {
+          "version": "9.6.0",
+          "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
+          "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
+          "dev": true,
+          "requires": {
+            "@sindresorhus/is": "^0.14.0",
+            "@szmarczak/http-timer": "^1.1.2",
+            "cacheable-request": "^6.0.0",
+            "decompress-response": "^3.3.0",
+            "duplexer3": "^0.1.4",
+            "get-stream": "^4.1.0",
+            "lowercase-keys": "^1.0.1",
+            "mimic-response": "^1.0.1",
+            "p-cancelable": "^1.0.0",
+            "to-readable-stream": "^1.0.0",
+            "url-parse-lax": "^3.0.0"
+          }
+        },
+        "http-cache-semantics": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+          "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+          "dev": true
+        },
+        "json-buffer": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+          "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
+          "dev": true
+        },
+        "keyv": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
+          "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
+          "dev": true,
+          "requires": {
+            "json-buffer": "3.0.0"
+          }
+        },
+        "lowercase-keys": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+          "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+          "dev": true
+        },
+        "normalize-url": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
+          "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+          "dev": true
+        },
+        "p-cancelable": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
+          "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
+          "dev": true
+        },
+        "responselike": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+          "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+          "dev": true,
+          "requires": {
+            "lowercase-keys": "^1.0.0"
+          }
         }
       }
     },
@@ -2151,18 +2280,16 @@
       }
     },
     "@sindresorhus/is": {
-      "version": "0.14.0",
-      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
-      "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
-      "dev": true
+      "version": "3.0.0",
+      "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-3.0.0.tgz",
+      "integrity": "sha512-kqA5I6Yun7PBHk8WN9BBP1c7FfN2SrD05GuVSEYPqDb4nerv7HqYfgBfMIKmT/EuejURkJKLZuLyGKGs6WEG9w=="
     },
     "@szmarczak/http-timer": {
-      "version": "1.1.2",
-      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
-      "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
-      "dev": true,
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-4.0.5.tgz",
+      "integrity": "sha512-PyRA9sm1Yayuj5OIoJ1hGt2YISX45w9WcFbh6ddT0Z/0yaFxOtGLInr4jUfU1EAFVs0Yfyfev4RNwBlUaHdlDQ==",
       "requires": {
-        "defer-to-connect": "^1.0.1"
+        "defer-to-connect": "^2.0.0"
       }
     },
     "@types/ajv": {
@@ -2174,6 +2301,17 @@
         "ajv": "*"
       }
     },
+    "@types/cacheable-request": {
+      "version": "6.0.1",
+      "resolved": "https://registry.npmjs.org/@types/cacheable-request/-/cacheable-request-6.0.1.tgz",
+      "integrity": "sha512-ykFq2zmBGOCbpIXtoVbz4SKY5QriWPh3AjyU4G74RYbtt5yOc5OfaY75ftjg7mikMOla1CTGpX3lLbuJh8DTrQ==",
+      "requires": {
+        "@types/http-cache-semantics": "*",
+        "@types/keyv": "*",
+        "@types/node": "*",
+        "@types/responselike": "*"
+      }
+    },
     "@types/color-name": {
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/@types/color-name/-/color-name-1.1.1.tgz",
@@ -2211,6 +2349,11 @@
         "@types/node": "*"
       }
     },
+    "@types/http-cache-semantics": {
+      "version": "4.0.0",
+      "resolved": "https://registry.npmjs.org/@types/http-cache-semantics/-/http-cache-semantics-4.0.0.tgz",
+      "integrity": "sha512-c3Xy026kOF7QOTn00hbIllV1dLR9hG9NkSrLQgCVs8NF6sBU+VGWjD3wLPhmh1TYAc7ugCFsvHYMN4VcBN1U1A=="
+    },
     "@types/json-schema": {
       "version": "7.0.4",
       "resolved": "https://registry.npmjs.org/@types/json-schema/-/json-schema-7.0.4.tgz",
@@ -2223,6 +2366,14 @@
       "integrity": "sha1-7ihweulOEdK4J7y+UnC86n8+ce4=",
       "dev": true
     },
+    "@types/keyv": {
+      "version": "3.1.1",
+      "resolved": "https://registry.npmjs.org/@types/keyv/-/keyv-3.1.1.tgz",
+      "integrity": "sha512-MPtoySlAZQ37VoLaPcTHCu1RWJ4llDkULYZIzOYxlhxBqYPB0RsRlmMU0R6tahtFe27mIdkHV+551ZWV4PLmVw==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/lodash": {
       "version": "4.14.157",
       "resolved": "https://registry.npmjs.org/@types/lodash/-/lodash-4.14.157.tgz",
@@ -2238,8 +2389,7 @@
     "@types/node": {
       "version": "14.0.14",
       "resolved": "https://registry.npmjs.org/@types/node/-/node-14.0.14.tgz",
-      "integrity": "sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ==",
-      "dev": true
+      "integrity": "sha512-syUgf67ZQpaJj01/tRTknkMNoBBLWJOBODF0Zm4NrXmiSuxjymFrxnTu1QVYRubhVkRcZLYZG8STTwJRdVm/WQ=="
     },
     "@types/q": {
       "version": "1.5.4",
@@ -2247,6 +2397,14 @@
       "integrity": "sha512-1HcDas8SEj4z1Wc696tH56G8OlRaH/sqZOynNNB+HF0WOeXPaxTtbYzJY2oEfiUxjSKjhCKr+MvR7dCHcEelug==",
       "dev": true
     },
+    "@types/responselike": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/@types/responselike/-/responselike-1.0.0.tgz",
+      "integrity": "sha512-85Y2BjiufFzaMIlvJDvTTB8Fxl2xfLo4HgmHzVBz08w4wDePCTjYw66PdrolO0kzli3yam/YCgRufyo1DdQVTA==",
+      "requires": {
+        "@types/node": "*"
+      }
+    },
     "@types/source-list-map": {
       "version": "0.1.2",
       "resolved": "https://registry.npmjs.org/@types/source-list-map/-/source-list-map-0.1.2.tgz",
@@ -4082,26 +4240,29 @@
         "unset-value": "^1.0.0"
       }
     },
+    "cacheable-lookup": {
+      "version": "5.0.3",
+      "resolved": "https://registry.npmjs.org/cacheable-lookup/-/cacheable-lookup-5.0.3.tgz",
+      "integrity": "sha512-W+JBqF9SWe18A72XFzN/V/CULFzPm7sBXzzR6ekkE+3tLG72wFZrBiBZhrZuDoYexop4PHJVdFAKb/Nj9+tm9w=="
+    },
     "cacheable-request": {
-      "version": "6.1.0",
-      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
-      "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
-      "dev": true,
+      "version": "7.0.1",
+      "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-7.0.1.tgz",
+      "integrity": "sha512-lt0mJ6YAnsrBErpTMWeu5kl/tg9xMAWjavYTN6VQXM1A/teBITuNcccXsCxF0tDQQJf9DfAaX5O4e0zp0KlfZw==",
       "requires": {
         "clone-response": "^1.0.2",
         "get-stream": "^5.1.0",
         "http-cache-semantics": "^4.0.0",
-        "keyv": "^3.0.0",
+        "keyv": "^4.0.0",
         "lowercase-keys": "^2.0.0",
         "normalize-url": "^4.1.0",
-        "responselike": "^1.0.2"
+        "responselike": "^2.0.0"
       },
       "dependencies": {
         "get-stream": {
           "version": "5.1.0",
           "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
           "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
-          "dev": true,
           "requires": {
             "pump": "^3.0.0"
           }
@@ -4109,20 +4270,12 @@
         "http-cache-semantics": {
           "version": "4.1.0",
           "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
-          "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
-          "dev": true
-        },
-        "lowercase-keys": {
-          "version": "2.0.0",
-          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
-          "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
-          "dev": true
+          "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ=="
         },
         "normalize-url": {
           "version": "4.5.0",
           "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
-          "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
-          "dev": true
+          "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ=="
         }
       }
     },
@@ -4378,7 +4531,6 @@
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/clone-response/-/clone-response-1.0.2.tgz",
       "integrity": "sha1-0dyXOSAxTfZ/vrlCI7TuNQI56Ws=",
-      "dev": true,
       "requires": {
         "mimic-response": "^1.0.0"
       }
@@ -5251,12 +5403,18 @@
       "dev": true
     },
     "decompress-response": {
-      "version": "3.3.0",
-      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
-      "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
-      "dev": true,
+      "version": "6.0.0",
+      "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-6.0.0.tgz",
+      "integrity": "sha512-aW35yZM6Bb/4oJlZncMH2LCoZtJXTRxES17vE3hoRiowU2kWHaJKFkSBDnDR+cm9J+9QhXmREyIfv0pji9ejCQ==",
       "requires": {
-        "mimic-response": "^1.0.0"
+        "mimic-response": "^3.1.0"
+      },
+      "dependencies": {
+        "mimic-response": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-3.1.0.tgz",
+          "integrity": "sha512-z0yWI+4FDrrweS8Zmt4Ej5HdJmky15+L2e6Wgn3+iK5fWzb6T3fhNFq2+MeTRb064c6Wr4N/wv0DzQTjNzHNGQ=="
+        }
       }
     },
     "deep-equal": {
@@ -5313,10 +5471,9 @@
       }
     },
     "defer-to-connect": {
-      "version": "1.1.3",
-      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
-      "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-2.0.0.tgz",
+      "integrity": "sha512-bYL2d05vOSf1JEZNx5vSAtPuBMkX8K9EUutg7zlKvTqKXHt7RhWJFbmd7qakVuf13i+IkGmp6FwSsONOf6VYIg=="
     },
     "define-properties": {
       "version": "1.1.3",
@@ -6140,7 +6297,6 @@
       "version": "1.4.4",
       "resolved": "https://registry.npmjs.org/end-of-stream/-/end-of-stream-1.4.4.tgz",
       "integrity": "sha512-+uw1inIHVPQoaVuHzRyXd21icM+cnt4CzD5rW+NC1wjOUSTOs+Te7FOv7AhN7vS9x/oIyhLP5PR1H+phQAHu5Q==",
-      "dev": true,
       "requires": {
         "once": "^1.4.0"
       }
@@ -7577,22 +7733,21 @@
       }
     },
     "got": {
-      "version": "9.6.0",
-      "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
-      "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
-      "dev": true,
-      "requires": {
-        "@sindresorhus/is": "^0.14.0",
-        "@szmarczak/http-timer": "^1.1.2",
-        "cacheable-request": "^6.0.0",
-        "decompress-response": "^3.3.0",
-        "duplexer3": "^0.1.4",
-        "get-stream": "^4.1.0",
-        "lowercase-keys": "^1.0.1",
-        "mimic-response": "^1.0.1",
-        "p-cancelable": "^1.0.0",
-        "to-readable-stream": "^1.0.0",
-        "url-parse-lax": "^3.0.0"
+      "version": "11.5.0",
+      "resolved": "https://registry.npmjs.org/got/-/got-11.5.0.tgz",
+      "integrity": "sha512-vOZEcEaK0b6x11uniY0HcblZObKPRO75Jvz53VKuqGSaKCM/zEt0sj2LGYVdqDYJzO3wYdG+FPQQ1hsgoXy7vQ==",
+      "requires": {
+        "@sindresorhus/is": "^3.0.0",
+        "@szmarczak/http-timer": "^4.0.5",
+        "@types/cacheable-request": "^6.0.1",
+        "@types/responselike": "^1.0.0",
+        "cacheable-lookup": "^5.0.3",
+        "cacheable-request": "^7.0.1",
+        "decompress-response": "^6.0.0",
+        "http2-wrapper": "^1.0.0-beta.4.8",
+        "lowercase-keys": "^2.0.0",
+        "p-cancelable": "^2.0.0",
+        "responselike": "^2.0.0"
       }
     },
     "graceful-fs": {
@@ -8003,6 +8158,15 @@
         "sshpk": "^1.7.0"
       }
     },
+    "http2-wrapper": {
+      "version": "1.0.0-beta.5.2",
+      "resolved": "https://registry.npmjs.org/http2-wrapper/-/http2-wrapper-1.0.0-beta.5.2.tgz",
+      "integrity": "sha512-xYz9goEyBnC8XwXDTuC/MZ6t+MrKVQZOk4s7+PaDkwIsQd8IwqvM+0M6bA/2lvG8GHXcPdf+MejTUeO2LCPCeQ==",
+      "requires": {
+        "quick-lru": "^5.1.1",
+        "resolve-alpn": "^1.0.0"
+      }
+    },
     "https-browserify": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/https-browserify/-/https-browserify-1.0.0.tgz",
@@ -8772,10 +8936,9 @@
       "dev": true
     },
     "json-buffer": {
-      "version": "3.0.0",
-      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
-      "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
-      "dev": true
+      "version": "3.0.1",
+      "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.1.tgz",
+      "integrity": "sha512-4bV5BfR2mqfQTJm+V5tPPdf+ZpuhiIvTuAB5g8kcrXOZpTT/QwwVRWBywX1ozr6lEuPdbHxwaJlm9G6mI2sfSQ=="
     },
     "json-parse-better-errors": {
       "version": "1.0.2",
@@ -8863,12 +9026,11 @@
       }
     },
     "keyv": {
-      "version": "3.1.0",
-      "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
-      "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
-      "dev": true,
+      "version": "4.0.1",
+      "resolved": "https://registry.npmjs.org/keyv/-/keyv-4.0.1.tgz",
+      "integrity": "sha512-xz6Jv6oNkbhrFCvCP7HQa8AaII8y8LRpoSm661NOKLr4uHuBwhX4epXrPQgF3+xdJnN4Esm5X0xwY4bOlALOtw==",
       "requires": {
-        "json-buffer": "3.0.0"
+        "json-buffer": "3.0.1"
       }
     },
     "killable": {
@@ -9123,10 +9285,9 @@
       }
     },
     "lowercase-keys": {
-      "version": "1.0.1",
-      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
-      "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+      "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA=="
     },
     "lru-cache": {
       "version": "5.1.1",
@@ -9427,8 +9588,7 @@
     "mimic-response": {
       "version": "1.0.1",
       "resolved": "https://registry.npmjs.org/mimic-response/-/mimic-response-1.0.1.tgz",
-      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ==",
-      "dev": true
+      "integrity": "sha512-j5EctnkH7amfV/q5Hgmoal1g2QHFJRraOtmx0JpIqkxhBhI/lJSl1nMpQ45hVarwNETOoWEimndZ4QK0RHxuxQ=="
     },
     "mini-css-extract-plugin": {
       "version": "0.9.0",
@@ -10207,7 +10367,6 @@
       "version": "1.4.0",
       "resolved": "https://registry.npmjs.org/once/-/once-1.4.0.tgz",
       "integrity": "sha1-WDsap3WWHUsROsF9nFC6753Xa9E=",
-      "dev": true,
       "requires": {
         "wrappy": "1"
       }
@@ -10393,10 +10552,9 @@
       }
     },
     "p-cancelable": {
-      "version": "1.1.0",
-      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
-      "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
-      "dev": true
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-2.0.0.tgz",
+      "integrity": "sha512-wvPXDmbMmu2ksjkB4Z3nZWTSkJEb9lqVdMaCKpZUGJG9TMiNp9XcbG3fn9fPKjem04fJMJnXoyFPk2FmgiaiNg=="
     },
     "p-defer": {
       "version": "1.0.0",
@@ -10465,6 +10623,137 @@
         "registry-auth-token": "^4.0.0",
         "registry-url": "^5.0.0",
         "semver": "^6.2.0"
+      },
+      "dependencies": {
+        "@sindresorhus/is": {
+          "version": "0.14.0",
+          "resolved": "https://registry.npmjs.org/@sindresorhus/is/-/is-0.14.0.tgz",
+          "integrity": "sha512-9NET910DNaIPngYnLLPeg+Ogzqsi9uM4mSboU5y6p8S5DzMTVEsJZrawi+BoDNUVBa2DhJqQYUFvMDfgU062LQ==",
+          "dev": true
+        },
+        "@szmarczak/http-timer": {
+          "version": "1.1.2",
+          "resolved": "https://registry.npmjs.org/@szmarczak/http-timer/-/http-timer-1.1.2.tgz",
+          "integrity": "sha512-XIB2XbzHTN6ieIjfIMV9hlVcfPU26s2vafYWQcZHWXHOxiaRZYEDKEwdl129Zyg50+foYV2jCgtrqSA6qNuNSA==",
+          "dev": true,
+          "requires": {
+            "defer-to-connect": "^1.0.1"
+          }
+        },
+        "cacheable-request": {
+          "version": "6.1.0",
+          "resolved": "https://registry.npmjs.org/cacheable-request/-/cacheable-request-6.1.0.tgz",
+          "integrity": "sha512-Oj3cAGPCqOZX7Rz64Uny2GYAZNliQSqfbePrgAQ1wKAihYmCUnraBtJtKcGR4xz7wF+LoJC+ssFZvv5BgF9Igg==",
+          "dev": true,
+          "requires": {
+            "clone-response": "^1.0.2",
+            "get-stream": "^5.1.0",
+            "http-cache-semantics": "^4.0.0",
+            "keyv": "^3.0.0",
+            "lowercase-keys": "^2.0.0",
+            "normalize-url": "^4.1.0",
+            "responselike": "^1.0.2"
+          },
+          "dependencies": {
+            "get-stream": {
+              "version": "5.1.0",
+              "resolved": "https://registry.npmjs.org/get-stream/-/get-stream-5.1.0.tgz",
+              "integrity": "sha512-EXr1FOzrzTfGeL0gQdeFEvOMm2mzMOglyiOXSTpPC+iAjAKftbr3jpCMWynogwYnM+eSj9sHGc6wjIcDvYiygw==",
+              "dev": true,
+              "requires": {
+                "pump": "^3.0.0"
+              }
+            },
+            "lowercase-keys": {
+              "version": "2.0.0",
+              "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-2.0.0.tgz",
+              "integrity": "sha512-tqNXrS78oMOE73NMxK4EMLQsQowWf8jKooH9g7xPavRT706R6bkQJ6DY2Te7QukaZsulxa30wQ7bk0pm4XiHmA==",
+              "dev": true
+            }
+          }
+        },
+        "decompress-response": {
+          "version": "3.3.0",
+          "resolved": "https://registry.npmjs.org/decompress-response/-/decompress-response-3.3.0.tgz",
+          "integrity": "sha1-gKTdMjdIOEv6JICDYirt7Jgq3/M=",
+          "dev": true,
+          "requires": {
+            "mimic-response": "^1.0.0"
+          }
+        },
+        "defer-to-connect": {
+          "version": "1.1.3",
+          "resolved": "https://registry.npmjs.org/defer-to-connect/-/defer-to-connect-1.1.3.tgz",
+          "integrity": "sha512-0ISdNousHvZT2EiFlZeZAHBUvSxmKswVCEf8hW7KWgG4a8MVEu/3Vb6uWYozkjylyCxe0JBIiRB1jV45S70WVQ==",
+          "dev": true
+        },
+        "got": {
+          "version": "9.6.0",
+          "resolved": "https://registry.npmjs.org/got/-/got-9.6.0.tgz",
+          "integrity": "sha512-R7eWptXuGYxwijs0eV+v3o6+XH1IqVK8dJOEecQfTmkncw9AV4dcw/Dhxi8MdlqPthxxpZyizMzyg8RTmEsG+Q==",
+          "dev": true,
+          "requires": {
+            "@sindresorhus/is": "^0.14.0",
+            "@szmarczak/http-timer": "^1.1.2",
+            "cacheable-request": "^6.0.0",
+            "decompress-response": "^3.3.0",
+            "duplexer3": "^0.1.4",
+            "get-stream": "^4.1.0",
+            "lowercase-keys": "^1.0.1",
+            "mimic-response": "^1.0.1",
+            "p-cancelable": "^1.0.0",
+            "to-readable-stream": "^1.0.0",
+            "url-parse-lax": "^3.0.0"
+          }
+        },
+        "http-cache-semantics": {
+          "version": "4.1.0",
+          "resolved": "https://registry.npmjs.org/http-cache-semantics/-/http-cache-semantics-4.1.0.tgz",
+          "integrity": "sha512-carPklcUh7ROWRK7Cv27RPtdhYhUsela/ue5/jKzjegVvXDqM2ILE9Q2BGn9JZJh1g87cp56su/FgQSzcWS8cQ==",
+          "dev": true
+        },
+        "json-buffer": {
+          "version": "3.0.0",
+          "resolved": "https://registry.npmjs.org/json-buffer/-/json-buffer-3.0.0.tgz",
+          "integrity": "sha1-Wx85evx11ne96Lz8Dkfh+aPZqJg=",
+          "dev": true
+        },
+        "keyv": {
+          "version": "3.1.0",
+          "resolved": "https://registry.npmjs.org/keyv/-/keyv-3.1.0.tgz",
+          "integrity": "sha512-9ykJ/46SN/9KPM/sichzQ7OvXyGDYKGTaDlKMGCAlg2UK8KRy4jb0d8sFc+0Tt0YYnThq8X2RZgCg74RPxgcVA==",
+          "dev": true,
+          "requires": {
+            "json-buffer": "3.0.0"
+          }
+        },
+        "lowercase-keys": {
+          "version": "1.0.1",
+          "resolved": "https://registry.npmjs.org/lowercase-keys/-/lowercase-keys-1.0.1.tgz",
+          "integrity": "sha512-G2Lj61tXDnVFFOi8VZds+SoQjtQC3dgokKdDG2mTm1tx4m50NUHBOZSBwQQHyy0V12A0JTG4icfZQH+xPyh8VA==",
+          "dev": true
+        },
+        "normalize-url": {
+          "version": "4.5.0",
+          "resolved": "https://registry.npmjs.org/normalize-url/-/normalize-url-4.5.0.tgz",
+          "integrity": "sha512-2s47yzUxdexf1OhyRi4Em83iQk0aPvwTddtFz4hnSSw9dCEsLEGf6SwIO8ss/19S9iBb5sJaOuTvTGDeZI00BQ==",
+          "dev": true
+        },
+        "p-cancelable": {
+          "version": "1.1.0",
+          "resolved": "https://registry.npmjs.org/p-cancelable/-/p-cancelable-1.1.0.tgz",
+          "integrity": "sha512-s73XxOZ4zpt1edZYZzvhqFa6uvQc1vwUa0K0BdtIZgQMAJj9IbebH+JkgKZc9h+B05PKHLOTl4ajG1BmNrVZlw==",
+          "dev": true
+        },
+        "responselike": {
+          "version": "1.0.2",
+          "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
+          "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
+          "dev": true,
+          "requires": {
+            "lowercase-keys": "^1.0.0"
+          }
+        }
       }
     },
     "pacote": {
@@ -11606,7 +11895,6 @@
       "version": "3.0.0",
       "resolved": "https://registry.npmjs.org/pump/-/pump-3.0.0.tgz",
       "integrity": "sha512-LwZy+p3SFs1Pytd/jYct4wpv49HiYCqd9Rlc5ZVdk0V+8Yzv6jR5Blk3TRmPL1ft69TxP0IMZGJ+WPFU2BFhww==",
-      "dev": true,
       "requires": {
         "end-of-stream": "^1.1.0",
         "once": "^1.3.1"
@@ -11689,6 +11977,11 @@
       "integrity": "sha512-w7fLxIRCRT7U8Qu53jQnJyPkYZIaR4n5151KMfcJlO/A9397Wxb1amJvROTK6TOnp7PfoAmg/qXiNHI+08jRfA==",
       "dev": true
     },
+    "quick-lru": {
+      "version": "5.1.1",
+      "resolved": "https://registry.npmjs.org/quick-lru/-/quick-lru-5.1.1.tgz",
+      "integrity": "sha512-WuyALRjWPDGtt/wzJiadO5AXY+8hZ80hVpe6MyivgraREW751X3SbhRvG3eLKOYN+8VEvqLcf3wdnt44Z4S4SA=="
+    },
     "randombytes": {
       "version": "2.1.0",
       "resolved": "https://registry.npmjs.org/randombytes/-/randombytes-2.1.0.tgz",
@@ -12142,6 +12435,11 @@
         "path-parse": "^1.0.6"
       }
     },
+    "resolve-alpn": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/resolve-alpn/-/resolve-alpn-1.0.0.tgz",
+      "integrity": "sha512-rTuiIEqFmGxne4IovivKSDzld2lWW9QCjqv80SYjPgf+gS35eaCAjaP54CCwGAwBtnCsvNLYtqxe1Nw+i6JEmA=="
+    },
     "resolve-cwd": {
       "version": "2.0.0",
       "resolved": "https://registry.npmjs.org/resolve-cwd/-/resolve-cwd-2.0.0.tgz",
@@ -12164,12 +12462,11 @@
       "dev": true
     },
     "responselike": {
-      "version": "1.0.2",
-      "resolved": "https://registry.npmjs.org/responselike/-/responselike-1.0.2.tgz",
-      "integrity": "sha1-kYcg7ztjHFZCvgaPFa3lpG9Loec=",
-      "dev": true,
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/responselike/-/responselike-2.0.0.tgz",
+      "integrity": "sha512-xH48u3FTB9VsZw7R+vvgaKeLKzT6jOogbQhEe/jewwnZgzPcnyWui2Av6JpoYZF/91uueC+lqhWqeURw5/qhCw==",
       "requires": {
-        "lowercase-keys": "^1.0.0"
+        "lowercase-keys": "^2.0.0"
       }
     },
     "restore-cursor": {
@@ -15540,8 +15837,7 @@
     "wrappy": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/wrappy/-/wrappy-1.0.2.tgz",
-      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8=",
-      "dev": true
+      "integrity": "sha1-tSQ9jz7BqjXxNkYFvA0QNuMKtp8="
     },
     "write": {
       "version": "1.0.3",
diff --git a/package.json b/package.json
index 4dfdb4fa7..6966ea373 100644
--- a/package.json
+++ b/package.json
@@ -80,6 +80,7 @@
     "ajv": "^6.12.2",
     "angular-svg-round-progressbar": "^3.0.1",
     "electron-store": "^5.2.0",
+    "got": "^11.5.0",
     "lodash": "^4.17.15",
     "ngx-spinner": "^9.0.2",
     "rxjs": "~6.5.5",
diff --git a/src/app/main-screen/main-screen.component.html b/src/app/main-screen/main-screen.component.html
index 07eec8f31..516091925 100644
--- a/src/app/main-screen/main-screen.component.html
+++ b/src/app/main-screen/main-screen.component.html
@@ -1,14 +1,14 @@
 <!-- FIXME -->
-<!-- <div *ngIf="(false && isPrinting()) || isFileLoaded()"> -->
-<div *ngIf="isPrinting() || isFileLoaded()">
+<div *ngIf="(false && isPrinting()) || isFileLoaded()">
+  <!-- <div *ngIf="isPrinting() || isFileLoaded()"> -->
   <app-print-control *ngIf="isPrinting()"></app-print-control>
   <app-job-status></app-job-status>
   <app-printer-status></app-printer-status>
   <app-layer-progress></app-layer-progress>
   <app-bottom-bar></app-bottom-bar>
 </div>
-<!-- <div *ngIf="true || (!isPrinting() && !isFileLoaded())"> -->
-<div *ngIf="!isPrinting() && !isFileLoaded()">
+<div *ngIf="true || (!isPrinting() && !isFileLoaded())">
+  <!-- <div *ngIf="!isPrinting() && !isFileLoaded()"> -->
   <app-main-menu></app-main-menu>
   <app-printer-status></app-printer-status>
   <app-bottom-bar></app-bottom-bar>
diff --git a/src/app/update/update.component.ts b/src/app/update/update.component.ts
index b35016f20..af4a9c8d2 100644
--- a/src/app/update/update.component.ts
+++ b/src/app/update/update.component.ts
@@ -41,6 +41,7 @@ export class UpdateComponent implements OnInit {
   private setupListeners(): void {
     this.ipc.on("updateError", (_, updateError: UpdateError): void => {
       this.notificationService.setError("Can't install update!", updateError.error.message);
+      this.closeFunction.emit();
     });
   }
 

From 9f0fe7800c44f63e14087497bb634bb5d5b87bdc Mon Sep 17 00:00:00 2001
From: UnchartedBull <timon.gaebelein@icloud.com>
Date: Thu, 16 Jul 2020 00:53:18 +0200
Subject: [PATCH 6/9] download working

---
 main.js                              | 54 ++++++++++++++++++++++++++--
 package-lock.json                    | 50 ++++++++++++++------------
 package.json                         |  3 +-
 src/app/update/update.component.html | 12 +++++--
 src/app/update/update.component.scss |  4 +--
 src/app/update/update.component.ts   | 34 ++++++++++++++++--
 6 files changed, 124 insertions(+), 33 deletions(-)

diff --git a/main.js b/main.js
index bfd9c9832..7d4d2cc31 100644
--- a/main.js
+++ b/main.js
@@ -6,6 +6,9 @@ const fs = require("fs");
 const got = require('got');
 const path = require("path");
 const url = require("url");
+const stream = require('stream');
+const {promisify} = require('util');
+const progress = require('progress-stream');
 
 const exec = require("child_process").exec;
 
@@ -144,6 +147,8 @@ function sendVersionInfo() {
 }
 
 function downloadUpdate(updateInfo) {
+  const downloadPath = "/tmp/octodash.deb";
+
   exec("arch", (err, stdout, stderr) => {
     if (err || stderr) {
       window.webContents.send("updateError", {
@@ -152,14 +157,59 @@ function downloadUpdate(updateInfo) {
     }
     got(updateInfo.assetsURL)
     .then((releaseFiles) => {
+      const reducer = (accumulator, currentValue) => accumulator + currentValue;
+      let averageETA = [];
       let downloadURL;
+      let packageSize;
       for (let package of JSON.parse(releaseFiles.body)) {
         //FIXME
         // if (package.name.includes(stdout)) downloadURL = package.browser_download_url;
-        if (package.name.includes("armv7l")) downloadURL = package.browser_download_url;
+        if (package.name.includes("armv7l")) {
+          downloadURL = package.browser_download_url;
+          packageSize = package.size;
+        }
       }
       if (downloadURL) {
-        console.log(downloadURL)
+        const downloadPipeline = promisify(stream.pipeline);
+        let downloadProgress = progress({
+          length: packageSize,
+          time: 300,
+        });
+
+        downloadProgress.on('progress', (progress) => {
+          averageETA.push(progress.eta);
+          if (averageETA.length > 4) averageETA.shift();
+          window.webContents.send("updateDownloadProgress", {
+            percentage: progress.percentage,
+            transferred: (progress.transferred / 100000).toFixed(1),
+            total: (progress.length / 1000000).toFixed(1),
+            remaining: (progress.remaining / 100000).toFixed(1),
+            eta: new Date(averageETA.reduce(reducer) * 1000).toISOString().substr(14, 5),
+            runtime: new Date(progress.runtime * 1000).toISOString().substr(14, 5),
+            delta: (progress.delta / 100000).toFixed(1),
+            speed: (progress.speed / 1000000).toFixed(2),
+          })
+        })
+
+        try {
+          if (fs.existsSync(downloadPath)) fs.unlinkSync(downloadPath)
+        } catch {
+          // no need to handle this properly
+        }
+
+        downloadPipeline(
+          got.stream(downloadURL),
+          downloadProgress,
+          fs.createWriteStream(downloadPath)
+        ).catch((error) => {
+          window.webContents.send("updateError", {
+            error: {
+              message: `Can't download package! ${error.message}.`
+            }
+          })
+        }).then(() => {
+          console.log("DONE")
+        })
       } else {
         window.webContents.send("updateError", {
           error: {
diff --git a/package-lock.json b/package-lock.json
index fdd423980..4a015d2a3 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -4974,8 +4974,7 @@
     "core-util-is": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/core-util-is/-/core-util-is-1.0.2.tgz",
-      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac=",
-      "dev": true
+      "integrity": "sha1-tf1UIgqivFq1eqtxQMlAdUUDwac="
     },
     "cosmiconfig": {
       "version": "5.2.1",
@@ -8335,8 +8334,7 @@
     "inherits": {
       "version": "2.0.4",
       "resolved": "https://registry.npmjs.org/inherits/-/inherits-2.0.4.tgz",
-      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ==",
-      "dev": true
+      "integrity": "sha512-k/vGaX4/Yla3WzyMCvTQOXYeIHvqOKtnqBduzTHpzpQZzAskKMhZ2K+EnBiSM9zGSoIFeMpXKxa4dYeZIQqewQ=="
     },
     "ini": {
       "version": "1.3.5",
@@ -8815,8 +8813,7 @@
     "isarray": {
       "version": "1.0.0",
       "resolved": "https://registry.npmjs.org/isarray/-/isarray-1.0.0.tgz",
-      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE=",
-      "dev": true
+      "integrity": "sha1-u5NdSFgsuhaMBoNJV6VKPgcSTxE="
     },
     "isbinaryfile": {
       "version": "4.0.6",
@@ -9238,9 +9235,9 @@
       }
     },
     "lodash": {
-      "version": "4.17.15",
-      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.15.tgz",
-      "integrity": "sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A=="
+      "version": "4.17.19",
+      "resolved": "https://registry.npmjs.org/lodash/-/lodash-4.17.19.tgz",
+      "integrity": "sha512-JNvd8XER9GQX0v2qJgsaN/mzFCNA5BRe/j8JN9d+tWyGLSodKQHKFicdwNYzWwI3wjRnaKPsGj1XkBjx/F96DQ=="
     },
     "lodash.clonedeep": {
       "version": "4.5.0",
@@ -10101,9 +10098,9 @@
       }
     },
     "npm-registry-fetch": {
-      "version": "4.0.4",
-      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.4.tgz",
-      "integrity": "sha512-6jb34hX/iYNQebqWUHtU8YF6Cjb1H6ouTFPClYsyiW6lpFkljTpdeftm53rRojtja1rKAvKNIIiTS5Sjpw4wsA==",
+      "version": "4.0.5",
+      "resolved": "https://registry.npmjs.org/npm-registry-fetch/-/npm-registry-fetch-4.0.5.tgz",
+      "integrity": "sha512-yQ0/U4fYpCCqmueB2g8sc+89ckQ3eXpmU4+Yi2j5o/r0WkKvE2+Y0tK3DEILAtn2UaQTkjTHxIXe2/CSdit+/Q==",
       "dev": true,
       "requires": {
         "JSONStream": "^1.3.4",
@@ -11788,8 +11785,7 @@
     "process-nextick-args": {
       "version": "2.0.1",
       "resolved": "https://registry.npmjs.org/process-nextick-args/-/process-nextick-args-2.0.1.tgz",
-      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag==",
-      "dev": true
+      "integrity": "sha512-3ouUOpQhtgrbOa17J7+uxOTpITYWaGP7/AhoR3+A+/1e9skrzelGi/dXzEYyvbxubEF6Wn2ypscTKiKJFFn1ag=="
     },
     "progress": {
       "version": "2.0.3",
@@ -11797,6 +11793,15 @@
       "integrity": "sha512-7PiHtLll5LdnKIMw100I+8xJXR5gW2QwWYkT6iJva0bXitZKa/XMrSbdmg3r2Xnaidz9Qumd0VPaMrZlF9V9sA==",
       "dev": true
     },
+    "progress-stream": {
+      "version": "2.0.0",
+      "resolved": "https://registry.npmjs.org/progress-stream/-/progress-stream-2.0.0.tgz",
+      "integrity": "sha1-+sY6Cz0R3qy7CWmrzJOyFLzhntU=",
+      "requires": {
+        "speedometer": "~1.0.0",
+        "through2": "~2.0.3"
+      }
+    },
     "promise": {
       "version": "7.3.1",
       "resolved": "https://registry.npmjs.org/promise/-/promise-7.3.1.tgz",
@@ -12212,7 +12217,6 @@
       "version": "2.3.7",
       "resolved": "https://registry.npmjs.org/readable-stream/-/readable-stream-2.3.7.tgz",
       "integrity": "sha512-Ebho8K4jIbHAxnuxi7o42OrZgF/ZTNcsZj6nRKyUmkhLFq8CHItp/fy6hQZuZmP/n3yZ9VBUbp4zz/mX8hmYPw==",
-      "dev": true,
       "requires": {
         "core-util-is": "~1.0.0",
         "inherits": "~2.0.3",
@@ -12596,8 +12600,7 @@
     "safe-buffer": {
       "version": "5.1.2",
       "resolved": "https://registry.npmjs.org/safe-buffer/-/safe-buffer-5.1.2.tgz",
-      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g==",
-      "dev": true
+      "integrity": "sha512-Gd2UZBJDkXlY7GbJxfsE8/nvKkUEU1G38c1siN6QP6a9PT9MmHB8GnpscSmMJSoF8LOIrt8ud/wPtojys4G6+g=="
     },
     "safe-regex": {
       "version": "1.1.0",
@@ -13403,6 +13406,11 @@
         "chalk": "^2.0.1"
       }
     },
+    "speedometer": {
+      "version": "1.0.0",
+      "resolved": "https://registry.npmjs.org/speedometer/-/speedometer-1.0.0.tgz",
+      "integrity": "sha1-zWccsGdSwivKM3Di8zREC+T8YuI="
+    },
     "split-string": {
       "version": "3.1.0",
       "resolved": "https://registry.npmjs.org/split-string/-/split-string-3.1.0.tgz",
@@ -13589,7 +13597,6 @@
       "version": "1.1.1",
       "resolved": "https://registry.npmjs.org/string_decoder/-/string_decoder-1.1.1.tgz",
       "integrity": "sha512-n/ShnvDi6FHbbVfviro+WojiFzv+s8MPMHBczVePfUpDJLwoLT0ht1l4YwBCbi8pJAveEEdnkHyPyTP/mzRfwg==",
-      "dev": true,
       "requires": {
         "safe-buffer": "~5.1.0"
       }
@@ -14086,7 +14093,6 @@
       "version": "2.0.5",
       "resolved": "https://registry.npmjs.org/through2/-/through2-2.0.5.tgz",
       "integrity": "sha512-/mrRod8xqpA+IHSLyGCQ2s8SPHiCDEeQJSep1jqLYeEUClOFG2Qsh+4FU6G9VeqpZnGW/Su8LQGc4YKni5rYSQ==",
-      "dev": true,
       "requires": {
         "readable-stream": "~2.3.6",
         "xtend": "~4.0.1"
@@ -14663,8 +14669,7 @@
     "util-deprecate": {
       "version": "1.0.2",
       "resolved": "https://registry.npmjs.org/util-deprecate/-/util-deprecate-1.0.2.tgz",
-      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8=",
-      "dev": true
+      "integrity": "sha1-RQ1Nyfpw3nMnYvvS1KKJgUGaDM8="
     },
     "util-promisify": {
       "version": "2.1.0",
@@ -15877,8 +15882,7 @@
     "xtend": {
       "version": "4.0.2",
       "resolved": "https://registry.npmjs.org/xtend/-/xtend-4.0.2.tgz",
-      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ==",
-      "dev": true
+      "integrity": "sha512-LKYU1iAXJXUgAXn9URjiu+MWhyUXHsvfp7mcuYm9dSUKK0/CjtrUwFAxD82/mCWbtLsGjFIad0wIsod4zrTAEQ=="
     },
     "y18n": {
       "version": "4.0.0",
diff --git a/package.json b/package.json
index 6966ea373..0f36f6c68 100644
--- a/package.json
+++ b/package.json
@@ -81,8 +81,9 @@
     "angular-svg-round-progressbar": "^3.0.1",
     "electron-store": "^5.2.0",
     "got": "^11.5.0",
-    "lodash": "^4.17.15",
+    "lodash": "^4.17.19",
     "ngx-spinner": "^9.0.2",
+    "progress-stream": "^2.0.0",
     "rxjs": "~6.5.5",
     "tslib": "^1.13.0",
     "zone.js": "~0.10.3"
diff --git a/src/app/update/update.component.html b/src/app/update/update.component.html
index 01e6cb07d..18bf9b7cc 100644
--- a/src/app/update/update.component.html
+++ b/src/app/update/update.component.html
@@ -1,8 +1,14 @@
 <div class="update-container">
   <span class="update-heading">downloading update ...</span>
   <div class="update-progress-bar__wrapper">
-    <div class="update-progress-bar" id="updateDownloadProgress">0.4 MB/s</div>
+    <div
+      class="update-progress-bar"
+      [ngStyle]="{ width: updateProgress.percentage / 2 + 'vw' }"
+      id="updateDownloadProgress"
+    >
+      {{ updateProgress.speed }} MB/s&nbsp;
+    </div>
   </div>
-  <span class="update-size__total">115.5MB</span>
-  <span class="update-time__remaining">01:25 minutes left</span>
+  <span class="update-size__total">{{ updateProgress.total }} MB</span>
+  <span class="update-time__remaining">{{ updateProgress.eta }} minutes left</span>
 </div>
diff --git a/src/app/update/update.component.scss b/src/app/update/update.component.scss
index b6bb6e10e..0cec0bf17 100644
--- a/src/app/update/update.component.scss
+++ b/src/app/update/update.component.scss
@@ -18,9 +18,9 @@
     transition: width 0.7s ease-in-out;
     font-size: 0.5rem;
     text-align: right;
-    vertical-align: center;
     padding-top: 1.5vh;
-    padding-right: 1vw;
+    overflow: visible;
+    white-space: nowrap;
 
     &__wrapper {
       background-color: #718093;
diff --git a/src/app/update/update.component.ts b/src/app/update/update.component.ts
index af4a9c8d2..03d54f02b 100644
--- a/src/app/update/update.component.ts
+++ b/src/app/update/update.component.ts
@@ -1,4 +1,4 @@
-import { Component, EventEmitter, OnInit, Output } from "@angular/core";
+import { ChangeDetectorRef, Component, EventEmitter, OnInit, Output } from "@angular/core";
 
 import { AppService } from "../app.service";
 import { NotificationService } from "../notification/notification.service";
@@ -13,8 +13,22 @@ export class UpdateComponent implements OnInit {
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private ipc: any;
+  public updateProgress: UpdateDownloadProgress = {
+    percentage: 0,
+    transferred: 0,
+    total: "--.-",
+    remaining: 0,
+    eta: "--:--",
+    runtime: "--:--",
+    delta: 0,
+    speed: "--.-",
+  };
 
-  constructor(public service: AppService, private notificationService: NotificationService) {
+  constructor(
+    public service: AppService,
+    private notificationService: NotificationService,
+    private changeDetector: ChangeDetectorRef
+  ) {
     try {
       this.ipc = window.require("electron").ipcRenderer;
     } catch (e) {
@@ -43,6 +57,11 @@ export class UpdateComponent implements OnInit {
       this.notificationService.setError("Can't install update!", updateError.error.message);
       this.closeFunction.emit();
     });
+
+    this.ipc.on("updateDownloadProgress", (_, updateDownloadProgress: UpdateDownloadProgress): void => {
+      this.updateProgress = updateDownloadProgress;
+      this.changeDetector.detectChanges();
+    });
   }
 
   private update(assetsURL: string): void {
@@ -58,3 +77,14 @@ interface UpdateError {
     stack?: string;
   };
 }
+
+interface UpdateDownloadProgress {
+  percentage: number;
+  transferred: number;
+  total: number | string;
+  remaining: number;
+  eta: string;
+  runtime: string;
+  delta: number;
+  speed: number | string;
+}

From 6b119be0fdb63463fbc4eb41a1bd9e642e9ffbe4 Mon Sep 17 00:00:00 2001
From: UnchartedBull <timon.gaebelein@icloud.com>
Date: Thu, 30 Jul 2020 15:22:44 +0200
Subject: [PATCH 7/9] download and installation working

---
 main.js                              | 39 ++++++++++++++++--------
 src/app/update/update.component.html | 37 ++++++++++++++++-------
 src/app/update/update.component.scss | 45 ++++++++++++++++++++++++++++
 src/app/update/update.component.ts   | 36 ++++++++++++++++++++--
 4 files changed, 133 insertions(+), 24 deletions(-)

diff --git a/main.js b/main.js
index 7d4d2cc31..76f3a4fd6 100644
--- a/main.js
+++ b/main.js
@@ -9,6 +9,7 @@ const url = require("url");
 const stream = require('stream');
 const {promisify} = require('util');
 const progress = require('progress-stream');
+const { windowsStore } = require("process");
 
 const exec = require("child_process").exec;
 
@@ -163,7 +164,7 @@ function downloadUpdate(updateInfo) {
       let packageSize;
       for (let package of JSON.parse(releaseFiles.body)) {
         //FIXME
-        // if (package.name.includes(stdout)) downloadURL = package.browser_download_url;
+        // if (package.name.includes(stdout)) {
         if (package.name.includes("armv7l")) {
           downloadURL = package.browser_download_url;
           packageSize = package.size;
@@ -197,19 +198,33 @@ function downloadUpdate(updateInfo) {
           // no need to handle this properly
         }
 
-        downloadPipeline(
-          got.stream(downloadURL),
-          downloadProgress,
-          fs.createWriteStream(downloadPath)
-        ).catch((error) => {
-          window.webContents.send("updateError", {
-            error: {
-              message: `Can't download package! ${error.message}.`
+        setTimeout(() => {
+          window.webContents.send("updateDownloadFinished");
+          exec('~/Desktop/tmp.sh', (err, _, stderr) => {
+            if (err || stderr) {
+              window.webContents.send("updateError", {
+                error: err ? err : { message: stderr },
+              });
+            } else {
+              window.webContents.send("updateInstalled");
             }
           })
-        }).then(() => {
-          console.log("DONE")
-        })
+        }, 100)
+
+
+        // downloadPipeline(
+        //   got.stream(downloadURL),
+        //   downloadProgress,
+        //   fs.createWriteStream(downloadPath)
+        // ).catch((error) => {
+        //   window.webContents.send("updateError", {
+        //     error: {
+        //       message: `Can't download package! ${error.message}.`
+        //     }
+        //   })
+        // }).then(() => {
+        //   // TODO HERE
+        // })
       } else {
         window.webContents.send("updateError", {
           error: {
diff --git a/src/app/update/update.component.html b/src/app/update/update.component.html
index 18bf9b7cc..290c9087d 100644
--- a/src/app/update/update.component.html
+++ b/src/app/update/update.component.html
@@ -1,14 +1,31 @@
 <div class="update-container">
-  <span class="update-heading">downloading update ...</span>
-  <div class="update-progress-bar__wrapper">
-    <div
-      class="update-progress-bar"
-      [ngStyle]="{ width: updateProgress.percentage / 2 + 'vw' }"
-      id="updateDownloadProgress"
-    >
-      {{ updateProgress.speed }} MB/s&nbsp;
+  <div *ngIf="page === 1">
+    <span class="update-heading">downloading update ...</span>
+    <div class="update-progress-bar__wrapper">
+      <div
+        class="update-progress-bar"
+        [ngStyle]="{ width: updateProgress.percentage / 2 + 'vw' }"
+        id="updateDownloadProgress"
+      >
+        {{ updateProgress.speed }} MB/s&nbsp;
+      </div>
+    </div>
+    <span class="update-size__total">{{ updateProgress.total }} MB</span>
+    <span class="update-time__remaining">{{ updateProgress.eta }} minutes left</span>
+  </div>
+  <div *ngIf="page === 2">
+    <span class="update-heading">installing update ...</span>
+    <div class="update-progress-bar__wrapper">
+      <div class="update-progress-bar update-progress-bar-no-percentage" id="installUpdateProgress"></div>
+    </div>
+    <span class="update-notice">this might take a while</span>
+  </div>
+  <div *ngIf="page === 3">
+    <span class="update-heading">v{{ service.version }} installed</span>
+    <span class="update-restart">would you like to reboot now to activate the latest version?</span>
+    <div class="update-restart-button__wrapper">
+      <button class="update-restart-button update-restart-button__no" (click)="closeUpdateWindow()">no</button>
+      <button class="update-restart-button update-restart-button__yes" (click)="reboot()">yes</button>
     </div>
   </div>
-  <span class="update-size__total">{{ updateProgress.total }} MB</span>
-  <span class="update-time__remaining">{{ updateProgress.eta }} minutes left</span>
 </div>
diff --git a/src/app/update/update.component.scss b/src/app/update/update.component.scss
index 0cec0bf17..dcb2fc0fc 100644
--- a/src/app/update/update.component.scss
+++ b/src/app/update/update.component.scss
@@ -22,6 +22,12 @@
     overflow: visible;
     white-space: nowrap;
 
+    &-no-percentage {
+      width: 10vw;
+      transition: margin-left 2s ease-in-out;
+      margin-left: 0vw;
+    }
+
     &__wrapper {
       background-color: #718093;
       width: 50vw;
@@ -54,4 +60,43 @@
     text-align: center;
     margin-top: 10vh;
   }
+
+  &-notice {
+    display: block;
+    text-align: center;
+    font-size: 0.5rem;
+    margin-top: 20vh;
+  }
+
+  &-restart {
+    display: block;
+    text-align: center;
+    font-size: 0.65rem;
+    margin-top: 10vh;
+    margin-bottom: 8vw;
+
+    &-button {
+      padding: 1.4vh 2vw;
+      border-radius: 1vw;
+      box-shadow: 0 10px 19px -8px rgba(0, 0, 0, 0.75);
+      font-size: 0.7rem;
+      outline: 0;
+      border: 0;
+      margin: 7vh 2vw;
+
+      &__no {
+        background-color: #718093;
+        opacity: 0.8;
+      }
+
+      &__yes {
+        background-color: #44bd32;
+      }
+
+      &__wrapper {
+        display: block;
+        text-align: center;
+      }
+    }
+  }
 }
diff --git a/src/app/update/update.component.ts b/src/app/update/update.component.ts
index 03d54f02b..e78b384eb 100644
--- a/src/app/update/update.component.ts
+++ b/src/app/update/update.component.ts
@@ -2,6 +2,7 @@ import { ChangeDetectorRef, Component, EventEmitter, OnInit, Output } from "@ang
 
 import { AppService } from "../app.service";
 import { NotificationService } from "../notification/notification.service";
+import { OctoprintService } from "../octoprint.service";
 
 @Component({
   selector: "app-update",
@@ -13,6 +14,7 @@ export class UpdateComponent implements OnInit {
 
   // eslint-disable-next-line @typescript-eslint/no-explicit-any
   private ipc: any;
+  private installationAnimationInterval: number;
   public updateProgress: UpdateDownloadProgress = {
     percentage: 0,
     transferred: 0,
@@ -23,10 +25,12 @@ export class UpdateComponent implements OnInit {
     delta: 0,
     speed: "--.-",
   };
+  public page = 1;
 
   constructor(
     public service: AppService,
     private notificationService: NotificationService,
+    private octoprintService: OctoprintService,
     private changeDetector: ChangeDetectorRef
   ) {
     try {
@@ -45,7 +49,7 @@ export class UpdateComponent implements OnInit {
         "Can't initiate update!",
         "Some information is missing, please try again in an hour or update manually."
       );
-      this.closeFunction.emit();
+      this.closeUpdateWindow();
     } else {
       this.setupListeners();
       this.update(this.service.getLatestVersionAssetsURL());
@@ -55,13 +59,36 @@ export class UpdateComponent implements OnInit {
   private setupListeners(): void {
     this.ipc.on("updateError", (_, updateError: UpdateError): void => {
       this.notificationService.setError("Can't install update!", updateError.error.message);
-      this.closeFunction.emit();
+      this.closeUpdateWindow();
     });
 
     this.ipc.on("updateDownloadProgress", (_, updateDownloadProgress: UpdateDownloadProgress): void => {
       this.updateProgress = updateDownloadProgress;
       this.changeDetector.detectChanges();
     });
+
+    this.ipc.on("updateDownloadFinished", (): void => {
+      this.page = 2;
+      this.changeDetector.detectChanges();
+      setTimeout(() => {
+        const updateProgressBar = document.getElementById("installUpdateProgress");
+        updateProgressBar.style.marginLeft = "40vw";
+        this.installationAnimationInterval = setInterval(() => {
+          updateProgressBar.style.marginLeft = updateProgressBar.style.marginLeft === "0vw" ? "40vw" : "0vw";
+        }, 2000);
+      }, 250);
+    });
+
+    this.ipc.on("updateInstalled", (): void => {
+      this.page = 3;
+      this.changeDetector.detectChanges();
+      clearInterval(this.installationAnimationInterval);
+    });
+  }
+
+  private closeUpdateWindow(): void {
+    this.page = 1;
+    this.closeFunction.emit();
   }
 
   private update(assetsURL: string): void {
@@ -69,6 +96,11 @@ export class UpdateComponent implements OnInit {
       assetsURL: assetsURL,
     });
   }
+
+  public reboot(): void {
+    console.log("reboot");
+    // this.octoprintService.sendSystemCommand("reboot");
+  }
 }
 
 interface UpdateError {

From bbf746c535779e52bc674cac0660a430378cfe7d Mon Sep 17 00:00:00 2001
From: UnchartedBull <timon.gaebelein@icloud.com>
Date: Fri, 31 Jul 2020 21:58:29 +0200
Subject: [PATCH 8/9] finished and tested

---
 main.js                                       | 36 ++++++++-----------
 scripts/install.sh                            | 19 ++++++++++
 .../main-screen/main-screen.component.html    |  7 ++--
 src/app/update/update.component.ts            |  7 ++--
 4 files changed, 38 insertions(+), 31 deletions(-)

diff --git a/main.js b/main.js
index 76f3a4fd6..c1831379f 100644
--- a/main.js
+++ b/main.js
@@ -9,7 +9,6 @@ const url = require("url");
 const stream = require('stream');
 const {promisify} = require('util');
 const progress = require('progress-stream');
-const { windowsStore } = require("process");
 
 const exec = require("child_process").exec;
 
@@ -163,9 +162,7 @@ function downloadUpdate(updateInfo) {
       let downloadURL;
       let packageSize;
       for (let package of JSON.parse(releaseFiles.body)) {
-        //FIXME
-        // if (package.name.includes(stdout)) {
-        if (package.name.includes("armv7l")) {
+        if (package.name.includes(stdout.trim())) {
           downloadURL = package.browser_download_url;
           packageSize = package.size;
         }
@@ -198,9 +195,19 @@ function downloadUpdate(updateInfo) {
           // no need to handle this properly
         }
 
-        setTimeout(() => {
+        downloadPipeline(
+          got.stream(downloadURL),
+          downloadProgress,
+          fs.createWriteStream(downloadPath)
+        ).catch((error) => {
+          window.webContents.send("updateError", {
+            error: {
+              message: `Can't download package! ${error.message}.`
+            }
+          })
+        }).then(() => {
           window.webContents.send("updateDownloadFinished");
-          exec('~/Desktop/tmp.sh', (err, _, stderr) => {
+          exec('sudo ~/scripts/update-octodash', (err, _, stderr) => {
             if (err || stderr) {
               window.webContents.send("updateError", {
                 error: err ? err : { message: stderr },
@@ -209,22 +216,7 @@ function downloadUpdate(updateInfo) {
               window.webContents.send("updateInstalled");
             }
           })
-        }, 100)
-
-
-        // downloadPipeline(
-        //   got.stream(downloadURL),
-        //   downloadProgress,
-        //   fs.createWriteStream(downloadPath)
-        // ).catch((error) => {
-        //   window.webContents.send("updateError", {
-        //     error: {
-        //       message: `Can't download package! ${error.message}.`
-        //     }
-        //   })
-        // }).then(() => {
-        //   // TODO HERE
-        // })
+        })
       } else {
         window.webContents.send("updateError", {
           error: {
diff --git a/scripts/install.sh b/scripts/install.sh
index cd9277472..464abd05e 100755
--- a/scripts/install.sh
+++ b/scripts/install.sh
@@ -757,6 +757,25 @@ EOF
     echo "OctoDash will start automatically on next reboot. Please ensure that auto-login is enabled!"
 fi
 
+list_input "Should I setup the update script? This will allow installing '~/tmp/octodash.deb' without sudo or root access. For more info visit the Update section of the wiki. " yes_no update
+if [ $update == 'yes' ]; then
+    mkdir -p ~/scripts
+    echo "Setting up update script ..."
+    cat <<EOF > ~/scripts/update-octodash
+#!/bin/bash
+
+dpkg -i /tmp/octodash.deb
+rm /tmp/octodash.deb
+EOF
+
+    sudo chmod +x ~/scripts/update-octodash
+
+    sudo bash -c 'cat >> /etc/sudoers.d/update-octodash' <<EOF
+pi ALL=NOPASSWD: /home/pi/scripts/update-octodash
+EOF
+fi
+
+
 list_input "Shall I reboot your Pi now?" yes_no reboot
 echo "OctoDash has been successfully installed! :)"
 if [ $reboot == 'yes' ]; then
diff --git a/src/app/main-screen/main-screen.component.html b/src/app/main-screen/main-screen.component.html
index 516091925..01fa8007d 100644
--- a/src/app/main-screen/main-screen.component.html
+++ b/src/app/main-screen/main-screen.component.html
@@ -1,14 +1,11 @@
-<!-- FIXME -->
-<div *ngIf="(false && isPrinting()) || isFileLoaded()">
-  <!-- <div *ngIf="isPrinting() || isFileLoaded()"> -->
+<div *ngIf="isPrinting() || isFileLoaded()">
   <app-print-control *ngIf="isPrinting()"></app-print-control>
   <app-job-status></app-job-status>
   <app-printer-status></app-printer-status>
   <app-layer-progress></app-layer-progress>
   <app-bottom-bar></app-bottom-bar>
 </div>
-<div *ngIf="true || (!isPrinting() && !isFileLoaded())">
-  <!-- <div *ngIf="!isPrinting() && !isFileLoaded()"> -->
+<div *ngIf="!isPrinting() && !isFileLoaded()">
   <app-main-menu></app-main-menu>
   <app-printer-status></app-printer-status>
   <app-bottom-bar></app-bottom-bar>
diff --git a/src/app/update/update.component.ts b/src/app/update/update.component.ts
index e78b384eb..50bf316f1 100644
--- a/src/app/update/update.component.ts
+++ b/src/app/update/update.component.ts
@@ -75,19 +75,19 @@ export class UpdateComponent implements OnInit {
         updateProgressBar.style.marginLeft = "40vw";
         this.installationAnimationInterval = setInterval(() => {
           updateProgressBar.style.marginLeft = updateProgressBar.style.marginLeft === "0vw" ? "40vw" : "0vw";
-        }, 2000);
+        }, 2050);
       }, 250);
     });
 
     this.ipc.on("updateInstalled", (): void => {
       this.page = 3;
       this.changeDetector.detectChanges();
-      clearInterval(this.installationAnimationInterval);
     });
   }
 
   private closeUpdateWindow(): void {
     this.page = 1;
+    clearInterval(this.installationAnimationInterval);
     this.closeFunction.emit();
   }
 
@@ -98,8 +98,7 @@ export class UpdateComponent implements OnInit {
   }
 
   public reboot(): void {
-    console.log("reboot");
-    // this.octoprintService.sendSystemCommand("reboot");
+    this.octoprintService.sendSystemCommand("reboot");
   }
 }
 

From 11473e95e5d9d70b466cd328ea3b10ea44596046 Mon Sep 17 00:00:00 2001
From: UnchartedBull <timon.gaebelein@icloud.com>
Date: Fri, 31 Jul 2020 22:01:01 +0200
Subject: [PATCH 9/9] codefactor

---
 src/app/update/update.component.scss | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/app/update/update.component.scss b/src/app/update/update.component.scss
index dcb2fc0fc..bc4a39535 100644
--- a/src/app/update/update.component.scss
+++ b/src/app/update/update.component.scss
@@ -25,11 +25,10 @@
     &-no-percentage {
       width: 10vw;
       transition: margin-left 2s ease-in-out;
-      margin-left: 0vw;
+      margin-left: 0;
     }
 
     &__wrapper {
-      background-color: #718093;
       width: 50vw;
       margin: 14vh auto 3vh;
       display: block;