@capgo/capacitor-nfc 8.0.18 → 8.0.23

package/ios/Sources/NfcPlugin/NfcPlugin.swift

@@ -4,7 +4,7 @@ import UIKit
 
 @objc(NfcPlugin)
 public class NfcPlugin: CAPPlugin, CAPBridgedPlugin {
-    private let pluginVersion: String = "8.0.18"
+    private let pluginVersion: String = "8.0.23"
 
     public let identifier = "NfcPlugin"
     public let jsName = "CapacitorNfc"
@@ -29,19 +29,52 @@ public class NfcPlugin: CAPPlugin, CAPBridgedPlugin {
     private var invalidateAfterFirstRead = true
     private var sessionType: String = "ndef"
 
+    private func isSessionAvailable(for type: String) -> Bool {
+        if type == "tag" {
+            return NFCTagReaderSession.readingAvailable
+        }
+        return NFCNDEFReaderSession.readingAvailable
+    }
+
+    private func isNfcAvailable() -> Bool {
+        NFCTagReaderSession.readingAvailable || NFCNDEFReaderSession.readingAvailable
+    }
+
+    private func makeTagReaderSession(
+        pollingOptions: NFCTagReaderSession.PollingOption,
+        alertMessage: String?
+    ) -> NFCTagReaderSession? {
+        guard let session = NFCTagReaderSession(
+            pollingOption: pollingOptions,
+            delegate: self,
+            queue: sessionQueue
+        ) else {
+            return nil
+        }
+
+        if let alertMessage, !alertMessage.isEmpty {
+            session.alertMessage = alertMessage
+        }
+
+        session.begin()
+        return session
+    }
+
     @objc public func startScanning(_ call: CAPPluginCall) {
         #if targetEnvironment(simulator)
         call.reject("NFC is not available on the simulator.", "NO_NFC")
         return
         #else
-        guard NFCNDEFReaderSession.readingAvailable else {
+        let requestedSessionType = call.getString("iosSessionType", "ndef").lowercased()
+        sessionType = requestedSessionType == "tag" ? "tag" : "ndef"
+
+        guard isSessionAvailable(for: sessionType) else {
             call.reject("NFC is not available on this device.", "NO_NFC")
             return
         }
 
         invalidateAfterFirstRead = call.getBool("invalidateAfterFirstRead", true)
         let alertMessage = call.getString("alertMessage")
-        sessionType = call.getString("iosSessionType", "ndef")
 
         DispatchQueue.main.async {
             // Invalidate any existing sessions
@@ -52,11 +85,19 @@ public class NfcPlugin: CAPPlugin, CAPBridgedPlugin {
 
             if self.sessionType == "tag" {
                 // Use NFCTagReaderSession for raw tag support
-                self.tagReaderSession = NFCTagReaderSession(
-                    pollingOption: [.iso14443, .iso15693, .iso18092],
-                    delegate: self,
-                    queue: self.sessionQueue
+                self.tagReaderSession = self.makeTagReaderSession(
+                    pollingOptions: [.iso14443, .iso15693, .iso18092],
+                    alertMessage: alertMessage
                 )
+
+                // Some configurations block FeliCa polling; retry without iso18092 to keep common formats working.
+                if self.tagReaderSession == nil {
+                    self.tagReaderSession = self.makeTagReaderSession(
+                        pollingOptions: [.iso14443, .iso15693],
+                        alertMessage: alertMessage
+                    )
+                }
+
                 guard self.tagReaderSession != nil else {
                     call.reject(
                         "Failed to create NFC tag reader session. Make sure the 'Near Field Communication Tag Reader Session Formats' entitlement includes the 'TAG' format in your app target.",
@@ -64,10 +105,6 @@ public class NfcPlugin: CAPPlugin, CAPBridgedPlugin {
                     )
                     return
                 }
-                if let alertMessage, !alertMessage.isEmpty {
-                    self.tagReaderSession?.alertMessage = alertMessage
-                }
-                self.tagReaderSession?.begin()
             } else {
                 // Use NFCNDEFReaderSession (default behavior)
                 self.ndefReaderSession = NFCNDEFReaderSession(
@@ -159,7 +196,7 @@ public class NfcPlugin: CAPPlugin, CAPBridgedPlugin {
     }
 
     @objc public func getStatus(_ call: CAPPluginCall) {
-        let status = NFCNDEFReaderSession.readingAvailable ? "NFC_OK" : "NO_NFC"
+        let status = isNfcAvailable() ? "NFC_OK" : "NO_NFC"
         call.resolve([
             "status": status
         ])
@@ -190,7 +227,7 @@ public class NfcPlugin: CAPPlugin, CAPBridgedPlugin {
         ])
         #else
         call.resolve([
-            "supported": NFCNDEFReaderSession.readingAvailable
+            "supported": isNfcAvailable()
         ])
         #endif
     }
@@ -408,8 +445,8 @@ extension NfcPlugin: NFCNDEFReaderSessionDelegate {
         if (error as NSError).code != NFCReaderError.readerSessionInvalidationErrorFirstNDEFTagRead.rawValue {
             DispatchQueue.main.async {
                 let payload: [String: Any] = [
-                    "status": NFCNDEFReaderSession.readingAvailable ? "NFC_OK" : "NO_NFC",
-                    "enabled": NFCNDEFReaderSession.readingAvailable
+                    "status": self.isNfcAvailable() ? "NFC_OK" : "NO_NFC",
+                    "enabled": self.isNfcAvailable()
                 ]
                 self.notifyListeners("nfcStateChange", data: payload, retainUntilConsumed: true)
             }
@@ -488,8 +525,8 @@ extension NfcPlugin: NFCTagReaderSessionDelegate {
         if nfcError.code != NFCReaderError.readerSessionInvalidationErrorUserCanceled.rawValue {
             DispatchQueue.main.async {
                 let payload: [String: Any] = [
-                    "status": NFCNDEFReaderSession.readingAvailable ? "NFC_OK" : "NO_NFC",
-                    "enabled": NFCNDEFReaderSession.readingAvailable
+                    "status": self.isNfcAvailable() ? "NFC_OK" : "NO_NFC",
+                    "enabled": self.isNfcAvailable()
                 ]
                 self.notifyListeners("nfcStateChange", data: payload, retainUntilConsumed: true)
             }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@capgo/capacitor-nfc",
-  "version": "8.0.18",
+  "version": "8.0.23",
   "description": "Native NFC tag discovery, reading and writing for Capacitor apps on iOS and Android.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",