Leahnaya/pokemon-showdown
1
0
Fork 0
mirror of https://github.com/smogon/pokemon-showdown.git synced 2026-03-21 17:25:10 -05:00
Code Issues Actions 1 Packages Projects Releases Wiki Activity

Fix REPL crashing on startup

Browse Source 
The problem is that we were cleaning up old REPL sockets after
launching new ones. This moves the cleanup step to before Artemis
and Friends processes are launched.
This commit is contained in:
Guangcong Luo 2023-12-29 17:05:55 -06:00
parent 5cb91c62f4
commit e22f49ef04
2 changed files with 38 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
lib/repl.ts
View File

@ -20,7 +20,7 @@ export const Repl = new class {
/**
* Contains the pathnames of all active REPL sockets.
*/
socketPathnames: Set<string> = new Set();
socketPathnames = new Set<string>();
listenersSetup = false;
@ -57,6 +57,41 @@ export const Repl = new class {
};
}
/**
* Delete old sockets in the REPL directory (presumably from a crashed
* previous launch of PS).
*
* Does everything synchronously, so that the directory is guaranteed
* clean and ready for new REPL sockets by the time this function returns.
*/
cleanup() {
const config = typeof Config !== 'undefined' ? Config : {};
if (!config.repl) return;
// Clean up old REPL sockets.
const directory = path.dirname(
path.resolve(FS.ROOT_PATH, config.replsocketprefix || 'logs/repl', 'app')
);
let files;
try {
files = fs.readdirSync(directory);
} catch {}
if (files) {
for (const file of files) {
const pathname = path.resolve(directory, file);
const stat = fs.statSync(pathname);
if (!stat.isSocket()) continue;
const socket = net.connect(pathname, () => {
socket.end();
socket.destroy();
}).on('error', () => {
fs.unlinkSync(pathname);
});
}
}
}
/**
* Starts a REPL server, using a UNIX socket for IPC. The eval function
* parametre is passed in because there is no other way to access a file's
@ -64,38 +99,13 @@ export const Repl = new class {
*/
start(filename: string, evalFunction: (input: string) => any) {
const config = typeof Config !== 'undefined' ? Config : {};
if (config.repl !== undefined && !config.repl) return;
if (!config.repl) return;
// TODO: Windows does support the REPL when using named pipes. For now,
// this only supports UNIX sockets.
Repl.setupListeners(filename);
if (filename === 'app') {
// Clean up old REPL sockets.
const directory = path.dirname(
path.resolve(FS.ROOT_PATH, config.replsocketprefix || 'logs/repl', 'app')
);
let files;
try {
files = fs.readdirSync(directory);
} catch {}
if (files) {
for (const file of files) {
const pathname = path.resolve(directory, file);
const stat = fs.statSync(pathname);
if (!stat.isSocket()) continue;
const socket = net.connect(pathname, () => {
socket.end();
socket.destroy();
}).on('error', () => {
fs.unlink(pathname, () => {});
});
}
}
}
const server = net.createServer(socket => {
repl.start({
input: socket,

1
server/index.ts
View File

@ -71,6 +71,7 @@ function setupGlobals() {
void Monitor.version().then((hash: any) => {
global.__version.tree = hash;
});
Repl.cleanup();
if (Config.watchconfig) {
FS('config/config.js').onModify(() => {