@elefunc/send 0.1.4 → 0.1.5

package/package.json

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

package/src/core/session.ts

@@ -157,6 +157,7 @@ export interface SessionConfig {
   localId?: string
   name?: string
   saveDir?: string
+  peerSelectionMemory?: Map<string, boolean>
   autoAcceptIncoming?: boolean
   autoSaveIncoming?: boolean
   turnUrls?: string[]
@@ -257,7 +258,12 @@ export const turnUsageState = (
   return "idle"
 }
 
-const timeoutSignal = (ms: number) => typeof AbortSignal !== "undefined" && typeof AbortSignal.timeout === "function" ? AbortSignal.timeout(ms) : undefined
+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 normalizeCandidateType = (value: unknown) => typeof value === "string" ? value.toLowerCase() : ""
 const validCandidateType = (value: string) => ["host", "srflx", "prflx", "relay"].includes(value)
@@ -335,6 +341,7 @@ export class SendSession {
   private autoSaveIncoming: boolean
   private readonly reconnectSocket: boolean
   private readonly iceServers: RTCIceServer[]
+  private readonly peerSelectionMemory: Map<string, boolean>
   private readonly peers = new Map<string, PeerState>()
   private readonly transfers = new Map<string, TransferState>()
   private readonly logs: LogEntry[] = []
@@ -346,6 +353,7 @@ export class SendSession {
   private socketToken = 0
   private reconnectTimer: ReturnType<typeof setTimeout> | null = null
   private peerStatsTimer: ReturnType<typeof setInterval> | null = null
+  private lifecycleAbortController: AbortController | null = null
   private stopped = false
 
   constructor(config: SessionConfig) {
@@ -353,6 +361,7 @@ export class SendSession {
     this.room = cleanRoom(config.room)
     this.name = cleanName(config.name ?? fallbackName)
     this.saveDir = resolve(config.saveDir ?? resolve(process.cwd(), "downloads"))
+    this.peerSelectionMemory = config.peerSelectionMemory ?? new Map()
     this.autoAcceptIncoming = !!config.autoAcceptIncoming
     this.autoSaveIncoming = !!config.autoSaveIncoming
     this.reconnectSocket = config.reconnectSocket ?? true
@@ -394,6 +403,8 @@ export class SendSession {
 
   async connect(timeoutMs = 10_000) {
     this.stopped = false
+    this.lifecycleAbortController?.abort()
+    this.lifecycleAbortController = typeof AbortController === "function" ? new AbortController() : null
     this.startPeerStatsPolling()
     void this.loadLocalProfile()
     void this.probePulse()
@@ -405,6 +416,9 @@ export class SendSession {
     this.stopped = true
     this.stopPeerStatsPolling()
     if (this.reconnectTimer) clearTimeout(this.reconnectTimer)
+    this.reconnectTimer = null
+    this.lifecycleAbortController?.abort()
+    this.lifecycleAbortController = null
     if (this.socket?.readyState === WebSocket.OPEN) this.sendSignal({ kind: "bye" })
     const socket = this.socket
     this.socket = null
@@ -428,8 +442,12 @@ export class SendSession {
 
   setPeerSelected(peerId: string, selected: boolean) {
     const peer = this.peers.get(peerId)
-    if (!peer || peer.presence !== "active") return false
-    peer.selected = selected
+    if (!peer) return false
+    const next = !!selected
+    const rememberedChanged = this.rememberPeerSelected(peerId, next)
+    if (peer.presence !== "active") return rememberedChanged
+    if (peer.selected === next && !rememberedChanged) return false
+    peer.selected = next
     this.emit({ type: "peer", peer: this.peerSnapshot(peer) })
     this.notify()
     return true
@@ -862,13 +880,17 @@ export class SendSession {
 
   private async loadLocalProfile() {
     try {
-      const response = await fetch(PROFILE_URL, { cache: "no-store", signal: timeoutSignal(4000) })
+      const response = await fetch(PROFILE_URL, { cache: "no-store", signal: timeoutSignal(4000, this.lifecycleAbortController?.signal) })
       if (!response.ok) throw new Error(`profile ${response.status}`)
-      this.profile = localProfileFromResponse(await response.json())
+      const data = await response.json()
+      if (this.stopped) return
+      this.profile = localProfileFromResponse(data)
     } catch (error) {
+      if (this.stopped) return
       this.profile = localProfileFromResponse(null, `${error}`)
       this.pushLog("profile:error", { error: `${error}` }, "error")
     }
+    if (this.stopped) return
     this.broadcastProfile()
     this.notify()
   }
@@ -878,13 +900,16 @@ export class SendSession {
     this.pulse = { ...this.pulse, state: "checking", error: "" }
     this.notify()
     try {
-      const response = await fetch(PULSE_URL, { cache: "no-store", signal: timeoutSignal(3500) })
+      const response = await fetch(PULSE_URL, { cache: "no-store", signal: timeoutSignal(3500, this.lifecycleAbortController?.signal) })
       if (!response.ok) throw new Error(`pulse ${response.status}`)
+      if (this.stopped) return
       this.pulse = { state: "open", at: Date.now(), ms: performance.now() - startedAt, error: "" }
     } catch (error) {
+      if (this.stopped) return
       this.pulse = { state: "error", at: Date.now(), ms: 0, error: `${error}` }
       this.pushLog("pulse:error", { error: `${error}` }, "error")
     }
+    if (this.stopped) return
     this.notify()
   }
 
@@ -931,12 +956,23 @@ export class SendSession {
     return !!peer && !!channel && peer.rtcEpoch === rtcEpoch && peer.dc === channel && channel.readyState === "open"
   }
 
+  private peerSelected(peerId: string) {
+    return this.peerSelectionMemory.get(peerId) ?? true
+  }
+
+  private rememberPeerSelected(peerId: string, selected: boolean) {
+    const next = !!selected
+    const previous = this.peerSelectionMemory.get(peerId)
+    this.peerSelectionMemory.set(peerId, next)
+    return previous !== next
+  }
+
   private buildPeer(remoteId: string) {
     const peer: PeerState = {
       id: remoteId,
       name: fallbackName,
       presence: "active",
-      selected: true,
+      selected: this.peerSelected(remoteId),
       polite: this.localId > remoteId,
       pc: null,
       dc: null,
@@ -962,9 +998,11 @@ export class SendSession {
 
   private syncPeerPresence(remoteId: string, name?: string, profile?: PeerProfile, turnAvailable?: boolean) {
     const peer = this.peers.get(remoteId) ?? this.buildPeer(remoteId)
+    const wasTerminal = peer.presence === "terminal"
     peer.lastSeenAt = Date.now()
     peer.presence = "active"
     peer.terminalReason = ""
+    if (wasTerminal) peer.selected = this.peerSelected(remoteId)
     if (name != null) {
       peer.name = cleanName(name)
       for (const transfer of this.transfers.values()) if (transfer.peerId === remoteId) transfer.peerName = peer.name

package/src/tui/app.ts

@@ -43,6 +43,7 @@ export type VisiblePane = "peers" | "transfers" | "logs"
 export interface TuiState {
   session: SendSession
   sessionSeed: SessionSeed
+  peerSelectionByRoom: Map<string, Map<string, boolean>>
   snapshot: SessionSnapshot
   focusedId: string | null
   roomInput: string
@@ -98,6 +99,10 @@ const DRAFT_INPUT_ID = "draft-input"
 const TRANSPARENT_BORDER_STYLE = { fg: rgb(7, 10, 12) } as const
 const METRIC_BORDER_STYLE = { fg: rgb(20, 25, 32) } as const
 const DEFAULT_WEB_URL = "https://send.rt.ht/"
+const TRANSFER_DIRECTION_ARROW = {
+  out: { glyph: "↗", style: { fg: rgb(170, 217, 76), bold: true } },
+  in: { glyph: "↙", style: { fg: rgb(240, 113, 120), bold: true } },
+} as const
 
 const countFormat = new Intl.NumberFormat(undefined, { maximumFractionDigits: 0 })
 const percentFormat = new Intl.NumberFormat(undefined, { maximumFractionDigits: 0 })
@@ -180,6 +185,20 @@ const peerConnectionStatusKind = (status: string) => ({
   idle: "unknown",
   new: "unknown",
 }[status] || "unknown") as "online" | "offline" | "away" | "busy" | "unknown"
+const transferStatusKind = (status: TransferSnapshot["status"]) => ({
+  complete: "online",
+  sending: "online",
+  receiving: "online",
+  "awaiting-done": "online",
+  accepted: "busy",
+  queued: "busy",
+  offered: "busy",
+  pending: "busy",
+  cancelling: "busy",
+  rejected: "offline",
+  cancelled: "offline",
+  error: "offline",
+}[status] || "unknown") as "online" | "offline" | "away" | "busy" | "unknown"
 const visiblePeers = (peers: PeerSnapshot[], hideTerminalPeers: boolean) => hideTerminalPeers ? peers.filter(peer => peer.presence === "active") : peers
 const transferProgress = (transfer: TransferSnapshot) => Math.max(0, Math.min(1, transfer.progress / 100))
 const isPendingOffer = (transfer: TransferSnapshot) => transfer.direction === "out" && (transfer.status === "queued" || transfer.status === "offered")
@@ -298,8 +317,19 @@ const normalizeSessionSeed = (config: SessionConfig): SessionSeed => ({
   room: cleanRoom(config.room),
 })
 
-const makeSession = (seed: SessionSeed, autoAcceptIncoming: boolean, autoSaveIncoming: boolean) => new SendSession({
+const roomPeerSelectionMemory = (peerSelectionByRoom: Map<string, Map<string, boolean>>, room: string) => {
+  const roomKey = cleanRoom(room)
+  let selectionMemory = peerSelectionByRoom.get(roomKey)
+  if (!selectionMemory) {
+    selectionMemory = new Map<string, boolean>()
+    peerSelectionByRoom.set(roomKey, selectionMemory)
+  }
+  return selectionMemory
+}
+
+const makeSession = (seed: SessionSeed, autoAcceptIncoming: boolean, autoSaveIncoming: boolean, peerSelectionMemory: Map<string, boolean>) => new SendSession({
   ...seed,
+  peerSelectionMemory,
   autoAcceptIncoming,
   autoSaveIncoming,
 })
@@ -435,11 +465,13 @@ export const createInitialTuiState = (initialConfig: SessionConfig, showEvents =
   const sessionSeed = normalizeSessionSeed(initialConfig)
   const autoAcceptIncoming = initialConfig.autoAcceptIncoming ?? true
   const autoSaveIncoming = initialConfig.autoSaveIncoming ?? true
-  const session = makeSession(sessionSeed, autoAcceptIncoming, autoSaveIncoming)
+  const peerSelectionByRoom = new Map<string, Map<string, boolean>>()
+  const session = makeSession(sessionSeed, autoAcceptIncoming, autoSaveIncoming, roomPeerSelectionMemory(peerSelectionByRoom, sessionSeed.room))
   const focusState = deriveBootFocusState(sessionSeed.name)
   return {
     session,
     sessionSeed,
+    peerSelectionByRoom,
     snapshot: session.snapshot(),
     focusedId: null,
     roomInput: sessionSeed.room,
@@ -755,6 +787,7 @@ const transferPathLabel = (transfer: TransferSnapshot, peersById: Map<string, Pe
 
 const renderTransferRow = (transfer: TransferSnapshot, peersById: Map<string, PeerSnapshot>, actions: TuiActions, now = Date.now()) => {
   const hasStarted = !!transfer.startedAt
+  const directionArrow = TRANSFER_DIRECTION_ARROW[transfer.direction]
   const facts = [
     renderTransferFact("Size", formatBytes(transfer.size)),
     renderTransferFact("Path", transferPathLabel(transfer, peersById)),
@@ -767,13 +800,18 @@ const renderTransferRow = (transfer: TransferSnapshot, peersById: Map<string, Pe
 
   return denseSection({
     key: transfer.id,
-    title: `${transfer.direction === "out" ? "→" : "←"} ${transfer.name}`,
+    titleNode: ui.row({ id: `transfer-title-row-${transfer.id}`, gap: 1, items: "center", wrap: true }, [
+      ui.row({ id: `transfer-title-main-${transfer.id}`, gap: 0, items: "center", wrap: true }, [
+        ui.text(directionArrow.glyph, { style: directionArrow.style }),
+        ui.text(` ${transfer.name}`, { variant: "heading" }),
+      ]),
+      ui.row({ id: `transfer-badges-${transfer.id}`, gap: 1, items: "center", wrap: true }, [
+        ui.status(transferStatusKind(transfer.status), { label: transfer.status, showLabel: true }),
+        transfer.error ? tightTag("error", { variant: "error", bare: true }) : null,
+      ]),
+    ]),
     actions: transferActionButtons(transfer, actions),
   }, [
-    ui.row({ gap: 1, wrap: true }, [
-      tightTag(transfer.status, { variant: statusVariant(transfer.status), bare: true }),
-      transfer.error ? tightTag("error", { variant: "error", bare: true }) : null,
-    ]),
     ui.row({ gap: 0, wrap: true }, facts),
     ui.progress(transferProgress(transfer), { showPercent: true, label: `${percentFormat.format(transfer.progress)}%` }),
     ui.row({ gap: 0, wrap: true }, [
@@ -1188,12 +1226,13 @@ export const startTui = async (initialConfig: SessionConfig, showEvents = false)
 
   const replaceSession = (nextSeed: SessionSeed, text: string, options: { reseedBootFocus?: boolean } = {}) => {
     const previousSession = state.session
-    const nextSession = makeSession(nextSeed, state.autoAcceptIncoming, state.autoSaveIncoming)
+    const nextSession = makeSession(nextSeed, state.autoAcceptIncoming, state.autoSaveIncoming, roomPeerSelectionMemory(state.peerSelectionByRoom, nextSeed.room))
     stopPreviewSession()
     commit(current => withNotice({
       ...current,
       session: nextSession,
       sessionSeed: nextSeed,
+      peerSelectionByRoom: current.peerSelectionByRoom,
       snapshot: nextSession.snapshot(),
       roomInput: nextSeed.room,
       nameInput: visibleNameInput(nextSeed.name),
@@ -1270,7 +1309,7 @@ export const startTui = async (initialConfig: SessionConfig, showEvents = false)
     setNameInput: value => commit(current => ({ ...current, nameInput: value })),
     toggleSelectReadyPeers: () => {
       let changed = 0
-      for (const peer of state.snapshot.peers) if (peer.presence === "active" && state.session.setPeerSelected(peer.id, peer.ready)) changed += 1
+      for (const peer of state.snapshot.peers) if (state.session.setPeerSelected(peer.id, peer.presence === "active" && peer.ready)) changed += 1
       commit(current => withNotice(current, { text: changed ? "Selected ready peers." : "No ready peers to select.", variant: changed ? "success" : "info" }))
       maybeOfferDrafts()
     },