Rewrite in Ink

.github/workflows/main.yml

@@ -21,4 +21,5 @@ jobs:
  with:
  node-version: ${{ matrix.node-version }}
  - run: npm install
+ - run: npm run build
  - run: npm test

.gitignore

@@ -1,2 +1,3 @@
 node_modules
 yarn.lock
+dist/**

cli.js

@@ -1,7 +1,12 @@
 #!/usr/bin/env node
 import process from 'node:process';
+import React from 'react';
 import meow from 'meow';
 import fkill from 'fkill';
+import {render} from 'ink';
+import {listAllProcesses} from './utils.js';
+import {InteractiveUI} from './interactive.js';
+import {Dialog} from './dialog.js';
 
 const cli = meow(`
  Usage
@@ -52,8 +57,9 @@ const cli = meow(`
 
 (async () => {
  if (cli.input.length === 0) {
- // eslint-disable-next-line node/no-unsupported-features/es-syntax
- (await import('./interactive.js')).init(cli.flags);
+ const processes = await listAllProcesses();
+ const app = render(<InteractiveUI processes={processes} flags={cli.flags}/>);
+ await app.waitUntilExit();
  } else {
  const forceAfterTimeout = cli.flags.forceAfterTimeout === undefined ? undefined : cli.flags.forceAfterTimeout * 1000;
  const promise = fkill(cli.input, {...cli.flags, forceAfterTimeout, ignoreCase: true});
@@ -71,8 +77,33 @@ const cli = meow(`
  process.exit(1);
  }
 
- // eslint-disable-next-line node/no-unsupported-features/es-syntax
- (await import('./interactive.js')).handleFkillError(cli.input);
+ const modalSelectHandler = async answer => {
+ const processes = cli.input;
+ const suffix = processes.length > 1 ? 'es' : '';
+
+ if (process.stdout.isTTY === false) {
+ console.error(`Error killing process${suffix}. Try \`fkill --force ${processes.join(' ')}\``);
+ process.exit(1);
+ }
+
+ if (answer === 'Y') {
+ await fkill(processes, {
+ force: true,
+ ignoreCase: true,
+ });
+ }
+
+ process.exit(0);
+ };
+
+ await render(
+ <Dialog
+ opened
+ inputPlaceholder="(Y/n)"
+ message="Error killing process. Would you like to use the force? "
+ selectHandler={modalSelectHandler}
+ />,
+ ).waitUntilExit();
  }
  }
  }

dialog.js

@@ -0,0 +1,32 @@
+import {createRequire} from 'node:module';
+import React, {useState} from 'react';
+import {Box, Text} from 'ink';
+
+const require = createRequire(import.meta.url);
+const TextInput = require('ink-text-input').default;
+
+const Dialog = ({opened, inputPlaceholder, message, selectHandler}) => {
+ const [query, setQuery] = useState('');
+
+ if (!opened) {
+ return null;
+ }
+
+ return (
+ <Box marginTop={1} marginRight={1}>
+ <Text bold>
+ <Text color="green">{'? '}</Text>
+ <Text>{message}</Text>
+ </Text>
+
+ <TextInput
+ value={query}
+ placeholder={inputPlaceholder}
+ onChange={setQuery}
+ onSubmit={() => selectHandler(query)}
+ />
+ </Box>
+ );
+};
+
+export {Dialog};