Using IPC for spawning the manager

sentinel-official · Feb 20, 2021 · 908e9ab · 908e9ab
1 parent 2e61a60
commit 908e9ab
Show file tree

Hide file tree

Showing 43 changed files with 369 additions and 193 deletions.
diff --git a/build.js b/build.js
@@ -20,7 +20,10 @@ builder.build({
             executableName: 'sentinel',
             icon: './electron/',
             target: [
+                'AppImage',
+                'deb',
                 'dir',
+                'tar.gz',
             ],
         },
         mac: {

diff --git a/electron/channels.js b/electron/channels.js
@@ -0,0 +1,5 @@
+module.exports = {
+    MANAGER_LISTEN_URL_GET_REQ: 'MANAGER_LISTEN_URL_GET_REQ',
+    MANAGER_START_REQ: 'MANAGER_START_REQ',
+    MANAGER_START_RES: 'MANAGER_START_RES',
+};
diff --git a/electron/globals.js b/electron/globals.js
@@ -0,0 +1,11 @@
+const { app } = require('electron');
+
+const manager = null;
+const listenURL = app.commandLine.getSwitchValue('listen-url') || 'http://127.0.0.1:8080';
+const window = null;
+
+module.exports = {
+    listenURL,
+    manager,
+    window,
+};
diff --git a/electron/icon.png b/electron/icon.png
@@ -0,0 +1 @@
+../public/assets/512x512.png
diff --git a/electron/index.js b/electron/index.js
@@ -1,93 +1,48 @@
+require('./ipc');
 const {
     app,
     BrowserWindow,
     Menu,
 } = require('electron');
 const path = require('path');
-const { spawn } = require('child_process');
 const menu = require('./menu');
-const { isPortFree } = require('./utils/net');
+const globals = require('./globals');
 
 Menu.setApplicationMenu(menu);
 app.commandLine.appendSwitch('ignore-certificate-errors', 'true');
 
-const listenURL = app.commandLine.getSwitchValue('listen-url') || 'http://localhost:8080';
-let manager = null;
-
-const createWindow = () => {
+const createMainWindow = () => {
     const window = new BrowserWindow({
-        show: false,
-        height: 480,
+        autoHideMenuBar: true,
+        height: 720,
         icon: path.join(__dirname, 'icon.png'),
         title: 'Sentinel',
-        width: 852,
+        webPreferences: {
+            preload: path.join(__dirname, 'preload.js'),
+        },
+        width: 1280,
     });
 
-    window.loadFile(path.join(__dirname, '../build/index.html'))
-        .then(() => {
-            window.show();
-        })
-        .catch(console.error);
+    const indexFile = path.join(__dirname, '../build/index.html');
+    window.loadFile(indexFile).then().catch(console.error);
+
+    globals.window = window;
 };
 
 app.on('ready', () => {
-    const url = new URL(listenURL);
-    isPortFree(url.port, url.hostname, (error) => {
-        if (error) {
-            console.error(error);
-            app.quit();
-        } else {
-            manager = spawn(
-                path.join(__dirname, '../bin/manager'),
-                [
-                    'server',
-                    '--listen-url',
-                    listenURL,
-                ],
-                {
-                    detached: false,
-                },
-            );
-            manager.stdout.on('data', (data) => {
-                data = data.toString().trim();
-                console.log(data);
-            });
-            manager.stderr.on('data', (data) => {
-                data = data.toString().trim();
-                console.error(data);
-            });
-
-            let created = false;
-            manager.stdout.on('data', (data) => {
-                if (created) {
-                    return;
-                }
-
-                data = data.toString().trim();
-                if (data.indexOf('Listening on URL') === -1) {
-                    app.quit();
-                }
-
-                created = true;
-                createWindow();
-            });
-            manager.stderr.on('data', () => {
-                app.quit();
-            });
-        }
-    });
+    createMainWindow();
 });
 
 app.on('window-all-closed', () => {
     app.quit();
 });
 
 app.on('will-quit', () => {
-    manager.kill();
+    globals.manager.kill();
 });
 
 app.on('activate', () => {
     if (BrowserWindow.getAllWindows().length === 0) {
-        createWindow();
+        createMainWindow();
     }
 });
diff --git a/electron/ipc.js b/electron/ipc.js
@@ -0,0 +1,59 @@
+const path = require('path');
+const { spawn } = require('child_process');
+const { ipcMain } = require('electron');
+const {
+    MANAGER_LISTEN_URL_GET_REQ,
+    MANAGER_START_REQ,
+    MANAGER_START_RES,
+} = require('./channels');
+const globals = require('./globals');
+
+ipcMain.on(MANAGER_LISTEN_URL_GET_REQ, (event, args) => {
+    console.log('EVENT:', MANAGER_LISTEN_URL_GET_REQ, 'ARGS:', args);
+
+    event.returnValue = globals.listenURL;
+});
+
+ipcMain.on(MANAGER_START_REQ, (event, args) => {
+    console.log('EVENT:', MANAGER_START_REQ, 'ARGS:', args);
+
+    const manager = spawn(
+        path.join(__dirname, '../bin/manager'),
+        ['server', '--listen-url', globals.listenURL],
+        { detached: false },
+    );
+
+    let error = false;
+    let success = false;
+
+    manager.stderr.on('data', (data) => {
+        data = data.toString().trim();
+        console.error(data);
+
+        if (error) {
+            return;
+        }
+
+        error = true;
+        globals.window.webContents.send(MANAGER_START_RES, {
+            success: false,
+            data,
+        });
+    });
+    manager.stdout.on('data', (data) => {
+        data = data.toString().trim();
+        console.log(data);
+
+        if (success) {
+            return;
+        }
+
+        success = true;
+        globals.window.webContents.send(MANAGER_START_RES, {
+            success: true,
+            data,
+        });
+    });
+
+    globals.manager = manager;
+});
diff --git a/electron/menu.js b/electron/menu.js
@@ -44,9 +44,6 @@ const template = [
     {
         label: 'View',
         submenu: [
-            {
-                role: 'reload',
-            },
             {
                 role: 'toggleDevTools',
             },

diff --git a/electron/preload.js b/electron/preload.js
@@ -0,0 +1,3 @@
+const { ipcRenderer } = require('electron');
+
+window.ipcRenderer = ipcRenderer;
diff --git a/electron/utils/net.js b/electron/utils/net.js
diff --git a/package.json b/package.json
@@ -3,6 +3,12 @@
   "version": "0.3.0-rc0",
   "main": "./electron/index.js",
   "homepage": "./",
+  "description": "Sentinel desktop and web client.",
+  "author": {
+    "name": "Sentinel",
+    "email": "[email protected]",
+    "url": "https://sentinel.co"
+  },
   "private": true,
   "devDependencies": {
     "@material-ui/core": "^4.11.3",

diff --git a/src/actions/account.js b/src/actions/account.js
@@ -4,7 +4,7 @@ import {
     ACCOUNT_GET_SUCCESS,
     ACCOUNT_PASSWORD_SET,
     ACCOUNT_PASSWORD_VISIBLE_SET,
-    getAccountURL,
+    accountGetURL,
 } from '../constants/account';
 import { emptyFunc } from '../constants/common';
 import Async from 'async';
@@ -44,7 +44,7 @@ export const getAccount = (cb = emptyFunc) => (dispatch, getState) => {
                 },
             } = getState();
 
-            const url = getAccountURL(items[index].address);
+            const url = accountGetURL(items[index].address);
             Axios.get(url)
                 .then((res) => {
                     try {

diff --git a/src/actions/authentication.js b/src/actions/authentication.js
@@ -7,7 +7,7 @@ import {
     AUTHENTICATION_POST_IN_PROGRESS,
     AUTHENTICATION_POST_SUBMIT,
     AUTHENTICATION_POST_SUCCESS,
-    AUTHENTICATION_POST_URL,
+    authenticationPostURL,
 } from '../constants/authentication';
 import { emptyFunc } from '../constants/common';
 import Async from 'async';
@@ -56,7 +56,8 @@ export const postAuthentication = (history, cb = emptyFunc) => (dispatch, getSta
         }, (next) => {
             const { authentication: { password } } = getState();
 
-            Axios.post(AUTHENTICATION_POST_URL, {
+            const url = authenticationPostURL();
+            Axios.post(url, {
                 password: password.value.trim(),
             })
                 .then((res) => {

diff --git a/src/actions/configuration.js b/src/actions/configuration.js
@@ -11,14 +11,14 @@ import {
     CONFIGURATION_GET_ERROR,
     CONFIGURATION_GET_IN_PROGRESS,
     CONFIGURATION_GET_SUCCESS,
-    CONFIGURATION_GET_URL,
     CONFIGURATION_MODAL_HIDE,
     CONFIGURATION_MODAL_SHOW,
     CONFIGURATION_PUT_ERROR,
     CONFIGURATION_PUT_IN_PROGRESS,
     CONFIGURATION_PUT_SUCCESS,
-    CONFIGURATION_PUT_URL,
     CONFIGURATION_SETUP_SET,
+    configurationGetURL,
+    configurationPutURL,
 } from '../constants/configuration';
 import { emptyFunc } from '../constants/common';
 import Async from 'async';
@@ -121,7 +121,8 @@ export const getConfiguration = (history, cb = emptyFunc) => (dispatch, getState
             dispatch(getConfigurationInProgress());
             next(null);
         }, (next) => {
-            Axios.get(CONFIGURATION_GET_URL)
+            const url = configurationGetURL();
+            Axios.get(url)
                 .then((res) => {
                     try {
                         next(null, res?.data?.result);
@@ -198,7 +199,8 @@ export const putConfiguration = (cb = emptyFunc) => (dispatch, getState) => {
                 },
             } = getState();
 
-            Axios.put(CONFIGURATION_PUT_URL, {
+            const url = configurationPutURL();
+            Axios.put(url, {
                 from: items[index]?.name,
                 chain: {
                     broadcast_mode: broadcastMode.value.trim(),

diff --git a/src/actions/delegations.js b/src/actions/delegations.js
@@ -2,7 +2,7 @@ import {
     DELEGATIONS_GET_ERROR,
     DELEGATIONS_GET_IN_PROGRESS,
     DELEGATIONS_GET_SUCCESS,
-    getDelegationsURL,
+    delegationsGetURL,
 } from '../constants/delegations';
 import { emptyFunc } from '../constants/common';
 import Async from 'async';
@@ -42,7 +42,7 @@ export const getDelegations = (cb = emptyFunc) => (dispatch, getState) => {
                 },
             } = getState();
 
-            const url = getDelegationsURL(items[index].address);
+            const url = delegationsGetURL(items[index].address);
             Axios.get(url)
                 .then((res) => {
                     try {

diff --git a/src/actions/keys.js b/src/actions/keys.js
@@ -2,15 +2,15 @@ import {
     KEYS_GET_ERROR,
     KEYS_GET_IN_PROGRESS,
     KEYS_GET_SUCCESS,
-    KEYS_GET_URL,
     KEYS_PASSWORD_VISIBLE_SET,
     KEYS_POST_ERROR,
     KEYS_POST_IN_PROGRESS,
     KEYS_POST_SUCCESS,
-    KEYS_POST_URL,
     KEY_MNEMONIC_SET,
     KEY_NAME_SET,
     KEY_PASSWORD_SET,
+    keysGetURL,
+    keysPostURL,
 } from '../constants/keys';
 import { emptyFunc } from '../constants/common';
 import Async from 'async';
@@ -43,7 +43,8 @@ export const getKeys = (history, cb = emptyFunc) => (dispatch, getState) => {
             dispatch(getKeysInProgress(null));
             next(null);
         }, (next) => {
-            Axios.get(KEYS_GET_URL)
+            const url = keysGetURL();
+            Axios.get(url)
                 .then((res) => {
                     try {
                         next(null, res?.data?.result);
@@ -138,7 +139,8 @@ export const postKeys = (history, cb = emptyFunc) => (dispatch, getState) => {
                 },
             } = getState();
 
-            Axios.post(KEYS_POST_URL, {
+            const url = keysPostURL();
+            Axios.post(url, {
                 mnemonic: mnemonic.value.trim(),
                 name: name.value.trim(),
                 password: password.value.trim(),