status-im
/
safe-react
mirror of https://github.com/status-im/safe-react.git
2
0
Fork 0
Code Issues Projects Releases Wiki Activity

Desktop app - Detect port and change it if needed (#1395) 

* Bump new onboard.js version

* Detect if port is used and change it if needed before starting the server

* Fix icon creation

* Fix formatting

Co-authored-by: Daniel Sanchez <daniel.sanchez@gnosis.pm>
Co-authored-by: Mikhail Mikheev <mmvsha73@gmail.com>
This commit is contained in:
Mati Dastugue 2020-10-05 05:52:15 -03:00 committed by GitHub
parent f4f90acc22
commit 21ea1ad9dd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 106 additions and 100 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
package.json
View File

@ -183,6 +183,7 @@
"coveralls": "^3.1.0",
"currency-flags": "2.1.2",
"date-fns": "2.15.0",
"detect-port": "^1.3.0",
"electron-is-dev": "^1.2.0",
"electron-log": "4.2.4",
"electron-settings": "^4.0.2",

205
public/electron.js
View File

@ -1,84 +1,91 @@
const electron = require("electron");
const express = require('express');
const open = require('open');
const log = require('electron-log');
const fs = require('fs');
const Menu = electron.Menu;
const https = require('https');
const autoUpdater = require('./auto-updater');
const electron = require('electron')
const express = require('express')
const open = require('open')
const log = require('electron-log')
const fs = require('fs')
const Menu = electron.Menu
const https = require('https')
const detect = require('detect-port')
const autoUpdater = require('./auto-updater')
const app = electron.app;
const session = electron.session;
const BrowserWindow = electron.BrowserWindow;
const app = electron.app
const session = electron.session
const BrowserWindow = electron.BrowserWindow
const path = require("path");
const isDev = require("electron-is-dev");
const path = require('path')
const isDev = require('electron-is-dev')
const options = {
key: fs.readFileSync(path.join(__dirname, './ssl/server.key')),
key: fs.readFileSync(path.join(__dirname, './ssl/server.key')),
cert: fs.readFileSync(path.join(__dirname, './ssl/server.crt')),
ca: fs.readFileSync(path.join(__dirname, './ssl/rootCA.crt'))
};
const PORT = 5000;
const createServer = () => {
const app = express();
const staticRoute = path.join(__dirname, '../build');
app.use(express.static(staticRoute));
https.createServer(options, app).listen(PORT);
ca: fs.readFileSync(path.join(__dirname, './ssl/rootCA.crt')),
}
const DEFAULT_PORT = 5000
let mainWindow;
const createServer = async () => {
const app = express()
const staticRoute = path.join(__dirname, '../build')
app.use(express.static(staticRoute))
let selectedPort = DEFAULT_PORT
try {
const _port = await detect(DEFAULT_PORT)
if (_port !== DEFAULT_PORT) selectedPort = _port
https.createServer(options, app).listen(selectedPort)
} catch (e) {
log.error(e)
} finally {
return selectedPort
}
}
function getOpenedWindow(url,options) {
let display = electron.screen.getPrimaryDisplay();
let width = display.bounds.width;
let height = display.bounds.height;
let mainWindow
function getOpenedWindow(url, options) {
let display = electron.screen.getPrimaryDisplay()
let width = display.bounds.width
let height = display.bounds.height
// filter all requests to trezor-bridge and change origin to make it work
const filter = {
urls: ['http://127.0.0.1:21325/*']
};
options.webPreferences.affinity = 'main-window';
if(url.includes('trezor')){
session.defaultSession.webRequest.onBeforeSendHeaders(filter, (details, callback) => {
details.requestHeaders['Origin'] = 'https://connect.trezor.io';
callback({cancel: false, requestHeaders: details.requestHeaders});
});
const filter = {
urls: ['http://127.0.0.1:21325/*'],
}
if(url.includes('wallet.portis') || url.includes('trezor') || url.includes('app.tor.us')){
options.webPreferences.affinity = 'main-window'
if (url.includes('trezor')) {
session.defaultSession.webRequest.onBeforeSendHeaders(filter, (details, callback) => {
details.requestHeaders['Origin'] = 'https://connect.trezor.io'
callback({ cancel: false, requestHeaders: details.requestHeaders })
})
}
if (url.includes('wallet.portis') || url.includes('trezor') || url.includes('app.tor.us')) {
const win = new BrowserWindow({
width:350,
height:700,
width: 350,
height: 700,
x: width - 1300,
parent:mainWindow,
parent: mainWindow,
y: height - (process.platform === 'win32' ? 750 : 200),
webContents: options.webContents, // use existing webContents if provided
fullscreen: false,
show: false,
});
win.webContents.on('new-window', function(event, url){
if(url.includes('trezor') && url.includes('bridge'))
open(url);
});
win.once('ready-to-show', () => win.show());
})
win.webContents.on('new-window', function (event, url) {
if (url.includes('trezor') && url.includes('bridge')) open(url)
})
win.once('ready-to-show', () => win.show())
if(!options.webPreferences){
win.loadURL(url);
if (!options.webPreferences) {
win.loadURL(url)
}
return win
}
return null;
return null
}
function createWindow() {
function createWindow(port = DEFAULT_PORT) {
mainWindow = new BrowserWindow({
show: false,
width: 1024,
@ -88,80 +95,78 @@ function createWindow() {
allowRunningInsecureContent: true,
nativeWindowOpen: true, // need to be set in order to display modal
},
icon: path.join(__dirname, './build/safe.png'),
});
icon: electron.nativeImage.createFromPath(path.join(__dirname, './build/safe.png')),
})
mainWindow.once('ready-to-show', () => {
mainWindow.show();
});
mainWindow.show()
})
mainWindow.loadURL(
isDev
? "http://localhost:3000"
: `https://localhost:${PORT}`
)
mainWindow.loadURL(isDev ? 'http://localhost:3000' : `https://localhost:${port}`)
if (isDev) {
// Open the DevTools.
mainWindow.webContents.openDevTools();
mainWindow.webContents.openDevTools()
//BrowserWindow.addDevToolsExtension('<location to your react chrome extension>');
}
mainWindow.setMenu(null);
mainWindow.setMenuBarVisibility(false);
mainWindow.setMenu(null)
mainWindow.setMenuBarVisibility(false)
mainWindow.webContents.on('new-window', function(event, url, frameName, disposition, options){
event.preventDefault();
const win = getOpenedWindow(url,options);
if(win){
win.once('ready-to-show', () => win.show());
mainWindow.webContents.on('new-window', function (event, url, frameName, disposition, options) {
event.preventDefault()
const win = getOpenedWindow(url, options)
if (win) {
win.once('ready-to-show', () => win.show())
if(!options.webPreferences){
win.loadURL(url);
if (!options.webPreferences) {
win.loadURL(url)
}
event.newGuest = win
} else open(url);
});
} else open(url)
})
mainWindow.webContents.on('did-finish-load', () => {
autoUpdater.init(mainWindow);
});
autoUpdater.init(mainWindow)
})
mainWindow.webContents.on('crashed', (event) => {
log.info(`App Crashed: ${event}`);
mainWindow.reload();
});
log.info(`App Crashed: ${event}`)
mainWindow.reload()
})
mainWindow.on("closed", () => (mainWindow = null));
mainWindow.on('closed', () => (mainWindow = null))
}
process.on('uncaughtException',function(error){
log.error(error);
});
process.on('uncaughtException', function (error) {
log.error(error)
})
app.userAgentFallback = 'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) old-airport-include/1.0.0 Chrome Electron/7.1.7 Safari/537.36';
app.userAgentFallback =
'Mozilla/5.0 (Macintosh; Intel Mac OS X 10_14_6) AppleWebKit/537.36 (KHTML, like Gecko) old-airport-include/1.0.0 Chrome Electron/7.1.7 Safari/537.36'
// We have one non-context-aware module in node_modules/usb. This is used by @ledgerhq/hw-transport-node-hid
// This type of modules will be impossible to use after electron 10
app.allowRendererProcessReuse = false;
app.allowRendererProcessReuse = false
app.commandLine.appendSwitch('ignore-certificate-errors');
app.on("ready", () =>{
app.commandLine.appendSwitch('ignore-certificate-errors')
app.on('ready', async () => {
// Hide the menu
Menu.setApplicationMenu(null);
if(!isDev) createServer();
createWindow();
});
Menu.setApplicationMenu(null)
let usedPort = DEFAULT_PORT
if (!isDev) usedPort = await createServer()
createWindow(usedPort)
})
app.on("window-all-closed", () => {
if (process.platform !== "darwin") {
app.quit();
app.on('window-all-closed', () => {
if (process.platform !== 'darwin') {
app.quit()
}
});
})
app.on("activate", () => {
app.on('activate', () => {
if (mainWindow === null) {
createWindow();
createWindow()
}
});
})