@ledgerhq/device-transport-kit-react-native-hid 0.0.0-fix-rn-ble-20250502082216 → 0.0.0-hid-candidate-20250523130730

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

@@ -31,6 +31,7 @@ import kotlinx.coroutines.flow.onEach
 import kotlinx.coroutines.launch
 import timber.log.Timber
 import kotlin.random.Random
+import kotlin.time.Duration
 import kotlin.time.Duration.Companion.milliseconds
 
 class TransportHidModule(
@@ -206,7 +207,13 @@ class TransportHidModule(
     }
 
     @ReactMethod
-    fun sendApdu(sessionId: String, apduBase64: String, promise: Promise) {
+    fun sendApdu(
+        sessionId: String,
+        apduBase64: String,
+        triggersDisconnection: Boolean,
+        abortTimeout: Int,
+        promise: Promise
+    ) {
         try {
             val device = connectedDevices.firstOrNull() { it.id == sessionId }
             if (device == null) {
@@ -216,7 +223,9 @@ class TransportHidModule(
             coroutineScope.launch {
                 try {
                     val apdu: ByteArray = Base64.decode(apduBase64, Base64.DEFAULT)
-                    val res = device.sendApduFn(apdu)
+                    val abortTimeoutDuration = if (abortTimeout <= 0) Duration.INFINITE else abortTimeout.milliseconds
+                    val res =
+                        device.sendApduFn(apdu, triggersDisconnection, abortTimeoutDuration)
                     promise.resolve(res.toWritableMap())
                 } catch (e: Exception) {
                     Timber.i("$e, ${e.cause}")

package/android/src/main/kotlin/com/ledger/androidtransporthid/bridge/serialization.kt

@@ -103,6 +103,8 @@ internal fun SendApduResult.toWritableMap(): WritableMap {
                     SendApduFailureReason.NoUsbEndpointFound -> "NoUsbEndpointFound"
                     SendApduFailureReason.DeviceDisconnected -> "DeviceDisconnected"
                     SendApduFailureReason.Unknown -> "Unknown"
+                    SendApduFailureReason.AbortTimeout -> "SendApduTimeout"
+                    SendApduFailureReason.EmptyResponse -> "EmptyResponse"
                 })
             }
         }

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

@@ -97,31 +97,57 @@ internal class DefaultAndroidUsbTransport(
     override fun updateUsbState(state: UsbState) {
         when (state) {
             is UsbState.Detached -> {
-                loggerService.log(buildSimpleDebugLogInfo("AndroidUsbTransport", "Detached deviceId=${state.ledgerUsbDevice.uid}"))
+                loggerService.log(
+                    buildSimpleDebugLogInfo(
+                        "AndroidUsbTransport",
+                        "Detached deviceId=${state.ledgerUsbDevice.uid}"
+                    )
+                )
                 usbConnections.entries.find {
                     it.value.getApduSender().dependencies.ledgerUsbDevice.uid == state.ledgerUsbDevice.uid
                 }.let { item ->
                     scope.launch {
                         if (item == null) {
-                            loggerService.log(buildSimpleWarningLogInfo("AndroidUsbTransport", "No connection found"))
+                            loggerService.log(
+                                buildSimpleWarningLogInfo(
+                                    "AndroidUsbTransport",
+                                    "No connection found"
+                                )
+                            )
                             return@launch
                         }
                         val (key, deviceConnection) = item
-                        loggerService.log(buildSimpleInfoLogInfo("AndroidUsbTransport", "Device disconnected (sessionId=${deviceConnection.sessionId})"))
-                        deviceConnection.handleDeviceDisconnected()
+                        loggerService.log(
+                            buildSimpleInfoLogInfo(
+                                "AndroidUsbTransport",
+                                "Device disconnected (sessionId=${deviceConnection.sessionId})"
+                            )
+                        )
                         usbConnections.remove(key)
                         usbConnectionsPendingReconnection.add(deviceConnection)
+                        deviceConnection.handleDeviceDisconnected()
+                        (deviceConnection.getApduSender() as AndroidUsbApduSender).release()
                     }
                 }
             }
 
             is UsbState.Attached -> {
-                loggerService.log(buildSimpleDebugLogInfo("AndroidUsbTransport", "Attached deviceId=${state.ledgerUsbDevice.uid}, pendingReconnections=${usbConnectionsPendingReconnection}"))
+                loggerService.log(
+                    buildSimpleDebugLogInfo(
+                        "AndroidUsbTransport",
+                        "Attached deviceId=${state.ledgerUsbDevice.uid}, pendingReconnections=${usbConnectionsPendingReconnection}"
+                    )
+                )
                 val usbDevice = usbManager.deviceList.values.firstOrNull {
                     it.toLedgerUsbDevice()?.uid == state.ledgerUsbDevice.uid
                 }
                 if (usbDevice == null) {
-                    loggerService.log(buildSimpleWarningLogInfo("AndroidUsbTransport", "No UsbDevice found"))
+                    loggerService.log(
+                        buildSimpleWarningLogInfo(
+                            "AndroidUsbTransport",
+                            "No UsbDevice found"
+                        )
+                    )
                     return
                 }
                 usbConnectionsPendingReconnection.firstOrNull {
@@ -138,14 +164,29 @@ internal class DefaultAndroidUsbTransport(
                             )
                             return@launch
                         }
-                        loggerService.log(buildSimpleDebugLogInfo("AndroidUsbTransport", "Found matching device connection $deviceConnection"))
+                        loggerService.log(
+                            buildSimpleDebugLogInfo(
+                                "AndroidUsbTransport",
+                                "Found matching device connection $deviceConnection"
+                            )
+                        )
 
                         val permissionResult = checkOrRequestPermission(usbDevice)
                         if (permissionResult is PermissionResult.Denied) {
-                            loggerService.log(buildSimpleDebugLogInfo("AndroidUsbTransport", "Permission denied"))
+                            loggerService.log(
+                                buildSimpleDebugLogInfo(
+                                    "AndroidUsbTransport",
+                                    "Permission denied"
+                                )
+                            )
                             return@launch
                         }
-                        loggerService.log(buildSimpleInfoLogInfo("AndroidUsbTransport", "Reconnecting device (sessionId=${deviceConnection.sessionId})"))
+                        loggerService.log(
+                            buildSimpleInfoLogInfo(
+                                "AndroidUsbTransport",
+                                "Reconnecting device (sessionId=${deviceConnection.sessionId})"
+                            )
+                        )
                         deviceConnection.handleDeviceConnected(
                             AndroidUsbApduSender(
                                 dependencies = AndroidUsbApduSender.Dependencies(
@@ -195,7 +236,12 @@ internal class DefaultAndroidUsbTransport(
             device = usbDevice,
         )
 
-        loggerService.log(buildSimpleDebugLogInfo("AndroidUsbTransport", "Waiting for permission result"))
+        loggerService.log(
+            buildSimpleDebugLogInfo(
+                "AndroidUsbTransport",
+                "Waiting for permission result"
+            )
+        )
 
         val result = eventsFlow.first {
             it is UsbPermissionEvent.PermissionGranted ||
@@ -229,12 +275,33 @@ internal class DefaultAndroidUsbTransport(
     }
 
     override suspend fun connect(discoveryDevice: DiscoveryDevice): InternalConnectionResult {
-        val usbDevice: UsbDevice? =
-            usbManager.deviceList.values.firstOrNull { it.deviceId == discoveryDevice.uid.toInt() }
+
+        loggerService.log(
+            buildSimpleDebugLogInfo(
+                "AndroidUsbTransport",
+                "[connect] discoveryDevice=$discoveryDevice"
+            )
+        )
+
+        val usbDevices = usbManager.deviceList.values
+
+        var usbDevice: UsbDevice? =
+            usbDevices.firstOrNull { it.deviceId == discoveryDevice.uid.toInt() }
+
+        if (usbDevice == null) {
+            // This is useful for LL during the OS update
+            loggerService.log(buildSimpleDebugLogInfo("AndroidUsbTransport", "[connect] No device found with matching id, looking for device with matching model"))
+            usbDevice =
+                usbDevices.firstOrNull { it.toLedgerUsbDevice()?.ledgerDevice == discoveryDevice.ledgerDevice }
+        } else {
+            loggerService.log(buildSimpleDebugLogInfo("AndroidUsbTransport", "[connect] Found device with matching id"))
+        }
 
         val ledgerUsbDevice = usbDevice?.toLedgerUsbDevice()
 
         return if (usbDevice == null || ledgerUsbDevice == null) {
+            loggerService.log(
+                buildSimpleDebugLogInfo("AndroidUsbTransport", "[connect] No device found"))
             InternalConnectionResult.ConnectionError(error = InternalConnectionResult.Failure.DeviceNotFound)
         } else {
             val permissionResult = checkOrRequestPermission(usbDevice)
@@ -259,9 +326,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))
@@ -276,7 +344,9 @@ internal class DefaultAndroidUsbTransport(
                     discoveryDevice.name,
                     discoveryDevice.ledgerDevice,
                     discoveryDevice.connectivityType,
-                    sendApduFn = { apdu -> deviceConnection.requestSendApdu(apdu) },
+                    sendApduFn = { apdu: ByteArray, triggersDisconnection: Boolean, abortTimeoutDuration: Duration ->
+                        deviceConnection.requestSendApdu(apdu, triggersDisconnection, abortTimeoutDuration)
+                    }
                 )
 
             usbConnections[sessionId] = deviceConnection

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

@@ -13,21 +13,21 @@ import android.hardware.usb.UsbInterface
 import android.hardware.usb.UsbManager
 import android.hardware.usb.UsbRequest
 import com.ledger.devicesdk.shared.androidMain.transport.usb.model.LedgerUsbDevice
+import com.ledger.devicesdk.shared.androidMainInternal.transport.USB_MTU
+import com.ledger.devicesdk.shared.androidMainInternal.transport.deviceconnection.DeviceApduSender
 import com.ledger.devicesdk.shared.api.apdu.SendApduFailureReason
 import com.ledger.devicesdk.shared.api.apdu.SendApduResult
-import com.ledger.devicesdk.shared.androidMainInternal.transport.deviceconnection.DeviceApduSender
-import com.ledger.devicesdk.shared.api.utils.toHexadecimalString
-import com.ledger.devicesdk.shared.androidMainInternal.transport.USB_MTU
 import com.ledger.devicesdk.shared.internal.service.logger.LoggerService
 import com.ledger.devicesdk.shared.internal.service.logger.buildSimpleErrorLogInfo
-import com.ledger.devicesdk.shared.internal.service.logger.buildSimpleInfoLogInfo
 import com.ledger.devicesdk.shared.internal.transport.framer.FramerService
 import com.ledger.devicesdk.shared.internal.transport.framer.to2BytesArray
-import java.nio.ByteBuffer
-import kotlin.random.Random
 import kotlinx.coroutines.CoroutineDispatcher
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.launch
 import kotlinx.coroutines.withContext
-import timber.log.Timber
+import java.nio.ByteBuffer
+import kotlin.random.Random
+import kotlin.time.Duration
 
 private const val USB_TIMEOUT = 500
 
@@ -35,44 +35,75 @@ 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,
     private val loggerService: LoggerService,
 ) : DeviceApduSender<AndroidUsbApduSender.Dependencies> {
-
     data class Dependencies(
         val usbDevice: UsbDevice,
         val ledgerUsbDevice: LedgerUsbDevice,
     )
 
-    override suspend fun send(apdu: ByteArray): SendApduResult =
+    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)
+                    throw SendApduTimeoutException
+                }
 
                 transmitApdu(
                     usbConnection = usbConnection,
                     androidToUsbEndpoint = androidToUsbEndpoint,
                     rawApdu = apdu,
                 )
+
                 val apduResponse =
                     receiveApdu(
                         usbConnection = usbConnection,
                         usbToAndroidEndpoint = usbToAndroidEndpoint,
                     )
+                timeoutJob.cancel()
 
-                usbConnection.releaseInterface(usbInterface)
-                usbConnection.close()
+                if (apduResponse.isEmpty()) {
+                    return@withContext SendApduResult.Failure(reason = SendApduFailureReason.EmptyResponse)
+                }
 
-                SendApduResult.Success(apdu = apduResponse)
+                return@withContext SendApduResult.Success(apdu = apduResponse)
             }
+        } catch (e: SendApduTimeoutException) {
+            loggerService.log(
+                buildSimpleErrorLogInfo(
+                    "AndroidUsbApduSender",
+                    "timeout in send: $e"
+                )
+            )
+            SendApduResult.Failure(reason = SendApduFailureReason.AbortTimeout)
         } catch (e: NoSuchElementException) {
+            loggerService.log(
+                buildSimpleErrorLogInfo(
+                    "AndroidUsbApduSender",
+                    "no endpoint found: $e"
+                )
+            )
             SendApduResult.Failure(reason = SendApduFailureReason.NoUsbEndpointFound)
         } catch (e: Exception) {
             loggerService.log(buildSimpleErrorLogInfo("AndroidUsbApduSender", "error in send: $e"))
@@ -84,22 +115,27 @@ internal class AndroidUsbApduSender(
         androidToUsbEndpoint: UsbEndpoint,
         rawApdu: ByteArray,
     ) {
-        framerService.serialize(mtu = USB_MTU, channelId = generateChannelId(), rawApdu = rawApdu).forEach { apduFrame ->
-            val buffer = apduFrame.toByteArray()
-            Timber.i("APDU sent = ${buffer.toHexadecimalString()}")
-            usbConnection.bulkTransfer(androidToUsbEndpoint, buffer, apduFrame.size(), USB_TIMEOUT)
-        }
+        framerService.serialize(mtu = USB_MTU, channelId = generateChannelId(), rawApdu = rawApdu)
+            .forEach { apduFrame ->
+                val buffer = apduFrame.toByteArray()
+                usbConnection.bulkTransfer(
+                    androidToUsbEndpoint,
+                    buffer,
+                    apduFrame.size(),
+                    USB_TIMEOUT
+                )
+            }
     }
 
     private fun receiveApdu(
         usbConnection: UsbDeviceConnection,
         usbToAndroidEndpoint: UsbEndpoint,
-    ): ByteArray =
-        if (!request.initialize(usbConnection, usbToAndroidEndpoint)) {
+    ): ByteArray {
+        return if (!request.initialize(usbConnection, usbToAndroidEndpoint)) {
             request.close()
             byteArrayOf()
         } else {
-            val frames = framerService.createApduFrames(mtu = USB_MTU, isUsbTransport = true){
+            val frames = framerService.createApduFrames(mtu = USB_MTU, isUsbTransport = true) {
                 val buffer = ByteArray(USB_MTU)
                 val responseBuffer = ByteBuffer.allocate(USB_MTU)
 
@@ -107,8 +143,7 @@ internal class AndroidUsbApduSender(
                 if (!queuingResult) {
                     request.close()
                     byteArrayOf()
-                }
-                else{
+                } else {
                     usbConnection.requestWait()
                     responseBuffer.rewind()
                     responseBuffer.get(buffer, 0, responseBuffer.remaining())
@@ -117,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) {
@@ -129,5 +165,10 @@ internal class AndroidUsbApduSender(
         throw NoSuchElementException("No endpoint matching the predicate")
     }
 
-    private fun generateChannelId(): ByteArray = Random.nextInt(0, until = Int.MAX_VALUE).to2BytesArray()
+    private fun generateChannelId(): ByteArray =
+        Random.nextInt(0, until = Int.MAX_VALUE).to2BytesArray()
+
+    private data object SendApduTimeoutException : Exception() {
+        private fun readResolve(): Any = SendApduTimeoutException
+    }
 }

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

@@ -6,8 +6,9 @@
 package com.ledger.devicesdk.shared.androidMainInternal.transport.deviceconnection
 
 import com.ledger.devicesdk.shared.api.apdu.SendApduResult
+import kotlin.time.Duration
 
 internal interface DeviceApduSender<Dependencies> {
-    suspend fun send(apdu: ByteArray): SendApduResult
+    suspend fun send(apdu: ByteArray, abortTimeoutDuration: Duration): SendApduResult
     val dependencies: Dependencies
 }

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

@@ -24,9 +24,9 @@ internal class DeviceConnection<Dependencies>(
 
     init {
         stateMachine = DeviceConnectionStateMachine(
-            sendApduFn = {
+            sendApduFn = { apdu, abortTimeoutDuration ->
                 coroutineScope.launch {
-                    val res = deviceApduSender.send(it)
+                    val res = deviceApduSender.send(apdu, abortTimeoutDuration)
                     handleApduResult(res)
                 }
             },
@@ -66,12 +66,13 @@ internal class DeviceConnection<Dependencies>(
         stateMachine.handleDeviceDisconnected()
     }
 
-    public suspend fun requestSendApdu(apdu: ByteArray): SendApduResult =
+    public suspend fun requestSendApdu(apdu: ByteArray, triggersDisconnection: Boolean, abortTimeoutDuration: Duration): SendApduResult =
         suspendCoroutine { cont ->
             stateMachine.requestSendApdu(
                 DeviceConnectionStateMachine.SendApduRequestContent(
                     apdu = apdu,
-                    triggersDisconnection = apduTriggersDisconnection(apdu),
+                    triggersDisconnection = apduTriggersDisconnection(apdu) || triggersDisconnection,
+                    abortTimeoutDuration = abortTimeoutDuration,
                     resultCallback = cont::resume
                 )
             )

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

@@ -12,7 +12,7 @@ import kotlinx.coroutines.launch
 import kotlin.time.Duration
 
 internal class DeviceConnectionStateMachine(
-    private val sendApduFn: (apdu: ByteArray) -> Unit,
+    private val sendApduFn: (apdu: ByteArray, abortTimeoutDuration: Duration) -> Unit,
     private val onTerminated: () -> Unit,
     private val isFatalSendApduFailure: (SendApduResult.Failure) -> Boolean,
     private val reconnectionTimeoutDuration: Duration,
@@ -29,7 +29,7 @@ internal class DeviceConnectionStateMachine(
         when (newState) {
             is State.Connected -> {}
             is State.SendingApdu -> {
-                sendApduFn(newState.requestContent.apdu)
+                sendApduFn(newState.requestContent.apdu, newState.requestContent.abortTimeoutDuration)
             }
 
             is State.WaitingForReconnection -> {
@@ -240,7 +240,7 @@ internal class DeviceConnectionStateMachine(
             -> Event:       $event
             -> New state:   $state
         """.trimIndent()
-        loggerService.log(buildSimpleDebugLogInfo("DeviceConnectionStateMachine", logMessage))
+        // loggerService.log(buildSimpleDebugLogInfo("DeviceConnectionStateMachine", logMessage))
     }
 
     private var timeoutJob: Job? = null
@@ -280,6 +280,7 @@ internal class DeviceConnectionStateMachine(
     data class SendApduRequestContent(
         val apdu: ByteArray,
         val triggersDisconnection: Boolean,
+        val abortTimeoutDuration: Duration,
         val resultCallback: (SendApduResult) -> Unit
     )
 

package/android/src/main/kotlin/com/ledger/devicesdk/shared/api/apdu/SendApduResult.kt

@@ -44,4 +44,8 @@ public sealed class SendApduFailureReason {
     public data object DeviceDisconnected : SendApduFailureReason()
 
     public data object Unknown : SendApduFailureReason()
+
+    public data object AbortTimeout : SendApduFailureReason()
+
+    public data object EmptyResponse : SendApduFailureReason()
 }

package/android/src/main/kotlin/com/ledger/devicesdk/shared/api/discovery/DiscoveryDevice.kt

@@ -8,7 +8,7 @@ package com.ledger.devicesdk.shared.api.discovery
 import com.ledger.devicesdk.shared.api.device.LedgerDevice
 import kotlinx.datetime.Clock
 
-public class DiscoveryDevice(
+public data class DiscoveryDevice(
     public val uid: String,
     public val name: String,
     public val ledgerDevice: LedgerDevice,

package/android/src/main/kotlin/com/ledger/devicesdk/shared/internal/connection/InternalConnectedDevice.kt

@@ -9,5 +9,5 @@ internal data class InternalConnectedDevice(
     val name: String,
     val ledgerDevice: LedgerDevice,
     val connectivity: ConnectivityType,
-    val sendApduFn: suspend (ByteArray) -> SendApduResult,
+    val sendApduFn: suspend (apdu: ByteArray, triggersDisconnection: Boolean, abortTimeoutDuration: kotlin.time.Duration) -> SendApduResult,
 )