@ledgerhq/device-transport-kit-react-native-hid 0.0.0-rn-hid-20250221115747 → 0.0.0-rn-hid-sync-onboarding-behavior-20250516092329

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,17 +15,18 @@ 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(
-            sendApduFn = {
+            sendApduFn = { apdu, abortTimeoutDuration ->
                 coroutineScope.launch {
-                    val res = deviceApduSender.send(it)
+                    val res = deviceApduSender.send(apdu, abortTimeoutDuration)
                     handleApduResult(res)
                 }
             },
@@ -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()
     }
 
@@ -67,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

@@ -5,28 +5,31 @@ 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
 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,
-    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 -> {}
             is State.SendingApdu -> {
-                sendApduFn(newState.requestContent.apdu)
+                sendApduFn(newState.requestContent.apdu, newState.requestContent.abortTimeoutDuration)
             }
 
             is State.WaitingForReconnection -> {
@@ -277,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/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,
+)

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,
 )

package/android/src/main/kotlin/com/ledger/devicesdk/shared/internal/transport/framer/FramerService.kt

@@ -186,7 +186,7 @@ internal class FramerService(
                     apduSize = null
                     rawApdu = parser.extractRemainingBytesValue()
                 }
-                nbrDataRead += mtu
+                nbrDataRead += rawApdu.size
                 add(
                     ApduFrame(
                         header = header,