@beast01/tcurl 1.0.1 → 1.0.2

package/README.md

@@ -104,7 +104,10 @@ Fields open in **INSERT** mode so you can type right away; press `Esc` for
 - **Auth** — Bearer token or HTTP Basic (username / password).
 - **Redirects** — follow (with method downgrade on 301/302/303) or manual.
 - **TLS control** — toggle certificate verification for self-signed hosts.
-- **Timeouts** — per-request, in milliseconds.
+- **Timeouts & cancellation** — per-request timeout in milliseconds (default
+  30 000; set `0` to disable). While a request is in flight, press `Esc` (or
+  `q`) to abort it immediately — even with no timeout set — and `Ctrl+C`
+  always quits, so a hung server can never lock you up.
 - **Pretty responses** — JSON is auto-formatted; scrollable body & headers
   with status, timing, and size.
 - **Persistence** — requests are stored as JSON and reused across sessions.

package/dist/app.js

@@ -39,6 +39,9 @@ export function App({ initialStore, exitState, }) {
     const [loading, setLoading] = useState(false);
     const [flash, setFlash] = useState(null);
     const pendingG = useRef(false);
+    // In-flight request: controller to abort it, token to ignore stale results.
+    const abortRef = useRef(null);
+    const sendToken = useRef(0);
     const theme = getTheme(store.theme);
     const requests = store.requests;
     function persist(next) {
@@ -61,19 +64,41 @@ export function App({ initialStore, exitState, }) {
             flashMessage('Set a URL first');
             return;
         }
+        const token = ++sendToken.current;
+        const controller = new AbortController();
+        abortRef.current = controller;
         setLoading(true);
         setResponse(null);
-        const result = await executeRequest(config);
+        const result = await executeRequest(config, controller.signal);
+        // Ignore results from a request the user cancelled or superseded.
+        if (sendToken.current !== token)
+            return;
+        abortRef.current = null;
         setResponse(result);
         setLoading(false);
         setMode('response');
     }
-    // Global keys — only in list mode and when idle.
+    function cancelSend() {
+        abortRef.current?.abort();
+        abortRef.current = null;
+        sendToken.current++; // invalidate the pending result
+        setLoading(false);
+        flashMessage('Request cancelled');
+    }
+    // Ctrl+C always quits, from any mode (aborting any in-flight request).
     useInput((input, key) => {
         if (key.ctrl && input === 'c') {
+            abortRef.current?.abort();
             exit();
-            return;
         }
+    });
+    // While a request is in flight, Esc (or q) cancels it.
+    useInput((input, key) => {
+        if (key.escape || input === 'q')
+            cancelSend();
+    }, { isActive: loading });
+    // Global keys — only in list mode and when idle.
+    useInput((input, key) => {
         if (loading)
             return;
         if (input === '?') {
@@ -178,8 +203,9 @@ export function App({ initialStore, exitState, }) {
         : [];
     return (React.createElement(Box, { flexDirection: "column", width: cols, minHeight: rows - 1 },
         React.createElement(Header, { theme: theme, subtitle: mode === 'list' ? `${requests.length} saved · ` : '' }),
-        React.createElement(Box, { flexGrow: 1, flexDirection: "column", marginTop: 1 }, loading ? (React.createElement(Box, { flexGrow: 1, borderStyle: "round", borderColor: theme.border, paddingX: 1, alignItems: "center", justifyContent: "center" },
-            React.createElement(Spinner, { theme: theme, label: "Sending request\u2026" }))) : mode === 'help' ? (React.createElement(Help, { theme: theme, onClose: () => setMode('list') })) : mode === 'editor' && working ? (React.createElement(RequestEditor, { theme: theme, request: working, isActive: mode === 'editor', onChange: onEditorChange, onSend: onEditorSend, onBack: onEditorBack })) : mode === 'response' && response ? (React.createElement(ResponseViewer, { theme: theme, response: response, isActive: mode === 'response', onBack: () => setMode('list'), width: cols, height: rows })) : (React.createElement(RequestList, { theme: theme, requests: requests, selectedIndex: selected }))),
+        React.createElement(Box, { flexGrow: 1, flexDirection: "column", marginTop: 1 }, loading ? (React.createElement(Box, { flexGrow: 1, borderStyle: "round", borderColor: theme.border, paddingX: 1, alignItems: "center", justifyContent: "center", flexDirection: "column" },
+            React.createElement(Spinner, { theme: theme, label: "Sending request\u2026" }),
+            React.createElement(Text, { color: theme.muted }, "Esc or q to cancel"))) : mode === 'help' ? (React.createElement(Help, { theme: theme, onClose: () => setMode('list') })) : mode === 'editor' && working ? (React.createElement(RequestEditor, { theme: theme, request: working, isActive: mode === 'editor', onChange: onEditorChange, onSend: onEditorSend, onBack: onEditorBack })) : mode === 'response' && response ? (React.createElement(ResponseViewer, { theme: theme, response: response, isActive: mode === 'response', onBack: () => setMode('list'), width: cols, height: rows })) : (React.createElement(RequestList, { theme: theme, requests: requests, selectedIndex: selected }))),
         React.createElement(Box, { justifyContent: "space-between" },
             React.createElement(StatusBar, { theme: theme, hints: statusHints }),
             flash ? (React.createElement(Box, { paddingX: 1 },

package/dist/components/Help.js

@@ -9,6 +9,7 @@ const SECTIONS = [
             ['n', 'New request'],
             ['Enter / e', 'Edit request'],
             ['s', 'Send request'],
+            ['Esc / q', 'Cancel a request while it is sending'],
             ['d', 'Delete request'],
             ['y', 'Copy as curl (prints on exit)'],
             ['t', 'Cycle theme (gruvbox / ember)'],

package/dist/http/client.js

@@ -141,14 +141,28 @@ function doRequest(opts, redirectsLeft) {
         req.end();
     });
 }
-/** Execute a request config and return a normalized result (never throws). */
-export async function executeRequest(config) {
+/**
+ * Execute a request config and return a normalized result (never throws).
+ *
+ * The optional `externalSignal` lets the caller (the UI) cancel an in-flight
+ * request; when it fires the result carries `error: "Request cancelled"`.
+ * A per-request timeout aborts independently.
+ */
+export async function executeRequest(config, externalSignal) {
     const start = Date.now();
     const controller = new AbortController();
     let timer;
     if (config.timeoutMs > 0) {
         timer = setTimeout(() => controller.abort(), config.timeoutMs);
     }
+    // Bridge an external (user) cancellation into our controller.
+    const onExternalAbort = () => controller.abort();
+    if (externalSignal) {
+        if (externalSignal.aborted)
+            controller.abort();
+        else
+            externalSignal.addEventListener('abort', onExternalAbort, { once: true });
+    }
     try {
         const url = buildUrl(config);
         if (url.protocol !== 'http:' && url.protocol !== 'https:') {
@@ -168,6 +182,7 @@ export async function executeRequest(config) {
     }
     catch (err) {
         const aborted = err?.name === 'AbortError' || controller.signal.aborted;
+        const cancelled = externalSignal?.aborted ?? false;
         return {
             ok: false,
             status: 0,
@@ -178,13 +193,17 @@ export async function executeRequest(config) {
             durationMs: Date.now() - start,
             sizeBytes: 0,
             finalUrl: config.url,
-            error: aborted
-                ? `Request timed out after ${config.timeoutMs}ms`
-                : String(err?.message ?? err),
+            error: cancelled
+                ? 'Request cancelled'
+                : aborted
+                    ? `Request timed out after ${config.timeoutMs}ms`
+                    : String(err?.message ?? err),
         };
     }
     finally {
         if (timer)
             clearTimeout(timer);
+        if (externalSignal)
+            externalSignal.removeEventListener('abort', onExternalAbort);
     }
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@beast01/tcurl",
-  "version": "1.0.1",
+  "version": "1.0.2",
   "publishConfig": {
     "access": "public"
   },