@elefunc/send 0.1.21 → 0.1.30

package/package.json

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

package/src/core/session.ts

@@ -310,11 +310,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() : ""
@@ -490,9 +520,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)
   }
 
@@ -1176,7 +1205,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 +1225,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()