@iotize/device-com-nfc.cordova 3.9.0 → 3.9.2

package/src/ios/AppDelegate+NFC.swift

@@ -1,51 +1,51 @@
-//
-//  AppDelegate+NFC.swift
-//  PhoneGap NFC - Cordova Plugin
-//
-//  Copyright © 2019 dev@iotize.com. All rights reserved.
-
-import CoreNFC
-
-extension AppDelegate {
-    
-    override open func application(_ application: UIApplication,
-                     continue userActivity: NSUserActivity,
-                     restorationHandler: @escaping ([Any]?) -> Void) -> Bool {
-        
-        NSLog("Extending UIApplicationDelegate")
-        
-        guard userActivity.activityType == NSUserActivityTypeBrowsingWeb else {
-            return false
-        }
-        
-        // Confirm that the NSUserActivity object contains a valid NDEF message.
-        if #available(iOS 12.0, *) {
-            let ndefMessage = userActivity.ndefMessagePayload
-            guard ndefMessage.records.count > 0,
-            ndefMessage.records[0].typeNameFormat != .empty else {
-                return false
-            }
-            let nfcPluginInstance: NfcPlugin = self.viewController.getCommandInstance("NfcPlugin") as! NfcPlugin
-            var resolved: Bool = false;
-            NSLog(nfcPluginInstance.debugDescription);
-            
-            DispatchQueue.global().async {
-                let waitingTimeInterval: Double = 0.1;
-                print("<NFC> Did start timeout")
-                for _ in 1...2000 { // 5?s timeout
-                    if ( !nfcPluginInstance.isListeningNDEF ) {
-                    Thread.sleep(forTimeInterval: waitingTimeInterval)
-                    } else {
-                        let jsonDictionary = ndefMessage.ndefMessageToJSON()
-                        nfcPluginInstance.sendThroughChannel(jsonDictionary: jsonDictionary)
-                        resolved = true
-                        return
-                    }
-                }
-        }
-            return resolved
-        } else {
-            return false
-        }
-    }
-}
+//
+//  AppDelegate+NFC.swift
+//  PhoneGap NFC - Cordova Plugin
+//
+//  Copyright © 2019 dev@iotize.com. All rights reserved.
+
+import CoreNFC
+
+extension AppDelegate {
+    
+    override open func application(_ application: UIApplication,
+                     continue userActivity: NSUserActivity,
+                     restorationHandler: @escaping ([Any]?) -> Void) -> Bool {
+        
+        NSLog("Extending UIApplicationDelegate")
+        
+        guard userActivity.activityType == NSUserActivityTypeBrowsingWeb else {
+            return false
+        }
+        
+        // Confirm that the NSUserActivity object contains a valid NDEF message.
+        if #available(iOS 12.0, *) {
+            let ndefMessage = userActivity.ndefMessagePayload
+            guard ndefMessage.records.count > 0,
+            ndefMessage.records[0].typeNameFormat != .empty else {
+                return false
+            }
+            let nfcPluginInstance: NfcPlugin = self.viewController.getCommandInstance("NfcPlugin") as! NfcPlugin
+            var resolved: Bool = false;
+            NSLog(nfcPluginInstance.debugDescription);
+            
+            DispatchQueue.global().async {
+                let waitingTimeInterval: Double = 0.1;
+                print("<NFC> Did start timeout")
+                for _ in 1...2000 { // 5?s timeout
+                    if ( !nfcPluginInstance.isListeningNDEF ) {
+                    Thread.sleep(forTimeInterval: waitingTimeInterval)
+                    } else {
+                        let jsonDictionary = ndefMessage.ndefMessageToJSON()
+                        nfcPluginInstance.sendThroughChannel(jsonDictionary: jsonDictionary)
+                        resolved = true
+                        return
+                    }
+                }
+        }
+            return resolved
+        } else {
+            return false
+        }
+    }
+}

package/src/ios/NFCHelpers.swift

@@ -1,144 +1,144 @@
-import CoreNFC
-
-public extension String {
-    
-     func dataFromHexString() -> Data {
-        var bytes = [UInt8]()
-        for i in 0..<(count/2) {
-            let range = index(self.startIndex, offsetBy: 2*i)..<index(self.startIndex, offsetBy: 2*i+2)
-            let stringBytes = self[range]
-            let byte = strtol((stringBytes as NSString).utf8String, nil, 16)
-            bytes.append(UInt8(byte))
-        }
-        return Data(bytes: UnsafePointer<UInt8>(bytes), count:bytes.count)
-    }
-    
-}
-
-public extension Data {
-    
-    func hexEncodedString() -> String {
-        let format = "%02hhX"
-        return map { String(format: format, $0) }.joined()
-    }
-}
-
-public extension NFCISO15693Tag {
-    
-    func toJSON(ndefMessage: NFCNDEFMessage? = nil) -> [AnyHashable: Any] {
-        
-        let wrapper = NSMutableDictionary()
-        wrapper.setValue([UInt8](self.identifier) , forKey: "id")
-        
-        let returnedJSON = NSMutableDictionary()
-        returnedJSON.setValue("tag", forKey: "type")
-        returnedJSON.setObject(wrapper, forKey: "tag" as NSString)
-        
-        
-
-        return returnedJSON as! [AnyHashable : Any]
-    }
-}
-
-public enum NfcTech: String {
-    case IsoDep = "IsoDep" // Provides access to ISO-DEP (ISO 14443-4) properties and I/O operations on a Tag.
-    case MifareClassic = "MifareClassic" // Provides access to MIFARE Classic properties and I/O operations on a Tag.
-    case MifareUltralight = "MifareUltralight" // Provides access to MIFARE Ultralight properties and I/O operations on a Tag.
-    case Ndef = "Ndef" // Provides access to NDEF content and operations on a Tag.
-    case NdefFormatable = "NdefFormatable" // Provide access to NDEF format operations on a Tag.
-    case NfcA = "NfcA" // Provides access to NFC-A (ISO 14443-3A) properties and I/O operations on a Tag.
-    case NfcB = "NfcB" // Provides access to NFC-B (ISO 14443-3B) properties and I/O operations on a Tag.
-    case NfcBarcode = "NfcBarcode" // Provides access to tags containing just a barcode.
-    case NfcF = "NfcF" // Provides access to NFC-F (JIS 6319-4) properties and I/O operations on a Tag.
-    case NfcV = "NfcV" // Provides access to NFC-V (ISO 15693) properties and I/O operations on a Tag.
-    case AnyTag = ""
-  }
-
-@available(iOS 13.0, *)
-public extension NFCTag {
-        
-    func toJSON(isTapDiscoveryEnabled: Bool) async -> [AnyHashable: Any] {
-        let wrapper = NSMutableDictionary()
-        var techTypes: [String] = []
-        
-        switch self {
-        case .iso15693(let iso15693Tag):
-            wrapper.setValue([UInt8](iso15693Tag.identifier) , forKey: "id")
-            techTypes.append(NfcTech.NfcV.rawValue)
-            do {
-               let ndefMessage = try await iso15693Tag.readNDEF()
-                techTypes.append(NfcTech.Ndef.rawValue)
-                wrapper.setValue(ndefMessage.toJSONRecords(), forKey: "ndefMessage")
-            } catch {
-                print("ReadNDEF Error: \(error)")
-            }
-            
-            break
-        case .iso7816(let iso7816Tag):
-            wrapper.setValue([UInt8](iso7816Tag.identifier) , forKey: "id")
-            techTypes.append(NfcTech.NfcA.rawValue)
-            if let ndefMessage = try? await iso7816Tag.readNDEF() {
-                techTypes.append(NfcTech.Ndef.rawValue)
-                wrapper.setValue(ndefMessage.toJSONRecords(), forKey: "ndefMessage")
-            }
-            break
-        case .miFare(let miFareTag):
-            wrapper.setValue([UInt8](miFareTag.identifier) , forKey: "id")
-            switch miFareTag.mifareFamily {
-            case .ultralight:
-                techTypes.append(NfcTech.MifareUltralight.rawValue)
-                break
-            default:
-                techTypes.append(NfcTech.MifareClassic.rawValue)
-                break
-            }
-            if let ndefMessage = try? await miFareTag.readNDEF() {
-                techTypes.append(NfcTech.Ndef.rawValue)
-                wrapper.setValue(ndefMessage.toJSONRecords(), forKey: "ndefMessage")
-            }
-            break
-        default:
-            break
-        }
-        
-        wrapper.setValue(techTypes, forKey: "techTypes")
-        
-        let returnedJSON = NSMutableDictionary()
-        returnedJSON.setValue(wrapper, forKey: "tag")
-        returnedJSON.setValue("tag", forKey: "type")
-        if (isTapDiscoveryEnabled) {
-            //For now, NFCTag is labelled as IoTizeTap if it is a 15693 tag with 4+ NDEF messages.
-            //Cf Android implementation
-            if (techTypes.contains(NfcTech.NfcV.rawValue)) {
-                if let ndef = wrapper.value(forKey: "ndefMessage") {
-                    if (ndef as! [[AnyHashable: Any]]).count >= 4 {
-                        returnedJSON.setValue("nfc-tap-device", forKey: "type")
-                        //Add tap property
-                        let tapProp = NSMutableDictionary()
-                        tapProp.setValue(false, forKey: "nfcPairingDone")
-                        returnedJSON.setValue(tapProp, forKey: "tap")
-                    }
-                }
-            }
-        }
-        return returnedJSON as! [AnyHashable : Any]
-
-    }
-}
-
-public extension NFCNDEFMessage {
-    func toJSONRecords() -> [[AnyHashable: Any]] {
-        let array = NSMutableArray()
-        for record in self.records {
-            let recordDictionary = self.ndefToNSDictionary(record: record)
-            array.add(recordDictionary)
-        }
-        return array as! [[AnyHashable: Any]]
-    }
-}
-
-public func printNFC(_ message: String) {
-    #if DEBUG
-    print("NFC Plugin \(String(format: "%.3f", CACurrentMediaTime())): \(message)")
-    #endif
-}
+import CoreNFC
+
+public extension String {
+    
+     func dataFromHexString() -> Data {
+        var bytes = [UInt8]()
+        for i in 0..<(count/2) {
+            let range = index(self.startIndex, offsetBy: 2*i)..<index(self.startIndex, offsetBy: 2*i+2)
+            let stringBytes = self[range]
+            let byte = strtol((stringBytes as NSString).utf8String, nil, 16)
+            bytes.append(UInt8(byte))
+        }
+        return Data(bytes: UnsafePointer<UInt8>(bytes), count:bytes.count)
+    }
+    
+}
+
+public extension Data {
+    
+    func hexEncodedString() -> String {
+        let format = "%02hhX"
+        return map { String(format: format, $0) }.joined()
+    }
+}
+
+public extension NFCISO15693Tag {
+    
+    func toJSON(ndefMessage: NFCNDEFMessage? = nil) -> [AnyHashable: Any] {
+        
+        let wrapper = NSMutableDictionary()
+        wrapper.setValue([UInt8](self.identifier) , forKey: "id")
+        
+        let returnedJSON = NSMutableDictionary()
+        returnedJSON.setValue("tag", forKey: "type")
+        returnedJSON.setObject(wrapper, forKey: "tag" as NSString)
+        
+        
+
+        return returnedJSON as! [AnyHashable : Any]
+    }
+}
+
+public enum NfcTech: String {
+    case IsoDep = "IsoDep" // Provides access to ISO-DEP (ISO 14443-4) properties and I/O operations on a Tag.
+    case MifareClassic = "MifareClassic" // Provides access to MIFARE Classic properties and I/O operations on a Tag.
+    case MifareUltralight = "MifareUltralight" // Provides access to MIFARE Ultralight properties and I/O operations on a Tag.
+    case Ndef = "Ndef" // Provides access to NDEF content and operations on a Tag.
+    case NdefFormatable = "NdefFormatable" // Provide access to NDEF format operations on a Tag.
+    case NfcA = "NfcA" // Provides access to NFC-A (ISO 14443-3A) properties and I/O operations on a Tag.
+    case NfcB = "NfcB" // Provides access to NFC-B (ISO 14443-3B) properties and I/O operations on a Tag.
+    case NfcBarcode = "NfcBarcode" // Provides access to tags containing just a barcode.
+    case NfcF = "NfcF" // Provides access to NFC-F (JIS 6319-4) properties and I/O operations on a Tag.
+    case NfcV = "NfcV" // Provides access to NFC-V (ISO 15693) properties and I/O operations on a Tag.
+    case AnyTag = ""
+  }
+
+@available(iOS 13.0, *)
+public extension NFCTag {
+        
+    func toJSON(isTapDiscoveryEnabled: Bool) async -> [AnyHashable: Any] {
+        let wrapper = NSMutableDictionary()
+        var techTypes: [String] = []
+        
+        switch self {
+        case .iso15693(let iso15693Tag):
+            wrapper.setValue([UInt8](iso15693Tag.identifier) , forKey: "id")
+            techTypes.append(NfcTech.NfcV.rawValue)
+            do {
+               let ndefMessage = try await iso15693Tag.readNDEF()
+                techTypes.append(NfcTech.Ndef.rawValue)
+                wrapper.setValue(ndefMessage.toJSONRecords(), forKey: "ndefMessage")
+            } catch {
+                print("ReadNDEF Error: \(error)")
+            }
+            
+            break
+        case .iso7816(let iso7816Tag):
+            wrapper.setValue([UInt8](iso7816Tag.identifier) , forKey: "id")
+            techTypes.append(NfcTech.NfcA.rawValue)
+            if let ndefMessage = try? await iso7816Tag.readNDEF() {
+                techTypes.append(NfcTech.Ndef.rawValue)
+                wrapper.setValue(ndefMessage.toJSONRecords(), forKey: "ndefMessage")
+            }
+            break
+        case .miFare(let miFareTag):
+            wrapper.setValue([UInt8](miFareTag.identifier) , forKey: "id")
+            switch miFareTag.mifareFamily {
+            case .ultralight:
+                techTypes.append(NfcTech.MifareUltralight.rawValue)
+                break
+            default:
+                techTypes.append(NfcTech.MifareClassic.rawValue)
+                break
+            }
+            if let ndefMessage = try? await miFareTag.readNDEF() {
+                techTypes.append(NfcTech.Ndef.rawValue)
+                wrapper.setValue(ndefMessage.toJSONRecords(), forKey: "ndefMessage")
+            }
+            break
+        default:
+            break
+        }
+        
+        wrapper.setValue(techTypes, forKey: "techTypes")
+        
+        let returnedJSON = NSMutableDictionary()
+        returnedJSON.setValue(wrapper, forKey: "tag")
+        returnedJSON.setValue("tag", forKey: "type")
+        if (isTapDiscoveryEnabled) {
+            //For now, NFCTag is labelled as IoTizeTap if it is a 15693 tag with 4+ NDEF messages.
+            //Cf Android implementation
+            if (techTypes.contains(NfcTech.NfcV.rawValue)) {
+                if let ndef = wrapper.value(forKey: "ndefMessage") {
+                    if (ndef as! [[AnyHashable: Any]]).count >= 4 {
+                        returnedJSON.setValue("nfc-tap-device", forKey: "type")
+                        //Add tap property
+                        let tapProp = NSMutableDictionary()
+                        tapProp.setValue(false, forKey: "nfcPairingDone")
+                        returnedJSON.setValue(tapProp, forKey: "tap")
+                    }
+                }
+            }
+        }
+        return returnedJSON as! [AnyHashable : Any]
+
+    }
+}
+
+public extension NFCNDEFMessage {
+    func toJSONRecords() -> [[AnyHashable: Any]] {
+        let array = NSMutableArray()
+        for record in self.records {
+            let recordDictionary = self.ndefToNSDictionary(record: record)
+            array.add(recordDictionary)
+        }
+        return array as! [[AnyHashable: Any]]
+    }
+}
+
+public func printNFC(_ message: String) {
+    #if DEBUG
+    print("NFC Plugin \(String(format: "%.3f", CACurrentMediaTime())): \(message)")
+    #endif
+}

package/src/ios/NFCNDEFDelegate.swift

@@ -1,78 +1,78 @@
-//
-//  NFCNDEFDelegate.swift
-//  NFC
-//
-//  Created by dev@iotize.com on 05/08/2019.
-//  Copyright © 2019 dev@iotize.com. All rights reserved.
-//
-
-import Foundation
-import CoreNFC
-
-class NFCNDEFDelegate: NSObject, NFCNDEFReaderSessionDelegate {
-    var session: NFCNDEFReaderSession?
-    var completed: ([AnyHashable : Any]?, Error?) -> ()
-    
-    init(completed: @escaping ([AnyHashable: Any]?, Error?) -> (), message: String?) {
-        self.completed = completed
-        super.init()
-        self.session = NFCNDEFReaderSession.init(delegate: self, queue: nil, invalidateAfterFirstRead: false)
-        if (self.session == nil) {
-            self.completed(nil, "NFC is not available" as? Error);
-            return
-        }
-        self.session!.alertMessage = message ?? ""
-        self.session!.begin()
-    }
-    
-    func readerSession(_: NFCNDEFReaderSession, didDetectNDEFs messages: [NFCNDEFMessage]) {
-        for message in messages {
-            self.fireNdefEvent(message: message)
-        }
-        self.session?.invalidate()
-    }
-    
-    func readerSession(_: NFCNDEFReaderSession, didInvalidateWithError _: Error) {
-        completed(nil, "NFCNDEFReaderSession error" as? Error)
-    }
-    
-    func readerSessionDidBecomeActive(_: NFCNDEFReaderSession) {
-        print("NDEF Reader session active")
-    }
-    
-    func fireNdefEvent(message: NFCNDEFMessage) {
-        let response = message.ndefMessageToJSON()
-        completed(response, nil)
-    }
-    
-    
-    
-}
-
-extension NFCNDEFMessage {
-    func ndefMessageToJSON() -> [AnyHashable: Any] {
-        let array = NSMutableArray()
-        for record in self.records {
-            let recordDictionary = self.ndefToNSDictionary(record: record)
-            array.add(recordDictionary)
-        }
-        let wrapper = NSMutableDictionary()
-        wrapper.setObject(array, forKey: "ndefMessage" as NSString)
-        
-        let returnedJSON = NSMutableDictionary()
-        returnedJSON.setValue("ndef", forKey: "type")
-        returnedJSON.setObject(wrapper, forKey: "tag" as NSString)
-
-        return returnedJSON as! [AnyHashable : Any]
-    }
-    
-    func ndefToNSDictionary(record: NFCNDEFPayload) -> NSDictionary {
-        let dict = NSMutableDictionary()
-        dict.setObject([record.typeNameFormat.rawValue], forKey: "tnf" as NSString)
-        dict.setObject([UInt8](record.type), forKey: "type" as NSString)
-        dict.setObject([UInt8](record.identifier), forKey: "id" as NSString)
-        dict.setObject([UInt8](record.payload), forKey: "payload" as NSString)
-        
-        return dict
-    }
-}
+//
+//  NFCNDEFDelegate.swift
+//  NFC
+//
+//  Created by dev@iotize.com on 05/08/2019.
+//  Copyright © 2019 dev@iotize.com. All rights reserved.
+//
+
+import Foundation
+import CoreNFC
+
+class NFCNDEFDelegate: NSObject, NFCNDEFReaderSessionDelegate {
+    var session: NFCNDEFReaderSession?
+    var completed: ([AnyHashable : Any]?, Error?) -> ()
+    
+    init(completed: @escaping ([AnyHashable: Any]?, Error?) -> (), message: String?) {
+        self.completed = completed
+        super.init()
+        self.session = NFCNDEFReaderSession.init(delegate: self, queue: nil, invalidateAfterFirstRead: false)
+        if (self.session == nil) {
+            self.completed(nil, "NFC is not available" as? Error);
+            return
+        }
+        self.session!.alertMessage = message ?? ""
+        self.session!.begin()
+    }
+    
+    func readerSession(_: NFCNDEFReaderSession, didDetectNDEFs messages: [NFCNDEFMessage]) {
+        for message in messages {
+            self.fireNdefEvent(message: message)
+        }
+        self.session?.invalidate()
+    }
+    
+    func readerSession(_: NFCNDEFReaderSession, didInvalidateWithError _: Error) {
+        completed(nil, "NFCNDEFReaderSession error" as? Error)
+    }
+    
+    func readerSessionDidBecomeActive(_: NFCNDEFReaderSession) {
+        print("NDEF Reader session active")
+    }
+    
+    func fireNdefEvent(message: NFCNDEFMessage) {
+        let response = message.ndefMessageToJSON()
+        completed(response, nil)
+    }
+    
+    
+    
+}
+
+extension NFCNDEFMessage {
+    func ndefMessageToJSON() -> [AnyHashable: Any] {
+        let array = NSMutableArray()
+        for record in self.records {
+            let recordDictionary = self.ndefToNSDictionary(record: record)
+            array.add(recordDictionary)
+        }
+        let wrapper = NSMutableDictionary()
+        wrapper.setObject(array, forKey: "ndefMessage" as NSString)
+        
+        let returnedJSON = NSMutableDictionary()
+        returnedJSON.setValue("ndef", forKey: "type")
+        returnedJSON.setObject(wrapper, forKey: "tag" as NSString)
+
+        return returnedJSON as! [AnyHashable : Any]
+    }
+    
+    func ndefToNSDictionary(record: NFCNDEFPayload) -> NSDictionary {
+        let dict = NSMutableDictionary()
+        dict.setObject([record.typeNameFormat.rawValue], forKey: "tnf" as NSString)
+        dict.setObject([UInt8](record.type), forKey: "type" as NSString)
+        dict.setObject([UInt8](record.identifier), forKey: "id" as NSString)
+        dict.setObject([UInt8](record.payload), forKey: "payload" as NSString)
+        
+        return dict
+    }
+}