Browse Source

Merge pull request #43 from loeck/master

Clean stuff
master
Meriadec Pillet 7 years ago
committed by GitHub
parent
commit
21ffec5ee2
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 2
      src/components/Wrapper.js
  2. 2
      src/internals/index.js
  3. 2
      src/main/app.js
  4. 17
      src/main/bridge.js

2
src/components/Wrapper.js

@ -26,7 +26,7 @@ class Wrapper extends Component<{}> {
render() {
return (
<Fragment>
<AppRegionDrag />
{process.platform === 'darwin' && <AppRegionDrag />}
<IsUnlocked
render={() => (

2
src/internals/index.js

@ -4,8 +4,6 @@ import objectPath from 'object-path'
process.title = `ledger-wallet-desktop-${process.env.FORK_TYPE}`
process.setMaxListeners(Infinity)
function sendEvent(type: string, data: any, options: Object = { kill: true }) {
process.send({ type, data, options })
}

2
src/main/app.js

@ -2,6 +2,8 @@
import { app, ipcMain, BrowserWindow } from 'electron'
process.setMaxListeners(100)
// necessary to prevent win from being garbage collected
let mainWindow

17
src/main/bridge.js

@ -11,12 +11,19 @@ function onForkChannel(forkType, callType) {
return (event: any, payload) => {
const { type, data } = payload
const compute = fork(resolve(__dirname, `${__DEV__ ? '../../' : './'}dist/internals`), [], {
let compute = fork(resolve(__dirname, `${__DEV__ ? '../../' : './'}dist/internals`), {
env: {
FORK_TYPE: forkType,
},
})
const kill = () => {
if (compute) {
compute.kill('SIGINT')
compute = null
}
}
compute.send({ type, data })
compute.on('message', payload => {
const { type, data, options = {} } = payload
@ -26,12 +33,12 @@ function onForkChannel(forkType, callType) {
if (callType === 'sync') {
event.returnValue = { type, data }
}
if (options.kill) {
compute.kill()
if (options.kill && compute) {
kill()
}
})
process.on('exit', () => compute.kill('SIGINT'))
process.on('exit', kill)
}
}
@ -41,7 +48,7 @@ ipcMain.on('accounts', onForkChannel('accounts', 'async'))
const handlers = {
updater: {
init: send => setupAutoUpdater(send),
init: setupAutoUpdater,
},
}

Loading…
Cancel
Save