@ledgerhq/device-transport-kit-react-native-hid 0.0.0-rn-hid-20250221115747 → 0.0.0-rnhid-transport-20250411151739

package/README.md

@@ -35,7 +35,7 @@ The transport itself is only compatible with Android devices but there is no add
 
 ### Pre-requisites
 
-To use this transport, ensure you have the Device Magement Kit installed in your project.
+To use this transport, ensure you have the Device Management Kit installed in your project.
 
 #### AndroidManifest.xml
 

package/android/build.gradle

@@ -93,7 +93,9 @@ dependencies {
     implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_stdlib_version"
     implementation "org.jetbrains.kotlinx:kotlinx-coroutines-core:$kotlin_coroutines_version"
     implementation "org.jetbrains.kotlinx:kotlinx-datetime:$kotlinx_datetime_version"
-    implementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlin_coroutines_test_version"
     implementation "com.jakewharton.timber:timber:$timber_version"
     implementation "com.ditchoom:buffer:$buffer_version"
+    testImplementation "org.jetbrains.kotlin:kotlin-test:$kotlin_version"
+    testImplementation "org.jetbrains.kotlinx:kotlinx-coroutines-test:$kotlin_coroutines_test_version"
+    testImplementation "junit:junit:4.13.2"
 }

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

@@ -9,13 +9,6 @@ import android.app.Application
 import android.hardware.usb.UsbDevice
 import android.hardware.usb.UsbManager
 import android.hardware.usb.UsbRequest
-import com.ledger.devicesdk.shared.api.discovery.DiscoveryDevice
-import com.ledger.devicesdk.shared.internal.connection.InternalConnectedDevice
-import com.ledger.devicesdk.shared.internal.connection.InternalConnectionResult
-import com.ledger.devicesdk.shared.internal.event.SdkEventDispatcher
-import com.ledger.devicesdk.shared.internal.service.logger.LoggerService
-import com.ledger.devicesdk.shared.internal.transport.TransportEvent
-import com.ledger.devicesdk.shared.internal.transport.framer.FramerService
 import com.ledger.devicesdk.shared.androidMain.transport.usb.connection.AndroidUsbApduSender
 import com.ledger.devicesdk.shared.androidMain.transport.usb.model.LedgerUsbDevice
 import com.ledger.devicesdk.shared.androidMain.transport.usb.model.UsbPermissionEvent
@@ -24,11 +17,16 @@ 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.DiscoveryDevice
+import com.ledger.devicesdk.shared.internal.connection.InternalConnectedDevice
+import com.ledger.devicesdk.shared.internal.connection.InternalConnectionResult
+import com.ledger.devicesdk.shared.internal.event.SdkEventDispatcher
+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.buildSimpleErrorLogInfo
 import com.ledger.devicesdk.shared.internal.service.logger.buildSimpleInfoLogInfo
 import com.ledger.devicesdk.shared.internal.service.logger.buildSimpleWarningLogInfo
-import kotlin.time.Duration
+import com.ledger.devicesdk.shared.internal.transport.TransportEvent
+import com.ledger.devicesdk.shared.internal.transport.framer.FramerService
 import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.Dispatchers
@@ -41,11 +39,10 @@ import kotlinx.coroutines.flow.MutableStateFlow
 import kotlinx.coroutines.flow.SharingStarted
 import kotlinx.coroutines.flow.first
 import kotlinx.coroutines.flow.merge
-import kotlinx.coroutines.flow.onStart
 import kotlinx.coroutines.flow.shareIn
 import kotlinx.coroutines.isActive
 import kotlinx.coroutines.launch
-import kotlin.math.log
+import kotlin.time.Duration
 import kotlin.time.Duration.Companion.seconds
 
 internal class DefaultAndroidUsbTransport(
@@ -55,25 +52,23 @@ internal class DefaultAndroidUsbTransport(
     private val eventDispatcher: SdkEventDispatcher,
     private val loggerService: LoggerService,
     private val scanDelay: Duration,
-    coroutineDispatcher: CoroutineDispatcher,
+    private val coroutineDispatcher: CoroutineDispatcher,
 ) : AndroidUsbTransport {
     private val scope = CoroutineScope(coroutineDispatcher + SupervisorJob())
     private val internalUsbEventFlow: MutableSharedFlow<UsbState> = MutableSharedFlow()
     private val internalUsbPermissionEventFlow: MutableSharedFlow<UsbPermissionEvent> =
         MutableSharedFlow()
 
-    @Suppress("BackingPropertyName")
-    private var _scanStateFlow: MutableStateFlow<List<DiscoveryDevice>> =
-        MutableStateFlow(emptyList())
-    private var discoveryJob: Job? = null
     private val usbConnections: MutableMap<String, DeviceConnection<AndroidUsbApduSender.Dependencies>> =
         mutableMapOf()
     private val usbConnectionsPendingReconnection: MutableSet<DeviceConnection<AndroidUsbApduSender.Dependencies>> =
         mutableSetOf()
 
+    private var discoveryJob: Job? = null
+
     override fun startScan(): Flow<List<DiscoveryDevice>> {
+        val scanStateFlow = MutableStateFlow<List<DiscoveryDevice>>(emptyList())
         discoveryJob?.cancel()
-        _scanStateFlow.value = emptyList()
         discoveryJob =
             scope.launch {
                 while (isActive) {
@@ -86,12 +81,12 @@ internal class DefaultAndroidUsbTransport(
                                 }.isEmpty()
                             }.toUsbDevices()
 
-                    _scanStateFlow.value = devices.toScannedDevices()
+                    scanStateFlow.value = devices.toScannedDevices()
 
                     delay(scanDelay)
                 }
             }
-        return _scanStateFlow
+        return scanStateFlow
     }
 
     override fun stopScan() {
@@ -151,7 +146,7 @@ internal class DefaultAndroidUsbTransport(
                             return@launch
                         }
                         loggerService.log(buildSimpleInfoLogInfo("AndroidUsbTransport", "Reconnecting device (sessionId=${deviceConnection.sessionId})"))
-                        deviceConnection.setApduSender(
+                        deviceConnection.handleDeviceConnected(
                             AndroidUsbApduSender(
                                 dependencies = AndroidUsbApduSender.Dependencies(
                                     usbDevice = usbDevice,
@@ -164,7 +159,6 @@ internal class DefaultAndroidUsbTransport(
                                 loggerService = loggerService
                             )
                         )
-                        deviceConnection.handleDeviceConnected()
                         usbConnectionsPendingReconnection.remove(deviceConnection)
                         usbConnections[deviceConnection.sessionId] = deviceConnection
                     }
@@ -272,7 +266,7 @@ internal class DefaultAndroidUsbTransport(
                     usbConnectionsPendingReconnection.remove(it)
                     eventDispatcher.dispatch(TransportEvent.DeviceConnectionLost(sessionId))
                 },
-                coroutineScope = scope,
+                coroutineDispatcher = coroutineDispatcher,
                 loggerService = loggerService,
             )
 

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

@@ -42,7 +42,7 @@ internal class UsbPermissionReceiver(
                 context,
                 this,
                 IntentFilter(ACTION_USB_PERMISSION),
-                ACTION_USB_PERMISSION,
+                null,
                 null,
                 ContextCompat.RECEIVER_NOT_EXPORTED,
             )

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

@@ -5,51 +5,42 @@
 
 package com.ledger.devicesdk.shared.androidMain.transport.usb.utils
 
-import com.ledger.devicesdk.shared.api.device.LedgerDevice
 import com.ledger.devicesdk.shared.androidMain.transport.usb.model.ProductId
+import com.ledger.devicesdk.shared.api.device.LedgerDevice
 
 internal fun ProductId.toLedgerDevice(): LedgerDevice? =
-    when {
-        this.id.isLedgerDeviceProductId(LedgerDevice.NanoS)
-        -> {
-            LedgerDevice.NanoS
-        }
-
-        this.id.isLedgerDeviceProductId(LedgerDevice.NanoSPlus)
-        -> {
-            LedgerDevice.NanoSPlus
+        when {
+            this.id.isLedgerDeviceProductId(LedgerDevice.NanoS) -> {
+                LedgerDevice.NanoS
+            }
+            this.id.isLedgerDeviceProductId(LedgerDevice.NanoSPlus) -> {
+                LedgerDevice.NanoSPlus
+            }
+            this.id.isLedgerDeviceProductId(LedgerDevice.NanoX) -> {
+                LedgerDevice.NanoX
+            }
+            this.id.isLedgerDeviceProductId(LedgerDevice.Stax) -> {
+                LedgerDevice.Stax
+            }
+            this.id.isLedgerDeviceProductId(LedgerDevice.Flex) -> {
+                LedgerDevice.Flex
+            }
+            else -> {
+                null
+            }
         }
 
-        this.id.isLedgerDeviceProductId(LedgerDevice.NanoX)
-        -> {
-            LedgerDevice.NanoX
-        }
-
-        this.id.isLedgerDeviceProductId(LedgerDevice.Stax)
-        -> {
-            LedgerDevice.Stax
-        }
-
-        this.id.isLedgerDeviceProductId(LedgerDevice.Flex)
-        -> {
-            LedgerDevice.Flex
-        }
-
-        else -> {
-            null
-        }
-    }
-
 private fun Int.isLedgerDeviceProductId(device: LedgerDevice): Boolean {
     val productId = device.usbInfo.productIdMask.sdkHexToInt()
+    val bootloaderProductId = device.usbInfo.bootloaderProductId.sdkHexToInt()
     val shiftedId = this shr 8
-    return shiftedId == productId
+    return shiftedId == productId || this == bootloaderProductId
 }
 
 @OptIn(ExperimentalStdlibApi::class)
 public fun String.sdkHexToInt(withPrefix: Boolean = true): Int =
-    if (withPrefix) {
-        this.substring(2).hexToInt()
-    } else {
-        this.hexToInt()
-    }
+        if (withPrefix) {
+            this.substring(2).hexToInt()
+        } else {
+            this.hexToInt()
+        }

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

@@ -5,4 +5,4 @@
 
 package com.ledger.devicesdk.shared.androidMainInternal.transport
 
-internal val USB_MTU: Int = 64
+internal const val USB_MTU: Int = 64

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

@@ -3,6 +3,7 @@ package com.ledger.devicesdk.shared.androidMainInternal.transport.deviceconnecti
 import com.ledger.devicesdk.shared.api.apdu.SendApduResult
 import com.ledger.devicesdk.shared.internal.service.logger.LoggerService
 import com.ledger.devicesdk.shared.internal.service.logger.buildSimpleErrorLogInfo
+import kotlinx.coroutines.CoroutineDispatcher
 import kotlinx.coroutines.CoroutineScope
 import kotlinx.coroutines.launch
 import kotlin.coroutines.resume
@@ -14,11 +15,12 @@ internal class DeviceConnection<Dependencies>(
     private var deviceApduSender: DeviceApduSender<Dependencies>,
     isFatalSendApduFailure: (SendApduResult.Failure) -> Boolean,
     reconnectionTimeoutDuration: Duration,
+    coroutineDispatcher: CoroutineDispatcher,
     private val onTerminated: (DeviceConnection<Dependencies>) -> Unit,
-    private val coroutineScope: CoroutineScope,
     private val loggerService: LoggerService,
 ) {
     private val stateMachine: DeviceConnectionStateMachine
+    private val coroutineScope = CoroutineScope(coroutineDispatcher)
 
     init {
         stateMachine = DeviceConnectionStateMachine(
@@ -33,7 +35,7 @@ internal class DeviceConnection<Dependencies>(
             },
             isFatalSendApduFailure = isFatalSendApduFailure,
             reconnectionTimeoutDuration = reconnectionTimeoutDuration,
-            coroutineScope = coroutineScope,
+            coroutineDispatcher = coroutineDispatcher,
             onError = {
                 loggerService.log(
                     buildSimpleErrorLogInfo(
@@ -51,15 +53,12 @@ internal class DeviceConnection<Dependencies>(
         stateMachine.handleApduResult(result)
     }
 
-    public fun setApduSender(apduSender: DeviceApduSender<Dependencies>) {
-        deviceApduSender = apduSender
-    }
-
     public fun getApduSender(): DeviceApduSender<Dependencies> {
         return deviceApduSender
     }
 
-    public fun handleDeviceConnected() {
+    public fun handleDeviceConnected(apduSender: DeviceApduSender<Dependencies>) {
+        deviceApduSender = apduSender
         stateMachine.handleDeviceConnected()
     }
 

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

@@ -5,6 +5,7 @@ import com.ledger.devicesdk.shared.api.apdu.SendApduResult
 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
 import kotlinx.coroutines.launch
@@ -15,13 +16,15 @@ internal class DeviceConnectionStateMachine(
     private val onTerminated: () -> Unit,
     private val isFatalSendApduFailure: (SendApduResult.Failure) -> Boolean,
     private val reconnectionTimeoutDuration: Duration,
-    private val coroutineScope: CoroutineScope,
     private val onError: (Throwable) -> Unit,
     private val loggerService: LoggerService,
+    coroutineDispatcher: CoroutineDispatcher,
 ) {
-
+    private val coroutineScope = CoroutineScope(coroutineDispatcher)
     private var state: State = State.Connected
 
+    fun getState() = state
+
     private fun pushState(newState: State) {
         when (newState) {
             is State.Connected -> {}

package/android/src/main/kotlin/com/ledger/devicesdk/shared/api/device/LedgerDevice.kt

@@ -1,62 +1,76 @@
 package com.ledger.devicesdk.shared.api.device
 
 public sealed class LedgerDevice(
-    public val name: String,
-    public val usbInfo: UsbInfo,
-    public val bleInformation: BleInformation? = null,
+        public val name: String,
+        public val usbInfo: UsbInfo,
+        public val bleInformation: BleInformation? = null,
 ) {
-    public data object Flex : LedgerDevice(
-        name = "Ledger Flex",
-        usbInfo = UsbInfo(LEDGER_USB_VENDOR_ID, "0x70"),
-        bleInformation =
-            BleInformation(
-                serviceUuid = "13d63400-2c97-3004-0000-4c6564676572",
-                notifyCharacteristicUuid = "13d63400-2c97-3004-0001-4c6564676572",
-                writeWithResponseCharacteristicUuid = "13d63400-2c97-3004-0002-4c6564676572",
-                writeWithoutResponseCharacteristicUuid = "13d63400-2c97-3004-0003-4c6564676572",
-            ),
-    )
+    public data object Flex :
+            LedgerDevice(
+                    name = "Ledger Flex",
+                    usbInfo = UsbInfo(LEDGER_USB_VENDOR_ID, "0x70", "0x0007"),
+                    bleInformation =
+                            BleInformation(
+                                    serviceUuid = "13d63400-2c97-3004-0000-4c6564676572",
+                                    notifyCharacteristicUuid =
+                                            "13d63400-2c97-3004-0001-4c6564676572",
+                                    writeWithResponseCharacteristicUuid =
+                                            "13d63400-2c97-3004-0002-4c6564676572",
+                                    writeWithoutResponseCharacteristicUuid =
+                                            "13d63400-2c97-3004-0003-4c6564676572",
+                            ),
+            )
 
-    public data object Stax : LedgerDevice(
-        name = "Ledger Stax",
-        usbInfo = UsbInfo(LEDGER_USB_VENDOR_ID, "0x60"),
-        bleInformation =
-            BleInformation(
-                serviceUuid = "13d63400-2c97-6004-0000-4c6564676572",
-                notifyCharacteristicUuid = "13d63400-2c97-6004-0001-4c6564676572",
-                writeWithResponseCharacteristicUuid = "13d63400-2c97-6004-0002-4c6564676572",
-                writeWithoutResponseCharacteristicUuid = "13d63400-2c97-6004-0003-4c6564676572",
-            ),
-    )
+    public data object Stax :
+            LedgerDevice(
+                    name = "Ledger Stax",
+                    usbInfo = UsbInfo(LEDGER_USB_VENDOR_ID, "0x60", "0x0006"),
+                    bleInformation =
+                            BleInformation(
+                                    serviceUuid = "13d63400-2c97-6004-0000-4c6564676572",
+                                    notifyCharacteristicUuid =
+                                            "13d63400-2c97-6004-0001-4c6564676572",
+                                    writeWithResponseCharacteristicUuid =
+                                            "13d63400-2c97-6004-0002-4c6564676572",
+                                    writeWithoutResponseCharacteristicUuid =
+                                            "13d63400-2c97-6004-0003-4c6564676572",
+                            ),
+            )
 
-    public data object NanoX : LedgerDevice(
-        name = "Nano X",
-        usbInfo = UsbInfo(LEDGER_USB_VENDOR_ID, "0x40"),
-        bleInformation =
-            BleInformation(
-                serviceUuid = "13d63400-2c97-0004-0000-4c6564676572",
-                notifyCharacteristicUuid = "13d63400-2c97-0004-0001-4c6564676572",
-                writeWithResponseCharacteristicUuid = "13d63400-2c97-0004-0002-4c6564676572",
-                writeWithoutResponseCharacteristicUuid = "13d63400-2c97-0004-0003-4c6564676572",
-            ),
-    )
+    public data object NanoX :
+            LedgerDevice(
+                    name = "Nano X",
+                    usbInfo = UsbInfo(LEDGER_USB_VENDOR_ID, "0x40", "0x0004"),
+                    bleInformation =
+                            BleInformation(
+                                    serviceUuid = "13d63400-2c97-0004-0000-4c6564676572",
+                                    notifyCharacteristicUuid =
+                                            "13d63400-2c97-0004-0001-4c6564676572",
+                                    writeWithResponseCharacteristicUuid =
+                                            "13d63400-2c97-0004-0002-4c6564676572",
+                                    writeWithoutResponseCharacteristicUuid =
+                                            "13d63400-2c97-0004-0003-4c6564676572",
+                            ),
+            )
 
-    public data object NanoSPlus : LedgerDevice(
-        name = "Nano S Plus",
-        usbInfo = UsbInfo(LEDGER_USB_VENDOR_ID, "0x50"),
-        bleInformation = null,
-    )
+    public data object NanoSPlus :
+            LedgerDevice(
+                    name = "Nano S Plus",
+                    usbInfo = UsbInfo(LEDGER_USB_VENDOR_ID, "0x50", "0x0005"),
+                    bleInformation = null,
+            )
 
-    public data object NanoS : LedgerDevice(
-        name = "Nano S",
-        usbInfo = UsbInfo(LEDGER_USB_VENDOR_ID, "0x10"),
-        bleInformation = null,
-    )
+    public data object NanoS :
+            LedgerDevice(
+                    name = "Nano S",
+                    usbInfo = UsbInfo(LEDGER_USB_VENDOR_ID, "0x10", "0x0001"),
+                    bleInformation = null,
+            )
 
     public companion object {
         public const val LEDGER_USB_VENDOR_ID: String = "0x2c97"
 
-        //Cannot use reflexion here to get all subclasses as it depends of the JVM
+        // Cannot use reflexion here to get all subclasses as it depends of the JVM
         private val subclasses = buildList {
             add(Flex)
             add(Stax)
@@ -69,6 +83,7 @@ public sealed class LedgerDevice(
             return subclasses
         }
 
-        public fun getAllDevicesWithBluetooth(): List<LedgerDevice> = getAllDevices().filter { it.bleInformation != null }
+        public fun getAllDevicesWithBluetooth(): List<LedgerDevice> =
+                getAllDevices().filter { it.bleInformation != null }
     }
-}
+}

package/android/src/main/kotlin/com/ledger/devicesdk/shared/api/device/UsbInfo.kt

@@ -1,6 +1,7 @@
 package com.ledger.devicesdk.shared.api.device
 
 public data class UsbInfo(
-    val vendorId: String,
-    val productIdMask: String,
-)
+        val vendorId: String,
+        val productIdMask: String,
+        val bootloaderProductId: String,
+)