mirrors/electron
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages 1 Wiki Activity Actions 1

Add finish helper to ensure connection

Browse source
This commit is contained in:
Kevin Sawicki 2017-06-28 09:58:23 -07:00
parent 523fbe2df9
commit 5822e718e6
1 changed files with 20 additions and 13 deletions
Download patch file Download diff file Expand all files Collapse all files

33
spec/fixtures/api/mixed-sandbox-app/main.js vendored
View file

@ -17,7 +17,7 @@ app.once('ready', () => {
sandboxWindow = new BrowserWindow({ sandboxWindow = new BrowserWindow({
show: false, show: false,
webPreferences: { webPreferences: {
preload: path.join(app.getAppPath(), 'electron-app-mixed-sandbox-preload.js'), preload: path.join(__dirname, 'electron-app-mixed-sandbox-preload.js'),
sandbox: true sandbox: true
} }
}) })
@ -26,7 +26,7 @@ app.once('ready', () => {
noSandboxWindow = new BrowserWindow({ noSandboxWindow = new BrowserWindow({
show: false, show: false,
webPreferences: { webPreferences: {
preload: path.join(app.getAppPath(), 'electron-app-mixed-sandbox-preload.js'), preload: path.join(__dirname, 'electron-app-mixed-sandbox-preload.js'),
sandbox: false sandbox: false
} }
}) })
@ -37,22 +37,29 @@ app.once('ready', () => {
noSandbox: null noSandbox: null
} }
let connected = false
function finish () {
if (connected && argv.sandbox != null && argv.noSandbox != null) {
client.once('end', () => {
app.exit(0)
})
client.end(JSON.stringify(argv))
}
}
const socketPath = process.platform === 'win32' ? '\\\\.\\pipe\\electron-mixed-sandbox' : '/tmp/electron-mixed-sandbox'
const client = net.connect(socketPath, () => {
connected = true
finish()
})
ipcMain.on('argv', (event, value) => { ipcMain.on('argv', (event, value) => {
if (event.sender === sandboxWindow.webContents) { if (event.sender === sandboxWindow.webContents) {
argv.sandbox = value argv.sandbox = value
} else if (event.sender === noSandboxWindow.webContents) { } else if (event.sender === noSandboxWindow.webContents) {
argv.noSandbox = value argv.noSandbox = value
} }
finish()
if (argv.sandbox != null && argv.noSandbox != null) {
const socketPath = process.platform === 'win32' ? '\\\\.\\pipe\\electron-mixed-sandbox' : '/tmp/electron-mixed-sandbox'
const client = net.connect(socketPath)
client.once('connect', () => {
client.end(JSON.stringify(argv))
})
client.once('end', () => {
app.exit(0)
})
}
}) })
}) })