Merge remote-tracking branch 'origin/master'

Author: Alexander Blair

proxy.js

@@ -445,15 +445,17 @@ function balanceWorkers(){
             for (let minerID in activeWorkers[workerID]){
                 if (activeWorkers[workerID].hasOwnProperty(minerID)){
                     let miner = activeWorkers[workerID][minerID];
-                    let minerCoin = miner.coin;
-                    if (!minerStates.hasOwnProperty(minerCoin)){
-                        minerStates[minerCoin] = {
-                            hashrate: 0
-                        };
-                    }
-                    minerStates[minerCoin].hashrate += miner.avgSpeed;
-                    poolStates[minerCoin][miner.pool].hashrate += miner.avgSpeed;
-                    poolStates[minerCoin][miner.pool].miners[`${workerID}_${minerID}`] = miner.avgSpeed;
+                    try {
+                        let minerCoin = miner.coin;
+                        if (!minerStates.hasOwnProperty(minerCoin)){
+                            minerStates[minerCoin] = {
+                                hashrate: 0
+                            };
+                        }
+                        minerStates[minerCoin].hashrate += miner.avgSpeed;
+                        poolStates[minerCoin][miner.pool].hashrate += miner.avgSpeed;
+                        poolStates[minerCoin][miner.pool].miners[`${workerID}_${minerID}`] = miner.avgSpeed;
+                    } catch (err) {}
                 }
             }
         }
@@ -590,14 +592,18 @@ function enumerateWorkerStats(){
                 if (activeWorkers[poolID].hasOwnProperty(workerID)) {
                     let workerData = activeWorkers[poolID][workerID];
                     if (typeof workerData !== 'undefined') {
-                        if (workerData.lastContact < ((Math.floor((Date.now())/1000) - 120))){
+                        try{
+                            if (workerData.lastContact < ((Math.floor((Date.now())/1000) - 120))){
+                                delete activeWorkers[poolID][workerID];
+                                continue;
+                            }
+                            stats.miners += 1;
+                            stats.hashes += workerData.hashes;
+                            stats.hashRate += workerData.avgSpeed;
+                            stats.diff += workerData.diff;
+                        } catch (err) {
                             delete activeWorkers[poolID][workerID];
-                            continue;
                         }
-                        stats.miners += 1;
-                        stats.hashes += workerData.hashes;
-                        stats.hashRate += workerData.avgSpeed;
-                        stats.diff += workerData.diff;
                     } else {
                         delete activeWorkers[poolID][workerID];
                     }