Merge pull request #13 from Alethio/add-clientTimeout

Add support for "clientTimeout" messages from the server

Author: baxy

CHANGELOG.md

@@ -1,6 +1,9 @@
 # Changelog
 All notable changes to this project will be documented in this file.
 
+## [2.5.1] - 2019-05-22
+- Add support for "clientTimeout" messages from the server
+
 ## [2.5.0] - 2019-05-21
 - Add WebSocket API improvements
 - Add support for "stats.pendingTxs"

lib/Logger.js

@@ -39,7 +39,7 @@ export default class Logger {
     }
 
     if (processExit) {
-      process.exit();
+      process.exit((type === 'error' ? 1 : 0));
     }
   }
 

lib/Server.js

@@ -153,7 +153,7 @@ export default class Server {
     this.socket.on('end', () => {
       this.isLoggedIn = false;
       this.socketIsOpen = false;
-      this.log.warning('Connection ended with ethstats server');
+      this.log.error('Connection ended with ethstats server', false, true);
     });
 
     this.socket.on('reconnect failed', () => {
@@ -167,6 +167,9 @@ export default class Server {
         case 'invalidMessage':
           this.resolveResponse(message.topic, message.payload);
           break;
+        case 'clientTimeout':
+          this.resolveResponse(message.topic, message.payload);
+          break;
         case 'requestRateLimitReached':
           this.resolveResponse(message.topic, message.payload);
           break;

lib/app-daemon.js

@@ -5,7 +5,7 @@ import moment from 'moment';
 
 if (config.configStore.get('firstRun') !== false) {
   console.log('Your node is not registered. Please run "ethstats-cli" first.');
-  process.exit();
+  process.exit(1);
 }
 
 const daemonOption = process.argv[2];
@@ -27,7 +27,7 @@ if (!daemonAvailableOptions.includes(daemonOption)) {
     
   If any CLI options are specified after the Daemon option, they will be forwarded to the forked process.
 `);
-  process.exit();
+  process.exit(1);
 }
 
 if (!process.argv.includes('-v')) {
@@ -48,7 +48,7 @@ const processOptions = {
 pm2.connect(err => {
   if (err) {
     console.error(err);
-    process.exit(2);
+    process.exit(1);
   }
 
   if (daemonOption === 'start') {
@@ -95,7 +95,7 @@ pm2.connect(err => {
     pm2.killDaemon(error => {
       console.log(`Ethstats daemon KILL ${(error) ? chalk.red(`[FAILED] ${error.message}`) : chalk.green('[OK]')}`);
       pm2.disconnect();
-      process.exit();
+      process.exit((error) ? 1 : 0);
     });
   }
 });