Merge pull request #6 from anthonyraymond/reworked-dekstop

Reworked dekstop

.travis.yml

@@ -79,4 +79,3 @@ script:
   - yarn lint
   - yarn flow
   - yarn build-e2e
-  - yarn test-e2e

app/electron/WindowManager.js

@@ -1,4 +1,9 @@
-import { app, ipcMain, BrowserWindow as BrowserWindowElectron } from 'electron';
+import {
+  app,
+  ipcMain,
+  BrowserWindow as BrowserWindowElectron,
+  dialog
+} from 'electron';
 import waitOn from 'wait-on';
 import StateManager from './StateManager';
 import MenuBuilder from './MenuBuilder';
@@ -14,6 +19,8 @@ export default class WindowManager {
 
   dependencyUpdater = new DependencyUpdater();
 
+  isUpdateInProgress = false;
+
   stateManager = new StateManager();
 
   joal = new Joal();
@@ -46,11 +53,29 @@ export default class WindowManager {
     window: BrowserWindow,
     descriptor: WindowItem
   ): void {
-    window.on('close', () => {
+    window.on('close', e => {
       WindowManager.saveWindowState(window, descriptor);
 
       this.stateManager.save();
 
+      if (this.isUpdateInProgress) {
+        const pressedButton = dialog.showMessageBox(window, {
+          type: 'question',
+          title: 'Update in progress',
+          message:
+            'Closing the app during the dependencies download process may leave your app in an unstable state.\n\nAre you sure you want to quit now ?',
+          buttons: ['&Yes', '&Cancel'],
+          defaultId: 1,
+          cancelId: 1,
+          normalizeAccessKeys: true
+        });
+        if (pressedButton === 1) {
+          e.preventDefault();
+          return;
+        }
+      }
+      this.isUpdateInProgress = false; // the below app.quit() will call this function another time, prevent a second dialog to open
+      // Force quit when the window is closed to prevent mac from hidding in in the dock.
       this.joal.kill(() => app.quit());
     });
     window.on('closed', () => {
@@ -60,22 +85,26 @@ export default class WindowManager {
 
   registerIpcEventHandlers(window: BrowserWindow): void {
     ipcMain.on('renderer-ready-to-update', event => {
-      this.dependencyUpdater.checkAndInstallUpdate(event);
+      this.isUpdateInProgress = true;
+      this.dependencyUpdater
+        .checkAndInstallUpdate(event)
+        .then(() => {
+          this.isUpdateInProgress = false;
+          return true;
+        })
+        .catch(() => {
+          this.isUpdateInProgress = false;
+        });
     });
     ipcMain.on('renderer-ready-to-start-joal', () => {
       console.log('Start joal now');
 
       const uiConfig = this.joal.start();
+      const configAsUrlParam = encodeURI(JSON.stringify(uiConfig));
 
-      // TODO : remove this function as soon as the webui is able to intercept the loadURL.extraHeaders on startup
-      window.webContents.on('did-navigate', () => {
-        window.webContents.executeJavaScript(
-          `localStorage.setItem('guiConfig', '${JSON.stringify(uiConfig)}')`
-        );
-      });
       const uiUrl = `http://${uiConfig.host}:${uiConfig.port}/${
         uiConfig.pathPrefix
-      }/ui`;
+      }/ui?ui_credentials=${configAsUrlParam}`;
       waitOn(
         {
           resources: [uiUrl],
@@ -92,11 +121,7 @@ export default class WindowManager {
             );
             return;
           }
-          window.loadURL(uiUrl, {
-            extraHeaders: `joal-desktop-forwarded-ui-config: ${JSON.stringify(
-              uiConfig
-            )}`
-          });
+          window.loadURL(uiUrl);
         }
       );
     });

app/electron/runner/Joal.js

@@ -68,9 +68,9 @@ export default class Joal {
     if (callback) {
       callbackFn = callback;
     }
-    console.log('Killing joal');
 
     if (this.joalProcess) {
+      console.log('Killing joal');
       treeKill(this.joalProcess.pid, 'SIGINT', err => {
         if (!err) {
           return callbackFn();

app/electron/updaters/DependencyUpdater.js

@@ -21,17 +21,17 @@ import {
   updateProcessError
 } from '../../components/updaters/updaters.actions';
 
+/* eslint-disable class-methods-use-this */
 export default class DepencencyUpdater {
   checkAndInstallUpdate(ipcChannel) {
-    // eslint-disable-line class-methods-use-this
     // first check and install electron update
     const passReducerActionToRenderer = action => {
       // eslint-disable-line no-param-reassign
       ipcChannel.sender.send('forward-update-message-to-renderer', action);
     };
 
     passReducerActionToRenderer(electronCheckingForUpdate());
-    updateElectron()
+    return updateElectron()
       .onProgress(progress =>
         passReducerActionToRenderer(electronDownloadProgress(progress * 100))
       )
@@ -115,3 +115,4 @@ export default class DepencencyUpdater {
       });
   }
 }
+/* eslint-enable class-methods-use-this */

app/electron/updaters/joal-updater/index.js

@@ -14,7 +14,7 @@ const CLIENT_FILES_DIR = path.join(ROOT_INSTALL_FOLDER, 'clients');
 const TORRENTS_DIR = path.join(ROOT_INSTALL_FOLDER, 'torrents');
 const ARCHIVED_TORRENTS_DIR = path.join(TORRENTS_DIR, 'archived');
 const JOAL_CORE_VERSION_FILE = path.join(ROOT_INSTALL_FOLDER, '.joal-core');
-const JOAL_CORE_VERSION = '2.1.11';
+const JOAL_CORE_VERSION = '2.1.12';
 const JAR_NAME = `jack-of-all-trades-${JOAL_CORE_VERSION}.jar`;
 const DOWNLOAD_URL = `https://github.com/anthonyraymond/joal/releases/download/v${JOAL_CORE_VERSION}/joal.tar.gz`;
 
@@ -94,8 +94,13 @@ const cleanInstallFolder = () => {
       .forEach(jar => rimraf.sync(path.join(ROOT_INSTALL_FOLDER, jar)));
   }
 
-  rimraf.sync(TMP_UPDATE_DIR);
-  rimraf.sync(JOAL_CORE_VERSION_FILE);
+  if (fs.existsSync(TMP_UPDATE_DIR)) {
+    rimraf.sync(TMP_UPDATE_DIR);
+  }
+
+  if (fs.existsSync(JOAL_CORE_VERSION_FILE)) {
+    rimraf.sync(JOAL_CORE_VERSION_FILE);
+  }
 };
 
 const install = () =>
@@ -109,6 +114,12 @@ const install = () =>
       });
       return;
     }
+    try {
+      cleanInstallFolder(); // clean before install
+    } catch (e) {
+      console.log('Joal failed to clean install folder before install');
+      reject(e);
+    }
 
     console.log('Joal is not installed yet, pulling from github');
     let downloaded = 0;

app/electron/updaters/jre-updater/index.js

@@ -2,6 +2,7 @@ import os from 'os';
 import { app } from 'electron';
 import path from 'path';
 import request from 'request';
+import fs from 'fs';
 import rimraf from 'rimraf';
 import zlib from 'zlib';
 import tar from 'tar-fs';
@@ -79,7 +80,9 @@ const isInstalledAndDoesNotRequiresUpdates = () => {
 };
 
 const cleanInstallFolder = () => {
-  rimraf.sync(ROOT_INSTALL_FOLDER);
+  if (fs.existsSync(ROOT_INSTALL_FOLDER)) {
+    rimraf.sync(ROOT_INSTALL_FOLDER);
+  }
 };
 
 const install = () =>
@@ -94,6 +97,13 @@ const install = () =>
       return;
     }
 
+    try {
+      cleanInstallFolder(); // clean before install
+    } catch (e) {
+      console.log('Jre failed to clean install folder before install');
+      reject(e);
+    }
+
     console.log(`Jre is not installed yet, pulling it from ${url()}`);
     let downloaded = 0;
     let totalDownloadLength = 0;

appveyor.yml

@@ -33,4 +33,3 @@ test_script:
   - yarn package-ci
   - yarn lint
   - yarn build-e2e
-  - yarn test-e2e

package.json

@@ -1,7 +1,7 @@
 {
   "name": "joal-desktop",
   "productName": "JoalDesktop",
-  "version": "1.2.0",
+  "version": "2.0.0",
   "description": "A tool to fake your torrent tracker upload.",
   "scripts": {
     "build": "concurrently \"yarn build-main\" \"yarn build-renderer\"",