mirror of
https://git.sanhost.net/sanasol/hytale-f2p
synced 2026-02-26 14:01:48 -03:00
fix: remove duplicate check
This commit is contained in:
@@ -343,7 +343,6 @@ exec "$REAL_JAVA" "\${ARGS[@]}"
|
|||||||
|
|
||||||
const waylandEnv = setupWaylandEnvironment();
|
const waylandEnv = setupWaylandEnvironment();
|
||||||
Object.assign(env, waylandEnv);
|
Object.assign(env, waylandEnv);
|
||||||
|
|
||||||
const gpuEnv = setupGpuEnvironment(gpuPreference);
|
const gpuEnv = setupGpuEnvironment(gpuPreference);
|
||||||
Object.assign(env, gpuEnv);
|
Object.assign(env, gpuEnv);
|
||||||
|
|
||||||
@@ -396,45 +395,16 @@ exec "$REAL_JAVA" "\${ARGS[@]}"
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// ==========================================================================
|
|
||||||
// STEP 4: Check if game is already running (prevent duplicate launches)
|
|
||||||
// ==========================================================================
|
|
||||||
const GAME_RUNNING_MARKER = path.join(userDataDir, '.game_running');
|
|
||||||
|
|
||||||
if (fs.existsSync(GAME_RUNNING_MARKER)) {
|
|
||||||
try {
|
|
||||||
const existingPid = fs.readFileSync(GAME_RUNNING_MARKER, 'utf8').trim();
|
|
||||||
const error = new Error(`Game is already running (PID: ${existingPid}). Please close it before launching again.`);
|
|
||||||
console.error('[Launcher]', error.message);
|
|
||||||
if (progressCallback) {
|
|
||||||
progressCallback(error.message, -1, null, null, null);
|
|
||||||
}
|
|
||||||
throw error;
|
|
||||||
} catch (err) {
|
|
||||||
if (err.message.includes('already running')) {
|
|
||||||
throw err;
|
|
||||||
}
|
|
||||||
// File is corrupted, clean it up and continue
|
|
||||||
console.log('Game running marker corrupted, cleaning up and continuing...');
|
|
||||||
try {
|
|
||||||
fs.unlinkSync(GAME_RUNNING_MARKER);
|
|
||||||
} catch (unlinkErr) {
|
|
||||||
// Ignore if file is already gone
|
|
||||||
}
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
try {
|
try {
|
||||||
let spawnOptions = {
|
let spawnOptions = {
|
||||||
stdio: ['ignore', 'pipe', 'pipe'],
|
stdio: ['ignore', 'pipe', 'pipe'],
|
||||||
detached: true, // Detach on all platforms to make game process independent
|
detached: true,
|
||||||
env: env
|
env: env
|
||||||
};
|
};
|
||||||
|
|
||||||
if (process.platform === 'win32') {
|
if (process.platform === 'win32') {
|
||||||
spawnOptions.shell = false;
|
spawnOptions.shell = false;
|
||||||
spawnOptions.windowsHide = true;
|
spawnOptions.windowsHide = true;
|
||||||
// Windows: Hide the spawned process window
|
|
||||||
}
|
}
|
||||||
|
|
||||||
const child = spawn(clientPath, args, spawnOptions);
|
const child = spawn(clientPath, args, spawnOptions);
|
||||||
@@ -443,15 +413,6 @@ exec "$REAL_JAVA" "\${ARGS[@]}"
|
|||||||
// This works on all platforms (Windows, macOS, Linux)
|
// This works on all platforms (Windows, macOS, Linux)
|
||||||
child.unref();
|
child.unref();
|
||||||
|
|
||||||
// Write game running marker file to track process
|
|
||||||
try {
|
|
||||||
fs.writeFileSync(GAME_RUNNING_MARKER, child.pid.toString());
|
|
||||||
console.log(`Game running marker created: ${GAME_RUNNING_MARKER} (PID: ${child.pid})`);
|
|
||||||
} catch (markerErr) {
|
|
||||||
console.warn('Failed to create game running marker:', markerErr.message);
|
|
||||||
// Continue anyway - not critical if marker fails
|
|
||||||
}
|
|
||||||
|
|
||||||
console.log(`Game process started with PID: ${child.pid}`);
|
console.log(`Game process started with PID: ${child.pid}`);
|
||||||
|
|
||||||
let hasExited = false;
|
let hasExited = false;
|
||||||
@@ -461,14 +422,16 @@ exec "$REAL_JAVA" "\${ARGS[@]}"
|
|||||||
if (child.stdout) {
|
if (child.stdout) {
|
||||||
child.stdout.on('data', (data) => {
|
child.stdout.on('data', (data) => {
|
||||||
outputReceived = true;
|
outputReceived = true;
|
||||||
console.log(`Game output: ${data.toString().trim()}`);
|
const msg = data.toString().trim();
|
||||||
|
console.log(`Game output: ${msg}`);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
if (child.stderr) {
|
if (child.stderr) {
|
||||||
child.stderr.on('data', (data) => {
|
child.stderr.on('data', (data) => {
|
||||||
outputReceived = true;
|
outputReceived = true;
|
||||||
console.error(`Game error: ${data.toString().trim()}`);
|
const msg = data.toString().trim();
|
||||||
|
console.error(`Game error: ${msg}`);
|
||||||
});
|
});
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -485,21 +448,14 @@ exec "$REAL_JAVA" "\${ARGS[@]}"
|
|||||||
hasExited = true;
|
hasExited = true;
|
||||||
clearTimeout(launchCheckTimeout);
|
clearTimeout(launchCheckTimeout);
|
||||||
|
|
||||||
// Clean up game running marker file
|
|
||||||
try {
|
|
||||||
if (fs.existsSync(GAME_RUNNING_MARKER)) {
|
|
||||||
fs.unlinkSync(GAME_RUNNING_MARKER);
|
|
||||||
console.log('Game running marker removed');
|
|
||||||
}
|
|
||||||
} catch (markerCleanupErr) {
|
|
||||||
console.warn('Failed to remove game running marker:', markerCleanupErr.message);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (code !== null) {
|
if (code !== null) {
|
||||||
console.log(`Game process exited with code ${code}`);
|
console.log(`Game process exited with code ${code}`);
|
||||||
if (code !== 0 && progressCallback) {
|
if (code !== 0) {
|
||||||
|
console.error(`[Launcher] Game crashed or exited with error code ${code}`);
|
||||||
|
if (progressCallback) {
|
||||||
progressCallback(`Game exited with error code ${code}`, -1, null, null, null);
|
progressCallback(`Game exited with error code ${code}`, -1, null, null, null);
|
||||||
}
|
}
|
||||||
|
}
|
||||||
} else if (signal) {
|
} else if (signal) {
|
||||||
console.log(`Game process terminated by signal ${signal}`);
|
console.log(`Game process terminated by signal ${signal}`);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user