@dutodev/cli 0.5.0 → 0.6.0

package/README.md

@@ -145,9 +145,14 @@ Com os túneis no ar, o terminal mostra cada túnel (URL, destino local, requisi
 | `m` | Mostra o QR code do túnel selecionado, para abrir no celular |
 | `f` | Filtra por túnel, método, caminho ou status |
 | `↵` | Detalhes da requisição: cabeçalhos e o começo dos corpos |
+| `r` | No detalhe, reenvia a requisição ao serviço local |
 | `tab`, `↑↓` | Alterna entre túneis e requisições e move a seleção |
 | `q` ou Ctrl+C | Fecha os túneis e sai |
 
+**Reenviar uma requisição.** No detalhe (`↵`), a tecla `r` manda de novo ao serviço local o mesmo método, caminho, cabeçalhos e corpo que o app recebeu, já com as regras `host:` e `headers:` do túnel aplicadas e sem as credenciais do próprio Duto. O reenvio entra na lista marcado com `↻`, a tela pula para o detalhe dele (`↻ reenvio de #N`) e `esc` volta. Serve para depurar webhooks sem esperar o serviço externo mandar de novo; em especial, uma requisição que ficou com `503` porque o serviço local estava fora do ar pode ser reenviada assim que ele subir. Como os bytes são idênticos, assinaturas de webhook continuam válidas. Já apps que recusam eventos antigos (o Stripe tolera 5 minutos por padrão) vão rejeitar o reenvio depois dessa janela.
+
+Não dá para reenviar WebSocket, requisições barradas pela senha do túnel, corpos binários, corpos acima de 64 KB, requisições cujo corpo não terminou de chegar ou quando o túnel já não está aberto; nesses casos uma linha explica o motivo. O reenvio não existe no log simples (sem terminal interativo).
+
 Se o túnel está no ar mas nada responde na porta local, quem abrir o endereço no navegador vê uma página do Duto que volta sozinha quando o serviço sobe. Ela espera por uma conexão só (SSE): a CLI checa a porta na sua máquina e avisa a página assim que o serviço responde, sem recarregar de tempos em tempos. Clientes que não são navegador (`curl`, APIs) recebem a mesma resposta em texto. Em ambos os casos o status é `503` com `Retry-After: 3`. Os caminhos `/__duto/…` são reservados para isso e nunca chegam ao seu app.
 
 Fora de um terminal interativo (pipe, CI) ou com `--no-ui`, a CLI imprime um log simples. No Windows a tela cheia vem desligada; use `--ui` para tentar.

package/dist/{fullscreen-DKIFHB6J.js → fullscreen-7P5GBCQX.js}

@@ -84,12 +84,16 @@ function Detail({ record }) {
         record.tunnel
       ] })
     ] }),
+    record.replayOf !== void 0 && /* @__PURE__ */ jsxs(Text, { color: C.muted, children: [
+      "\u21BB reenvio de #",
+      record.replayOf
+    ] }),
     record.error && /* @__PURE__ */ jsx(Text, { color: C.err, children: record.error }),
-    /* @__PURE__ */ jsx(Section, { title: "Requisi\xE7\xE3o", headers: record.reqHeaders, body: record.reqBody, truncated: record.truncated }),
-    /* @__PURE__ */ jsx(Section, { title: "Resposta", headers: record.resHeaders, body: record.resBody, truncated: record.truncated }),
+    /* @__PURE__ */ jsx(Section, { title: "Requisi\xE7\xE3o", headers: record.reqHeaders, body: record.reqBody, truncated: record.reqTruncated }),
+    /* @__PURE__ */ jsx(Section, { title: "Resposta", headers: record.resHeaders, body: record.resBody, truncated: record.resTruncated }),
     /* @__PURE__ */ jsxs(Text, { color: C.muted, children: [
       "\n",
-      "esc volta para a lista"
+      "r reenvia \xB7 esc volta para a lista"
     ] })
   ] });
 }
@@ -189,7 +193,7 @@ function RequestList(props) {
   const start = Math.max(0, Math.min(selected - Math.floor(height / 2), records.length - height));
   const visible = records.slice(start, start + height);
   const accessW = Math.max(0, ...visible.map((r) => (accessLabel(r.access)?.text.length ?? -1) + 1));
-  const pathW = Math.max(10, width - 52 - accessW);
+  const pathW = Math.max(10, width - 54 - accessW);
   const title = props.filter ? `REQUISI\xC7\xD5ES \xB7 filtro: ${props.filter} ` : "REQUISI\xC7\xD5ES ";
   return /* @__PURE__ */ jsxs4(Box3, { flexDirection: "column", children: [
     /* @__PURE__ */ jsx4(Text4, { color: C.muted, children: title + "\u2500".repeat(Math.max(0, width - title.length)) }),
@@ -204,6 +208,7 @@ function RequestList(props) {
         "  ",
         /* @__PURE__ */ jsx4(Text4, { color: tunnelColor(props.tunnelIndex(r.tunnel)), children: fit(r.tunnel, 9) }),
         " ",
+        /* @__PURE__ */ jsx4(Text4, { color: C.muted, children: r.replayOf !== void 0 ? "\u21BB " : "  " }),
         /* @__PURE__ */ jsx4(Text4, { bold: true, children: fit(method, 5) }),
         fit(r.path, pathW),
         " ",
@@ -316,6 +321,9 @@ function App({ session, version, system, onExit }) {
   useEffect(() => {
     if (selReq >= records.length) setSelReq(Math.max(0, records.length - 1));
   }, [records.length, selReq]);
+  useEffect(() => {
+    if (mode.kind === "detail" && !all.some((r) => r.id === mode.id)) setMode({ kind: "list" });
+  }, [mode, all]);
   useEffect(() => {
     if (!message) return;
     const t = setTimeout(() => setMessage(null), 4e3);
@@ -396,7 +404,12 @@ function App({ session, version, system, onExit }) {
       return;
     }
     if (mode.kind === "detail") {
-      if (key.escape || key.return || input === "q") setMode({ kind: "list" });
+      if (key.escape || key.return || input === "q") return setMode({ kind: "list" });
+      if (input === "r") {
+        const res = session.replay(mode.id);
+        if (res.ok) setMode({ kind: "detail", id: res.id });
+        else setMessage({ text: res.reason, tone: "warn" });
+      }
       return;
     }
     if (mode.kind === "qr") {
@@ -419,7 +432,7 @@ function App({ session, version, system, onExit }) {
       else setSelReq((i) => Math.min(Math.max(0, i + d), Math.max(0, records.length - 1)));
       return;
     }
-    if (key.return && focus === "requests" && records[selReq]) return setMode({ kind: "detail" });
+    if (key.return && focus === "requests" && records[selReq]) return setMode({ kind: "detail", id: records[selReq].id });
     if (key.escape && filter) return setFilter("");
     if (input === "c") return void act("copy");
     if (input === "o") return void act("open");
@@ -430,7 +443,7 @@ function App({ session, version, system, onExit }) {
   const live = state.tunnels.filter((t) => t.status === "live").length;
   const conn = state.connection === "online" ? { text: "conectado \u25CF", color: C.signal } : state.connection === "connecting" ? { text: "conectando\u2026", color: C.muted } : { text: "reconectando\u2026", color: C.warn };
   const listHeight = Math.max(3, rows - state.tunnels.length - 9);
-  const selected = records[selReq];
+  const detailRecord = mode.kind === "detail" ? all.find((r) => r.id === mode.id) : void 0;
   const qrTunnel = mode.kind === "qr" ? state.tunnels.find((t) => t.key === mode.key) : void 0;
   return /* @__PURE__ */ jsxs6(Box5, { flexDirection: "column", width, children: [
     /* @__PURE__ */ jsxs6(Box5, { justifyContent: "space-between", children: [
@@ -457,7 +470,7 @@ function App({ session, version, system, onExit }) {
     /* @__PURE__ */ jsx6(Text6, { children: " " }),
     /* @__PURE__ */ jsx6(TunnelTable, { tunnels: state.tunnels, selected: selTun, focused: focus === "tunnels" }),
     /* @__PURE__ */ jsx6(Text6, { children: " " }),
-    mode.kind === "detail" && selected ? /* @__PURE__ */ jsx6(Detail, { record: selected }) : mode.kind === "qr" && qrTunnel ? /* @__PURE__ */ jsx6(QrView, { tunnel: qrTunnel, link: mode.link, now }) : /* @__PURE__ */ jsx6(RequestList, { records, tunnelIndex, selected: selReq, focused: focus === "requests", height: listHeight, width, filter }),
+    mode.kind === "detail" && detailRecord ? /* @__PURE__ */ jsx6(Detail, { record: detailRecord }) : mode.kind === "qr" && qrTunnel ? /* @__PURE__ */ jsx6(QrView, { tunnel: qrTunnel, link: mode.link, now }) : /* @__PURE__ */ jsx6(RequestList, { records, tunnelIndex, selected: selReq, focused: focus === "requests", height: listHeight, width, filter }),
     /* @__PURE__ */ jsx6(Text6, { children: " " }),
     mode.kind === "filter" && /* @__PURE__ */ jsx6(Prompt, { label: "Filtrar (t\xFAnel, m\xE9todo, caminho ou status):", value: mode.value, hint: "\u21B5 aplica \xB7 esc cancela" }),
     mode.kind === "port" && /* @__PURE__ */ jsx6(Prompt, { label: "Novo t\xFAnel \u2014 porta local:", value: mode.value, hint: "\u21B5 continua \xB7 esc cancela" }),

package/dist/index.js

@@ -787,7 +787,29 @@ ${o.error ? `<p class="error" role="alert">Usu\xE1rio ou senha incorretos.</p>
   );
 }
 
+// src/session/replay.ts
+function replayBlock(r) {
+  if (!r) return "Essa requisi\xE7\xE3o j\xE1 saiu da lista.";
+  if (r.websocket) return "WebSocket n\xE3o d\xE1 para reenviar.";
+  if (r.noReplay) return r.noReplay;
+  if (r.access?.kind === "denied") return "Barrada pela senha do t\xFAnel; n\xE3o d\xE1 para reenviar.";
+  if (!r.reqComplete) return "A requisi\xE7\xE3o ainda n\xE3o chegou inteira.";
+  if (r.reqTruncated) return "Corpo acima de 64 KB; n\xE3o d\xE1 para reenviar.";
+  if (r.reqBodyBytes > 0 && r.reqRaw === null) return "Corpo bin\xE1rio n\xE3o \xE9 guardado; n\xE3o d\xE1 para reenviar.";
+  return null;
+}
+var DROP = /* @__PURE__ */ new Set(["connection", "keep-alive", "transfer-encoding", "expect", "content-length", "upgrade", "te", "trailer", "proxy-connection"]);
+function replayHeaders(r) {
+  const out = {};
+  for (const [k, v] of Object.entries(r.reqHeaders)) if (!DROP.has(k.toLowerCase())) out[k] = v;
+  const hadLength = Object.keys(r.reqHeaders).some((k) => k.toLowerCase() === "content-length");
+  if (r.reqBodyBytes > 0 || hadLength) out["content-length"] = String(r.reqRaw?.length ?? 0);
+  return out;
+}
+
 // src/session/proxy.ts
+var DENIED_NO_REPLAY = "Barrada pela senha do t\xFAnel; n\xE3o d\xE1 para reenviar.";
+var PREFLIGHT_NO_REPLAY = "Preflight de CORS n\xE3o d\xE1 para reenviar.";
 var TEXT = /^(text\/|application\/(json|xml|javascript|x-www-form-urlencoded|graphql)|[^;]*\+(json|xml))/i;
 var MAX_BODY = 64 * 1024;
 var LOCAL_AGENT = new Agent({ keepAlive: false });
@@ -805,8 +827,11 @@ var Capture = class {
   max;
   chunks = [];
   size = 0;
+  /** Bytes vistos, capturados ou não. */
+  total = 0;
   truncated = false;
   push(c) {
+    this.total += c.length;
     if (!this.enabled) return;
     const room = this.max - this.size;
     if (room <= 0) {
@@ -818,6 +843,9 @@ var Capture = class {
     this.chunks.push(part);
     this.size += part.length;
   }
+  raw() {
+    return this.enabled && this.size > 0 ? Buffer.concat(this.chunks) : null;
+  }
   text() {
     return this.enabled && this.size > 0 ? Buffer.concat(this.chunks).toString("utf8") : null;
   }
@@ -986,7 +1014,7 @@ async function startProxy(o) {
       await new Promise((r) => setTimeout(r, 50));
     }
   }
-  function record(req, route, headers, websocket, access) {
+  function record(req, route, headers, websocket, access, noReplay) {
     const id = nextId++;
     const started = Date.now();
     o.store.add({
@@ -1003,11 +1031,77 @@ async function startProxy(o) {
       resHeaders: {},
       reqBody: null,
       resBody: null,
+      reqRaw: null,
+      reqBodyBytes: 0,
+      reqTruncated: false,
+      reqComplete: false,
       truncated: false,
-      ...access && { access }
+      resTruncated: false,
+      ...access && { access },
+      ...noReplay && { noReplay }
     });
     return { id, started };
   }
+  function trackResponse(id, started, up, reqCap) {
+    const resCap = new Capture(TEXT.test(up.headers["content-type"] ?? ""), max);
+    let bytes = 0;
+    up.on("data", (c) => {
+      bytes += c.length;
+      resCap.push(c);
+    });
+    up.on(
+      "end",
+      () => o.store.update(id, {
+        status: up.statusCode ?? null,
+        durationMs: Date.now() - started,
+        bytes,
+        resHeaders: flat(up.headers),
+        resBody: resCap.text(),
+        truncated: !!reqCap?.truncated || resCap.truncated,
+        resTruncated: resCap.truncated,
+        ...reqCap && { reqBody: reqCap.text(), reqRaw: reqCap.truncated ? null : reqCap.raw(), reqBodyBytes: reqCap.total, reqTruncated: reqCap.truncated }
+      })
+    );
+  }
+  function replay(id) {
+    const r = o.store.get(id);
+    const blocked = replayBlock(r);
+    if (blocked || !r) return { ok: false, reason: blocked ?? "Essa requisi\xE7\xE3o j\xE1 saiu da lista." };
+    const route = [...o.routes.values()].find((x) => x.tunnel === r.tunnel);
+    if (!route) return { ok: false, reason: `O t\xFAnel ${r.tunnel} n\xE3o est\xE1 aberto nesta sess\xE3o.` };
+    const newId = nextId++;
+    const started = Date.now();
+    const headers = replayHeaders(r);
+    o.store.add({
+      id: newId,
+      tunnel: r.tunnel,
+      method: r.method,
+      path: r.path,
+      status: null,
+      durationMs: null,
+      bytes: 0,
+      startedAt: started,
+      websocket: false,
+      reqHeaders: headers,
+      resHeaders: {},
+      reqBody: r.reqBody,
+      resBody: null,
+      reqRaw: r.reqRaw,
+      reqBodyBytes: r.reqBodyBytes,
+      reqTruncated: false,
+      reqComplete: true,
+      truncated: false,
+      resTruncated: false,
+      replayOf: r.id
+    });
+    void (async () => {
+      const host = await localHost(route.port);
+      const upstream = request({ host, port: route.port, agent: LOCAL_AGENT, method: r.method, path: r.path, headers }, (up) => trackResponse(newId, started, up));
+      upstream.on("error", (err) => o.store.update(newId, { status: 503, durationMs: Date.now() - started, error: err.message || err.code || err.name }));
+      upstream.end(r.reqRaw ?? void 0);
+    })();
+    return { ok: true, id: newId };
+  }
   const server = createServer(async (req, res) => {
     req.pause();
     const route = await routeFor(req);
@@ -1031,12 +1125,12 @@ async function startProxy(o) {
     const headers = delivered(req.headers, route);
     if (access?.kind === "denied") {
       const html = wantsHtml(req.headers.accept);
-      const { id: id2, started: started2 } = record(req, route, headers, false, html ? void 0 : access);
+      const { id: id2, started: started2 } = record(req, route, headers, false, html ? void 0 : access, DENIED_NO_REPLAY);
       const { status, out, body } = deny(req, res, html);
       o.store.update(id2, { status, durationMs: Date.now() - started2, bytes: Buffer.byteLength(body), resHeaders: out });
       return;
     }
-    const { id, started } = record(req, route, headers, false, access);
+    const { id, started } = record(req, route, headers, false, access, preflight ? PREFLIGHT_NO_REPLAY : void 0);
     const reqCap = new Capture(TEXT.test(req.headers["content-type"] ?? ""), max);
     req.pause();
     const host = await localHost(route.port);
@@ -1051,35 +1145,19 @@ async function startProxy(o) {
           up.resume();
           return;
         }
-        const resCap = new Capture(TEXT.test(up.headers["content-type"] ?? ""), max);
-        let bytes = 0;
         if (route.host && route.rewriteRedirects !== false && typeof up.headers.location === "string") {
           up.headers.location = rewriteLocation(up.headers.location, route.host, hostOf(req));
         }
         res.writeHead(up.statusCode ?? 502, up.statusMessage, up.headers);
-        up.on("data", (c) => {
-          bytes += c.length;
-          resCap.push(c);
-        });
+        trackResponse(id, started, up, reqCap);
         up.pipe(res);
-        up.on(
-          "end",
-          () => o.store.update(id, {
-            status: up.statusCode ?? null,
-            durationMs: Date.now() - started,
-            bytes,
-            resHeaders: flat(up.headers),
-            reqBody: reqCap.text(),
-            resBody: resCap.text(),
-            truncated: reqCap.truncated || resCap.truncated
-          })
-        );
       }
     );
     res.on("close", () => {
       if (!res.writableFinished) upstream.destroy();
     });
     upstream.on("error", (err) => {
+      req.resume();
       if (res.destroyed && res.writableFinished === false && !res.headersSent) return;
       const html = wantsHtml(req.headers.accept);
       const msg = html ? unavailablePage({ tunnel: route.tunnel, port: route.port, retry: req.method === "GET" }) : `Nada escutando em localhost:${route.port}. Suba o servidor e tente de novo.`;
@@ -1089,6 +1167,7 @@ async function startProxy(o) {
       } else res.destroy();
       o.store.update(id, { status: 503, durationMs: Date.now() - started, bytes: res.headersSent ? 0 : Buffer.byteLength(msg), error: err.message || err.code || err.name, reqBody: reqCap.text() });
     });
+    req.on("end", () => o.store.update(id, { reqComplete: true, reqRaw: reqCap.truncated ? null : reqCap.raw(), reqBodyBytes: reqCap.total, reqTruncated: reqCap.truncated, reqBody: reqCap.text() }));
     if (preflight) {
       req.resume();
       upstream.end();
@@ -1103,7 +1182,7 @@ async function startProxy(o) {
     if (!route) return void client.end("HTTP/1.1 404 Not Found\r\nConnection: close\r\n\r\n");
     const access = route.auth?.access(req.headers);
     const headers = delivered(req.headers, route);
-    const { id, started } = record(req, route, headers, true, access);
+    const { id, started } = record(req, route, headers, true, access, access?.kind === "denied" ? DENIED_NO_REPLAY : void 0);
     if (access?.kind === "denied") {
       client.end(WS_DENIED);
       o.store.update(id, { status: 401, durationMs: Date.now() - started });
@@ -1146,6 +1225,7 @@ async function startProxy(o) {
   });
   return {
     port: server.address().port,
+    replay,
     close: () => new Promise((resolve) => {
       for (const s of sockets) s.destroy();
       server.close(() => resolve());
@@ -1241,6 +1321,9 @@ var RecordStore = class {
     Object.assign(r, patch);
     this.emit();
   }
+  get(id) {
+    return this.items.find((x) => x.id === id);
+  }
   /** Mais recentes primeiro. Mesma referência até a próxima mudança (serve de snapshot para a tela). */
   list() {
     this.snapshot ??= [...this.items].reverse();
@@ -1348,6 +1431,10 @@ var Session = class {
     this.auths.set(key, auth);
     return auth;
   }
+  /** Reenvia uma requisição da lista ao serviço local. */
+  replay(id) {
+    return this.proxy ? this.proxy.replay(id) : { ok: false, reason: "Sess\xE3o ainda n\xE3o come\xE7ou." };
+  }
   async stop() {
     if (this.stopped) return;
     this.stopped = true;
@@ -1601,10 +1688,10 @@ async function runSession(specs, source, flags) {
   }
   const session = new Session({ api, deviceId: config.deviceId, deviceName: hostname(), cloudflaredPath, source, runDir: join6(dutoHome(), "run") });
   if (wantsUi(flags)) {
-    const { runFullscreen } = await import("./fullscreen-DKIFHB6J.js");
-    process.exit(await runFullscreen(session, specs, "0.5.0"));
+    const { runFullscreen } = await import("./fullscreen-7P5GBCQX.js");
+    process.exit(await runFullscreen(session, specs, "0.6.0"));
   }
-  console.log(`${mark()} ${paint("muted", `${"0.5.0"} \xB7 ${source} \xB7 Ctrl+C para encerrar`)}`);
+  console.log(`${mark()} ${paint("muted", `${"0.6.0"} \xB7 ${source} \xB7 Ctrl+C para encerrar`)}`);
   const stopLog = runPlain(session, (l) => console.log(l));
   const stopped = new Promise((resolve) => {
     const onSignal = () => {
@@ -1698,7 +1785,7 @@ cli.help(
     body: s.body.replace(/^\s*For more info, run any command with the `--help` flag:/m, "  Mais detalhes de um comando: duto <comando> --help").replace("Display this message", "Mostra esta ajuda").replace("Display version number", "Mostra a vers\xE3o")
   }))
 );
-cli.version("0.5.0");
+cli.version("0.6.0");
 try {
   cli.parse(process.argv, { run: false });
   await cli.runMatchedCommand();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dutodev/cli",
-  "version": "0.5.0",
+  "version": "0.6.0",
   "description": "Exponha uma porta local em https://<nome>-<usuário>.duto.dev com um comando.",
   "license": "MIT",
   "type": "module",