Send files directly between devices over the internet - no cloud storage, no size limits.
TypeScript cross-platformdata-transferdecentralizedfile-sharingfile-transferhole-punchingopen-sourcep2ppeer-to-peerprivacyprivacy-tools
fix canceled transfer blocking new connections on a pending device invite
Denis Lupookova3732373230b
diff --git a/packages/core/src/worklet/peers/discovery.test.ts b/packages/core/src/worklet/peers/discovery.test.tsindex e55c38d..a38d67f 100644--- a/packages/core/src/worklet/peers/discovery.test.ts+++ b/packages/core/src/worklet/peers/discovery.test.ts@@ -174,6 +174,19 @@ describe('DiscoveryCoordinator', () => {}})+ it('cancelWaiters() resolves pending invites without tearing down the swarm', async () => {+ const peer = makePeer()+ const { coordinator, destroy } = setup([peer])+ await coordinator.start()++ const invitePromise = coordinator.invite(peer.remoteDevicePubkey, hex(crypto.randomBytes(32)))+ await flush()++ coordinator.cancelWaiters()+ expect(await invitePromise).toEqual({ delivered: false })+ expect(destroy).not.toHaveBeenCalled()+ })+it('stop() drains pending invites and tears down the swarm', async () => {const peer = makePeer()const { coordinator, destroy } = setup([peer])diff --git a/packages/core/src/worklet/peers/discovery.ts b/packages/core/src/worklet/peers/discovery.tsindex 3a6f064..d0657d4 100644--- a/packages/core/src/worklet/peers/discovery.ts+++ b/packages/core/src/worklet/peers/discovery.ts@@ -180,8 +180,7 @@ export class DiscoveryCoordinator {} catch {}}- async stop(): Promise<void> {- this.starting = null+ cancelWaiters(): void {for (const waiters of this.sessionWaiters.values()) {for (const waiter of waiters) {clearTimeout(waiter.timer)@@ -189,6 +188,11 @@ export class DiscoveryCoordinator {}}this.sessionWaiters.clear()+ }++ async stop(): Promise<void> {+ this.starting = null+ this.cancelWaiters()for (const { socket } of this.sessions.values()) {try {socket.destroy()diff --git a/packages/core/src/worklet/rpc/server.ts b/packages/core/src/worklet/rpc/server.tsindex 155c8b7..a9b493a 100644--- a/packages/core/src/worklet/rpc/server.ts+++ b/packages/core/src/worklet/rpc/server.ts@@ -17,8 +17,15 @@ function toError(err: unknown) {return err instanceof Error ? err : new Error('Unknown worker error')}+const IMMEDIATE_METHODS = new Set<TransferMethod>([+ 'pauseDownload',+ 'testCustomRelay',+ 'inviteDevice',+ 'respondToInvite'+])+export function runsWithoutWaiting(method: TransferMethod): boolean {- return method === 'pauseDownload' || method === 'testCustomRelay'+ return IMMEDIATE_METHODS.has(method)}export function isFileTransfer(method: TransferMethod): boolean {diff --git a/packages/core/src/worklet/transfer/orchestrator.ts b/packages/core/src/worklet/transfer/orchestrator.tsindex e530ef4..13d54b4 100644--- a/packages/core/src/worklet/transfer/orchestrator.ts+++ b/packages/core/src/worklet/transfer/orchestrator.ts@@ -626,6 +626,7 @@ export class TransferOrchestrator implements TransferRPC {}abortInFlight(): void {+ this.discovery.cancelWaiters()for (const session of this.swarm.sessions) session.drive?.cancel()for (const controller of this.inflight) controller.abort()}diff --git a/packages/core/src/worklet/transfer/resume.test.ts b/packages/core/src/worklet/transfer/resume.test.tsindex 16024ad..94e663c 100644--- a/packages/core/src/worklet/transfer/resume.test.ts+++ b/packages/core/src/worklet/transfer/resume.test.ts@@ -171,9 +171,12 @@ describe('command scheduling', () => {it('lets pause run without waiting, and queues transfers separately', async () => {const { runsWithoutWaiting, isFileTransfer } = await import('../rpc/server')- expect(runsWithoutWaiting('pauseDownload')).toBe(true)expect(isFileTransfer('downloadFiles')).toBe(true)+ for (const method of ['pauseDownload', 'inviteDevice', 'respondToInvite'] as const) {+ expect(runsWithoutWaiting(method)).toBe(true)+ }+for (const method of ['shareFiles', 'disconnect', 'closePeers', 'peersList'] as const) {expect(runsWithoutWaiting(method)).toBe(false)expect(isFileTransfer(method)).toBe(false)