@ledgerhq/device-transport-kit-react-native-hid 0.0.0-web-ble-29-08---20250829104351 → 1.0.0

package/android/src/main/kotlin/com/ledger/androidtransporthid/TransportHidModule.kt

@@ -49,7 +49,7 @@ class TransportHidModule(
     private val loggerService: LoggerService =
         LoggerService { info ->
             Timber.tag("LDMKTransportHIDModule " + info.tag).d(info.message)
-            sendEvent(reactContext, BridgeEvents.TransportLog(info))
+            // sendEvent(reactContext, BridgeEvents.TransportLog(info))
         }
 
     private val transport: AndroidUsbTransport? by lazy {

package/android/src/main/kotlin/com/ledger/devicesdk/shared/androidMain/transport/usb/DefaultAndroidUsbTransport.kt

@@ -123,9 +123,10 @@ internal class DefaultAndroidUsbTransport(
                                 "Device disconnected (sessionId=${deviceConnection.sessionId})"
                             )
                         )
-                        deviceConnection.handleDeviceDisconnected()
                         usbConnections.remove(key)
                         usbConnectionsPendingReconnection.add(deviceConnection)
+                        deviceConnection.handleDeviceDisconnected()
+                        (deviceConnection.getApduSender() as AndroidUsbApduSender).release()
                     }
                 }
             }
@@ -186,19 +187,30 @@ internal class DefaultAndroidUsbTransport(
                                 "Reconnecting device (sessionId=${deviceConnection.sessionId})"
                             )
                         )
-                        deviceConnection.handleDeviceConnected(
-                            AndroidUsbApduSender(
-                                dependencies = AndroidUsbApduSender.Dependencies(
-                                    usbDevice = usbDevice,
-                                    ledgerUsbDevice = state.ledgerUsbDevice,
-                                ),
-                                usbManager = usbManager,
-                                ioDispatcher = Dispatchers.IO,
-                                framerService = FramerService(loggerService),
-                                request = UsbRequest(),
-                                loggerService = loggerService
-                            )
+
+                        val apduSender = AndroidUsbApduSender(
+                            dependencies = AndroidUsbApduSender.Dependencies(
+                                usbDevice = usbDevice,
+                                ledgerUsbDevice = state.ledgerUsbDevice,
+                            ),
+                            usbManager = usbManager,
+                            ioDispatcher = Dispatchers.IO,
+                            framerService = FramerService(loggerService),
+                            request = UsbRequest(),
+                            loggerService = loggerService
                         )
+
+                        if (!usbConnectionsPendingReconnection.contains(deviceConnection)) {
+                            /**
+                             * We check this because maybe by the time we get here,
+                             * the reconnection has timed out and the session has been terminated.
+                             * Easy to reproduce for instance if the permission request requires
+                             * a user interaction.
+                             */
+                            apduSender.release()
+                            return@launch
+                        }
+                        deviceConnection.handleDeviceConnected(apduSender)
                         usbConnectionsPendingReconnection.remove(deviceConnection)
                         usbConnections[deviceConnection.sessionId] = deviceConnection
                     }
@@ -304,9 +316,10 @@ internal class DefaultAndroidUsbTransport(
             val deviceConnection = DeviceConnection(
                 sessionId = sessionId,
                 deviceApduSender = apduSender,
-                isFatalSendApduFailure = { false }, // TODO: refine this
+                isFatalSendApduFailure = { false },
                 reconnectionTimeoutDuration = 5.seconds,
                 onTerminated = {
+                    (it.getApduSender() as AndroidUsbApduSender).release()
                     usbConnections.remove(sessionId)
                     usbConnectionsPendingReconnection.remove(it)
                     eventDispatcher.dispatch(TransportEvent.DeviceConnectionLost(sessionId))
@@ -333,7 +346,9 @@ internal class DefaultAndroidUsbTransport(
     }
 
     override suspend fun disconnect(deviceId: String) {
+        // The DeviceConnection is either in usbConnections or usbConnectionsPendingReconnection
         usbConnections[deviceId]?.requestCloseConnection()
+        usbConnectionsPendingReconnection.find { it.sessionId == deviceId }?.requestCloseConnection()
     }
 
     private fun generateSessionId(usbDevice: UsbDevice): String = "usb_${usbDevice.deviceId}"

package/android/src/main/kotlin/com/ledger/devicesdk/shared/androidMain/transport/usb/connection/AndroidUsbApduSender.kt

@@ -22,7 +22,6 @@ import com.ledger.devicesdk.shared.internal.service.logger.buildSimpleErrorLogIn
 import com.ledger.devicesdk.shared.internal.transport.framer.FramerService
 import com.ledger.devicesdk.shared.internal.transport.framer.to2BytesArray
 import kotlinx.coroutines.CoroutineDispatcher
-import kotlinx.coroutines.cancel
 import kotlinx.coroutines.delay
 import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
@@ -36,7 +35,7 @@ private const val DEFAULT_USB_INTERFACE = 0
 
 internal class AndroidUsbApduSender(
     override val dependencies: Dependencies,
-    private val usbManager: UsbManager,
+    usbManager: UsbManager,
     private val framerService: FramerService,
     private val request: UsbRequest,
     private val ioDispatcher: CoroutineDispatcher,
@@ -47,49 +46,48 @@ internal class AndroidUsbApduSender(
         val ledgerUsbDevice: LedgerUsbDevice,
     )
 
+    private val usbDevice = dependencies.usbDevice
+    private val usbInterface = usbDevice.getInterface(DEFAULT_USB_INTERFACE)
+    private val androidToUsbEndpoint =
+        usbInterface.firstEndpointOrThrow { it == UsbConstants.USB_DIR_OUT }
+    private val usbToAndroidEndpoint =
+        usbInterface.firstEndpointOrThrow { it == UsbConstants.USB_DIR_IN }
+    private val usbConnection = usbManager.openDevice(usbDevice)
+        .apply { claimInterface(usbInterface, true) }
+
+
+    fun release() {
+        usbConnection.releaseInterface(usbInterface)
+        usbConnection.close()
+    }
+
     override suspend fun send(apdu: ByteArray, abortTimeoutDuration: Duration): SendApduResult =
         try {
-            val usbDevice = dependencies.usbDevice
             withContext(context = ioDispatcher) {
-                val usbInterface = usbDevice.getInterface(DEFAULT_USB_INTERFACE)
-                val androidToUsbEndpoint =
-                    usbInterface.firstEndpointOrThrow { it == UsbConstants.USB_DIR_OUT }
-                val usbToAndroidEndpoint =
-                    usbInterface.firstEndpointOrThrow { it == UsbConstants.USB_DIR_IN }
-                val usbConnection = usbManager.openDevice(usbDevice)
-                    .apply { claimInterface(usbInterface, true) }
 
                 val timeoutJob = launch {
                     delay(abortTimeoutDuration)
-                    usbConnection.releaseInterface(usbInterface)
-                    usbConnection.close()
                     throw SendApduTimeoutException
                 }
 
-                try {
+                transmitApdu(
+                    usbConnection = usbConnection,
+                    androidToUsbEndpoint = androidToUsbEndpoint,
+                    rawApdu = apdu,
+                )
 
-                    transmitApdu(
+                val apduResponse =
+                    receiveApdu(
                         usbConnection = usbConnection,
-                        androidToUsbEndpoint = androidToUsbEndpoint,
-                        rawApdu = apdu,
+                        usbToAndroidEndpoint = usbToAndroidEndpoint,
                     )
+                timeoutJob.cancel()
 
-                    val apduResponse =
-                        receiveApdu(
-                            usbConnection = usbConnection,
-                            usbToAndroidEndpoint = usbToAndroidEndpoint,
-                        )
-                    timeoutJob.cancel()
-
-                    if (apduResponse.isEmpty()) {
-                        return@withContext SendApduResult.Failure(reason = SendApduFailureReason.EmptyResponse)
-                    }
-
-                    return@withContext SendApduResult.Success(apdu = apduResponse)
-                } finally {
-                    usbConnection.releaseInterface(usbInterface)
-                    usbConnection.close()
+                if (apduResponse.isEmpty()) {
+                    return@withContext SendApduResult.Failure(reason = SendApduFailureReason.EmptyResponse)
                 }
+
+                return@withContext SendApduResult.Success(apdu = apduResponse)
             }
         } catch (e: SendApduTimeoutException) {
             loggerService.log(
@@ -132,8 +130,8 @@ internal class AndroidUsbApduSender(
     private fun receiveApdu(
         usbConnection: UsbDeviceConnection,
         usbToAndroidEndpoint: UsbEndpoint,
-    ): ByteArray =
-        if (!request.initialize(usbConnection, usbToAndroidEndpoint)) {
+    ): ByteArray {
+        return if (!request.initialize(usbConnection, usbToAndroidEndpoint)) {
             request.close()
             byteArrayOf()
         } else {
@@ -154,6 +152,7 @@ internal class AndroidUsbApduSender(
             }
             framerService.deserialize(mtu = USB_MTU, frames)
         }
+    }
 
     private fun UsbInterface.firstEndpointOrThrow(predicate: (Int) -> Boolean): UsbEndpoint {
         for (endp in 0..this.endpointCount) {
@@ -169,7 +168,7 @@ internal class AndroidUsbApduSender(
     private fun generateChannelId(): ByteArray =
         Random.nextInt(0, until = Int.MAX_VALUE).to2BytesArray()
 
-    private data object SendApduTimeoutException: Exception() {
+    private data object SendApduTimeoutException : Exception() {
         private fun readResolve(): Any = SendApduTimeoutException
     }
 }

package/android/src/main/kotlin/com/ledger/devicesdk/shared/androidMainInternal/transport/deviceconnection/DeviceConnectionStateMachine.kt

@@ -2,9 +2,9 @@ package com.ledger.devicesdk.shared.androidMainInternal.transport.deviceconnecti
 
 import com.ledger.devicesdk.shared.api.apdu.SendApduFailureReason
 import com.ledger.devicesdk.shared.api.apdu.SendApduResult
+import com.ledger.devicesdk.shared.api.utils.fromHexStringToBytesOrThrow
 import com.ledger.devicesdk.shared.internal.service.logger.LoggerService
 import com.ledger.devicesdk.shared.internal.service.logger.buildSimpleDebugLogInfo
-import com.ledger.devicesdk.shared.internal.service.logger.buildSimpleInfoLogInfo
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Job
@@ -26,12 +26,31 @@ internal class DeviceConnectionStateMachine(
     fun getState() = state
 
     private fun pushState(newState: State) {
+
+        val currentState = state
+
+        /* STATE EXIT EFFECTS */
+        if (newState != currentState) {
+            when (currentState) {
+                is State.WaitingForDisconnection -> {
+                    currentState.requestContent.resultCallback(currentState.result)
+                }
+                else -> {}
+            }
+        }
+
+        /* STATE ENTRY EFFECTS */
         when (newState) {
             is State.Connected -> {}
             is State.SendingApdu -> {
                 sendApduFn(newState.requestContent.apdu, newState.requestContent.abortTimeoutDuration)
             }
 
+            is State.WaitingForDisconnection -> {
+                // TODO: send getAppAndVersion
+                sendApduFn ("b0010000".fromHexStringToBytesOrThrow(), Duration.INFINITE)
+            }
+
             is State.WaitingForReconnection -> {
                 startReconnectionTimeout()
             }
@@ -42,11 +61,16 @@ internal class DeviceConnectionStateMachine(
             }
         }
         this.state = newState
+        loggerService.log(buildSimpleDebugLogInfo("DeviceConnectionStateMachine", "-> New state: $newState"))
     }
 
     private fun handleEvent(event: Event) {
-        val currentState = state
-        when (currentState) {
+        val logMessage = """
+            -> Event received: $event
+               In state: $state
+        """.trimIndent()
+        loggerService.log(buildSimpleDebugLogInfo("DeviceConnectionStateMachine", logMessage))
+        when (val currentState = state) {
             is State.Connected -> {
                 when (event) {
                     is Event.SendApduRequested -> {
@@ -71,31 +95,27 @@ internal class DeviceConnectionStateMachine(
                 when (event) {
                     is Event.ApduResultReceived -> {
                         when (event.result) {
-                            is SendApduResult.Failure -> {
-                                if (isFatalSendApduFailure(event.result)) {
-                                    pushState(State.Terminated)
+                            is SendApduResult.Success -> {
+                                // check if last 2 bytes of APDU are [0x90,OxO0]
+                                val apdu = event.result.apdu
+
+
+                                if (isSuccessApdu(apdu) && currentState.requestContent.triggersDisconnection) {
+                                    pushState(State.WaitingForDisconnection(requestContent = currentState.requestContent, result = event.result))
                                 } else {
                                     pushState(State.Connected)
+                                    currentState.requestContent.resultCallback(event.result)
                                 }
                             }
-
-                            is SendApduResult.Success -> {
-                                // check if last 2 bytes of APDU are [0x90,OxO0]
-                                val apdu = event.result.apdu
-                                val apduSize = apdu.size
-                                val isSuccessApdu =
-                                    apdu.size >= 2 &&
-                                            apdu[apduSize - 2] == 0x90.toByte() &&
-                                            apdu[apduSize - 1] == 0x00.toByte()
-
-                                if (isSuccessApdu && currentState.requestContent.triggersDisconnection) {
-                                    pushState(State.WaitingForReconnection)
+                            is SendApduResult.Failure -> {
+                                if (isFatalSendApduFailure(event.result)) {
+                                    pushState(State.Terminated)
                                 } else {
                                     pushState(State.Connected)
                                 }
+                                currentState.requestContent.resultCallback(event.result)
                             }
                         }
-                        currentState.requestContent.resultCallback(event.result)
                     }
 
                     is Event.CloseConnectionRequested -> {
@@ -130,6 +150,42 @@ internal class DeviceConnectionStateMachine(
                 }
             }
 
+            is State.WaitingForDisconnection -> {
+                when (event) {
+                    is Event.ApduResultReceived -> {
+                        when (event.result) {
+                            is SendApduResult.Success -> {
+                                val apdu = event.result.apdu
+                                if (isSendApduBusyError(apdu)) {
+                                    pushState(state) // Loop on same state, will trigger a new send of GetAppAndVersion (entry effect)
+                                } else {
+                                    pushState(State.Connected)
+                                }
+                            }
+                            is SendApduResult.Failure -> {
+                                pushState(State.WaitingForReconnection)
+                            }
+                        }
+                    }
+                    is Event.SendApduRequested -> {
+                        event.requestContent.resultCallback(
+                            SendApduResult.Failure(
+                                SendApduFailureReason.DeviceBusy
+                            )
+                        )
+                    }
+                    is Event.DeviceDisconnected -> {
+                        pushState(State.WaitingForReconnection)
+                    }
+                    is Event.CloseConnectionRequested -> {
+                        pushState(State.Terminated)
+                    }
+                    else -> {
+                        onError(Exception("Unhandled event: $event in state: $currentState"))
+                    }
+                }
+            }
+
             is State.WaitingForReconnection -> {
                 when (event) {
                     is Event.DeviceConnected -> {
@@ -234,13 +290,24 @@ internal class DeviceConnectionStateMachine(
                 onError(Exception("Unhandled event: $event in state: $currentState"))
             }
         }
-        val logMessage = """
-            Received event:
-            In state:       $currentState
-            -> Event:       $event
-            -> New state:   $state
-        """.trimIndent()
-        loggerService.log(buildSimpleDebugLogInfo("DeviceConnectionStateMachine", logMessage))
+    }
+
+    private fun  isSuccessApdu(apdu: ByteArray): Boolean {
+        val apduSize = apdu.size
+        return apduSize >= 2 &&
+                apdu[apduSize - 2] == 0x90.toByte() &&
+                apdu[apduSize - 1] == 0x00.toByte()
+    }
+
+    private fun isSendApduBusyError(apdu: ByteArray): Boolean {
+        val apduSize = apdu.size
+        return apduSize >= 2 &&
+                apdu[apduSize - 2] == 0x66.toByte() &&
+                apdu[apduSize - 1] == 0x01.toByte()
+    }
+
+    private fun sendGetAppAndVersionApdu() {
+        sendApduFn("b0010000".fromHexStringToBytesOrThrow(), Duration.INFINITE)
     }
 
     private var timeoutJob: Job? = null
@@ -257,23 +324,23 @@ internal class DeviceConnectionStateMachine(
         timeoutJob = null
     }
 
-    public fun requestSendApdu(requestContent: SendApduRequestContent) {
+    fun requestSendApdu(requestContent: SendApduRequestContent) {
         handleEvent(Event.SendApduRequested(requestContent))
     }
 
-    public fun requestCloseConnection() {
+    fun requestCloseConnection() {
         handleEvent(Event.CloseConnectionRequested)
     }
 
-    public fun handleApduResult(result: SendApduResult) {
+    fun handleApduResult(result: SendApduResult) {
         handleEvent(Event.ApduResultReceived(result))
     }
 
-    public fun handleDeviceConnected() {
+    fun handleDeviceConnected() {
         handleEvent(Event.DeviceConnected)
     }
 
-    public fun handleDeviceDisconnected() {
+    fun handleDeviceDisconnected() {
         handleEvent(Event.DeviceDisconnected)
     }
 
@@ -307,6 +374,8 @@ internal class DeviceConnectionStateMachine(
 
         data object WaitingForReconnection : State()
 
+        data class WaitingForDisconnection(val requestContent: SendApduRequestContent, val result: SendApduResult): State()
+
         data class WaitingForReconnectionWithQueuedApdu(val requestContent: SendApduRequestContent) :
             State()
 

package/android/src/test/kotlin/com/ledger/devicesdk/shared/androidMainInternal/transport/deviceconnection/DeviceConnectionStateMachineTest.kt

@@ -2,6 +2,7 @@ package com.ledger.devicesdk.shared.androidMainInternal.transport.deviceconnecti
 
 import com.ledger.devicesdk.shared.api.apdu.SendApduFailureReason
 import com.ledger.devicesdk.shared.api.apdu.SendApduResult
+import com.ledger.devicesdk.shared.api.utils.fromHexStringToBytesOrThrow
 import com.ledger.devicesdk.shared.internal.service.logger.LogInfo
 import com.ledger.devicesdk.shared.internal.service.logger.LoggerService
 import kotlinx.coroutines.ExperimentalCoroutinesApi
@@ -12,6 +13,7 @@ import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 import kotlin.test.Test
 import org.junit.Assert.*
+import kotlin.test.assertIs
 import kotlin.time.Duration.Companion.milliseconds
 
 @OptIn(ExperimentalCoroutinesApi::class)
@@ -88,7 +90,7 @@ class DeviceConnectionStateMachineTest {
             stateMachine.handleApduResult(mockedFailureResult)
 
             // Then
-            assertEquals(sendApduResult, mockedFailureResult)
+            assertEquals(mockedFailureResult, sendApduResult)
             assertTrue(terminated)
             assertNull(error)
         }
@@ -134,14 +136,13 @@ class DeviceConnectionStateMachineTest {
         }
 
     @Test
-    fun `GIVEN the device connection state machine WHEN an APDU with triggersDisconnection is sent THEN the machine moves to WaitingForReconnection and recovers when device reconnects`() =
+    fun `GIVEN the device connection state machine WHEN an APDU with triggersDisconnection is sent and triggers a disconnection THEN the machine moves to WaitingForReconnection and recovers when device reconnects`() =
         runTest {
             var sendApduCalled: ByteArray? = null
             var sendApduResult: SendApduResult? = null
             var terminated = false
             var error: Throwable? = null
 
-            val dispatcher = StandardTestDispatcher(testScheduler)
             val stateMachine = DeviceConnectionStateMachine(
                 sendApduFn = { apdu, _ -> sendApduCalled = apdu },
                 onTerminated = { terminated = true },
@@ -167,6 +168,10 @@ class DeviceConnectionStateMachineTest {
             val mockedSuccessApduResult = SendApduResult.Success(mockedResultApduSuccessA)
             stateMachine.handleApduResult(mockedSuccessApduResult)
 
+            assertNull(sendApduResult)
+            // Simulate a disconnection
+            stateMachine.handleDeviceDisconnected()
+
             // Result should have been returned
             assertEquals(mockedSuccessApduResult, sendApduResult)
 
@@ -203,7 +208,118 @@ class DeviceConnectionStateMachineTest {
         }
 
     @Test
-    fun `GIVEN the device connection state machine WHEN an APDU with triggersDisconnection is sent THEN the machine moves to WaitingForReconnection and the next APDU is queued until reconnection`() =
+    fun `GIVEN the device connection state machine WHEN an APDU with triggersDisconnection is sent and device does not disconnect THEN the machine moves to Connected`() =
+        runTest {
+            var sendApduCalled: ByteArray? = null
+            var sendApduResult: SendApduResult? = null
+            var terminated = false
+            var error: Throwable? = null
+
+            val stateMachine = DeviceConnectionStateMachine(
+                sendApduFn = { apdu, _ -> sendApduCalled = apdu },
+                onTerminated = { terminated = true },
+                isFatalSendApduFailure = { false },
+                reconnectionTimeoutDuration = reconnectionTimeout,
+                onError = { error = it },
+                loggerService = FakeLoggerService(),
+                coroutineDispatcher = StandardTestDispatcher(testScheduler)
+            )
+
+            // Request sending an APDU (with triggersDisconnection = true)
+            stateMachine.requestSendApdu(DeviceConnectionStateMachine.SendApduRequestContent(
+                apdu = mockedRequestApduA,
+                triggersDisconnection = true,
+                resultCallback = { result -> sendApduResult = result },
+                abortTimeoutDuration = Duration.INFINITE
+            ))
+
+            // Send APDU should have been called
+            assertArrayEquals(mockedRequestApduA, sendApduCalled)
+
+            // Simulate a successful response
+            val mockedSuccessApduResult = SendApduResult.Success(mockedResultApduSuccessA)
+            stateMachine.handleApduResult(mockedSuccessApduResult)
+
+            assertNull(sendApduResult)
+
+            // Simulate Response from GetAppAndVersion
+            val mockedSuccessApduResultGetAppAndVersion = SendApduResult.Success(mockedGetAppAndVersionSuccessfulResponse)
+            stateMachine.handleApduResult(mockedSuccessApduResultGetAppAndVersion)
+
+            // Should be in Connected state
+            assertEquals(
+                DeviceConnectionStateMachine.State.Connected,
+                stateMachine.getState()
+            )
+
+            // Response should have been returned
+            assertEquals(mockedSuccessApduResult, sendApduResult)
+        }
+
+    @Test
+    fun `GIVEN the device connection state machine WHEN an APDU with triggersDisconnection is sent and device does not disconnect but is first busy THEN the machine retries and moves to Connected`() =
+        runTest {
+            var sendApduCalled: ByteArray? = null
+            var sendApduResult: SendApduResult? = null
+            var terminated = false
+            var error: Throwable? = null
+
+            val stateMachine = DeviceConnectionStateMachine(
+                sendApduFn = { apdu, _ -> sendApduCalled = apdu },
+                onTerminated = { terminated = true },
+                isFatalSendApduFailure = { false },
+                reconnectionTimeoutDuration = reconnectionTimeout,
+                onError = { error = it },
+                loggerService = FakeLoggerService(),
+                coroutineDispatcher = StandardTestDispatcher(testScheduler)
+            )
+
+            // Request sending an APDU (with triggersDisconnection = true)
+            stateMachine.requestSendApdu(DeviceConnectionStateMachine.SendApduRequestContent(
+                apdu = mockedRequestApduA,
+                triggersDisconnection = true,
+                resultCallback = { result -> sendApduResult = result },
+                abortTimeoutDuration = Duration.INFINITE
+            ))
+
+            // Send APDU should have been called
+            assertArrayEquals(mockedRequestApduA, sendApduCalled)
+
+            // Simulate a successful response
+            val mockedSuccessApduResult = SendApduResult.Success(mockedResultApduSuccessA)
+            stateMachine.handleApduResult(mockedSuccessApduResult)
+
+            assertNull(sendApduResult)
+
+            assertIs<DeviceConnectionStateMachine.State.WaitingForDisconnection>(
+                stateMachine.getState()
+            )
+
+            // Simulate Busy Response from GetAppAndVersion
+            val mockedBusyApduResultGetAppAndVersion = SendApduResult.Success(mockedGetAppAndVersionBusyResponse)
+            stateMachine.handleApduResult(mockedBusyApduResultGetAppAndVersion)
+
+            assertIs<DeviceConnectionStateMachine.State.WaitingForDisconnection>(
+                stateMachine.getState()
+            )
+
+            // Simulate Successful Response from GetAppAndVersion
+            val mockedSuccessApduResultGetAppAndVersion = SendApduResult.Success(mockedGetAppAndVersionSuccessfulResponse)
+            stateMachine.handleApduResult(mockedSuccessApduResultGetAppAndVersion)
+
+            // Should be in Connected state
+            assertEquals(
+                DeviceConnectionStateMachine.State.Connected,
+                stateMachine.getState()
+            )
+
+            // Response should have been returned
+            assertEquals(mockedSuccessApduResult, sendApduResult)
+        }
+
+
+    @Test
+    fun `GIVEN the device connection state machine WHEN an APDU with triggersDisconnection is sent and triggers a disconnection THEN the machine moves to WaitingForReconnection and the next APDU is queued until reconnection`() =
         runTest {
             val sendApduCalled: MutableList<ByteArray> = mutableListOf()
             var terminated = false
@@ -231,10 +347,19 @@ class DeviceConnectionStateMachineTest {
             val mockedSuccessApduResult = SendApduResult.Success(mockedResultApduSuccessA)
             stateMachine.handleApduResult(mockedSuccessApduResult)
 
-            // sendApduFn should have been called once
-            assertEquals(1, sendApduCalled.size)
+            // sendApduFn should have been called twice (for the mockedRequestApduA and an extra call for the getAppAndVersion APDU)
+            assertEquals(2, sendApduCalled.size)
+
+            // Should be in WaitingForDisconnection state
+            assertIs<DeviceConnectionStateMachine.State.WaitingForDisconnection>(
+                stateMachine.getState()
+            )
+
+            // Simulate disconnection
+            stateMachine.handleDeviceDisconnected()
+
+            // Should be in WaitingForReconnection state
 
-            // Should be in waiting state
             assertEquals(
                 DeviceConnectionStateMachine.State.WaitingForReconnection,
                 stateMachine.getState()
@@ -256,7 +381,7 @@ class DeviceConnectionStateMachineTest {
             )
 
             // sendApduFn should not have been called one more time
-            assertEquals(1, sendApduCalled.size)
+            assertEquals(2, sendApduCalled.size)
 
             // Simulate reconnection
             stateMachine.handleDeviceConnected()
@@ -267,9 +392,9 @@ class DeviceConnectionStateMachineTest {
                 stateMachine.getState()::class
             )
 
-            // Send APDU should have been called a second time, and the result should have been returned
-            assertEquals(2, sendApduCalled.size)
-            assertArrayEquals(mockedRequestApduB, sendApduCalled[1])
+            // Send APDU should have been called a 3rd time, and the result should have been returned
+            assertEquals(3, sendApduCalled.size)
+            assertArrayEquals(mockedRequestApduB, sendApduCalled[2])
 
             // Simulate a successful response
             val mockedSuccessApduResultB = SendApduResult.Success(mockedResultApduSuccessB)
@@ -721,9 +846,11 @@ class DeviceConnectionStateMachineTest {
         }
 
         val reconnectionTimeout: Duration = 5.seconds
-        val mockedRequestApduA: ByteArray = byteArrayOf(0x01, 0x02)
-        val mockedRequestApduB: ByteArray = byteArrayOf(0x03, 0x04)
-        val mockedResultApduSuccessA: ByteArray = byteArrayOf(0x05, 0x06, 0x90.toByte(), 0x00)
-        val mockedResultApduSuccessB: ByteArray = byteArrayOf(0x07, 0x08, 0x90.toByte(), 0x00)
+        val mockedRequestApduA: ByteArray = "1234".fromHexStringToBytesOrThrow()
+        val mockedRequestApduB: ByteArray = "5678".fromHexStringToBytesOrThrow()
+        val mockedGetAppAndVersionSuccessfulResponse: ByteArray = "12349000".fromHexStringToBytesOrThrow()
+        val mockedGetAppAndVersionBusyResponse: ByteArray = "12346601".fromHexStringToBytesOrThrow()
+        val mockedResultApduSuccessA: ByteArray = "56789000".fromHexStringToBytesOrThrow()
+        val mockedResultApduSuccessB: ByteArray = "abcd9000".fromHexStringToBytesOrThrow()
     }
 }