Feature: push os system info to view and update error check list modal

spacemeshos · Sep 27, 2023 · 35c2b42 · 35c2b42
1 parent e403e3f
commit 35c2b42
Show file tree

Hide file tree

Showing 6 changed files with 23 additions and 6 deletions.
diff --git a/app/redux/ui/selectors.ts b/app/redux/ui/selectors.ts
@@ -9,3 +9,19 @@ export const getWarningByType = <T extends WarningType>(type: T) => (
   getWarnings(state).find((w) => w.type === type) as
     | WarningObject<T>
     | undefined;
+
+export const getOsPlatform = (state: RootState) => state.ui.osPlatform;
+export const isWindows = (state: RootState) => {
+  const osPlatform = getOsPlatform(state);
+  return osPlatform === 'win32';
+};
+
+export const isMacOS = (state: RootState) => {
+  const osPlatform = getOsPlatform(state);
+  return osPlatform === 'darwin';
+};
+
+export const isLinux = (state: RootState) => {
+  const osPlatform = getOsPlatform(state);
+  return osPlatform === 'linux';
+};
diff --git a/app/types/redux.ts b/app/types/redux.ts
@@ -84,6 +84,7 @@ export interface UiState {
   error: Error | null;
   skinId: string | null;
   warnings: AnyWarningObject[];
+  osPlatform: string;
 }
 
 export interface RootState {

diff --git a/desktop/NodeManager.ts b/desktop/NodeManager.ts
@@ -146,19 +146,18 @@ class NodeManager extends AbstractManager {
       if (!fatalErrorLine) {
         const installedLibs = await checkRequiredLibs();
 
-        if (!installedLibs.openCL) {
+        if (installedLibs?.openCL === false) {
           this.sendNodeError(requiredLibsCrashErrors.openCL);
           return;
         }
 
-        if (!installedLibs.visualCpp) {
+        if (installedLibs?.visualCpp === false) {
           this.sendNodeError(requiredLibsCrashErrors.visualCpp);
           return;
         }
 
         // If we can't find fatal error — show default crash error
         this.sendNodeError(defaultCrashError());
-
         return;
       }
 

diff --git a/desktop/checkRequiredLibs.ts b/desktop/checkRequiredLibs.ts
@@ -110,7 +110,7 @@ const checkUbuntuOpenCLLibrary = async (): Promise<boolean> => {
 };
 
 type RequiredLibraries = {
-  openCL: boolean;
+  openCL?: boolean;
   visualCpp?: boolean;
 };
 const checkWindowsLibs = async (): Promise<RequiredLibraries> => ({
@@ -131,7 +131,7 @@ export const checkRequiredLibs = async (): Promise<RequiredLibraries> => {
     return checkLinuxLibs();
   }
 
-  return {} as RequiredLibraries;
+  return {};
 };
 
 export const requiredLibsCrashErrors = {

diff --git a/desktop/main/sources/smesherInfo.ts b/desktop/main/sources/smesherInfo.ts
@@ -128,7 +128,7 @@ const syncSmesherInfo = (
       from(
         (async () => {
           if (!isLocalNode) return '';
-          if (await managers.node.getNodeStatus(60)) {
+          if (await managers.node.getNodeStatus()) {
             const smesherId = await managers.smesher
               .getSmesherId()
               .catch(() => '');

diff --git a/desktop/main/startApp.ts b/desktop/main/startApp.ts
@@ -1,3 +1,4 @@
+import os from 'os';
 import * as $ from 'rxjs';
 import { app } from 'electron';
 import Bech32 from '@spacemesh/address-wasm';