@elefunc/send 0.1.11 → 0.1.13

package/package.json

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

package/src/core/protocol.ts

@@ -1,6 +1,12 @@
 import type { RTCIceCandidateInit, RTCIceServer, RTCSessionDescriptionInit } from "werift"
 
 export const SIGNAL_WS_URL = "wss://sig.efn.kr/ws"
+export const SIGNAL_PULSE_URL = "https://sig.efn.kr/pulse?app=send"
+export const signalSocketUrl = (room: string) => {
+  const url = new URL(SIGNAL_WS_URL)
+  url.search = new URLSearchParams({ i: room, app: "send" }).toString()
+  return url.toString()
+}
 export const BASE_ICE_SERVERS = [
   { urls: "stun:stun.cloudflare.com:3478" },
   { urls: "stun:stun.l.google.com:19302" },

package/src/core/session.ts

@@ -19,7 +19,9 @@ import {
   fallbackName,
   formatEta,
   formatRate,
+  SIGNAL_PULSE_URL,
   signalEpoch,
+  signalSocketUrl,
   stamp,
   turnStateLabel,
   type CandidateSignal,
@@ -171,8 +173,6 @@ export interface SessionConfig {
 const LOG_LIMIT = 200
 const STATS_POLL_MS = 1000
 const PROFILE_URL = "https://ip.rt.ht/"
-const PULSE_URL = "https://sig.efn.kr/pulse"
-
 export interface PeerConnectivitySnapshot {
   rttMs: number
   localCandidateType: string
@@ -953,7 +953,7 @@ export class SendSession {
     if (this.stopped) return
     if (this.reconnectTimer) clearTimeout(this.reconnectTimer)
     const token = ++this.socketToken
-    const socket = new WebSocket(`${SIGNAL_WS_URL}?i=${encodeURIComponent(this.room)}`)
+    const socket = new WebSocket(signalSocketUrl(this.room))
     this.socket = socket
     this.socketState = "connecting"
     this.emit({ type: "socket", socketState: this.socketState })
@@ -1012,7 +1012,7 @@ 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, this.lifecycleAbortController?.signal) })
+      const response = await fetch(SIGNAL_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: "" }

package/src/index.ts

@@ -1,7 +1,7 @@
 #!/usr/bin/env bun
 import { resolve } from "node:path"
 import { cac, type CAC } from "cac"
-import { cleanRoom } from "./core/protocol"
+import { cleanRoom, displayPeerName } from "./core/protocol"
 import type { SendSession, SessionConfig, SessionEvent } from "./core/session"
 import { resolvePeerTargets } from "./core/targeting"
 import { ensureSessionRuntimePatches, ensureTuiRuntimePatches } from "../runtime/install"
@@ -108,9 +108,10 @@ export const sessionConfigFrom = (options: Record<string, unknown>, defaults: {
   }
 }
 
-export const roomAnnouncement = (room: string, json = false) => json ? JSON.stringify({ type: "room", room }) : `room ${room}`
+export const roomAnnouncement = (room: string, self: string, json = false) =>
+  json ? JSON.stringify({ type: "room", room, self }) : `room ${room}\nself ${self}`
 
-const printRoomAnnouncement = (room: string, json = false) => console.log(roomAnnouncement(room, json))
+const printRoomAnnouncement = (room: string, self: string, json = false) => console.log(roomAnnouncement(room, self, json))
 
 const printEvent = (event: SessionEvent) => console.log(JSON.stringify(event))
 
@@ -191,7 +192,7 @@ const peersCommand = async (options: Record<string, unknown>) => {
   const { SendSession } = await loadSessionRuntime()
   const session = new SendSession(sessionConfigFrom(options, {}))
   handleSignals(session)
-  printRoomAnnouncement(session.room, !!options.json)
+  printRoomAnnouncement(session.room, displayPeerName(session.name, session.localId), !!options.json)
   await session.connect()
   await Bun.sleep(numberOption(options.wait, 3000))
   const snapshot = session.snapshot()
@@ -218,7 +219,7 @@ const offerCommand = async (files: string[], options: Record<string, unknown>) =
   const { SendSession } = await loadSessionRuntime()
   const session = new SendSession(sessionConfigFrom(options, {}))
   handleSignals(session)
-  printRoomAnnouncement(session.room, !!options.json)
+  printRoomAnnouncement(session.room, displayPeerName(session.name, session.localId), !!options.json)
   const detachReporter = attachReporter(session, !!options.json)
   await session.connect()
   const targets = await waitForTargets(session, selectors, timeoutMs)
@@ -234,7 +235,7 @@ const acceptCommand = async (options: Record<string, unknown>) => {
   const { SendSession } = await loadSessionRuntime()
   const session = new SendSession(sessionConfigFrom(options, { autoAcceptIncoming: true, autoSaveIncoming: true }))
   handleSignals(session)
-  printRoomAnnouncement(session.room, !!options.json)
+  printRoomAnnouncement(session.room, displayPeerName(session.name, session.localId), !!options.json)
   const detachReporter = attachReporter(session, !!options.json)
   await session.connect()
   if (!options.json) console.log(`listening in ${session.room}`)