@iotize/device-com-nfc.cordova 3.8.0 → 3.8.2

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "@iotize/device-com-nfc.cordova",
   "main": "bundles/iotize-device-com-nfc.cordova.umd.js",
-  "version": "3.8.0",
+  "version": "3.8.2",
   "description": "Near Field Communication (NFC) Plugin. Read and write NDEF messages to NFC tags and share NDEF messages with peers.",
   "cordova": {
     "id": "@iotize/device-com-nfc.cordova",

package/plugin.xml

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <plugin xmlns="http://www.phonegap.com/ns/plugins/1.0" 
-    xmlns:android="http://schemas.android.com/apk/res/android" id="@iotize/device-com-nfc.cordova" version="3.7.0">
+    xmlns:android="http://schemas.android.com/apk/res/android" id="@iotize/device-com-nfc.cordova" version="3.8.1">
 
     <name>@iotize/device-com-nfc.cordova</name>
 

package/src/android/src/com/chariotsolutions/nfc/plugin/NfcPlugin.java

@@ -131,104 +131,117 @@ public class NfcPlugin extends CordovaPlugin {
 
     @Override
     public boolean execute(String action, JSONArray data, CallbackContext callbackContext) throws JSONException {
+        try {
+            Log.d(TAG, "execute " + action);
 
-        Log.d(TAG, "execute " + action);
-
-        // showSettings can be called if NFC is disabled
-        // might want to skip this if NO_NFC
-        if (action.equalsIgnoreCase(SHOW_SETTINGS)) {
-            showSettings(callbackContext);
-            return true;
-        }
+            // showSettings can be called if NFC is disabled
+            // might want to skip this if NO_NFC
+            if (action.equalsIgnoreCase(SHOW_SETTINGS)) {
+                showSettings(callbackContext);
+                return true;
+            }
 
-        // the channel is set up when the plugin starts
-        if (action.equalsIgnoreCase(CHANNEL)) {
-            channelCallback = callbackContext;
-            return true; // short circuit
-        }
+            // the channel is set up when the plugin starts
+            if (action.equalsIgnoreCase(CHANNEL)) {
+                channelCallback = callbackContext;
+                return true; // short circuit
+            }
 
-        if (!getNfcStatus().equals(STATUS_NFC_OK)) {
-            callbackContext.error(getNfcStatus());
-            return true; // short circuit
-        }
+            if (!getNfcStatus().equals(STATUS_NFC_OK)) {
+                callbackContext.error(getNfcStatus());
+                return true; // short circuit
+            }
 
-        createPendingIntent();
+            createPendingIntent();
 
-        if (action.equalsIgnoreCase(READER_MODE)) {
-            int flags = data.getInt(0);
-            readerMode(flags, callbackContext);
+            if (action.equalsIgnoreCase(READER_MODE)) {
+                int flags = data.getInt(0);
+                readerMode(flags, callbackContext);
 
-        } else if (action.equalsIgnoreCase(REGISTER_MIME_TYPE)) {
-            registerMimeType(data, callbackContext);
-        } else if (action.equalsIgnoreCase(REGISTER_NFC_TAP_DEVICE)) {
+            } else if (action.equalsIgnoreCase(REGISTER_MIME_TYPE)) {
+                registerMimeType(data, callbackContext);
+            } else if (action.equalsIgnoreCase(REGISTER_NFC_TAP_DEVICE)) {
 //            JSONObject jsonStringOptions = data.getJSONObject(0);
-            registerTapDevice(callbackContext);
-        } else if (action.equalsIgnoreCase(REMOVE_MIME_TYPE)) {
-            removeMimeType(data, callbackContext);
+                registerTapDevice(callbackContext);
+            } else if (action.equalsIgnoreCase(REMOVE_MIME_TYPE)) {
+                removeMimeType(data, callbackContext);
 
-        } else if (action.equalsIgnoreCase(REGISTER_NDEF)) {
-            registerNdef(callbackContext);
-        } else if (action.equalsIgnoreCase(REMOVE_NDEF)) {
-            removeNdef(callbackContext);
+            } else if (action.equalsIgnoreCase(REGISTER_NDEF)) {
+                registerNdef(callbackContext);
+            } else if (action.equalsIgnoreCase(REMOVE_NDEF)) {
+                removeNdef(callbackContext);
 
-        } else if (action.equalsIgnoreCase(REGISTER_NDEF_FORMATABLE)) {
-            registerNdefFormatable(callbackContext);
+            } else if (action.equalsIgnoreCase(REGISTER_NDEF_FORMATABLE)) {
+                registerNdefFormatable(callbackContext);
 
-        } else if (action.equals(REGISTER_DEFAULT_TAG)) {
-            registerDefaultTag(callbackContext);
+            } else if (action.equals(REGISTER_DEFAULT_TAG)) {
+                registerDefaultTag(callbackContext);
 
-        } else if (action.equals(REMOVE_DEFAULT_TAG)) {
-            removeDefaultTag(callbackContext);
+            } else if (action.equals(REMOVE_DEFAULT_TAG)) {
+                removeDefaultTag(callbackContext);
 
-        } else if (action.equalsIgnoreCase(WRITE_TAG)) {
-            writeTag(data, callbackContext);
+            } else if (action.equalsIgnoreCase(WRITE_TAG)) {
+                writeTag(data, callbackContext);
 
-        } else if (action.equalsIgnoreCase(ERASE_TAG)) {
-            eraseTag(callbackContext);
+            } else if (action.equalsIgnoreCase(ERASE_TAG)) {
+                eraseTag(callbackContext);
 
-        } else if (action.equalsIgnoreCase(INIT)) {
-            init(callbackContext);
+            } else if (action.equalsIgnoreCase(INIT)) {
+                init(callbackContext);
 
-        } else if (action.equalsIgnoreCase(ENABLED)) {
-            // status is checked before every call
-            // if code made it here, NFC is enabled
-            callbackContext.success(STATUS_NFC_OK);
+            } else if (action.equalsIgnoreCase(ENABLED)) {
+                // status is checked before every call
+                // if code made it here, NFC is enabled
+                callbackContext.success(STATUS_NFC_OK);
 
-        } else if (action.equalsIgnoreCase(CONNECT_TAP)) {
-            String tech = data.getString(0);
-            int timeout = data.optInt(1, -1);
-            connectTap(tech, timeout, callbackContext);
+            } else if (action.equalsIgnoreCase(CONNECT_TAP)) {
+                String tech = data.getString(0);
+                int timeout = data.optInt(1, -1);
+                connectTap(tech, timeout, callbackContext);
 
-        } else if (action.equalsIgnoreCase(CONNECT_RAW)) {
-            String tech = data.getString(0);
-            int timeout = data.optInt(1, -1);
-            connectRaw(tech, timeout, callbackContext);
+            } else if (action.equalsIgnoreCase(CONNECT_RAW)) {
+                String tech = data.getString(0);
+                int timeout = data.optInt(1, -1);
+                connectRaw(tech, timeout, callbackContext);
 
-        } else if (action.equalsIgnoreCase(TRANSCEIVE)) {
-            CordovaArgs args = new CordovaArgs(data); // execute is using the old signature with JSON data
+            } else if (action.equalsIgnoreCase(TRANSCEIVE)) {
+                CordovaArgs args = new CordovaArgs(data); // execute is using the old signature with JSON data
 
-            byte[] command = args.getArrayBuffer(0);
-            transceiveRaw(command, callbackContext);
+                byte[] command = args.getArrayBuffer(0);
+                transceiveRaw(command, callbackContext);
 
-        } else if (action.equalsIgnoreCase(TRANSCEIVE_TAP)) {
-            CordovaArgs args = new CordovaArgs(data); // execute is using the old signature with JSON data
+            } else if (action.equalsIgnoreCase(TRANSCEIVE_TAP)) {
+                CordovaArgs args = new CordovaArgs(data); // execute is using the old signature with JSON data
 
-            byte[] command = args.getArrayBuffer(0);
-            transceiveTap(command, callbackContext);
+                byte[] command = args.getArrayBuffer(0);
+                transceiveTap(command, callbackContext);
 
-        } else if (action.equalsIgnoreCase(CLOSE)) {
-            close(callbackContext);
+            } else if (action.equalsIgnoreCase(CLOSE)) {
+                close(callbackContext);
 
-        } else if (action.equalsIgnoreCase(SET_TAP_DEVICE_DISCOVERY_ENABLED)) {
-            CordovaArgs args = new CordovaArgs(data);
-            this._isTapDeviceDiscoveryEnabled = args.getBoolean(0);
-        } else {
-            // invalid action
-            callbackContext.error("Invalid NFC action \"" + action +"\"");
-            return false;
+            } else if (action.equalsIgnoreCase(SET_TAP_DEVICE_DISCOVERY_ENABLED)) {
+                CordovaArgs args = new CordovaArgs(data);
+                this._isTapDeviceDiscoveryEnabled = args.getBoolean(0);
+            } else {
+                // invalid action
+                callbackContext.error("Invalid NFC action \"" + action + "\"");
+                return false;
+            }
+            return true;
+        }
+        catch (SecurityException err) {
+            if (err.getMessage().startsWith("Permission Denial")) {
+                callbackContext.error("NFC Tag lost!");
+            }
+            else {
+                callbackContext.error(err.getMessage());
+            }
+            return true;
+        }
+        catch (Throwable err) {
+            callbackContext.error(err.getMessage());
+            return true;
         }
-
-        return true;
     }
 
     private String getNfcStatus() {
@@ -492,11 +505,9 @@ public class NfcPlugin extends CordovaPlugin {
                         callbackContext.error("Tag doesn't support NDEF");
                     }
                 }
-            } catch (FormatException e) {
-                callbackContext.error(e.getMessage());
-            } catch (TagLostException e) {
-                callbackContext.error(e.getMessage());
-            } catch (IOException e) {
+            } catch (SecurityException e) {
+                callbackContext.error("NFC Tag lost!");
+            } catch (Throwable e) {
                 callbackContext.error(e.getMessage());
             }
         });
@@ -1054,7 +1065,7 @@ public class NfcPlugin extends CordovaPlugin {
                 }
                 callbackContext.success();
 
-            } catch (Exception ex) {
+            } catch (Throwable ex) {
                 Log.e(TAG, "Error closing nfc connection", ex);
                 callbackContext.error("Error closing nfc connection " + ex.getLocalizedMessage());
             }
@@ -1142,7 +1153,7 @@ public class NfcPlugin extends CordovaPlugin {
                 }
                 byte[] response = nfcProtocol.send(data);
                 callbackContext.success(Helper.ByteArrayToHexString(response));
-            } catch (Exception e) {
+            } catch (Throwable e) {
                 Log.e(TAG, e.getMessage(), e);
                 callbackContext.error(e.getMessage());
             }

package/src/ios/NFCTagReader.swift

@@ -66,6 +66,9 @@ class NFCTagReader : NSObject, NFCTagReaderSessionDelegate  {
             initSessionCompletion = nil //do not keep session completion
         }
         printNFC( "tagReaderSessionDidBecomeActive" )
+        if (self.comSession == nil) {
+            self.comSession = session
+        }
     }
  
     func tagReaderSession(_ session: NFCTagReaderSession, didInvalidateWithError error: Error) {
@@ -82,7 +85,7 @@ class NFCTagReader : NSObject, NFCTagReaderSessionDelegate  {
     }
 
     func tagReaderSession(_ session: NFCTagReaderSession, didDetect tags: [NFCTag]) {
-        printNFC( "tagReaderSession:didDectectTag" )
+        printNFC( "tagReaderSession:didDetectTag" )
         guard let session = self.comSession else {
             return;
         }
@@ -103,7 +106,7 @@ class NFCTagReader : NSObject, NFCTagReaderSessionDelegate  {
         
         self.tag = tag
         
-        if let onDiscover = self.onDiscoverCompletion {
+        if self.onDiscoverCompletion != nil {
             
             Task {
                 self.onDiscoverCompletion?(await self.createJSON(tag: tag), nil)
@@ -193,6 +196,12 @@ class NFCTagReader : NSObject, NFCTagReaderSessionDelegate  {
                     return
                 case .failure(let error):
                     printNFC("TRANSCEIVE RAW ERROR \(error.localizedDescription), TRY \(nbTry)")
+                    if (error is NFCReaderError) {
+                        if (!iso7816Tag.isAvailable) {
+                            completed(nil, error)
+                            return
+                        }
+                    }
                     if (nbTry >= 0) {
                         usleep(NFCTagReader.DELAY)
                         return self.transceiveRaw(request: request, completed: completed, nbTry: nbTry - 1)
@@ -496,5 +505,32 @@ extension NFCTagReader {
         try? await self.comSession?.connect(to: tag)
         return await tag.toJSON(isTapDiscoveryEnabled: self.plugin.isTapDiscoveryEnabled())
     }
+    
+    func writeNDEF(message: NFCNDEFMessage, completed: @escaping (Error?)->()) {
+        guard let ndefTag = self.tag else {
+            completed(NFCReaderError(NFCReaderError.readerTransceiveErrorTagNotConnected))
+            return
+        }
+        var tag: NFCNDEFTag? = nil
+        switch(ndefTag) {
+        case .iso15693(let iso15693Tag):
+            tag = iso15693Tag
+        default:
+            completed(NFCReaderError(NFCReaderError.readerTransceiveErrorTagNotConnected))
+            return
+            
+        }
+        if (tag != nil) {
+            tag?.writeNDEF(message, completionHandler: {
+                (error:Error?) in
+                if (error != nil) {
+                    completed(error)
+                } else {
+                    completed(nil)
+                }
+            })
+
+        }
+    }
 }
     

package/src/ios/NFCTapPlugin.swift

@@ -152,7 +152,7 @@ import CoreNFC
         DispatchQueue.main.async {
             printNFC("sending ...")
             if self.nfcController == nil {
-                self.sendError(command: command, result: "no session available")
+                self.sendError(command: command, result: "not connected")
                 return
             }
 
@@ -176,7 +176,7 @@ import CoreNFC
                 DispatchQueue.main.async {
                     if error != nil {
                         self.lastError = error
-                        self.sendError(command: command, result: error!.localizedDescription)
+                        self.sendError(command: command, result: "Tag was lost")//error!.localizedDescription)
                     } else {
                         printNFC("responded \(response!.hexEncodedString())")
                         self.sendSuccess(command: command, result: response!.hexEncodedString())
@@ -412,6 +412,8 @@ import CoreNFC
             alertMessage = alertMessageFromCommand
         }
         
+        printNFC("Begin session for tech \(tech) with message: \(alertMessage)")
+        
         DispatchQueue.main.async {
             printNFC("Begin session NFC \(String(describing: pollingOption))")
             if self.nfcController == nil {
@@ -523,5 +525,59 @@ import CoreNFC
     func registerChannel() {
         isListeningNDEF = true // Flag for the AppDelegate
     }
+    
+    @objc(writeTag:)
+    func writeTag(command: CDVInvokedUrlCommand) {
+        printNFC("writeTag")
+        
+        guard #available(iOS 13.0, *) else {
+            sendError(command: command, result: "write is only available on iOS 13+")
+            return
+        }
+        guard let messagesJSON = command.argument(at: 0) as? [NSDictionary] else {
+            sendError(command: command, result: "No message to write")
+            return
+        }
+        
+        guard let tagReader = self.nfcController as? NFCTagReader else {
+            self.sendError(command: command, result: "no session available")
+            return
+        }
+        guard ((tagReader.comSession?.isReady) != nil) else {
+            self.sendError(command: command, result: "no session available")
+            return
+        }
+        
+        printNFC("write NDEF messages with \(messagesJSON.count) records")
+        
+        //convert message array to NFCNDEFMessage
+        var records: [NFCNDEFPayload] = []
+        for record in messagesJSON  {
+            let tnf: UInt8 = record["tnf"] as? UInt8 ?? 0
+            if let type = record["type"] as? [UInt8] {
+                if let id = record["id"] as? [UInt8] {
+                    if let payload = record["payload"] as? [UInt8] {
+                        records.append(
+                            NFCNDEFPayload(format: .init(rawValue: tnf) ?? .unknown, type: Data(type), identifier: Data(id), payload: Data(payload))
+                            )
+                    }
+                }
+
+            }
+        }
+        
+        DispatchQueue.main.async {
+            
+            tagReader.writeNDEF(message: .init(records: records), completed: {
+                (error:Error?) in
+                if (error != nil) {
+                    self.sendError(command: command, result: error!.localizedDescription)
+                    return
+                }
+                self.sendSuccess(command: command)
+            })
+            
+        }
+    }
 
 }