@dutodev/cli 0.4.5 → 0.4.6

package/dist/{fullscreen-5437X7MP.js → fullscreen-EPWB53EP.js}

@@ -373,6 +373,7 @@ async function withFullscreen(stdout, run2) {
   const onSignal = () => ac.abort();
   process.on("SIGINT", onSignal);
   process.on("SIGTERM", onSignal);
+  process.on("SIGHUP", onSignal);
   process.once("exit", restore);
   stdout.write(ENTER_SCREEN);
   try {
@@ -380,6 +381,7 @@ async function withFullscreen(stdout, run2) {
   } finally {
     process.off("SIGINT", onSignal);
     process.off("SIGTERM", onSignal);
+    process.off("SIGHUP", onSignal);
     process.off("exit", restore);
     restore();
   }

package/dist/index.js

@@ -33,7 +33,7 @@ var fail = (msg) => `${paint("err", "\u2716", process.stderr)} ${msg}`;
 
 // src/index.ts
 import { hostname } from "os";
-import { relative } from "path";
+import { join as join5, relative } from "path";
 import cac from "cac";
 
 // src/api.ts
@@ -538,8 +538,18 @@ function waitForService(res, port, checkMs, pingMs) {
 async function startProxy(o) {
   const max = o.maxBody ?? MAX_BODY;
   let nextId = 1;
+  const routeWaitMs = o.routeWaitMs ?? 3e3;
+  async function routeFor(req) {
+    const host = hostOf(req);
+    for (let waited = 0; ; waited += 50) {
+      const route = o.routes.get(host);
+      if (route || waited >= routeWaitMs) return route;
+      await new Promise((r) => setTimeout(r, 50));
+    }
+  }
   const server = createServer(async (req, res) => {
-    const route = o.routes.get(hostOf(req));
+    req.pause();
+    const route = await routeFor(req);
     if (!route) {
       res.writeHead(404, { "content-type": "text/plain; charset=utf-8" });
       res.end("T\xFAnel n\xE3o encontrado nesta sess\xE3o");
@@ -619,7 +629,7 @@ async function startProxy(o) {
   });
   server.on("upgrade", async (req, client, head) => {
     client.on("error", () => client.destroy());
-    const route = o.routes.get(hostOf(req));
+    const route = await routeFor(req);
     if (!route) return void client.end("HTTP/1.1 404 Not Found\r\nConnection: close\r\n\r\n");
     const id = nextId++;
     const started = Date.now();
@@ -684,6 +694,74 @@ async function startProxy(o) {
   };
 }
 
+// src/session/orphans.ts
+import { spawnSync } from "child_process";
+import { existsSync as existsSync4, mkdirSync as mkdirSync3, readdirSync, readFileSync as readFileSync3, rmSync as rmSync2, writeFileSync as writeFileSync3 } from "fs";
+import { join as join4 } from "path";
+var fileOf = (dir, cfPid) => join4(dir, `cloudflared-${cfPid}.json`);
+function recordCloudflared(dir, cfPid, sessionPid = process.pid) {
+  try {
+    mkdirSync3(dir, { recursive: true });
+    writeFileSync3(fileOf(dir, cfPid), JSON.stringify({ sessionPid, cfPid, at: Date.now() }));
+  } catch {
+  }
+}
+function forgetCloudflared(dir, cfPid) {
+  rmSync2(fileOf(dir, cfPid), { force: true });
+}
+var realProc = {
+  alive(pid) {
+    try {
+      process.kill(pid, 0);
+      return true;
+    } catch (err) {
+      return err.code === "EPERM";
+    }
+  },
+  isCloudflared(pid) {
+    try {
+      if (process.platform === "linux") return readFileSync3(`/proc/${pid}/cmdline`, "utf8").includes("cloudflared");
+      if (process.platform === "darwin") return spawnSync("ps", ["-p", String(pid), "-o", "command="], { encoding: "utf8" }).stdout.includes("cloudflared");
+    } catch {
+      return false;
+    }
+    return false;
+  },
+  kill(pid) {
+    try {
+      process.kill(pid, "SIGTERM");
+    } catch {
+    }
+  }
+};
+function reapOrphans(dir, proc = realProc) {
+  if (!existsSync4(dir)) return 0;
+  let killed = 0;
+  for (const name of readdirSync(dir)) {
+    if (!/^cloudflared-\d+\.json$/.test(name)) continue;
+    const path = join4(dir, name);
+    let rec;
+    try {
+      rec = JSON.parse(readFileSync3(path, "utf8"));
+    } catch {
+      rmSync2(path, { force: true });
+      continue;
+    }
+    const { sessionPid, cfPid } = rec;
+    if (typeof sessionPid !== "number" || typeof cfPid !== "number") {
+      rmSync2(path, { force: true });
+      continue;
+    }
+    if (proc.alive(sessionPid)) continue;
+    if (proc.alive(cfPid) && proc.isCloudflared(cfPid)) {
+      proc.kill(cfPid);
+      killed++;
+    }
+    rmSync2(path, { force: true });
+  }
+  return killed;
+}
+
 // src/session/records.ts
 var RecordStore = class {
   constructor(max = 500) {
@@ -765,6 +843,7 @@ var Session = class {
   }
   /** Abre os túneis em sequência; falhas ficam no estado e não interrompem os outros. */
   async start(specs) {
+    if (this.o.runDir) reapOrphans(this.o.runDir);
     this.proxy = await startProxy({ routes: this.routes, store: this.records });
     this.tunnels = specs.map((s) => this.blank(s, false));
     this.emit();
@@ -853,6 +932,11 @@ var Session = class {
       stdio: ["ignore", "ignore", "pipe"]
     });
     this.child = c;
+    const runDir = this.o.runDir;
+    if (runDir && c.pid) {
+      recordCloudflared(runDir, c.pid);
+      c.once("exit", () => forgetCloudflared(runDir, c.pid));
+    }
     let buf = "";
     c.stderr?.on("data", (chunk) => {
       if (c !== this.child) return;
@@ -1010,21 +1094,23 @@ async function runSession(specs, source, flags) {
   } catch (err) {
     fail2(err instanceof Error ? err.message : String(err));
   }
-  const session = new Session({ api, deviceId: config.deviceId, deviceName: hostname(), cloudflaredPath, source });
+  const session = new Session({ api, deviceId: config.deviceId, deviceName: hostname(), cloudflaredPath, source, runDir: join5(dutoHome(), "run") });
   if (wantsUi(flags)) {
-    const { runFullscreen } = await import("./fullscreen-5437X7MP.js");
-    process.exit(await runFullscreen(session, specs, "0.4.5"));
+    const { runFullscreen } = await import("./fullscreen-EPWB53EP.js");
+    process.exit(await runFullscreen(session, specs, "0.4.6"));
   }
-  console.log(`${mark()} ${paint("muted", `${"0.4.5"} \xB7 ${source} \xB7 Ctrl+C para encerrar`)}`);
+  console.log(`${mark()} ${paint("muted", `${"0.4.6"} \xB7 ${source} \xB7 Ctrl+C para encerrar`)}`);
   const stopLog = runPlain(session, (l) => console.log(l));
   const stopped = new Promise((resolve) => {
     const onSignal = () => {
       process.off("SIGINT", onSignal);
       process.off("SIGTERM", onSignal);
+      process.off("SIGHUP", onSignal);
       resolve();
     };
     process.on("SIGINT", onSignal);
     process.on("SIGTERM", onSignal);
+    process.on("SIGHUP", onSignal);
   });
   await Promise.race([session.start(specs), stopped]);
   await stopped;
@@ -1102,7 +1188,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.4.5");
+cli.version("0.4.6");
 try {
   cli.parse(process.argv, { run: false });
   await cli.runMatchedCommand();

package/package.json

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