starred/Electron.NET
1
0
Fork 0
mirror of https://github.com/ElectronNET/Electron.NET.git synced 2026-09-22 06:54:44 +00:00
Code Issues 668 Packages Projects Releases 20 Wiki Activity

change argument name, detach process on creation

Browse Source
This commit is contained in:
rafael-aero
2021-08-25 11:14:21 +02:00
parent 8bbe6a96af
commit 144a0a0ddc
1 changed files with 43 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

64
ElectronNET.Host/main.js
View File

@@ -103,13 +103,13 @@ app.on('ready', () => {
app.on('quit', async (event, exitCode) => {
await server.close();
var shouldKill = true;
var detachedProcess = false;
if (manifestJsonFile.hasOwnProperty('killOnQuit')) {
shouldKill = manifestJsonFile.killOnQuit;
if (manifestJsonFile.hasOwnProperty('detachedProcess')) {
detachedProcess = manifestJsonFile.detachedProcess;
}
if (shouldKill) {
if (!detachedProcess) {
apiProcess.kill();
}
});
@@ -305,8 +305,8 @@ function startAspCoreBackend(electronPort) {
function startBackend(aspCoreBackendPort) {
console.log('ASP.NET Core Port: ' + aspCoreBackendPort);
loadURL = `http://localhost:${aspCoreBackendPort}`;
const parameters = [getEnvironmentParameter(), `/electronPort=${electronPort}`, `/electronWebPort=${aspCoreBackendPort}`, `/electronPID=${process.pid}`];
loadURL = 'http://localhost:${aspCoreBackendPort}';
const parameters = [getEnvironmentParameter(), '/electronPort=${electronPort}', '/electronWebPort=${aspCoreBackendPort}', '/electronPID=${process.pid}'];
let binaryFile = manifestJsonFile.executable;
const os = require('os');
@@ -314,25 +314,38 @@ function startAspCoreBackend(electronPort) {
binaryFile = binaryFile + '.exe';
}
var detachedProcess = false;
if (manifestJsonFile.hasOwnProperty('detachedProcess')) {
detachedProcess = manifestJsonFile.detachedProcess;
}
let binFilePath = path.join(currentBinPath, binaryFile);
var options = { cwd: currentBinPath };
var options = { cwd: currentBinPath, detached: detachedProcess };
apiProcess = cProcess(binFilePath, parameters, options);
apiProcess.stdout.on('data', (data) => {
console.log(`stdout: ${data.toString()}`);
console.log('stdout: ${data.toString()}');
});
apiProcess.stderr.on('data', (data) => {
console.log(`stderr: ${data.toString()}`);
console.log('stderr: ${data.toString()}');
});
apiProcess.on('close', (code) => {
console.log(`ASP.NET Process exited with code ${code}`);
console.log('ASP.NET Process exited with code ${code}');
if (code != 0) {
console.log(`Will quit Electron, as exit code != 0 (got ${code})`);
console.log('Will quit Electron, as exit code != 0 (got ${code})');
app.exit(code);
}
});
if (detachedProcess) {
console.log('Detached from ASP.NET process');
apiProcess.unref();
}
}
}
@@ -348,30 +361,39 @@ function startAspCoreBackendWithWatch(electronPort) {
function startBackend(aspCoreBackendPort) {
console.log('ASP.NET Core Watch Port: ' + aspCoreBackendPort);
loadURL = `http://localhost:${aspCoreBackendPort}`;
const parameters = ['watch', 'run', getEnvironmentParameter(), `/electronPort=${electronPort}`, `/electronWebPort=${aspCoreBackendPort}`, `/electronPID=${process.pid}`];
loadURL = 'http://localhost:${aspCoreBackendPort}';
const parameters = ['watch', 'run', getEnvironmentParameter(), '/electronPort=${electronPort}', '/electronWebPort=${aspCoreBackendPort}', '/electronPID=${process.pid}'];
var detachedProcess = false;
if (manifestJsonFile.hasOwnProperty('detachedProcess')) {
detachedProcess = manifestJsonFile.detachedProcess;
}
var options = { cwd: currentBinPath, env: process.env, detached: detachedProcess };
var options = {
cwd: currentBinPath,
env: process.env,
};
apiProcess = cProcess('dotnet', parameters, options);
apiProcess.stdout.on('data', (data) => {
console.log(`stdout: ${data.toString()}`);
console.log('stdout: ${data.toString()}');
});
apiProcess.stderr.on('data', (data) => {
console.log(`stderr: ${data.toString()}`);
console.log('stderr: ${data.toString()}');
});
apiProcess.on('close', (code) => {
console.log(`ASP.NET Process exited with code ${code}`);
console.log('ASP.NET Process exited with code ${code}');
if (code != 0) {
console.log(`Will quit Electron, as exit code != 0 (got ${code})`);
console.log('Will quit Electron, as exit code != 0 (got ${code})');
app.exit(code);
}
});
if (detachedProcess) {
console.log('Detached from ASP.NET process');
apiProcess.unref();
}
}
}