Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

add support for killing by port (using a colon to indicate port usage) #27

Closed
wants to merge 5 commits into from
Closed

add support for killing by port (using a colon to indicate port usage) #27

Show file tree
Hide file tree
Changes from 3 commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
242e266
add support for killing by port (using a colon to indicate port usage)
dnbkr May 31, 2017
480c0a6
favour `let` over `var` in for-loop
dnbkr May 31, 2017
5e2cd95
changed import to support older node imports
dnbkr May 31, 2017
1b2bc93
simplified logic for obtaining ports from cli input
dnbkr Jun 1, 2017
2b9b099
updated `portproc` to 1.0.2 to add support for node LTS v4
dnbkr Jun 1, 2017
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 15 additions & 1 deletion cli.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ const psList = require('ps-list');
const numSort = require('num-sort');
const escExit = require('esc-exit');
const cliTruncate = require('cli-truncate');
const portToProc = require('portproc').portToProc;
Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Would have been more readable as:

const portToProcess = require('portproc').portToProcess;

Not really worth saving a few characters for limited gain.

Copy link
Owner

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Can you extract the CLI in portproc into a separate package? I don't want to needlessly have commander in the dependency tree. See: sindresorhus/ama#17


const cli = meow(`
Usage
Expand Down Expand Up @@ -96,5 +97,18 @@ function handleFkillError(processes) {
if (cli.input.length === 0) {
init(cli.flags);
} else {
fkill(cli.input, cli.flags).catch(() => handleFkillError(cli.input));
let pids = [];
const promises = [];
for (let i = 0; i < cli.input.length; i++) {
Copy link
Contributor

@kevva kevva May 31, 2017 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Just do for (const x of cli.input).

if (cli.input[i][0] === ':') {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Made a little regex for this https://github.com/kevva/port-regex :).

promises.push(portToProc(parseInt(cli.input[i].slice(1), 0)));
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

0 is an invalid radix. Use 10 for decimal numbers.

} else {
pids.push(cli.input[i]);
}
}
Promise.all(promises).then(promisedPids => {
promisedPids = promisedPids.filter(pid => pid);
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

What are you filtering here?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

portproc will return undefined if the input has no valid output (i.e. the port is not in use, or the pid is not using a port), so this filters out falsey responses from portproc

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Shouldn't it reject if it can't find a process?

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'm not sure; I think if you ask to kill a valid target and an invalid target then the operation shouldn't fail; the valid target should be killed. But silently failing doesn't feel great, I agree. As a command line tool, rather than a library, perhaps it should be a little more permissive to user input? What do you think?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I mean, your module should reject and we should handle it in here (i.e not failing), imo.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Isn't rejecting a Promise like throwing an error? I'm not sure it's an error if you ask for the process using port X and there is no process using that port. That feels to me like it should return undefined.

If we want to treat undefined in this use case as an error, we can do - though I think i'd be more in favour or silently ignoring the command. At least if there's positive hits in the request too?

Am I making sense?

Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Yeah, maybe. I usually throw but I see where you coming from. Maybe @sindresorhus @SamVerschueren has any thoughts?

pids = pids.concat(promisedPids);
fkill(pids, cli.flags).catch(() => handleFkillError(cli.input));
});
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I would write it as:

if (cli.input.length === 0) {
    init(cli.flags);
} else {
    Promise.all(cli.input.map(x => x[0] === ':' ? portToProc(parseInt(x.slice(1), 10)) : x))
        .then(pids => fkill(pids, cli.flags).catch(() => handleFkillError(cli.input)));
}

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Overall I prefer this approach; I'll update the branch

}
1 change: 1 addition & 0 deletions package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,7 @@
"inquirer-autocomplete-prompt": "^0.7.0",
"meow": "^3.3.0",
"num-sort": "^1.0.0",
"portproc": "^1.0.0",
"ps-list": "^3.0.0"
},
"devDependencies": {
Expand Down