Skip to content

Send files directly between devices over the internet - no cloud storage, no size limits.

close worklet session on sender end

Denis Lupookov8d327366644c
diff --git a/apps/mobile/src/components/Layout/Layout.tsx b/apps/mobile/src/components/Layout/Layout.tsx
index b534fa1..4bd8c7c 100644
--- a/apps/mobile/src/components/Layout/Layout.tsx
+++ b/apps/mobile/src/components/Layout/Layout.tsx
@@ -11,6 +11,7 @@ interface LayoutProps {
description?: string
backdrop?: React.ReactElement
badge?: React.ReactElement
+ titleAccessory?: React.ReactElement
footer?: React.ReactElement
hasNativeHeader?: boolean
compactHeader?: boolean
@@ -26,6 +27,7 @@ export const Layout = ({
description,
backdrop,
badge,
+ titleAccessory,
footer,
children,
hasNativeHeader,
@@ -71,6 +73,7 @@ export const Layout = ({
{badge ? <View style={styles.badgeSlot}>{badge}</View> : null}
<View style={styles.titleRow}>
<Text style={[styles.title, { color: theme.colors.colorTextPrimary }]}>{title}</Text>
+ {titleAccessory}
{onMenuPress ? (
<IconButton
icon='settings'
diff --git a/apps/mobile/src/transfer/receive/views/ReceiveReconnectingView.tsx b/apps/mobile/src/transfer/receive/views/ReceiveReconnectingView.tsx
index 34406e6..12e70b5 100644
--- a/apps/mobile/src/transfer/receive/views/ReceiveReconnectingView.tsx
+++ b/apps/mobile/src/transfer/receive/views/ReceiveReconnectingView.tsx
@@ -28,7 +28,7 @@ export function ReceiveReconnectingView({
description={description}
footer={footer}
hasNativeHeader={hasNativeHeader}
- badge={<ActivityIndicator color={theme.colors.colorAccent} size='small' />}
+ titleAccessory={<ActivityIndicator color={theme.colors.colorAccent} size='small' />}
>
<ReceiveIncomingView hideFilesTitle pendingLabel={t('receive:status.waiting')} />
{children}
diff --git a/packages/domain/src/transfer/binding.test.ts b/packages/domain/src/transfer/binding.test.ts
index 9b12f66..fdeb415 100644
--- a/packages/domain/src/transfer/binding.test.ts
+++ b/packages/domain/src/transfer/binding.test.ts
@@ -42,6 +42,7 @@ function terminalEvent(): RendererTransferEvent {
let emit: (event: RendererTransferEvent) => void
let unbind: () => void
+let closePeers: ReturnType<typeof vi.fn>
function bytesInStore(): number {
return transferStore.getState().receiveDownloadStates[FILE_ID]?.bytesTransferred ?? -1
@@ -53,8 +54,9 @@ beforeEach(() => {
{ ...initialTransferSessionState, role: 'receiver', incomingFileOffers: [OFFER] },
true
)
+ closePeers = vi.fn(() => Promise.resolve())
unbind = bindTransferApi({
- worker: { peersList: () => Promise.resolve([]) } as never,
+ worker: { peersList: () => Promise.resolve([]), closePeers } as never,
startP2P: () => Promise.resolve(),
onTransferEvent: (cb) => {
emit = cb
@@ -138,3 +140,15 @@ describe('progress coalescing', () => {
expect(bytesInStore()).toBe(-1)
})
})
+
+describe('peer session ended', () => {
+ it('closes the worklet session for a settled receive but never for a sender', () => {
+ transferStore.setState({ transferPeerKey: 'p1' })
+ emit({ type: 'status', state: 'peer-session-ended', peer: 'p1' } as RendererTransferEvent)
+ expect(closePeers).toHaveBeenCalledTimes(1)
+
+ transferStore.setState({ ...initialTransferSessionState, role: 'sender' }, true)
+ emit({ type: 'status', state: 'peer-session-ended', peer: 'p1' } as RendererTransferEvent)
+ expect(closePeers).toHaveBeenCalledTimes(1)
+ })
+})
diff --git a/packages/domain/src/transfer/binding.ts b/packages/domain/src/transfer/binding.ts
index cd7c260..cd60e22 100644
--- a/packages/domain/src/transfer/binding.ts
+++ b/packages/domain/src/transfer/binding.ts
@@ -1,4 +1,4 @@
-import { dispatchToTransferStore } from './store'
+import { dispatchToTransferStore, transferStore } from './store'
import { getAppActive } from './effects/appActive'
import { getTransferDebugMessage, getTransferErrorCode } from './errors'
import { TRANSFER_ERROR_CODES } from './types'
@@ -189,8 +189,17 @@ function dispatchStatusEvent(event: StatusEvent): void {
case 'peer-disconnected':
if (event.peer) dispatchToTransferStore({ type: 'peer_left', peerKey: event.peer })
return
- case 'peer-session-ended':
- return dispatchToTransferStore({ type: 'peer_session_ended', peerKey: event.peer })
+ case 'peer-session-ended': {
+ dispatchToTransferStore({ type: 'peer_session_ended', peerKey: event.peer })
+ if (transferStore.getState().sessionEndedByPeer) {
+ getTransferApi()
+ .worker.closePeers()
+ .catch((err: unknown) => {
+ reportError('sessionEnded.closePeers', err)
+ })
+ }
+ return
+ }
case 'connection-type':
if (event.connectionType && event.peer) {
dispatchToTransferStore({
diff --git a/packages/domain/src/transfer/reducer.test.ts b/packages/domain/src/transfer/reducer.test.ts
index 1c1f99f..578cfdb 100644
--- a/packages/domain/src/transfer/reducer.test.ts
+++ b/packages/domain/src/transfer/reducer.test.ts
@@ -160,7 +160,7 @@ describe('transferSessionReducer — peer_unreachable', () => {
})
describe('transferSessionReducer — peer_session_ended', () => {
- it('settles only on the transfer peer goodbye', () => {
+ it('settles only on the known transfer peer goodbye', () => {
const state = make({
role: 'receiver',
transferPeerKey: 'sender-key',
@@ -168,6 +168,8 @@ describe('transferSessionReducer — peer_session_ended', () => {
incomingFileOffers: [offer('a', 'a.txt')]
})
expect(apply(state, { type: 'peer_session_ended', peerKey: 'another-receiver' })).toBe(state)
+ const preOffer = make({ role: 'receiver' })
+ expect(apply(preOffer, { type: 'peer_session_ended', peerKey: 'sender-key' })).toBe(preOffer)
const next = apply(state, { type: 'peer_session_ended', peerKey: 'sender-key' })
expect(next.sessionEndedByPeer).toBe(true)
expect(next.isReconnecting).toBe(false)
diff --git a/packages/domain/src/transfer/reducer.ts b/packages/domain/src/transfer/reducer.ts
index 065f83f..3e6f9ab 100644
--- a/packages/domain/src/transfer/reducer.ts
+++ b/packages/domain/src/transfer/reducer.ts
@@ -201,9 +201,8 @@ export function transferSessionReducer(
return { ...state, isReconnecting: true }
case 'peer_session_ended': {
if (state.role !== 'receiver') return state
- const fromAnotherPeer =
- !!state.transferPeerKey && !!action.peerKey && state.transferPeerKey !== action.peerKey
- if (fromAnotherPeer) return state
+ const fromTransferPeer = !!state.transferPeerKey && action.peerKey === state.transferPeerKey
+ if (!fromTransferPeer) return state
return { ...state, isReconnecting: false, sessionEndedByPeer: true }
}
case 'clear_session':