Merge pull request #1362 from spacemeshos/fix-dont-restart-node-hourly

Fix: don't restart node every hour

README.md

@@ -62,6 +62,12 @@ Smapp can be started with additional arguments:
   _e.g._ `./Spacemesh --test-mode`
   It runs Smapp and the Node under the hood in standalone mode, making it much easier to test and debug the application.
   Env variable alias: `TEST_MODE`
+- `--check-interval` (number)
+  _e.g._ `./Spacemesh --check-interval=60` to check for updates every 60 seconds
+  Smapp checks every N seconds for the updates the software updates and new config.
+  If new config arrived — it automatically merges it with the custom User settings and
+  restarts the Node.
+  Default: `3600` seconds, or every hour
 
 To run the application in dev mode with the same behavior set env variables instead:
 ```

desktop/main/sources/fetchDiscovery.ts

@@ -7,7 +7,9 @@ import {
   interval,
   map,
   Observable,
+  pairwise,
   retry,
+  startWith,
   Subject,
   switchMap,
   withLatestFrom,
@@ -23,6 +25,9 @@ import {
 import { handleIPC, handlerResult, makeSubscription } from '../rx.utils';
 import { fetchNodeConfig } from '../../utils';
 import { Managers } from '../app.types';
+import Logger from '../../logger';
+
+const logger = Logger({ className: 'fetchDiscovery' });
 
 export const fromNetworkConfig = (net: Network) =>
   from(fetchNodeConfig(net.conf)).pipe(
@@ -81,22 +86,23 @@ export const listNetworksByRequest = ($networks: Subject<Network[]>) =>
     (networks) => $networks.next(networks)
   );
 
-let cacheNodeConfig: NodeConfig | null = null;
 export const listenNodeConfigAndRestartNode = (
   $nodeConfig: Observable<NodeConfig>,
   $managers: Subject<Managers>
 ) =>
   makeSubscription(
-    $nodeConfig.pipe(withLatestFrom($managers)),
-    ([nodeConfig, managers]) => {
+    $nodeConfig.pipe(startWith(null), pairwise(), withLatestFrom($managers)),
+    ([[prevNodeConfig, nextNodeConfig], managers]) => {
       (async () => {
-        if (equals(nodeConfig, cacheNodeConfig)) {
-          return;
-        }
-
-        cacheNodeConfig = nodeConfig;
-
-        if (managers.node.isNodeRunning()) {
+        if (
+          prevNodeConfig !== null &&
+          !equals(prevNodeConfig, nextNodeConfig) &&
+          managers.node.isNodeRunning()
+        ) {
+          logger.log(
+            'listenNodeConfigAndRestartNode',
+            'Node config changed. Restart the Node'
+          );
           await managers.node.restartNode();
         }
       })();

desktop/main/startApp.ts

@@ -48,7 +48,12 @@ const positiveNum = (def: number, n: number) => (n > 0 ? n : def);
 const CHECK_UPDATES_INTERVAL =
   positiveNum(
     3600, // hour
-    parseInt(app.commandLine.getSwitchValue('checkInterval'), 10)
+    parseInt(
+      process.env.CHECK_INTERVAL ||
+        app.commandLine.getSwitchValue('check-interval') ||
+        '0',
+      10
+    )
   ) * 1000;
 
 const loadNetworkData = () => {