@dutodev/cli 1.2.0 → 1.4.0

package/README.md

@@ -203,3 +203,4 @@ The page has the list on the left and the details on the right, with the tabs **
 
 - Config lives in `~/.duto/config.json` (mode 600). `DUTO_HOME` changes that folder.
 - `DUTO_API_URL` points the CLI at another server (default: `https://duto.dev`).
+- Once a day, duto asks npm for the latest version and shows a line when there is a newer one. `DUTO_NO_UPDATE_CHECK=1` turns that off.

package/dist/{chunk-KBH2C2UC.js → chunk-4SIBC52A.js}

@@ -388,6 +388,107 @@ function placeOf(colo) {
   return entry ? { city: entry[0], country: entry[1] } : null;
 }
 
+// ../shared/src/cliVersion.ts
+var CLI_VERSION_HEADER = "x-duto-cli-version";
+var CLI_USER_AGENT = "duto-cli";
+var CLI_UPDATE_COMMAND = "npm i -g @dutodev/cli";
+var VERSION = /^(\d+)\.(\d+)\.(\d+)(?:[-+].*)?$/;
+function parts(version) {
+  const m = VERSION.exec(version.trim());
+  return m ? [Number(m[1]), Number(m[2]), Number(m[3])] : null;
+}
+function compareVersions(a, b) {
+  const x = parts(a);
+  const y = parts(b);
+  if (!x || !y) return null;
+  for (let i = 0; i < 3; i++) {
+    const d = (x[i] ?? 0) - (y[i] ?? 0);
+    if (d !== 0) return d;
+  }
+  return 0;
+}
+
+// src/config.ts
+import { randomUUID } from "crypto";
+import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
+import { homedir } from "os";
+import { join } from "path";
+function dutoHome() {
+  return process.env.DUTO_HOME || join(homedir(), ".duto");
+}
+function configPath() {
+  return join(dutoHome(), "config.json");
+}
+function apiUrl() {
+  return (process.env.DUTO_API_URL || "https://duto.dev").replace(/\/+$/, "");
+}
+function saveConfig(c) {
+  mkdirSync(dutoHome(), { recursive: true, mode: 448 });
+  const path = configPath();
+  writeFileSync(path, JSON.stringify(c, null, 2) + "\n", { mode: 384 });
+  chmodSync(path, 384);
+}
+function loadConfig() {
+  const path = configPath();
+  if (existsSync(path)) {
+    const parsed = JSON.parse(readFileSync(path, "utf8"));
+    if (parsed.deviceId) return parsed;
+    const fixed = { ...parsed, deviceId: randomUUID() };
+    saveConfig(fixed);
+    return fixed;
+  }
+  const fresh = { deviceId: randomUUID() };
+  saveConfig(fresh);
+  return fresh;
+}
+
+// src/updates.ts
+import { mkdirSync as mkdirSync2, readFileSync as readFileSync2, writeFileSync as writeFileSync2 } from "fs";
+import { join as join2 } from "path";
+var LATEST_URL = "https://registry.npmjs.org/@dutodev/cli/latest";
+var CHECK_EVERY_MS = 24 * 60 * 60 * 1e3;
+var TIMEOUT_MS = 3e3;
+async function fetchLatest(fetchImpl) {
+  const res = await fetchImpl(LATEST_URL, { headers: { accept: "application/json" }, signal: AbortSignal.timeout(TIMEOUT_MS) });
+  if (!res.ok) return null;
+  const { version } = await res.json();
+  return typeof version === "string" && compareVersions(version, version) === 0 ? version : null;
+}
+async function availableUpdate(o) {
+  const cached = o.read();
+  let latest = cached?.latest ?? null;
+  if (!cached || o.now - cached.checkedAt >= CHECK_EVERY_MS) {
+    latest = await fetchLatest(o.fetchImpl ?? fetch).catch(() => null) ?? latest;
+    o.write({ checkedAt: o.now, latest });
+  }
+  const diff = latest ? compareVersions(latest, o.current) : null;
+  return diff !== null && diff > 0 ? latest : null;
+}
+var cachePath = () => join2(dutoHome(), "update.json");
+function readUpdateCache() {
+  try {
+    const c = JSON.parse(readFileSync2(cachePath(), "utf8"));
+    return typeof c.checkedAt === "number" ? { checkedAt: c.checkedAt, latest: typeof c.latest === "string" ? c.latest : null } : null;
+  } catch {
+    return null;
+  }
+}
+function writeUpdateCache(cache) {
+  try {
+    mkdirSync2(dutoHome(), { recursive: true, mode: 448 });
+    writeFileSync2(cachePath(), JSON.stringify(cache) + "\n", { mode: 384 });
+  } catch {
+    return;
+  }
+}
+function checkForUpdate(current) {
+  if (process.env.DUTO_NO_UPDATE_CHECK) return Promise.resolve(null);
+  return availableUpdate({ current, now: Date.now(), read: readUpdateCache, write: writeUpdateCache }).catch(() => null);
+}
+function updateLine(latest) {
+  return `duto ${latest} is available. Update: ${CLI_UPDATE_COMMAND}`;
+}
+
 // src/ui/theme.ts
 var C = {
   signal: "#2dd4bf",
@@ -449,6 +550,12 @@ export {
   normalizeName,
   validateName,
   placeOf,
+  CLI_VERSION_HEADER,
+  CLI_USER_AGENT,
+  dutoHome,
+  apiUrl,
+  saveConfig,
+  loadConfig,
   C,
   tunnelColor,
   fit,
@@ -458,5 +565,7 @@ export {
   formatDuration,
   formatBytes,
   formatTime,
-  localLabel
+  localLabel,
+  checkForUpdate,
+  updateLine
 };

package/dist/{fullscreen-2I3U6JL7.js → fullscreen-MZMQ6ADN.js}

@@ -12,8 +12,9 @@ import {
   normalizeName,
   statusColor,
   tunnelColor,
+  updateLine,
   validateName
-} from "./chunk-KBH2C2UC.js";
+} from "./chunk-4SIBC52A.js";
 
 // src/ui/fullscreen.tsx
 import { render } from "ink";
@@ -75,6 +76,17 @@ function Detail({ record }) {
       record.replayOf
     ] }),
     record.error && /* @__PURE__ */ jsx(Text, { color: C.err, children: record.error }),
+    record.redirect && /* @__PURE__ */ jsxs(Box, { flexDirection: "column", children: [
+      /* @__PURE__ */ jsx(Text, { color: C.signal, children: "\u21AA Location rewritten" }),
+      /* @__PURE__ */ jsxs(Text, { color: C.muted, children: [
+        "  ",
+        record.redirect.from
+      ] }),
+      /* @__PURE__ */ jsxs(Text, { children: [
+        "  \u2192 ",
+        record.redirect.to
+      ] })
+    ] }),
     /* @__PURE__ */ jsx(Section, { title: "Request", headers: record.reqHeaders, body: record.reqBody, truncated: record.reqTruncated, note: bodyNote(record, "req") }),
     /* @__PURE__ */ jsx(Section, { title: "Response", headers: record.resHeaders, body: record.resBody, truncated: record.resTruncated, note: bodyNote(record, "res") }),
     /* @__PURE__ */ jsxs(Text, { color: C.muted, children: [
@@ -168,6 +180,7 @@ function QrView({ tunnel, link, now }) {
 // src/ui/RequestList.tsx
 import { Box as Box3, Text as Text4 } from "ink";
 import { jsx as jsx4, jsxs as jsxs4 } from "react/jsx-runtime";
+var REWRITTEN = " \u21AA rewritten";
 function accessLabel(a) {
   if (!a) return null;
   if (a.kind === "user") return { text: a.user, color: C.muted };
@@ -179,7 +192,8 @@ 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 - 54 - accessW);
+  const redirectW = visible.some((r) => r.redirect) ? REWRITTEN.length : 0;
+  const pathW = Math.max(10, width - 54 - accessW - redirectW);
   const title = props.filter ? `REQUESTS \xB7 filter: ${props.filter} ` : "REQUESTS ";
   return /* @__PURE__ */ jsxs4(Box3, { flexDirection: "column", children: [
     /* @__PURE__ */ jsx4(Text4, { color: C.muted, children: title + "\u2500".repeat(Math.max(0, width - title.length)) }),
@@ -203,7 +217,8 @@ function RequestList(props) {
         /* @__PURE__ */ jsx4(Text4, { color: C.muted, children: tail.padStart(7) }),
         " ",
         /* @__PURE__ */ jsx4(Text4, { color: C.muted, children: r.websocket ? "" : formatBytes(r.bytes).padStart(8) }),
-        acc ? /* @__PURE__ */ jsx4(Text4, { color: acc.color, children: ` ${acc.text}` }) : null
+        acc ? /* @__PURE__ */ jsx4(Text4, { color: acc.color, children: ` ${acc.text}` }) : null,
+        r.redirect ? /* @__PURE__ */ jsx4(Text4, { color: C.signal, children: REWRITTEN }) : null
       ] }, r.id);
     })
   ] });
@@ -284,7 +299,7 @@ var KEYS = [
   ["tab", "focus"],
   ["q", "quit"]
 ];
-function App({ session, version, system, onExit, inspector = null, inspectorError }) {
+function App({ session, version, system, onExit, inspector = null, inspectorError, update = null }) {
   const subState = useCallback((fn) => session.subscribe(fn), [session]);
   const subRecords = useCallback((fn) => session.records.subscribe(fn), [session]);
   const state = useSyncExternalStore(subState, () => session.getState());
@@ -435,7 +450,7 @@ function App({ session, version, system, onExit, inspector = null, inspectorErro
   });
   const live = state.tunnels.filter((t) => t.status === "live").length;
   const conn = state.connection === "online" ? { text: "connected \u25CF", color: C.signal } : state.connection === "connecting" ? { text: "connecting\u2026", color: C.muted } : { text: "reconnecting\u2026", color: C.warn };
-  const listHeight = Math.max(3, rows - state.tunnels.length - (inspector ? 10 : 9));
+  const listHeight = Math.max(3, rows - state.tunnels.length - (inspector ? 10 : 9) - (update ? 1 : 0));
   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: [
@@ -460,6 +475,7 @@ function App({ session, version, system, onExit, inspector = null, inspectorErro
       ] }),
       /* @__PURE__ */ jsx6(Text6, { color: conn.color, children: conn.text })
     ] }),
+    update && /* @__PURE__ */ jsx6(Text6, { color: C.warn, children: updateLine(update) }),
     /* @__PURE__ */ jsx6(Text6, { children: " " }),
     /* @__PURE__ */ jsx6(TunnelTable, { tunnels: state.tunnels, selected: selTun, focused: focus === "tunnels" }),
     inspector && /* @__PURE__ */ jsx6(Text6, { color: C.muted, children: `inspector  ${inspector.url}` }),
@@ -548,7 +564,7 @@ var realSystem = {
 
 // src/ui/fullscreen.tsx
 import { jsx as jsx7 } from "react/jsx-runtime";
-function runFullscreen(session, specs, version, inspector, inspectorError) {
+function runFullscreen(session, specs, version, inspector, inspectorError, update = Promise.resolve(null)) {
   return withFullscreen(
     process.stdout,
     (signal) => new Promise((resolve) => {
@@ -559,7 +575,11 @@ function runFullscreen(session, specs, version, inspector, inspectorError) {
         app.unmount();
         resolve(code);
       };
-      const app = render(/* @__PURE__ */ jsx7(App, { session, version, system: realSystem, inspector, inspectorError, onExit: () => finish(0) }), { exitOnCtrlC: false });
+      const view = (latest) => /* @__PURE__ */ jsx7(App, { session, version, system: realSystem, inspector, inspectorError, update: latest, onExit: () => finish(0) });
+      const app = render(view(null), { exitOnCtrlC: false });
+      void update.then((latest) => {
+        if (latest && !done) app.rerender(view(latest));
+      });
       signal.addEventListener("abort", () => void session.stop().then(() => finish(0)), { once: true });
       session.start(specs).catch(() => void 0);
     })

package/dist/index.js

@@ -1,18 +1,26 @@
 #!/usr/bin/env node
 import {
   C,
+  CLI_USER_AGENT,
+  CLI_VERSION_HEADER,
   MAX_NAME,
   TRUNCATED_NOTE,
+  apiUrl,
   bodyNote,
+  checkForUpdate,
+  dutoHome,
   formatBytes,
   formatDuration,
   formatTime,
+  loadConfig,
   localLabel,
   normalizeName,
   placeOf,
+  saveConfig,
   statusColor,
+  updateLine,
   validateName
-} from "./chunk-KBH2C2UC.js";
+} from "./chunk-4SIBC52A.js";
 
 // src/ui/brand.ts
 function colorOn(stream = process.stdout) {
@@ -38,9 +46,12 @@ var warn = (msg) => `${paint("warn", "\u26A0")} ${msg}`;
 
 // src/index.ts
 import { hostname as hostname2 } from "os";
-import { join as join6, relative } from "path";
+import { join as join5, relative } from "path";
 import cac from "cac";
 
+// src/version.ts
+var CLI_VERSION = "1.4.0";
+
 // src/api.ts
 var DutoApiError = class extends Error {
   constructor(message2, status, code) {
@@ -71,7 +82,8 @@ function createApiClient(o) {
           ...o.token === void 0 ? {} : { authorization: `Bearer ${o.token}` },
           ...body === void 0 ? {} : { "content-type": "application/json" },
           ...bookmark === null ? {} : { [BOOKMARK_HEADER]: bookmark },
-          "user-agent": "duto-cli"
+          "user-agent": CLI_USER_AGENT,
+          [CLI_VERSION_HEADER]: CLI_VERSION
         },
         body: body === void 0 ? void 0 : JSON.stringify(body)
       });
@@ -118,8 +130,8 @@ function createApiClient(o) {
 
 // src/cloudflared.ts
 import { createHash } from "crypto";
-import { chmodSync as chmodSync2, existsSync as existsSync2, mkdirSync as mkdirSync2, mkdtempSync, renameSync, rmSync, writeFileSync as writeFileSync2 } from "fs";
-import { join as join2 } from "path";
+import { chmodSync, existsSync, mkdirSync, mkdtempSync, renameSync, rmSync, writeFileSync } from "fs";
+import { join } from "path";
 import { extract } from "tar";
 
 // src/checksums.ts
@@ -132,40 +144,6 @@ var CHECKSUMS = {
   "cloudflared-windows-amd64.exe": "2493dbc168923bb3e59e5e7716f71deced92992eea9acd6e9d74f84ac7751343"
 };
 
-// src/config.ts
-import { randomUUID } from "crypto";
-import { chmodSync, existsSync, mkdirSync, readFileSync, writeFileSync } from "fs";
-import { homedir } from "os";
-import { join } from "path";
-function dutoHome() {
-  return process.env.DUTO_HOME || join(homedir(), ".duto");
-}
-function configPath() {
-  return join(dutoHome(), "config.json");
-}
-function apiUrl() {
-  return (process.env.DUTO_API_URL || "https://duto.dev").replace(/\/+$/, "");
-}
-function saveConfig(c) {
-  mkdirSync(dutoHome(), { recursive: true, mode: 448 });
-  const path = configPath();
-  writeFileSync(path, JSON.stringify(c, null, 2) + "\n", { mode: 384 });
-  chmodSync(path, 384);
-}
-function loadConfig() {
-  const path = configPath();
-  if (existsSync(path)) {
-    const parsed = JSON.parse(readFileSync(path, "utf8"));
-    if (parsed.deviceId) return parsed;
-    const fixed = { ...parsed, deviceId: randomUUID() };
-    saveConfig(fixed);
-    return fixed;
-  }
-  const fresh = { deviceId: randomUUID() };
-  saveConfig(fresh);
-  return fresh;
-}
-
 // src/cloudflared.ts
 function assetFor(platform, arch) {
   const key = `${platform}/${arch}`;
@@ -190,11 +168,11 @@ function downloadUrl(asset, version = CLOUDFLARED_VERSION) {
 async function ensureCloudflared(opts = {}) {
   const platform = opts.platform ?? process.platform;
   const { asset, kind } = assetFor(platform, opts.arch ?? process.arch);
-  const binDir = join2(dutoHome(), "bin");
-  const target = join2(binDir, `cloudflared-${CLOUDFLARED_VERSION}${platform === "win32" ? ".exe" : ""}`);
-  if (existsSync2(target)) return target;
+  const binDir = join(dutoHome(), "bin");
+  const target = join(binDir, `cloudflared-${CLOUDFLARED_VERSION}${platform === "win32" ? ".exe" : ""}`);
+  if (existsSync(target)) return target;
   opts.onDownload?.();
-  mkdirSync2(binDir, { recursive: true });
+  mkdirSync(binDir, { recursive: true });
   const res = await (opts.fetchImpl ?? fetch)(downloadUrl(asset));
   if (!res.ok) throw new Error(`Could not download cloudflared (HTTP ${res.status}).`);
   const bytes = Buffer.from(await res.arrayBuffer());
@@ -204,22 +182,22 @@ async function ensureCloudflared(opts = {}) {
     rmSync(target, { force: true });
     throw new Error("cloudflared checksum mismatch. Try again; if it keeps failing, update duto.");
   }
-  const tmp = mkdtempSync(join2(binDir, ".download-"));
+  const tmp = mkdtempSync(join(binDir, ".download-"));
   try {
     if (kind === "tgz") {
-      const tgz = join2(tmp, asset);
-      writeFileSync2(tgz, bytes);
+      const tgz = join(tmp, asset);
+      writeFileSync(tgz, bytes);
       await extract({ file: tgz, cwd: tmp });
-      renameSync(join2(tmp, "cloudflared"), target);
+      renameSync(join(tmp, "cloudflared"), target);
     } else {
-      const file = join2(tmp, "cloudflared");
-      writeFileSync2(file, bytes);
+      const file = join(tmp, "cloudflared");
+      writeFileSync(file, bytes);
       renameSync(file, target);
     }
   } finally {
     rmSync(tmp, { recursive: true, force: true });
   }
-  if (platform !== "win32") chmodSync2(target, 493);
+  if (platform !== "win32") chmodSync(target, 493);
   return target;
 }
 async function ensureCloudflaredWithProgress(write, opts = {}) {
@@ -241,9 +219,9 @@ async function ensureCloudflaredWithProgress(write, opts = {}) {
 }
 
 // src/session/allowlist.ts
-import { mkdirSync as mkdirSync3, readFileSync as readFileSync2, writeFileSync as writeFileSync3 } from "fs";
+import { mkdirSync as mkdirSync2, readFileSync, writeFileSync as writeFileSync2 } from "fs";
 import { BlockList, isIP } from "net";
-import { dirname, join as join3 } from "path";
+import { dirname, join as join2 } from "path";
 
 // src/session/allowlist-snapshot.ts
 var ALLOW_SNAPSHOT = {
@@ -312,7 +290,7 @@ function blockListOf(cidrs) {
 }
 function readCache(file) {
   try {
-    const c = JSON.parse(readFileSync2(file, "utf8"));
+    const c = JSON.parse(readFileSync(file, "utf8"));
     if (typeof c?.fetchedAt === "number" && c.lists && typeof c.lists === "object") return c;
   } catch {
   }
@@ -329,7 +307,7 @@ async function fetchRanges(name, f) {
   return out.map((x) => x.includes("/") ? x : `${x}/${splitCidr(x).prefix}`);
 }
 async function resolveAllow(entries, o = {}) {
-  const cacheFile = o.cacheFile ?? join3(dutoHome(), "allowlist.json");
+  const cacheFile = o.cacheFile ?? join2(dutoHome(), "allowlist.json");
   const f = o.fetch ?? fetch;
   const now = (o.now ?? Date.now)();
   const parsed = entries.map((raw) => ({ raw, e: parseAllowEntry(raw) }));
@@ -352,8 +330,8 @@ async function resolveAllow(entries, o = {}) {
     const everyListFromNetwork = names.length > 0 && Object.keys(net).length === names.length;
     if (everyListFromNetwork) {
       try {
-        mkdirSync3(dirname(cacheFile), { recursive: true });
-        writeFileSync3(cacheFile, JSON.stringify({ fetchedAt: now, lists: net }));
+        mkdirSync2(dirname(cacheFile), { recursive: true });
+        writeFileSync2(cacheFile, JSON.stringify({ fetchedAt: now, lists: net }));
       } catch {
       }
     }
@@ -375,8 +353,8 @@ async function resolveAllow(entries, o = {}) {
 }
 
 // src/session/config.ts
-import { existsSync as existsSync3, readFileSync as readFileSync3 } from "fs";
-import { dirname as dirname2, join as join4 } from "path";
+import { existsSync as existsSync2, readFileSync as readFileSync2 } from "fs";
+import { dirname as dirname2, join as join3 } from "path";
 import { isMap, isScalar, isSeq, LineCounter, parseDocument } from "yaml";
 var ConfigError = class extends Error {
   constructor(message2, line, file = CONFIG_FILES[0]) {
@@ -522,13 +500,13 @@ function parseConfig(text, file = CONFIG_FILES[0], env = process.env) {
 function findConfig(cwd) {
   let dir = cwd;
   for (; ; ) {
-    const present = CONFIG_FILES.filter((f) => existsSync3(join4(dir, f)));
+    const present = CONFIG_FILES.filter((f) => existsSync2(join3(dir, f)));
     if (present.length > 1) throw new ConfigError(`${CONFIG_FILES.join(" and ")} in the same folder. Delete one of them.`, void 0, "");
     if (present.length === 1) {
-      const path = join4(dir, present[0]);
-      return { path, tunnels: parseConfig(readFileSync3(path, "utf8"), present[0]) };
+      const path = join3(dir, present[0]);
+      return { path, tunnels: parseConfig(readFileSync2(path, "utf8"), present[0]) };
     }
-    if (existsSync3(join4(dir, ".git"))) return null;
+    if (existsSync2(join3(dir, ".git"))) return null;
     const up = dirname2(dir);
     if (up === dir) return null;
     dir = up;
@@ -545,7 +523,7 @@ async function browserLogin(o) {
   const start = await api.startLogin({
     deviceId: o.deviceId,
     deviceName: hostname(),
-    cliVersion: "1.2.0",
+    cliVersion: "1.4.0",
     nodeVersion: process.version,
     os: process.platform,
     arch: process.arch
@@ -777,6 +755,8 @@ button { font: inherit; color: inherit; background: none; border: 0; padding: 0;
 .row .dur { text-align: right; }
 .m { font-weight: 700; }
 .mut { color: ${C.muted}; }
+.sig { color: ${C.signal}; }
+.redirect { margin-top: 6px; display: grid; gap: 2px; }
 .empty { padding: 12px; color: ${C.muted}; }
 .detail { display: flex; flex-direction: column; min-height: 0; min-width: 0; }
 .pane { flex: 1; }
@@ -913,7 +893,12 @@ function renderList() {
     row.setAttribute("role", "option");
     row.setAttribute("aria-selected", it.id === state.selected ? "true" : "false");
     row.dataset.id = String(it.id);
-    row.appendChild(el("span", "mut", it.replayOf !== undefined ? "↻" : ""));
+    if (it.replayOf !== undefined) row.appendChild(el("span", "mut", "↻"));
+    else if (it.rewritten) {
+      var mark = el("span", "sig", "↪");
+      mark.title = "Location rewritten";
+      row.appendChild(mark);
+    } else row.appendChild(el("span", "mut", ""));
     if (multi) row.appendChild(el("span", "mut", it.tunnel));
     row.appendChild(el("span", "m", methodOf(it)));
     var p = el("span", "", it.path);
@@ -995,6 +980,13 @@ function renderDetail() {
   if (d.replayOf !== undefined) parts.push("↻ replay of #" + d.replayOf);
   head.appendChild(el("span", "mut", " · " + parts.join(" · ")));
   if (d.error) head.appendChild(el("div", "msg err", d.error));
+  if (d.redirect) {
+    var moved = el("div", "redirect");
+    moved.appendChild(el("div", "sig", "↪ Location rewritten"));
+    moved.appendChild(el("div", "mut", d.redirect.from));
+    moved.appendChild(el("div", "", "→ " + d.redirect.to));
+    head.appendChild(moved);
+  }
 
   var tabs = document.querySelectorAll(".tab");
   for (var i = 0; i < tabs.length; i++) {
@@ -1370,7 +1362,8 @@ function listItem(r) {
     startedAt: r.startedAt,
     websocket: r.websocket,
     ...r.replayOf !== void 0 && { replayOf: r.replayOf },
-    ...r.error !== void 0 && { error: r.error }
+    ...r.error !== void 0 && { error: r.error },
+    ...r.redirect !== void 0 && { rewritten: true }
   };
 }
 function detail(r, session) {
@@ -1386,6 +1379,7 @@ function detail(r, session) {
   return {
     ...listItem(r),
     edge: edgeOf(r.reqHeaders),
+    redirect: r.redirect ?? null,
     reqHeaders: r.reqHeaders,
     resHeaders: r.resHeaders,
     reqBody: r.reqBody,
@@ -2160,7 +2154,12 @@ async function startProxy(o) {
           return;
         }
         if (route.host && route.rewriteRedirects !== false && typeof up.headers.location === "string") {
-          up.headers.location = rewriteLocation(up.headers.location, route.host, hostOf(req));
+          const from = up.headers.location;
+          const to = rewriteLocation(from, route.host, hostOf(req));
+          if (to !== from) {
+            up.headers.location = to;
+            o.store.update(id, { redirect: { from, to } });
+          }
         }
         res.writeHead(up.statusCode ?? 502, up.statusMessage, up.headers);
         trackResponse(id, started, up, reqCap);
@@ -2249,13 +2248,13 @@ async function startProxy(o) {
 
 // src/session/orphans.ts
 import { spawnSync } from "child_process";
-import { existsSync as existsSync4, mkdirSync as mkdirSync4, readdirSync, readFileSync as readFileSync4, rmSync as rmSync2, writeFileSync as writeFileSync4 } from "fs";
-import { join as join5 } from "path";
-var fileOf = (dir, cfPid) => join5(dir, `cloudflared-${cfPid}.json`);
+import { existsSync as existsSync3, 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 {
-    mkdirSync4(dir, { recursive: true });
-    writeFileSync4(fileOf(dir, cfPid), JSON.stringify({ sessionPid, cfPid, at: Date.now() }));
+    mkdirSync3(dir, { recursive: true });
+    writeFileSync3(fileOf(dir, cfPid), JSON.stringify({ sessionPid, cfPid, at: Date.now() }));
   } catch {
   }
 }
@@ -2273,7 +2272,7 @@ var realProc = {
   },
   isCloudflared(pid) {
     try {
-      if (process.platform === "linux") return readFileSync4(`/proc/${pid}/cmdline`, "utf8").includes("cloudflared");
+      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;
@@ -2288,14 +2287,14 @@ var realProc = {
   }
 };
 function reapOrphans(dir, proc = realProc) {
-  if (!existsSync4(dir)) return 0;
+  if (!existsSync3(dir)) return 0;
   let killed = 0;
   for (const name of readdirSync(dir)) {
     if (!/^cloudflared-\d+\.json$/.test(name)) continue;
-    const path = join5(dir, name);
+    const path = join4(dir, name);
     let rec;
     try {
-      rec = JSON.parse(readFileSync4(path, "utf8"));
+      rec = JSON.parse(readFileSync3(path, "utf8"));
     } catch {
       rmSync2(path, { force: true });
       continue;
@@ -2623,7 +2622,7 @@ function runPlain(session, out) {
       printed.add(r.id);
       const method = r.websocket ? "WS" : r.method;
       out(
-        `${formatTime(r.startedAt)}  ${r.tunnel.padEnd(8)}  ${method} ${r.path}  ${paint(statusColor(r.status), String(r.status))}  ${formatDuration(r.durationMs)}  ${formatBytes(r.bytes)}`
+        `${formatTime(r.startedAt)}  ${r.tunnel.padEnd(8)}  ${method} ${r.path}  ${paint(statusColor(r.status), String(r.status))}  ${formatDuration(r.durationMs)}  ${formatBytes(r.bytes)}${r.redirect ? `  ${paint("signal", `\u21AA Location rewritten to ${r.redirect.to}`)}` : ""}`
       );
     }
   };
@@ -2686,13 +2685,14 @@ async function runSession(specs, source, flags) {
   const config = loadConfig();
   if (!config.authtoken) fail2(LOGIN_HINT);
   const api = createApiClient({ baseUrl: apiUrl(), token: config.authtoken });
+  const update = checkForUpdate(CLI_VERSION);
   let cloudflaredPath;
   try {
     cloudflaredPath = process.env.DUTO_CLOUDFLARED || await ensureCloudflaredWithProgress((s) => process.stdout.write(s));
   } catch (err) {
     fail2(err instanceof Error ? err.message : String(err));
   }
-  const session = new Session({ api, deviceId: config.deviceId, deviceName: hostname2(), cloudflaredPath, source, runDir: join6(dutoHome(), "run") });
+  const session = new Session({ api, deviceId: config.deviceId, deviceName: hostname2(), cloudflaredPath, source, runDir: join5(dutoHome(), "run") });
   let inspector = null;
   let inspectorError;
   if (flags.inspect !== false) {
@@ -2703,14 +2703,15 @@ async function runSession(specs, source, flags) {
     }
   }
   if (wantsUi(flags)) {
-    const { runFullscreen } = await import("./fullscreen-2I3U6JL7.js");
-    const code = await runFullscreen(session, specs, "1.2.0", inspector, inspectorError);
+    const { runFullscreen } = await import("./fullscreen-MZMQ6ADN.js");
+    const code = await runFullscreen(session, specs, CLI_VERSION, inspector, inspectorError, update);
     await inspector?.close().catch(() => void 0);
     process.exit(code);
   }
-  console.log(`${mark()} ${paint("muted", `${"1.2.0"} \xB7 ${source} \xB7 Ctrl+C to stop`)}`);
+  console.log(`${mark()} ${paint("muted", `${CLI_VERSION} \xB7 ${source} \xB7 Ctrl+C to stop`)}`);
   if (inspector) console.log(paint("muted", `inspector: ${inspector.openUrl}`));
   if (inspectorError) console.log(warn(`inspector failed to start: ${inspectorError}`));
+  void update.then((latest) => latest && console.log(warn(updateLine(latest))));
   const stopLog = runPlain(session, (l) => console.log(l));
   const stopped = new Promise((resolve) => {
     const onSignal = () => {
@@ -2836,7 +2837,7 @@ cli.command("status", "Show your account and live tunnels").action(async () => {
   }
 });
 cli.help();
-cli.version("1.2.0");
+cli.version(CLI_VERSION);
 try {
   cli.parse(process.argv, { run: false });
   await cli.runMatchedCommand();

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@dutodev/cli",
-  "version": "1.2.0",
+  "version": "1.4.0",
   "description": "Expose a local port at https://<name>-<user>.duto.dev with one command.",
   "license": "MIT",
   "type": "module",