@elefunc/send 0.1.22 → 0.1.31

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@elefunc/send",
-  "version": "0.1.22",
+  "version": "0.1.31",
   "description": "Browser-compatible file transfer CLI and TUI powered by Bun, WebRTC, and Rezi.",
   "license": "MIT",
   "type": "module",

package/src/core/session.ts

@@ -103,6 +103,7 @@ interface IncomingDiskState {
   offset: number
   error: string
   closed: boolean
+  overwrite: boolean
 }
 
 export interface PeerSnapshot {
@@ -310,11 +311,41 @@ export class SessionAbortedError extends Error {
 export const isSessionAbortedError = (error: unknown): error is SessionAbortedError =>
   error instanceof SessionAbortedError || error instanceof Error && error.name === "SessionAbortedError"
 
-const timeoutSignal = (ms: number, base?: AbortSignal | null) => {
-  const timeout = typeof AbortSignal !== "undefined" && typeof AbortSignal.timeout === "function" ? AbortSignal.timeout(ms) : undefined
-  if (!base) return timeout
-  if (!timeout) return base
-  return typeof AbortSignal.any === "function" ? AbortSignal.any([base, timeout]) : base
+const awaitAbortable = async <T>(promise: Promise<T>, signal?: AbortSignal | null) => {
+  if (!signal) return promise
+  if (signal.aborted) throw new SessionAbortedError()
+  return await new Promise<T>((resolve, reject) => {
+    const onAbort = () => {
+      signal.removeEventListener("abort", onAbort)
+      reject(new SessionAbortedError())
+    }
+    signal.addEventListener("abort", onAbort, { once: true })
+    promise.then(
+      value => {
+        signal.removeEventListener("abort", onAbort)
+        resolve(value)
+      },
+      error => {
+        signal.removeEventListener("abort", onAbort)
+        reject(error)
+      },
+    )
+  })
+}
+
+const fetchWithTimeout = async (input: string | URL | Request, init: RequestInit, ms: number, base?: AbortSignal | null) => {
+  if (typeof AbortController !== "function") return fetch(input, init)
+  const controller = new AbortController()
+  const timeout = setTimeout(() => controller.abort(new Error(`timed out after ${ms}ms`)), ms)
+  const onAbort = () => controller.abort(new SessionAbortedError())
+  if (base?.aborted) onAbort()
+  else base?.addEventListener("abort", onAbort, { once: true })
+  try {
+    return await fetch(input, { ...init, signal: controller.signal })
+  } finally {
+    clearTimeout(timeout)
+    base?.removeEventListener("abort", onAbort)
+  }
 }
 
 const normalizeCandidateType = (value: unknown) => typeof value === "string" ? value.toLowerCase() : ""
@@ -415,7 +446,7 @@ export class SendSession {
 
   private autoAcceptIncoming: boolean
   private autoSaveIncoming: boolean
-  private readonly overwriteIncoming: boolean
+  private overwriteIncoming: boolean
   private readonly reconnectSocket: boolean
   private iceServers: RTCIceServer[]
   private extraTurnServers: RTCIceServer[]
@@ -490,9 +521,8 @@ export class SendSession {
     this.lifecycleAbortController = typeof AbortController === "function" ? new AbortController() : null
     this.startPeerStatsPolling()
     this.startPulsePolling()
-    void this.loadLocalProfile()
-    void this.probePulse()
-    this.connectSocket()
+    await awaitAbortable(Promise.allSettled([this.loadLocalProfile(), this.probePulse()]), this.lifecycleAbortController?.signal) // Avoid the Bun Windows TUI TLS startup bug: https://github.com/oven-sh/bun/issues/28612
+    this.connectSocket() // Intentionally defer socket startup until after initial HTTPS calls: https://github.com/oven-sh/bun/issues/28612
     await this.waitFor(() => this.socketState === "open", timeoutMs, this.lifecycleAbortController?.signal)
   }
 
@@ -654,6 +684,14 @@ export class SendSession {
     return saved
   }
 
+  setOverwriteIncoming(enabled: boolean) {
+    const next = !!enabled
+    if (next === this.overwriteIncoming) return false
+    this.overwriteIncoming = next
+    this.notify()
+    return true
+  }
+
   cancelPendingOffers() {
     let cancelled = 0
     for (const transfer of this.transfers.values()) {
@@ -819,8 +857,9 @@ export class SendSession {
   }
 
   private async createIncomingDiskState(fileName: string): Promise<IncomingDiskState> {
-    const finalPath = await incomingOutputPath(this.saveDir, fileName || "download", this.overwriteIncoming, this.reservedSavePaths)
-    if (!this.overwriteIncoming) this.reservedSavePaths.add(finalPath)
+    const overwrite = this.overwriteIncoming
+    const finalPath = await incomingOutputPath(this.saveDir, fileName || "download", overwrite, this.reservedSavePaths)
+    if (!overwrite) this.reservedSavePaths.add(finalPath)
     for (let attempt = 0; ; attempt += 1) {
       const tempPath = `${finalPath}.part.${uid(6)}${attempt ? `.${attempt}` : ""}`
       try {
@@ -833,10 +872,11 @@ export class SendSession {
           offset: 0,
           error: "",
           closed: false,
+          overwrite,
         }
       } catch (error) {
         if ((error as NodeJS.ErrnoException | undefined)?.code === "EEXIST") continue
-        if (!this.overwriteIncoming) this.reservedSavePaths.delete(finalPath)
+        if (!overwrite) this.reservedSavePaths.delete(finalPath)
         throw error
       }
     }
@@ -906,12 +946,12 @@ export class SendSession {
         disk.closed = true
         await disk.handle.close()
       }
-      if (!this.overwriteIncoming && await pathExists(finalPath)) {
+      if (!disk.overwrite && await pathExists(finalPath)) {
         this.reservedSavePaths.delete(finalPath)
         finalPath = await uniqueOutputPath(this.saveDir, transfer.name || "download", this.reservedSavePaths)
         this.reservedSavePaths.add(finalPath)
       }
-      if (this.overwriteIncoming) await replaceOutputPath(disk.tempPath, finalPath)
+      if (disk.overwrite) await replaceOutputPath(disk.tempPath, finalPath)
       else await rename(disk.tempPath, finalPath)
       transfer.savedPath = finalPath
       transfer.savedAt ||= Date.now()
@@ -1176,7 +1216,7 @@ export class SendSession {
 
   private async loadLocalProfile() {
     try {
-      const response = await fetch(PROFILE_URL, { cache: "no-store", signal: timeoutSignal(4000, this.lifecycleAbortController?.signal) })
+      const response = await fetchWithTimeout(PROFILE_URL, { cache: "no-store" }, 4000, this.lifecycleAbortController?.signal)
       if (!response.ok) throw new Error(`profile ${response.status}`)
       const data = await response.json()
       if (this.stopped) return
@@ -1196,7 +1236,7 @@ export class SendSession {
     this.pulse = { ...this.pulse, state: "checking", error: "" }
     this.notify()
     try {
-      const response = await fetch(SIGNAL_PULSE_URL, { cache: "no-store", signal: timeoutSignal(3500, this.lifecycleAbortController?.signal) })
+      const response = await fetchWithTimeout(SIGNAL_PULSE_URL, { cache: "no-store" }, 3500, this.lifecycleAbortController?.signal)
       if (!response.ok) throw new Error(`pulse ${response.status}`)
       if (this.stopped) return
       this.pulse = { state: "open", lastSettledState: "open", at: Date.now(), ms: performance.now() - startedAt, error: "" }

package/src/index.ts

@@ -68,7 +68,7 @@ const TURN_OPTIONS = [
   ["--turn-username <value>", "custom TURN username"],
   ["--turn-credential <value>", "custom TURN credential"],
 ] as const
-const OVERWRITE_OPTION = ["--overwrite", "overwrite same-name saved files instead of creating copies"] as const
+const OVERWRITE_OPTION = ["-o, --overwrite", "overwrite same-name saved files instead of creating copies"] as const
 const SAVE_DIR_OPTION = ["--save-dir <dir>", "save directory", { default: "." }] as const
 const TUI_TOGGLE_OPTIONS = [
   ["--clean <0|1>", "show only active peers when 1; show terminal peers too when 0", { default: 1 }],
@@ -80,6 +80,13 @@ export const ACCEPT_SESSION_DEFAULTS = { autoAcceptIncoming: true, autoSaveIncom
 type CliOptionDefinition = readonly [flag: string, description: string, config?: { default?: unknown }]
 const addOptions = (command: CliCommand, definitions: readonly CliOptionDefinition[]) =>
   definitions.reduce((next, [flag, description, config]) => next.option(flag, description, config), command)
+const normalizeCliOptions = (options: Record<string, unknown>) => {
+  const normalized = { ...options }
+  if (normalized.overwrite == null && normalized.o != null) normalized.overwrite = normalized.o
+  delete normalized.h
+  delete normalized.o
+  return normalized
+}
 const withTrailingHelpLine = <T extends { outputHelp: () => void }>(target: T) => {
   const outputHelp = target.outputHelp.bind(target)
   target.outputHelp = () => {
@@ -323,7 +330,7 @@ export const createCli = (handlers: CliHandlers = defaultCliHandlers) => {
     ["--json", "print a json snapshot"],
     SAVE_DIR_OPTION,
     ...TURN_OPTIONS,
-  ])).action(handlers.peers)
+  ])).action(options => handlers.peers(normalizeCliOptions(options)))
 
   withTrailingHelpLine(addOptions(cli.command("offer [...files]", "offer files to browser-compatible peers").ignoreOptionDefaultValue(), [
     ...ROOM_SELF_OPTIONS,
@@ -332,7 +339,7 @@ export const createCli = (handlers: CliHandlers = defaultCliHandlers) => {
     ["--json", "emit ndjson events"],
     SAVE_DIR_OPTION,
     ...TURN_OPTIONS,
-  ])).action(handlers.offer)
+  ])).action((files, options) => handlers.offer(files, normalizeCliOptions(options)))
 
   withTrailingHelpLine(addOptions(cli.command("accept", "receive and save files").ignoreOptionDefaultValue(), [
     ...ROOM_SELF_OPTIONS,
@@ -341,7 +348,7 @@ export const createCli = (handlers: CliHandlers = defaultCliHandlers) => {
     ["--once", "exit after the first saved incoming transfer"],
     ["--json", "emit ndjson events"],
     ...TURN_OPTIONS,
-  ])).action(handlers.accept)
+  ])).action(options => handlers.accept(normalizeCliOptions(options)))
 
   withTrailingHelpLine(addOptions(cli.command("tui", "launch the interactive terminal UI").ignoreOptionDefaultValue(), [
     ...ROOM_SELF_OPTIONS,
@@ -350,7 +357,7 @@ export const createCli = (handlers: CliHandlers = defaultCliHandlers) => {
     SAVE_DIR_OPTION,
     OVERWRITE_OPTION,
     ...TURN_OPTIONS,
-  ])).action(handlers.tui)
+  ])).action(options => handlers.tui(normalizeCliOptions(options)))
 
   cli.help(sections => {
     const usage = sections.find(section => section.title === "Usage:")
@@ -391,7 +398,7 @@ export const runCli = async (argv = process.argv, handlers: CliHandlers = defaul
       printSubcommandHelp(argv, handlers, "tui")
       return
     }
-    await handlers.tui(parsed.options)
+    await handlers.tui(normalizeCliOptions(parsed.options))
     return
   }
   await cli.runMatchedCommand()

package/src/tui/app.ts

@@ -117,6 +117,7 @@ export interface TuiActions {
   toggleAutoOffer: TuiAction
   toggleAutoAccept: TuiAction
   toggleAutoSave: TuiAction
+  toggleOverwrite: TuiAction
   setDraftInput: (value: string, cursor?: number) => void
   addDrafts: TuiAction
   removeDraft: (draftId: string) => void
@@ -151,7 +152,7 @@ const ABOUT_BULLETS = [
   "• Join a room, see who is there, and filter or select exactly which peers to target before offering files.",
   "• File data does not travel through the signaling service; Send uses lightweight signaling to discover peers and negotiate WebRTC, then transfers directly peer-to-peer when possible, with TURN relay when needed.",
   "• Incoming transfers can be auto-accepted and auto-saved, and same-name files can either stay as numbered copies or overwrite the original when that mode is enabled.",
-  "• The CLI streams incoming saves straight to disk in the current save directory, with overwrite available through the CLI flag.",
+  "• The CLI streams incoming saves straight to disk in the current save directory, with overwrite available through the CLI flag and the TUI Ctrl+O shortcut.",
   "• Other features include copyable web and CLI invites, rendered-peer filtering and selection, TURN sharing, and live connection insight like signaling state, RTT, data state, and path labels.",
 ] as const
 const TRANSFER_DIRECTION_ARROW = {
@@ -293,6 +294,7 @@ export const createNoopTuiActions = (): TuiActions => ({
   toggleAutoOffer: noop,
   toggleAutoAccept: noop,
   toggleAutoSave: noop,
+  toggleOverwrite: noop,
   setDraftInput: noop,
   addDrafts: noop,
   removeDraft: noop,
@@ -1261,8 +1263,12 @@ const renderEventsCard = (state: TuiState, actions: TuiActions) => denseSection(
   ]),
 ])
 
+const footerKeycapWidth = (keycap: string) => keycap.length + 2
+
 const renderFooterHint = (id: string, keycap: string, label: string) => ui.row({ id, gap: 0, items: "center" }, [
-  ui.kbd(keycap),
+  ui.box({ id: `${id}-keycap`, width: footerKeycapWidth(keycap), border: "none" }, [
+    ui.kbd(keycap),
+  ]),
   ui.text(` ${label}`, { style: { dim: true } }),
 ])
 
@@ -1273,7 +1279,7 @@ const renderFooter = (state: TuiState) => ui.statusBar({
     ui.toolbar({ id: "footer-hints", gap: 3 }, [
       renderFooterHint("footer-hint-tab", "tab", "focus/accept"),
       renderFooterHint("footer-hint-enter", "enter", "accept/add"),
-      renderFooterHint("footer-hint-esc", "esc", "hide/reset"),
+      renderFooterHint("footer-hint-ctrl-o", "ctrl+o", "overwrite"),
       renderFooterHint("footer-hint-ctrlc", "ctrl+c", "quit"),
     ]),
   ],
@@ -1822,6 +1828,15 @@ export const startTui = async (initialConfig: SessionConfig, launchOptions: TuiL
         error => commit(current => withNotice(current, { text: `${error}`, variant: "error" })),
       )
     },
+    toggleOverwrite: () => {
+      const next = !state.overwriteIncoming
+      state.session.setOverwriteIncoming(next)
+      commit(current => withNotice({
+        ...current,
+        overwriteIncoming: next,
+        sessionSeed: { ...current.sessionSeed, overwriteIncoming: next },
+      }, { text: next ? "Overwrite on." : "Overwrite off.", variant: next ? "success" : "warning" }))
+    },
     setDraftInput: (value, cursor) => updateDraftInput(value, cursor),
     addDrafts,
     removeDraft: draftId => commit(current => withNotice({ ...current, drafts: current.drafts.filter(draft => draft.id !== draftId) }, { text: "Draft removed.", variant: "warning" })),
@@ -1971,6 +1986,12 @@ export const startTui = async (initialConfig: SessionConfig, launchOptions: TuiL
         commit(current => ({ ...current, filePreview: moveFilePreviewSelection(current.filePreview, 1) }))
       },
     },
+    "ctrl+o": {
+      description: "Toggle overwrite mode",
+      handler: () => {
+        actions.toggleOverwrite()
+      },
+    },
     enter: {
       description: "Commit focused input",
       when: ctx => ctx.focusedId === ROOM_INPUT_ID || ctx.focusedId === NAME_INPUT_ID || ctx.focusedId === DRAFT_INPUT_ID,