feat(web): full NFC card reading over WebUSB

.devcontainer/init-firewall.sh

@@ -84,6 +84,11 @@ ALLOWED_DOMAINS=(
     "cache-redirector.jetbrains.com"
     "maven.pkg.jetbrains.space"
     "packages.jetbrains.team"
+    # Node.js (Kotlin/Wasm test runner)
+    "nodejs.org"
+    # GitHub Actions (log access, artifact storage)
+    "productionresultssa7.blob.core.windows.net"
+    "blob.core.windows.net"
 )
 
 for domain in "${ALLOWED_DOMAINS[@]}"; do

.github/workflows/ci.yml

@@ -11,8 +11,8 @@ concurrency:
   cancel-in-progress: true
 
 jobs:
-  build-and-test:
-    name: Build & Test (JVM + Android + Web)
+  lint:
+    name: Lint
     runs-on: ubuntu-latest
     steps:
       - uses: actions/checkout@v4
@@ -26,20 +26,80 @@ jobs:
 
       - uses: gradle/actions/setup-gradle@v4
 
-      - name: Lint
+      - name: ktlint + checkstyle
         run: ./gradlew ktlintCheck checkstyle
 
-      - name: Run tests
-        run: xvfb-run ./gradlew allTests
+  test:
+    name: Test (JVM)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 23
+
+      - uses: gradle/actions/setup-gradle@v4
+
+      - name: Run JVM tests
+        run: xvfb-run ./gradlew jvmTest
+
+  android:
+    name: Build (Android)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 23
+
+      - uses: gradle/actions/setup-gradle@v4
 
-      - name: Build Android APK
+      - name: Build APK
         run: ./gradlew :app:android:assembleDebug
 
+  desktop:
+    name: Build (Desktop)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 23
+
+      - uses: gradle/actions/setup-gradle@v4
+
       - name: Build Desktop
         run: ./gradlew :app:desktop:assemble
 
+  web:
+    name: Build (Web)
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          submodules: recursive
+
+      - uses: actions/setup-java@v4
+        with:
+          distribution: temurin
+          java-version: 23
+
+      - uses: gradle/actions/setup-gradle@v4
+
       - name: Build Web
-        run: ./gradlew :app:web:wasmJsBrowserDistribution
+        run: ./gradlew :app:web:wasmJsBrowserDevelopmentExecutableDistribution
 
   ios:
     name: Build & Test (iOS)

app/desktop/src/jvmMain/kotlin/com/codebutler/farebot/desktop/DesktopCardScanner.kt

@@ -116,7 +116,7 @@ class DesktopCardScanner : CardScanner {
         PN533Device.shutdown()
     }
 
-    private fun discoverBackends(): List<NfcReaderBackend> {
+    private suspend fun discoverBackends(): List<NfcReaderBackend> {
         val backends = mutableListOf<NfcReaderBackend>(PcscReaderBackend())
         val transports = PN533Device.openAll()
         if (transports.isEmpty()) {

app/desktop/src/jvmMain/kotlin/com/codebutler/farebot/desktop/PN533ReaderBackend.kt

@@ -33,7 +33,7 @@ class PN533ReaderBackend(
 ) : PN53xReaderBackend(transport) {
     override val name: String = "PN533"
 
-    override fun initDevice(pn533: PN533) {
+    override suspend fun initDevice(pn533: PN533) {
         val fw = pn533.getFirmwareVersion()
         println("[$name] Firmware: $fw")
         pn533.samConfiguration()

app/desktop/src/jvmMain/kotlin/com/codebutler/farebot/desktop/PN53xReaderBackend.kt

@@ -40,6 +40,8 @@ import com.codebutler.farebot.card.nfc.pn533.Usb4JavaPN533Transport
 import com.codebutler.farebot.card.ultralight.UltralightCardReader
 import com.codebutler.farebot.shared.nfc.ISO7816Dispatcher
 import com.codebutler.farebot.shared.nfc.ScannedTag
+import kotlinx.coroutines.delay
+import kotlinx.coroutines.runBlocking
 
 /**
  * Abstract base for PN53x-family USB reader backends.
@@ -50,7 +52,7 @@ import com.codebutler.farebot.shared.nfc.ScannedTag
 abstract class PN53xReaderBackend(
     private val preOpenedTransport: Usb4JavaPN533Transport? = null,
 ) : NfcReaderBackend {
-    protected abstract fun initDevice(pn533: PN533)
+    protected abstract suspend fun initDevice(pn533: PN533)
 
     protected open fun createTransceiver(
         pn533: PN533,
@@ -70,14 +72,16 @@ abstract class PN53xReaderBackend(
         transport.flush()
         val pn533 = PN533(transport)
         try {
-            initDevice(pn533)
-            pollLoop(pn533, onCardDetected, onCardRead, onError)
+            runBlocking {
+                initDevice(pn533)
+                pollLoop(pn533, onCardDetected, onCardRead, onError)
+            }
         } finally {
             pn533.close()
         }
     }
 
-    private fun pollLoop(
+    private suspend fun pollLoop(
         pn533: PN533,
         onCardDetected: (ScannedTag) -> Unit,
         onCardRead: (RawCard<*>) -> Unit,
@@ -100,7 +104,7 @@ abstract class PN53xReaderBackend(
             }
 
             if (target == null) {
-                Thread.sleep(POLL_INTERVAL_MS)
+                delay(POLL_INTERVAL_MS)
                 continue
             }
 
@@ -137,7 +141,7 @@ abstract class PN53xReaderBackend(
         }
     }
 
-    private fun readTarget(
+    private suspend fun readTarget(
         pn533: PN533,
         target: PN533.TargetInfo,
     ): RawCard<*> =
@@ -146,7 +150,7 @@ abstract class PN53xReaderBackend(
             is PN533.TargetInfo.FeliCa -> readFeliCaCard(pn533, target)
         }
 
-    private fun readTypeACard(
+    private suspend fun readTypeACard(
         pn533: PN533,
         target: PN533.TargetInfo.TypeA,
     ): RawCard<*> {
@@ -182,7 +186,7 @@ abstract class PN53xReaderBackend(
         }
     }
 
-    private fun readFeliCaCard(
+    private suspend fun readFeliCaCard(
         pn533: PN533,
         target: PN533.TargetInfo.FeliCa,
     ): RawCard<*> {
@@ -192,9 +196,9 @@ abstract class PN53xReaderBackend(
         return FeliCaReader.readTag(tagId, adapter)
     }
 
-    private fun waitForRemoval(pn533: PN533) {
+    private suspend fun waitForRemoval(pn533: PN533) {
         while (true) {
-            Thread.sleep(REMOVAL_POLL_INTERVAL_MS)
+            delay(REMOVAL_POLL_INTERVAL_MS)
             val target =
                 try {
                     pn533.inListPassiveTarget(baudRate = PN533.BAUD_RATE_106_ISO14443A)

app/desktop/src/jvmMain/kotlin/com/codebutler/farebot/desktop/PcscReaderBackend.kt

@@ -35,6 +35,7 @@ import com.codebutler.farebot.card.nfc.PCSCUltralightTechnology
 import com.codebutler.farebot.card.ultralight.UltralightCardReader
 import com.codebutler.farebot.shared.nfc.ISO7816Dispatcher
 import com.codebutler.farebot.shared.nfc.ScannedTag
+import kotlinx.coroutines.runBlocking
 import javax.smartcardio.CardException
 import javax.smartcardio.CommandAPDU
 import javax.smartcardio.TerminalFactory
@@ -93,7 +94,7 @@ class PcscReaderBackend : NfcReaderBackend {
                     println("[PC/SC] Tag ID: ${tagId.hex()}")
 
                     onCardDetected(ScannedTag(id = tagId, techList = listOf(info.cardType.name)))
-                    val rawCard = readCard(info, channel, tagId)
+                    val rawCard = runBlocking { readCard(info, channel, tagId) }
                     onCardRead(rawCard)
                     println("[PC/SC] Card read successfully")
                 } finally {
@@ -112,7 +113,7 @@ class PcscReaderBackend : NfcReaderBackend {
         }
     }
 
-    private fun readCard(
+    private suspend fun readCard(
         info: PCSCCardInfo,
         channel: javax.smartcardio.CardChannel,
         tagId: ByteArray,

app/desktop/src/jvmMain/kotlin/com/codebutler/farebot/desktop/RCS956ReaderBackend.kt

@@ -47,7 +47,7 @@ class RCS956ReaderBackend(
         tg: Int,
     ): CardTransceiver = PN533CommunicateThruTransceiver(pn533)
 
-    override fun initDevice(pn533: PN533) {
+    override suspend fun initDevice(pn533: PN533) {
         // nfcpy rcs956.py init(transport) + Device.__init__() sequence.
         //
         // 1. ACK clears device state after USB connect (init function)

app/src/androidMain/kotlin/com/codebutler/farebot/app/core/nfc/ISO7816TagReader.kt

@@ -43,7 +43,7 @@ class ISO7816TagReader(
     override fun getTech(tag: Tag): CardTransceiver = AndroidCardTransceiver(IsoDep.get(tag))
 
     @Throws(Exception::class)
-    override fun readTag(
+    override suspend fun readTag(
         tagId: ByteArray,
         tag: Tag,
         tech: CardTransceiver,

app/src/commonMain/kotlin/com/codebutler/farebot/shared/nfc/ISO7816Dispatcher.kt

@@ -36,7 +36,7 @@ import com.codebutler.farebot.card.nfc.CardTransceiver
  * then falls back to the DESFire protocol if no known application is found.
  */
 object ISO7816Dispatcher {
-    fun readCard(
+    suspend fun readCard(
         tagId: ByteArray,
         transceiver: CardTransceiver,
     ): RawCard<*> {
@@ -47,7 +47,7 @@ object ISO7816Dispatcher {
         return DesfireCardReader.readCard(tagId, transceiver)
     }
 
-    private fun tryISO7816(
+    private suspend fun tryISO7816(
         tagId: ByteArray,
         transceiver: CardTransceiver,
     ): RawCard<*>? {

app/src/iosMain/kotlin/com/codebutler/farebot/shared/nfc/IosNfcScanner.kt

@@ -39,6 +39,7 @@ import kotlinx.coroutines.flow.SharedFlow
 import kotlinx.coroutines.flow.StateFlow
 import kotlinx.coroutines.flow.asSharedFlow
 import kotlinx.coroutines.flow.asStateFlow
+import kotlinx.coroutines.runBlocking
 import platform.CoreNFC.NFCFeliCaTagProtocol
 import platform.CoreNFC.NFCISO15693TagProtocol
 import platform.CoreNFC.NFCMiFareDESFire
@@ -197,14 +198,16 @@ class IosNfcScanner : CardScanner {
         }
 
         private fun readTag(tag: Any): RawCard<*> =
-            when (tag) {
-                is NFCFeliCaTagProtocol -> readFelicaTag(tag)
-                is NFCMiFareTagProtocol -> readMiFareTag(tag)
-                is NFCISO15693TagProtocol -> readVicinityTag(tag)
-                else -> throw Exception("Unsupported NFC tag type")
+            runBlocking {
+                when (tag) {
+                    is NFCFeliCaTagProtocol -> readFelicaTag(tag)
+                    is NFCMiFareTagProtocol -> readMiFareTag(tag)
+                    is NFCISO15693TagProtocol -> readVicinityTag(tag)
+                    else -> throw Exception("Unsupported NFC tag type")
+                }
             }
 
-        private fun readFelicaTag(tag: NFCFeliCaTagProtocol): RawCard<*> {
+        private suspend fun readFelicaTag(tag: NFCFeliCaTagProtocol): RawCard<*> {
             val tagId = tag.currentIDm.toByteArray()
             /*
              * onlyFirst = true is an iOS-specific hack to work around
@@ -221,7 +224,7 @@ class IosNfcScanner : CardScanner {
             return FeliCaReader.readTag(tagId, IosFeliCaTagAdapter(tag), onlyFirst = true)
         }
 
-        private fun readMiFareTag(tag: NFCMiFareTagProtocol): RawCard<*> {
+        private suspend fun readMiFareTag(tag: NFCMiFareTagProtocol): RawCard<*> {
             val tagId = tag.identifier.toByteArray()
             return when (tag.mifareFamily) {
                 NFCMiFareDESFire -> {
@@ -272,7 +275,7 @@ class IosNfcScanner : CardScanner {
             }
         }
 
-        private fun readVicinityTag(tag: NFCISO15693TagProtocol): RawCard<*> {
+        private suspend fun readVicinityTag(tag: NFCISO15693TagProtocol): RawCard<*> {
             val tagId = tag.identifier.toByteArray().reversedArray()
             val tech = IosVicinityTechnology(tag)
             tech.connect()