@ledgerhq/device-transport-kit-react-native-hid 0.0.0-rn-hid-fixed-device-id-20250521115949 → 0.0.0-rn-hid-improvements-20250522101701

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

@@ -172,6 +172,10 @@ class TransportHidModule(
     @ReactMethod()
     fun connectDevice(uid: String, promise: Promise) {
         val device = discoveryDevices.firstOrNull { it.uid == uid }
+        if (device == null) {
+            promise.reject(Exception("[TransportHidModule][connectDevice] Device not found"))
+            return
+        }
 
         coroutineScope.launch {
             try {

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

@@ -17,7 +17,6 @@ import com.ledger.devicesdk.shared.androidMain.transport.usb.utils.toLedgerUsbDe
 import com.ledger.devicesdk.shared.androidMain.transport.usb.utils.toScannedDevice
 import com.ledger.devicesdk.shared.androidMain.transport.usb.utils.toUsbDevices
 import com.ledger.devicesdk.shared.androidMainInternal.transport.deviceconnection.DeviceConnection
-import com.ledger.devicesdk.shared.api.discovery.ConnectivityType
 import com.ledger.devicesdk.shared.api.discovery.DiscoveryDevice
 import com.ledger.devicesdk.shared.internal.connection.InternalConnectedDevice
 import com.ledger.devicesdk.shared.internal.connection.InternalConnectionResult
@@ -124,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()
                     }
                 }
             }
@@ -274,7 +274,7 @@ internal class DefaultAndroidUsbTransport(
         }
     }
 
-    override suspend fun connect(discoveryDevice: DiscoveryDevice?): InternalConnectionResult {
+    override suspend fun connect(discoveryDevice: DiscoveryDevice): InternalConnectionResult {
 
         loggerService.log(
             buildSimpleDebugLogInfo(
@@ -286,13 +286,13 @@ internal class DefaultAndroidUsbTransport(
         val usbDevices = usbManager.deviceList.values
 
         var usbDevice: UsbDevice? =
-            usbDevices.firstOrNull { it.deviceId == discoveryDevice?.uid?.toInt() }
+            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() != null }
+                usbDevices.firstOrNull { it.toLedgerUsbDevice()?.ledgerDevice == discoveryDevice.ledgerDevice }
         } else {
             loggerService.log(buildSimpleDebugLogInfo("AndroidUsbTransport", "[connect] Found device with matching id"))
         }
@@ -326,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))
@@ -340,9 +341,9 @@ internal class DefaultAndroidUsbTransport(
             val connectedDevice =
                 InternalConnectedDevice(
                     sessionId,
-                    ledgerUsbDevice.name,
-                    ledgerUsbDevice.ledgerDevice,
-                    ConnectivityType.Usb,
+                    discoveryDevice.name,
+                    discoveryDevice.ledgerDevice,
+                    discoveryDevice.connectivityType,
                     sendApduFn = { apdu: ByteArray, triggersDisconnection: Boolean, abortTimeoutDuration: Duration ->
                         deviceConnection.requestSendApdu(apdu, triggersDisconnection, abortTimeoutDuration)
                     }

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/internal/transport/Transport.kt

@@ -14,7 +14,8 @@ internal interface Transport {
 
     fun stopScan()
 
-    suspend fun connect(discoveryDevice: DiscoveryDevice?): InternalConnectionResult
+    // TODO change by Flow<ConnectedDeviceState> or add observe device connection for listening device state flow through?
+    suspend fun connect(discoveryDevice: DiscoveryDevice): InternalConnectionResult
 
     suspend fun disconnect(deviceId: String)
 }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@ledgerhq/device-transport-kit-react-native-hid",
-  "version": "0.0.0-rn-hid-fixed-device-id-20250521115949",
+  "version": "0.0.0-rn-hid-improvements-20250522101701",
   "license": "Apache-2.0",
   "private": false,
   "react-native": "src/index.ts",
@@ -35,17 +35,17 @@
     "@types/uuid": "^10.0.0",
     "react-native": "0.76.6",
     "rxjs": "^7.8.2",
-    "@ledgerhq/device-management-kit": "0.0.0-rn-hid-fixed-device-id-20250521115949",
+    "@ledgerhq/device-management-kit": "0.0.0-rn-hid-improvements-20250522101701",
     "@ledgerhq/eslint-config-dsdk": "0.0.2",
     "@ledgerhq/ldmk-tool": "0.0.1",
     "@ledgerhq/prettier-config-dsdk": "0.0.2",
-    "@ledgerhq/tsconfig-dsdk": "1.0.1",
-    "@ledgerhq/vitest-config-dmk": "0.0.0"
+    "@ledgerhq/vitest-config-dmk": "0.0.0",
+    "@ledgerhq/tsconfig-dsdk": "1.0.1"
   },
   "peerDependencies": {
     "react-native": ">0.74.1",
     "rxjs": "^7.8.2",
-    "@ledgerhq/device-management-kit": "0.0.0-rn-hid-fixed-device-id-20250521115949"
+    "@ledgerhq/device-management-kit": "0.0.0-rn-hid-improvements-20250522101701"
   },
   "scripts": {
     "prebuild": "rimraf lib",