@exxili/capacitor-nfc 0.0.11 → 0.0.12

package/ios/Sources/NFCPlugin/NFCReader.swift

@@ -1,10 +1,10 @@
 import Foundation
 import CoreNFC
 
-@objc public class NFCReader: NSObject, NFCNDEFReaderSessionDelegate {
-    private var readerSession: NFCNDEFReaderSession?
+@objc public class NFCReader: NSObject, NFCTagReaderSessionDelegate {
+    private var readerSession: NFCTagReaderSession?
 
-    public var onNDEFMessageReceived: (([NFCNDEFMessage]) -> Void)?
+    public var onNDEFMessageReceived: (([NFCNDEFMessage], [String: Any]?) -> Void)?
     public var onError: ((Error) -> Void)?
 
     @objc public func startScanning() {
@@ -14,29 +14,30 @@ import CoreNFC
             print("NFC scanning not supported on this device")
             return
         }
-        readerSession = NFCNDEFReaderSession(delegate: self, queue: nil, invalidateAfterFirstRead: true)
+        readerSession = NFCTagReaderSession(pollingOption: [.iso14443, .iso15693, .iso18092], delegate: self, queue: nil)
         readerSession?.alertMessage = "Hold your iPhone near the NFC tag."
         readerSession?.begin()
     }
 
-    // NFCNDEFReaderSessionDelegate methods for reading
-    public func readerSession(_ session: NFCNDEFReaderSession, didInvalidateWithError error: Error) {
-        print("NFC reader session error: \(error.localizedDescription)")
-        onError?(error)
+    @objc public func cancelScanning() {
+        if let session = readerSession {
+            session.invalidate()
+        }
+        readerSession = nil
     }
 
-    public func readerSession(_ session: NFCNDEFReaderSession, didDetectNDEFs messages: [NFCNDEFMessage]) {
-        onNDEFMessageReceived?(messages)
+    // NFCTagReaderSessionDelegate methods
+    public func tagReaderSessionDidBecomeActive(_ session: NFCTagReaderSession) {
+        
     }
 
-    public func readerSessionDidBecomeActive(_ session: NFCNDEFReaderSession) {
-        
+    public func tagReaderSession(_ session: NFCTagReaderSession, didInvalidateWithError error: Error) {
+        print("NFC reader session error: \(error.localizedDescription)")
+        onError?(error)
     }
 
-    // Handle detection of NDEF tags (need to connect and read the NDEF message)
-    public func readerSession(_ session: NFCNDEFReaderSession, didDetect tags: [NFCNDEFTag]) {
+    public func tagReaderSession(_ session: NFCTagReaderSession, didDetect tags: [NFCTag]) {
         if tags.count > 1 {
-            // Restart polling in 500ms
             let retryInterval = DispatchTimeInterval.milliseconds(500)
             session.alertMessage = "More than one tag detected. Please remove extra tags and try again."
             DispatchQueue.global().asyncAfter(deadline: .now() + retryInterval) {
@@ -45,51 +46,191 @@ import CoreNFC
             return
         }
         
-        // Connect to the found tag and perform NDEF message reading
         let tag = tags.first!
         session.connect(to: tag) { (error: Error?) in
             if let error = error {
-                session.alertMessage = "Unable to connect to tag."
+                session.invalidate(errorMessage: "Unable to connect to tag.")
+                self.onError?(error)
+                return
+            }
+            
+            // Extract tag information
+            let tagInfo = self.extractTagInfo(from: tag)
+            
+            // Try to read NDEF if the tag supports it
+            if case let .iso7816(iso7816Tag) = tag {
+                self.handleISO7816Tag(iso7816Tag, session: session, tagInfo: tagInfo)
+            } else if case let .miFare(miFareTag) = tag {
+                self.handleMiFareTag(miFareTag, session: session, tagInfo: tagInfo)
+            } else if case let .feliCa(feliCaTag) = tag {
+                self.handleFeliCaTag(feliCaTag, session: session, tagInfo: tagInfo)
+            } else if case let .iso15693(iso15693Tag) = tag {
+                self.handleISO15693Tag(iso15693Tag, session: session, tagInfo: tagInfo)
+            } else {
+                // Unknown tag type, still return tag info
+                session.alertMessage = "Tag detected but no NDEF message found."
                 session.invalidate()
+                self.onNDEFMessageReceived?([], tagInfo)
+            }
+        }
+    }
+    
+    private func extractTagInfo(from tag: NFCTag) -> [String: Any] {
+        var tagInfo: [String: Any] = [:]
+        var techTypes: [String] = []
+        var uid: String = ""
+        
+        switch tag {
+        case .iso7816(let iso7816Tag):
+            uid = iso7816Tag.identifier.map { String(format: "%02X", $0) }.joined()
+            techTypes.append("ISO7816")
+            tagInfo["type"] = "ISO7816"
+            
+        case .miFare(let miFareTag):
+            uid = miFareTag.identifier.map { String(format: "%02X", $0) }.joined()
+            techTypes.append("MiFare")
+            tagInfo["type"] = "MiFare"
+            
+        case .feliCa(let feliCaTag):
+            uid = feliCaTag.currentIDm.map { String(format: "%02X", $0) }.joined()
+            techTypes.append("FeliCa")
+            tagInfo["type"] = "FeliCa"
+            
+        case .iso15693(let iso15693Tag):
+            uid = iso15693Tag.identifier.map { String(format: "%02X", $0) }.joined()
+            techTypes.append("ISO15693")
+            tagInfo["type"] = "ISO15693"
+            
+        @unknown default:
+            techTypes.append("Unknown")
+            tagInfo["type"] = "Unknown"
+        }
+        
+        tagInfo["uid"] = uid
+        tagInfo["techTypes"] = techTypes
+        
+        return tagInfo
+    }
+    
+    private func handleMiFareTag(_ miFareTag: NFCMiFareTag, session: NFCTagReaderSession, tagInfo: [String: Any]) {
+        miFareTag.queryNDEFStatus { (ndefStatus: NFCNDEFStatus, capacity: Int, error: Error?) in
+            if let error = error {
+                session.invalidate(errorMessage: "Unable to query NDEF status of tag.")
                 self.onError?(error)
                 return
             }
             
-            tag.queryNDEFStatus { (ndefStatus: NFCNDEFStatus, capacity: Int, error: Error?) in
+            if ndefStatus == .notSupported {
+                session.alertMessage = "Tag detected but no NDEF message found."
+                session.invalidate()
+                self.onNDEFMessageReceived?([], tagInfo)
+                return
+            }
+            
+            var updatedTagInfo = tagInfo
+            updatedTagInfo["maxSize"] = capacity
+            updatedTagInfo["isWritable"] = ndefStatus == .readWrite
+            
+            miFareTag.readNDEF { (message: NFCNDEFMessage?, error: Error?) in
                 if let error = error {
-                    session.alertMessage = "Unable to query NDEF status of tag."
+                    session.invalidate(errorMessage: "Failed to read NDEF from tag.")
+                    self.onError?(error)
+                    return
+                }
+                
+                if let message = message {
+                    session.alertMessage = "Found 1 NDEF message."
+                    session.invalidate()
+                    self.onNDEFMessageReceived?([message], updatedTagInfo)
+                } else {
+                    session.alertMessage = "Tag detected but no NDEF message found."
                     session.invalidate()
+                    self.onNDEFMessageReceived?([], updatedTagInfo)
+                }
+            }
+        }
+    }
+    
+    private func handleISO7816Tag(_ iso7816Tag: NFCISO7816Tag, session: NFCTagReaderSession, tagInfo: [String: Any]) {
+        // ISO7816 tags don't typically support NDEF directly
+        session.alertMessage = "Tag detected but no NDEF message found."
+        session.invalidate()
+        self.onNDEFMessageReceived?([], tagInfo)
+    }
+    
+    private func handleFeliCaTag(_ feliCaTag: NFCFeliCaTag, session: NFCTagReaderSession, tagInfo: [String: Any]) {
+        feliCaTag.queryNDEFStatus { (ndefStatus: NFCNDEFStatus, capacity: Int, error: Error?) in
+            if let error = error {
+                session.invalidate(errorMessage: "Unable to query NDEF status of tag.")
+                self.onError?(error)
+                return
+            }
+            
+            if ndefStatus == .notSupported {
+                session.alertMessage = "Tag detected but no NDEF message found."
+                session.invalidate()
+                self.onNDEFMessageReceived?([], tagInfo)
+                return
+            }
+            
+            var updatedTagInfo = tagInfo
+            updatedTagInfo["maxSize"] = capacity
+            updatedTagInfo["isWritable"] = ndefStatus == .readWrite
+            
+            feliCaTag.readNDEF { (message: NFCNDEFMessage?, error: Error?) in
+                if let error = error {
+                    session.invalidate(errorMessage: "Failed to read NDEF from tag.")
                     self.onError?(error)
                     return
                 }
                 
-                if ndefStatus == .notSupported {
-                    session.alertMessage = "Tag is not NDEF compliant."
+                if let message = message {
+                    session.alertMessage = "Found 1 NDEF message."
                     session.invalidate()
+                    self.onNDEFMessageReceived?([message], updatedTagInfo)
+                } else {
+                    session.alertMessage = "Tag detected but no NDEF message found."
+                    session.invalidate()
+                    self.onNDEFMessageReceived?([], updatedTagInfo)
+                }
+            }
+        }
+    }
+    
+    private func handleISO15693Tag(_ iso15693Tag: NFCISO15693Tag, session: NFCTagReaderSession, tagInfo: [String: Any]) {
+        iso15693Tag.queryNDEFStatus { (ndefStatus: NFCNDEFStatus, capacity: Int, error: Error?) in
+            if let error = error {
+                session.invalidate(errorMessage: "Unable to query NDEF status of tag.")
+                self.onError?(error)
+                return
+            }
+            
+            if ndefStatus == .notSupported {
+                session.alertMessage = "Tag detected but no NDEF message found."
+                session.invalidate()
+                self.onNDEFMessageReceived?([], tagInfo)
+                return
+            }
+            
+            var updatedTagInfo = tagInfo
+            updatedTagInfo["maxSize"] = capacity
+            updatedTagInfo["isWritable"] = ndefStatus == .readWrite
+            
+            iso15693Tag.readNDEF { (message: NFCNDEFMessage?, error: Error?) in
+                if let error = error {
+                    session.invalidate(errorMessage: "Failed to read NDEF from tag.")
+                    self.onError?(error)
                     return
                 }
                 
-                tag.readNDEF { (message: NFCNDEFMessage?, error: Error?) in
-                    var statusMessage: String
-                    if let error = error {
-                        statusMessage = "Failed to read NDEF from tag."
-                        session.alertMessage = statusMessage
-                        session.invalidate()
-                        self.onError?(error)
-                        return
-                    }
-                    
-                    if let message = message {
-                        print("NDEF message read: \(message)")
-                        statusMessage = "Found 1 NDEF message."
-                        session.alertMessage = statusMessage
-                        session.invalidate()
-                        self.onNDEFMessageReceived?([message])
-                    } else {
-                        statusMessage = "No NDEF message found."
-                        session.alertMessage = statusMessage
-                        session.invalidate()
-                    }
+                if let message = message {
+                    session.alertMessage = "Found 1 NDEF message."
+                    session.invalidate()
+                    self.onNDEFMessageReceived?([message], updatedTagInfo)
+                } else {
+                    session.alertMessage = "Tag detected but no NDEF message found."
+                    session.invalidate()
+                    self.onNDEFMessageReceived?([], updatedTagInfo)
                 }
             }
         }

package/ios/Sources/NFCPlugin/NFCWriter.swift

@@ -48,33 +48,28 @@ import CoreNFC
 
         session.connect(to: tag) { (error) in
             if let error = error {
-                session.alertMessage = "Unable to connect to tag."
-                session.invalidate()
+                session.invalidate(errorMessage: "Unable to connect to tag.")
                 self.onError?(error)
                 return
             }
 
             tag.queryNDEFStatus { (ndefStatus, capacity, error) in
                 if let error = error {
-                    session.alertMessage = "Unable to query the NDEF status of tag."
-                    session.invalidate()
+                    session.invalidate(errorMessage: "Unable to query the NDEF status of tag.")
                     self.onError?(error)
                     return
                 }
 
                 switch ndefStatus {
                 case .notSupported:
-                    session.alertMessage = "Tag is not NDEF compliant."
-                    session.invalidate()
+                    session.invalidate(errorMessage: "Tag is not NDEF compliant.")
                 case .readOnly:
-                    session.alertMessage = "Tag is read-only."
-                    session.invalidate()
+                    session.invalidate(errorMessage: "Tag is read-only.")
                 case .readWrite:
                     if let message = self.messageToWrite {
                         tag.writeNDEF(message) { (error) in
                             if let error = error {
-                                session.alertMessage = "Failed to write NDEF message."
-                                session.invalidate()
+                                session.invalidate(errorMessage: "Failed to write NDEF message.")
                                 self.onError?(error)
                                 return
                             }
@@ -83,12 +78,10 @@ import CoreNFC
                             self.onWriteSuccess?()
                         }
                     } else {
-                        session.alertMessage = "No message to write."
-                        session.invalidate()
+                        session.invalidate(errorMessage: "No message to write.")
                     }
                 @unknown default:
-                    session.alertMessage = "Unknown NDEF tag status."
-                    session.invalidate()
+                    session.invalidate(errorMessage: "Unknown NDEF tag status.")
                 }
             }
         }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@exxili/capacitor-nfc",
-  "version": "0.0.11",
+  "version": "0.0.12",
   "description": "A Capacitor plugin for reading and writing NFC NDEFtags.",
   "main": "dist/plugin.cjs.js",
   "module": "dist/esm/index.js",
@@ -53,13 +53,14 @@
     "@ionic/eslint-config": "^0.4.0",
     "@ionic/prettier-config": "^4.0.0",
     "@ionic/swiftlint-config": "^1.1.2",
+    "@types/node": "^22.18.8",
     "eslint": "^8.57.0",
     "prettier": "^3.3.3",
     "prettier-plugin-java": "^2.6.4",
     "rimraf": "^3.0.2",
     "rollup": "^2.32.0",
     "swiftlint": "^1.0.1",
-    "typescript": "~4.1.5"
+    "typescript": "^5.9.3"
   },
   "peerDependencies": {
     "@capacitor/core": ">=6.0.0 <9.0.0"
@@ -78,4 +79,4 @@
       "src": "android"
     }
   }
-}
+}