From 4a77548672a9243e5852753f5d5f9fbb4fb878c7 Mon Sep 17 00:00:00 2001 From: Aya Morisawa Date: Tue, 20 Nov 2018 11:23:32 +0900 Subject: [PATCH] Refactor port checking (#3336) --- src/index.ts | 14 +++++++++++--- 1 file changed, 11 insertions(+), 3 deletions(-) diff --git a/src/index.ts b/src/index.ts index c58a21405..7ad52ccf2 100644 --- a/src/index.ts +++ b/src/index.ts @@ -106,6 +106,14 @@ const runningNodejsVersion = process.version.slice(1).split('.').map(x => parseI const requiredNodejsVersion = [10, 0, 0]; const satisfyNodejsVersion = !lessThan(runningNodejsVersion, requiredNodejsVersion); +function isWellKnownPort(port: number): boolean { + return port < 1024; +} + +async function isPortAvailable(port: number): Promise { + return await portscanner.checkPortStatus(port, '127.0.0.1') === 'closed'; +} + async function showMachine() { const logger = new Logger('Machine'); logger.info(`Hostname: ${os.hostname()}`); @@ -172,12 +180,12 @@ async function init(): Promise { process.exit(1); } - if (process.platform === 'linux' && !isRoot() && config.port < 1024) { - Logger.error('You need root privileges to listen on port below 1024 on Linux'); + if (process.platform === 'linux' && isWellKnownPort(config.port) && !isRoot()) { + Logger.error('You need root privileges to listen on well-known port on Linux'); process.exit(1); } - if (await portscanner.checkPortStatus(config.port, '127.0.0.1') === 'open') { + if (!await isPortAvailable(config.port)) { Logger.error(`Port ${config.port} is already in use`); process.exit(1); }