Merge branch 'dev' into feature/alerts

particl · Jan 4, 2018 · b187088 · b187088
2 parents 282a23e + bec1e13
commit b187088
Show file tree

Hide file tree

Showing 267 changed files with 2,332 additions and 15,475 deletions.
diff --git a/main.js b/main.js
@@ -27,8 +27,10 @@ const daemon   = require('./modules/daemon/daemon');
 let mainWindow;
 let tray;
 let options;
+let openDevTools = false;
 
-let openDevTools = true;
+if (process.argv.includes('-opendevtools'))
+  openDevTools = true;
 
 // This method will be called when Electron has finished
 // initialization and is ready to create browser windows.

diff --git a/modules/clientBinaries/clientBinaries.json b/modules/clientBinaries/clientBinaries.json
@@ -1,15 +1,15 @@
 {
   "clients": {
     "particld": {
-      "version": "0.15.1.0",
+      "version": "0.15.1.1",
       "platforms": {
         "linux": {
           "arm": {
             "download": {
-              "url": "https://github.com/particl/particl-core/releases/download/v0.15.1.0/particl-0.15.1.0-arm-linux-gnueabihf.tar.gz",
+              "url": "https://github.com/particl/particl-core/releases/download/v0.15.1.1/particl-0.15.1.1-arm-linux-gnueabihf.tar.gz",
               "type": "tar",
-              "sha256": "0855d426026dd4bfff67727f798f64574e62255ada1b87a1d46b465ce0118010",
-              "bin": "particl-0.15.1.0/bin/particld"
+              "sha256": "cc8a3d314319464be259689836c18dce88b4f9d2168bb01c899dda97797b3e17",
+              "bin": "particl-0.15.1.1/bin/particld"
             },
             "bin": "particld",
             "commands": {
@@ -19,17 +19,17 @@
                 ],
                 "output": [
                   "Particl Core Daemon",
-                  "0.15.1.0"
+                  "0.15.1.1"
                 ]
               }
             }
           },
           "ia32": {
             "download": {
-              "url": "https://github.com/particl/particl-core/releases/download/v0.15.1.0/particl-0.15.1.0-i686-pc-linux-gnu.tar.gz",
+              "url": "https://github.com/particl/particl-core/releases/download/v0.15.1.1/particl-0.15.1.1-i686-pc-linux-gnu.tar.gz",
               "type": "tar",
-              "sha256": "371c40c32eb8e8f62c038d6636e91253da2f5579de97989c457fbab6de4842de",
-              "bin": "particl-0.15.1.0/bin/particld"
+              "sha256": "ed739c465e0e039597819d2126e8dd1a893cf9ac382b115816f8aa8786ea6214",
+              "bin": "particl-0.15.1.1/bin/particld"
             },
             "bin": "particld",
             "commands": {
@@ -39,17 +39,17 @@
                 ],
                 "output": [
                   "Particl Core Daemon",
-                  "0.15.1.0"
+                  "0.15.1.1"
                 ]
               }
             }
           },
           "x64": {
             "download": {
-              "url": "https://github.com/particl/particl-core/releases/download/v0.15.1.0/particl-0.15.1.0-x86_64-linux-gnu.tar.gz",
+              "url": "https://github.com/particl/particl-core/releases/download/v0.15.1.1/particl-0.15.1.1-x86_64-linux-gnu.tar.gz",
               "type": "tar",
-              "sha256": "06d570f6da0e536dd2b79d82cd0f8fc1db8cc02be97ad2a4359504600ccfd72a",
-              "bin": "particl-0.15.1.0/bin/particld"
+              "sha256": "53eda42d0e36212bb578017d49e359c4095e42886d1cca61934505ff3be33218",
+              "bin": "particl-0.15.1.1/bin/particld"
             },
             "bin": "particld",
             "commands": {
@@ -59,19 +59,39 @@
                 ],
                 "output": [
                   "Particl Core Daemon",
-                  "0.15.1.0"
+                  "0.15.1.1"
                 ]
               }
             }
           }
         },
         "mac": {
+          "ia32": {
+            "download": {
+              "url": "https://github.com/particl/particl-core/releases/download/v0.15.1.1/particl-0.15.1.1-osx-unsigned.dmg",
+              "type": "dmg",
+              "sha256": "8d23aa5e5777b068f07a569a2b42c64a9f2eb04ea5422f1da6fffec444d07a3b",
+              "bin": "particl-0.15.1.1/bin/particld"
+            },
+            "bin": "particld",
+            "commands": {
+              "sanity": {
+                "args": [
+                  "-version"
+                ],
+                "output": [
+                  "Particl Core Daemon",
+                  "0.15.1.1"
+                ]
+              }
+            }
+          },
           "x64": {
             "download": {
-              "url": "https://github.com/particl/particl-core/releases/download/v0.15.1.0/particl-0.15.1.0-osx64.tar.gz",
+              "url": "https://github.com/particl/particl-core/releases/download/v0.15.1.1/particl-0.15.1.1-osx64.tar.gz",
               "type": "tar",
-              "sha256": "f8398efc43f0fdbd7a5b8398ad985bcd7597197710326fe6c5f54d3b2eda570b",
-              "bin": "particl-0.15.1.0/bin/particld"
+              "sha256": "bfc9eb7f1b14b4a74db88713de02d37524977269f4a5fd0e9f15f639e20e740e",
+              "bin": "particl-0.15.1.1/bin/particld"
             },
             "bin": "particld",
             "commands": {
@@ -81,7 +101,7 @@
                 ],
                 "output": [
                   "Particl Core Daemon",
-                  "0.15.1.0"
+                  "0.15.1.1"
                 ]
               }
             }
@@ -90,10 +110,10 @@
         "win": {
           "ia32": {
             "download": {
-              "url": "https://github.com/particl/particl-core/releases/download/v0.15.1.0/particl-0.15.1.0-win32.zip",
+              "url": "https://github.com/particl/particl-core/releases/download/v0.15.1.1/particl-0.15.1.1-win32.zip",
               "type": "zip",
-              "sha256": "82e856eb823fbba56941e9ccd220aa8e8ee088d040b688f6e44db2c5967000cb",
-              "bin": "particl-0.15.1.0/bin/particld.exe"
+              "sha256": "4cb4c5c408dfe385c88d53ee31cabcaf1ae45e696139feee4e1631f988065371",
+              "bin": "particl-0.15.1.1/bin/particld.exe"
             },
             "bin": "particld.exe",
             "commands": {
@@ -103,17 +123,17 @@
                 ],
                 "output": [
                   "Particl Core Daemon",
-                  "0.15.1.0"
+                  "0.15.1.1"
                 ]
               }
             }
           },
           "x64": {
             "download": {
-              "url": "https://github.com/particl/particl-core/releases/download/v0.15.1.0/particl-0.15.1.0-win64.zip",
+              "url": "https://github.com/particl/particl-core/releases/download/v0.15.1.1/particl-0.15.1.1-win64.zip",
               "type": "zip",
-              "sha256": "a3a8e36c2c824be8c1ee68fc8070b89c5684d2bc95b6b7f402c69b11c802acfa",
-              "bin": "particl-0.15.1.0/bin/particld.exe"
+              "sha256": "9cdd3ad0d4b3fb456ecff7b88873f16bfa0f14eca7f8dfd7880ea06cb622502a",
+              "bin": "particl-0.15.1.1/bin/particld.exe"
             },
             "bin": "particld.exe",
             "commands": {
@@ -123,7 +143,7 @@
                 ],
                 "output": [
                   "Particl Core Daemon",
-                  "0.15.1.0"
+                  "0.15.1.1"
                 ]
               }
             }

diff --git a/modules/clientBinaries/clientBinariesManager.js b/modules/clientBinaries/clientBinariesManager.js
@@ -1,15 +1,16 @@
 "use strict";
 
-const got = require('got'),
-  _ = require('lodash'),
-  fs = require('fs'),
-  crypto = require('crypto'),
-  path = require('path'),
-  tmp = require('tmp'),
-  mkdirp = require('mkdirp'),
-  unzip = require('node-unzip-2'),
-  spawn = require('buffered-spawn'),
-  log = require('electron-log');
+const got  = require('got'),
+         _ = require('lodash'),
+        fs = require('fs'),
+    crypto = require('crypto'),
+      path = require('path'),
+       tmp = require('tmp'),
+    mkdirp = require('mkdirp'),
+     unzip = require('node-unzip-2'),
+     spawn = require('buffered-spawn'),
+       log = require('electron-log'),
+  progress = require('cli-progress')
 
 
 function copyFile(src, dst) {
@@ -200,28 +201,34 @@ class Manager {
       const writeStream = fs.createWriteStream(downloadFile);
 
       const stream = got.stream(downloadCfg.url);
-
-      // stream.pipe(progress({
-      //   time: 100
-      // }));
+      let progressBar = undefined;
 
       stream.pipe(writeStream);
 
-      // stream.on('progress', (info) => );
+      stream.on('downloadProgress', (info) => {
+        if (progressBar) {
+          progressBar.update(info.transferred);
+        } else {
+          progressBar = new progress.Bar({}, progress.Presets.shades_classic);
+          progressBar.start(info.total, info.transferred);
+        }
+      });
 
       stream.on('error', (err) => {
+        if (progressBar) {
+          progressBar.stop();
+        }
         this._logger.error(err);
-
         reject(new Error(`Error downloading package for ${clientId}: ${err.message}`));
-      })
+      });
 
       stream.on('end', () => {
+        if (progressBar) {
+          progressBar.stop();
+        }
         this._logger.debug(`Downloaded ${downloadCfg.url} to ${downloadFile}`);
-
-        // quick sanity check
         try {
           fs.accessSync(downloadFile, fs.F_OK | fs.R_OK);
-
           resolve({
             downloadFolder: downloadFolder,
             downloadFile: downloadFile