mirror of
https://github.com/AutoMaker-Org/automaker.git
synced 2026-02-04 09:13:08 +00:00
refactor: clean up whitespace and improve prompt formatting in port management
- Removed unnecessary whitespace in the init.mjs file for better readability. - Enhanced the formatting of user prompts to improve clarity during port conflict resolution.
This commit is contained in:
47
init.mjs
47
init.mjs
@@ -368,14 +368,14 @@ async function main() {
|
|||||||
|
|
||||||
// Check for processes on required ports and prompt user
|
// Check for processes on required ports and prompt user
|
||||||
log('Checking for processes on ports 3007 and 3008...', 'yellow');
|
log('Checking for processes on ports 3007 and 3008...', 'yellow');
|
||||||
|
|
||||||
const webPortInUse = isPortInUse(3007);
|
const webPortInUse = isPortInUse(3007);
|
||||||
const serverPortInUse = isPortInUse(3008);
|
const serverPortInUse = isPortInUse(3008);
|
||||||
|
|
||||||
let webPort = 3007;
|
let webPort = 3007;
|
||||||
let serverPort = 3008;
|
let serverPort = 3008;
|
||||||
let corsOriginEnv = process.env.CORS_ORIGIN || '';
|
let corsOriginEnv = process.env.CORS_ORIGIN || '';
|
||||||
|
|
||||||
if (webPortInUse || serverPortInUse) {
|
if (webPortInUse || serverPortInUse) {
|
||||||
console.log('');
|
console.log('');
|
||||||
if (webPortInUse) {
|
if (webPortInUse) {
|
||||||
@@ -387,11 +387,13 @@ async function main() {
|
|||||||
log(`⚠ Port 3008 is in use by process(es): ${pids.join(', ')}`, 'yellow');
|
log(`⚠ Port 3008 is in use by process(es): ${pids.join(', ')}`, 'yellow');
|
||||||
}
|
}
|
||||||
console.log('');
|
console.log('');
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
const choice = await prompt('What would you like to do? (k)ill processes, (u)se different ports, or (c)ancel: ');
|
const choice = await prompt(
|
||||||
|
'What would you like to do? (k)ill processes, (u)se different ports, or (c)ancel: '
|
||||||
|
);
|
||||||
const lowerChoice = choice.toLowerCase();
|
const lowerChoice = choice.toLowerCase();
|
||||||
|
|
||||||
if (lowerChoice === 'k' || lowerChoice === 'kill') {
|
if (lowerChoice === 'k' || lowerChoice === 'kill') {
|
||||||
if (webPortInUse) {
|
if (webPortInUse) {
|
||||||
await killPort(3007);
|
await killPort(3007);
|
||||||
@@ -409,59 +411,68 @@ async function main() {
|
|||||||
while (true) {
|
while (true) {
|
||||||
const newWebPort = await prompt('Enter web port (default 3007): ');
|
const newWebPort = await prompt('Enter web port (default 3007): ');
|
||||||
const parsedWebPort = newWebPort.trim() ? parseInt(newWebPort.trim(), 10) : 3007;
|
const parsedWebPort = newWebPort.trim() ? parseInt(newWebPort.trim(), 10) : 3007;
|
||||||
|
|
||||||
if (isNaN(parsedWebPort) || parsedWebPort < 1024 || parsedWebPort > 65535) {
|
if (isNaN(parsedWebPort) || parsedWebPort < 1024 || parsedWebPort > 65535) {
|
||||||
log('Invalid port. Please enter a number between 1024 and 65535.', 'red');
|
log('Invalid port. Please enter a number between 1024 and 65535.', 'red');
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isPortInUse(parsedWebPort)) {
|
if (isPortInUse(parsedWebPort)) {
|
||||||
const pids = getProcessesOnPort(parsedWebPort);
|
const pids = getProcessesOnPort(parsedWebPort);
|
||||||
log(`Port ${parsedWebPort} is already in use by process(es): ${pids.join(', ')}`, 'red');
|
log(
|
||||||
|
`Port ${parsedWebPort} is already in use by process(es): ${pids.join(', ')}`,
|
||||||
|
'red'
|
||||||
|
);
|
||||||
const useAnyway = await prompt('Use this port anyway? (y/n): ');
|
const useAnyway = await prompt('Use this port anyway? (y/n): ');
|
||||||
if (useAnyway.toLowerCase() !== 'y' && useAnyway.toLowerCase() !== 'yes') {
|
if (useAnyway.toLowerCase() !== 'y' && useAnyway.toLowerCase() !== 'yes') {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
webPort = parsedWebPort;
|
webPort = parsedWebPort;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
while (true) {
|
while (true) {
|
||||||
const newServerPort = await prompt('Enter server port (default 3008): ');
|
const newServerPort = await prompt('Enter server port (default 3008): ');
|
||||||
const parsedServerPort = newServerPort.trim() ? parseInt(newServerPort.trim(), 10) : 3008;
|
const parsedServerPort = newServerPort.trim() ? parseInt(newServerPort.trim(), 10) : 3008;
|
||||||
|
|
||||||
if (isNaN(parsedServerPort) || parsedServerPort < 1024 || parsedServerPort > 65535) {
|
if (isNaN(parsedServerPort) || parsedServerPort < 1024 || parsedServerPort > 65535) {
|
||||||
log('Invalid port. Please enter a number between 1024 and 65535.', 'red');
|
log('Invalid port. Please enter a number between 1024 and 65535.', 'red');
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (parsedServerPort === webPort) {
|
if (parsedServerPort === webPort) {
|
||||||
log('Server port cannot be the same as web port.', 'red');
|
log('Server port cannot be the same as web port.', 'red');
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
|
|
||||||
if (isPortInUse(parsedServerPort)) {
|
if (isPortInUse(parsedServerPort)) {
|
||||||
const pids = getProcessesOnPort(parsedServerPort);
|
const pids = getProcessesOnPort(parsedServerPort);
|
||||||
log(`Port ${parsedServerPort} is already in use by process(es): ${pids.join(', ')}`, 'red');
|
log(
|
||||||
|
`Port ${parsedServerPort} is already in use by process(es): ${pids.join(', ')}`,
|
||||||
|
'red'
|
||||||
|
);
|
||||||
const useAnyway = await prompt('Use this port anyway? (y/n): ');
|
const useAnyway = await prompt('Use this port anyway? (y/n): ');
|
||||||
if (useAnyway.toLowerCase() !== 'y' && useAnyway.toLowerCase() !== 'yes') {
|
if (useAnyway.toLowerCase() !== 'y' && useAnyway.toLowerCase() !== 'yes') {
|
||||||
continue;
|
continue;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
serverPort = parsedServerPort;
|
serverPort = parsedServerPort;
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
log(`Using ports: Web=${webPort}, Server=${serverPort}`, 'blue');
|
log(`Using ports: Web=${webPort}, Server=${serverPort}`, 'blue');
|
||||||
break;
|
break;
|
||||||
} else if (lowerChoice === 'c' || lowerChoice === 'cancel') {
|
} else if (lowerChoice === 'c' || lowerChoice === 'cancel') {
|
||||||
log('Cancelled.', 'yellow');
|
log('Cancelled.', 'yellow');
|
||||||
process.exit(0);
|
process.exit(0);
|
||||||
} else {
|
} else {
|
||||||
log('Invalid choice. Please enter k (kill), u (use different ports), or c (cancel).', 'red');
|
log(
|
||||||
|
'Invalid choice. Please enter k (kill), u (use different ports), or c (cancel).',
|
||||||
|
'red'
|
||||||
|
);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
} else {
|
} else {
|
||||||
|
|||||||
Reference in New Issue
Block a user