react-native-nfc-manager 3.16.1 → 4.0.0-beta.0

package/README.md

@@ -88,7 +88,7 @@ More info on Apple's [doc](https://developer.apple.com/documentation/corenfc/nfc
 </array>
 ```
 
-An incomplete list of aid's can be found here. [Application identifier](https://www.eftlab.com/knowledge-base/211-emv-aid-rid-pix/)
+An incomplete list of aid's can be found here. [Application identifier](https://www.eftlab.com/knowledge-base/complete-list-of-application-identifiers-aid)
 
 3. in Xcode's `Signing & Capabilities` tab, make sure `Near Field Communication Tag Reading` capability had been added, like this:
 

package/android/build.gradle

@@ -1,46 +1,105 @@
+buildscript {
+    if (project == rootProject) {
+        def kotlin_version = rootProject.ext.has("kotlinVersion") ? rootProject.ext.get("kotlinVersion") : project.properties["kotlinVersion"]
+
+        repositories {
+            google()
+            mavenCentral()
+        }
+
+        dependencies {
+            classpath "com.android.tools.build:gradle:7.2.1"
+            // noinspection DifferentKotlinGradleVersion
+            classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:$kotlin_version"
+        }
+    }
+}
+
+def reactNativeArchitectures() {
+    def value = rootProject.getProperties().get("reactNativeArchitectures")
+    return value ? value.split(",") : ["armeabi-v7a", "x86", "x86_64", "arm64-v8a"]
+}
+
+def isNewArchitectureEnabled() {
+    return rootProject.hasProperty("newArchEnabled") && rootProject.getProperty("newArchEnabled") == "true"
+}
+
+apply plugin: 'com.android.library'
+apply plugin: "kotlin-android"
+
+if (isNewArchitectureEnabled()) {
+    apply plugin: 'com.facebook.react'
+}
+
 def safeExtGet(prop, fallback) {
     rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
 }
 
-buildscript {
-	repositories {
-		mavenCentral()
-	}
+def getExtOrDefault(name) {
+    return rootProject.ext.has(name) ? rootProject.ext.get(name) : project.properties[name]
+}
+
+static def supportsNamespace() {
+    def parsed = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION.tokenize('.')
+    def major = parsed[0].toInteger()
+    def minor = parsed[1].toInteger()
 
-	dependencies {
-		classpath 'com.android.tools.build:gradle:1.5.0'
-	}
+    // Namespace support was added in 7.3.0
+    return (major == 7 && minor >= 3) || major >= 8
 }
-apply plugin: 'com.android.library'
 
 android {
-	compileSdkVersion safeExtGet('compileSdkVersion', 31)
+    if (supportsNamespace()) {
+        namespace "community.revteltech.nfc"
+    }
+
+    compileSdk safeExtGet("compileSdk", 34)
+
+    compileOptions {
+        sourceCompatibility JavaVersion.VERSION_1_9
+        targetCompatibility JavaVersion.VERSION_1_9
+    }
 
-	def agpVersion = com.android.Version.ANDROID_GRADLE_PLUGIN_VERSION
+    defaultConfig {
+        minSdkVersion safeExtGet("minSdkVersion", 24)
+        targetSdk safeExtGet("targetSdk", 34)
+        buildConfigField "boolean", "IS_NEW_ARCHITECTURE_ENABLED", isNewArchitectureEnabled().toString()
+    }
 
-	if (agpVersion.tokenize('.')[0].toInteger() >= 7) {
-			namespace "community.revteltech.nfc"
-  }
+    buildFeatures {
+        buildConfig true
+    }
 
-	defaultConfig {
-		minSdkVersion safeExtGet('minSdkVersion', 16)
-    	//noinspection OldTargetApi
-		targetSdkVersion safeExtGet('targetSdkVersion', 27)
-	}
-	lintOptions {
-		abortOnError false
-	}
+    buildTypes {
+        release {
+            minifyEnabled false
+        }
+    }
+
+    lintOptions {
+        disable "GradleCompatible"
+    }
 }
 
 repositories {
-	mavenCentral()
-	maven {
-		// All of React Native (JS, Obj-C sources, Android binaries) is installed from npm
-		url "$rootDir/../node_modules/react-native/android"
-	}
+    mavenCentral()
+    google()
 }
 
+def kotlin_version = getExtOrDefault("kotlinVersion")
 
 dependencies {
-	implementation 'com.facebook.react:react-native:+'
+    // For < 0.71, this will be from the local maven repo
+    // For > 0.71, this will be replaced by `com.facebook.react:react-android:$version` by react gradle plugin
+    //noinspection GradleDynamicVersion
+    implementation "com.facebook.react:react-native:+"
+    implementation "org.jetbrains.kotlin:kotlin-stdlib:$kotlin_version"
 }
+
+if (isNewArchitectureEnabled()) {
+    react {
+        jsRootDir = file("../specs/")
+        libraryName = "NfcManager"
+        codegenJavaPackageName = "community.revteltech.nfc"
+    }
+}

package/android/gradle.properties

@@ -1 +1,5 @@
+kotlinVersion=1.7.0
 android.useAndroidX=true
+android.enableJetifier=true
+# https://github.com/facebook/react-native/issues/35168
+org.gradle.jvmargs=-Xmx4096M

package/android/src/main/AndroidManifest.xml

@@ -1,5 +1,4 @@
-<manifest xmlns:android="http://schemas.android.com/apk/res/android"
-		  package="community.revteltech.nfc">
+<manifest xmlns:android="http://schemas.android.com/apk/res/android">
     <uses-permission android:name="android.permission.NFC" />
     <uses-feature android:name="android.hardware.nfc" android:required="false" />
 </manifest>

package/android/src/main/java/community/revteltech/nfc/NfcManager.java

@@ -41,7 +41,7 @@ import org.json.JSONException;
 
 import java.util.*;
 
-class NfcManager extends ReactContextBaseJavaModule implements ActivityEventListener, LifecycleEventListener {
+class NfcManager extends NativeNfcManagerSpec implements ActivityEventListener, LifecycleEventListener {
     private static final String LOG_TAG = "ReactNativeNfcManager";
     private final List<IntentFilter> intentFilters = new ArrayList<>();
     private final ArrayList<String[]> techLists = new ArrayList<>();
@@ -94,6 +94,12 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
         return "NfcManager";
     }
 
+    @ReactMethod
+    @Override
+    public void echo(String value, Callback callback) {
+        callback.invoke(null, value);
+    }
+
     @Override
     public Map<String, Object> getConstants() {
         final Map<String, Object> constants = new HashMap<>();
@@ -129,7 +135,7 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     }
 
     @ReactMethod
-    public void requestTechnology(ReadableArray techs, Callback callback) {
+    public void requestTechnology(ReadableArray techs, ReadableMap options, Callback callback) {
         synchronized(this) {
             if (!isForegroundEnabled) {
                 callback.invoke(ERR_NOT_REGISTERED);
@@ -217,7 +223,7 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     }
 
     @ReactMethod
-    public void getNdefStatus(Callback callback) {
+    public void queryNdefStatus(Callback callback) {
         synchronized(this) {
             if (techRequest != null) {
                 WritableMap writableMap = Arguments.createMap();
@@ -344,21 +350,22 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     }
 
     @ReactMethod
-    public void mifareClassicAuthenticateA(int sector, ReadableArray key, Callback callback) {
+    public void mifareClassicAuthenticateA(double sector, ReadableArray key, Callback callback) {
         synchronized(this) {
-            mifareClassicAuthenticate('A', sector, key, callback);
+            mifareClassicAuthenticate('A', (int)sector, key, callback);
         }
     }
 
     @ReactMethod
-    public void mifareClassicAuthenticateB(int sector, ReadableArray key, Callback callback) {
+    public void mifareClassicAuthenticateB(double sector, ReadableArray key, Callback callback) {
         synchronized(this) {
-            mifareClassicAuthenticate('B', sector, key, callback);
+            mifareClassicAuthenticate('B', (int)sector, key, callback);
         }
     }
 
     @ReactMethod
-    public void mifareClassicGetBlockCountInSector(int sectorIndex, Callback callback) {
+    public void mifareClassicGetBlockCountInSector(double _sectorIndex, Callback callback) {
+        int sectorIndex = (int)_sectorIndex;
         synchronized(this) {
             if (techRequest != null) {
                 try {
@@ -407,7 +414,8 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     }
 
     @ReactMethod
-    public void mifareClassicSectorToBlock(int sectorIndex, Callback callback) {
+    public void mifareClassicSectorToBlock(double _sectorIndex, Callback callback) {
+        int sectorIndex = (int)_sectorIndex;
         synchronized(this) {
             if (techRequest != null) {
                 try {
@@ -434,7 +442,8 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     }
 
     @ReactMethod
-    public void mifareClassicReadBlock(int blockIndex, Callback callback) {
+    public void mifareClassicReadBlock(double _blockIndex, Callback callback) {
+        int blockIndex = (int)_blockIndex;
         synchronized(this) {
             if (techRequest != null) {
                 try {
@@ -466,7 +475,8 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     }
 
     @ReactMethod
-    public void mifareClassicReadSector(int sectorIndex, Callback callback) {
+    public void mifareClassicReadSector(double _sectorIndex, Callback callback) {
+        int sectorIndex = (int)_sectorIndex;
         synchronized(this) {
             if (techRequest != null) {
                 try {
@@ -503,7 +513,8 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     }
 
     @ReactMethod
-    public void mifareClassicWriteBlock(int blockIndex, ReadableArray block, Callback callback) {
+    public void mifareClassicWriteBlock(double _blockIndex, ReadableArray block, Callback callback) {
+        int blockIndex = (int)_blockIndex;
         synchronized(this) {
             if (techRequest != null) {
                 try {
@@ -540,7 +551,9 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     }
 
     @ReactMethod
-    public void mifareClassicIncrementBlock(int blockIndex, int value, Callback callback) {
+    public void mifareClassicIncrementBlock(double _blockIndex, double _value, Callback callback) {
+        int blockIndex = (int)_blockIndex;
+        int value = (int)_value;
         synchronized(this) {
             if (techRequest != null) {
                 try {
@@ -571,7 +584,9 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     }
 
     @ReactMethod
-    public void mifareClassicDecrementBlock(int blockIndex, int value, Callback callback) {
+    public void mifareClassicDecrementBlock(double _blockIndex, double _value, Callback callback) {
+        int blockIndex = (int)_blockIndex;
+        int value = (int)_value;
         synchronized(this) {
             if (techRequest != null) {
                 try {
@@ -602,7 +617,8 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     }
 
     @ReactMethod
-    public void mifareClassicTransferBlock(int blockIndex, Callback callback) {
+    public void mifareClassicTransferBlock(double _blockIndex, Callback callback) {
+        int blockIndex = (int)_blockIndex;
         synchronized(this) {
             if (techRequest != null) {
                 try {
@@ -633,12 +649,12 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     }
 
     @ReactMethod
-    public void mifareUltralightReadPages(int pageOffset, Callback callback) {
+    public void mifareUltralightReadPages(double pageOffset, Callback callback) {
         synchronized(this) {
             if (techRequest != null) {
                 try {
                     MifareUltralight techHandle = (MifareUltralight)techRequest.getTechHandle();
-                    byte[] resultBytes = techHandle.readPages(pageOffset);
+                    byte[] resultBytes = techHandle.readPages((int)pageOffset);
                     WritableArray resultRnArray = bytesToRnArray(resultBytes);
                     callback.invoke(null, resultRnArray);
                 } catch (TagLostException ex) {
@@ -653,13 +669,13 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     }
 
     @ReactMethod
-    public void mifareUltralightWritePage(int pageOffset, ReadableArray rnArray, Callback callback) {
+    public void mifareUltralightWritePage(double pageOffset, ReadableArray rnArray, Callback callback) {
         synchronized(this) {
             if (techRequest != null) {
                 try {
                     byte[] bytes = rnArrayToBytes(rnArray);
                     MifareUltralight techHandle = (MifareUltralight)techRequest.getTechHandle();
-                    techHandle.writePage(pageOffset, bytes);
+                    techHandle.writePage((int)pageOffset, bytes);
                     callback.invoke();
                 } catch (TagLostException ex) {
                     callback.invoke("mifareUltralight fail: TAG_LOST");
@@ -690,8 +706,43 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
         }
     }
 
+    @Override
+    public void setAlertMessage(String message, Callback callback) {
+
+    }
+
+    @Override
+    public void isSessionAvailable(Callback callback) {
+
+    }
+
+    @Override
+    public void isTagSessionAvailable(Callback callback) {
+
+    }
+
+    @Override
+    public void sendMifareCommand(ReadableArray bytes, Callback callback) {
+
+    }
+
+    @Override
+    public void sendCommandAPDU(ReadableMap payload, Callback callback) {
+
+    }
+
+    @Override
+    public void sendCommandAPDUBytes(ReadableArray bytes, Callback callback) {
+
+    }
+
+    @Override
+    public void sendFelicaCommand(ReadableArray bytes, Callback callback) {
+
+    }
+
     @ReactMethod
-    public void setTimeout(int timeout, Callback callback) {
+    public void setTimeout(double timeout, Callback callback) {
         synchronized (this) {
             if (techRequest != null) {
                 try {
@@ -702,31 +753,31 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
                     switch (tech) {
                         case "NfcA": {
                             NfcA techHandle = (NfcA) baseTechHandle;
-                            techHandle.setTimeout(timeout);
+                            techHandle.setTimeout((int)timeout);
                             callback.invoke();
                             return;
                         }
                         case "NfcF": {
                             NfcF techHandle = (NfcF) baseTechHandle;
-                            techHandle.setTimeout(timeout);
+                            techHandle.setTimeout((int)timeout);
                             callback.invoke();
                             return;
                         }
                         case "IsoDep": {
                             IsoDep techHandle = (IsoDep) baseTechHandle;
-                            techHandle.setTimeout(timeout);
+                            techHandle.setTimeout((int)timeout);
                             callback.invoke();
                             return;
                         }
                         case "MifareClassic": {
                             MifareClassic techHandle = (MifareClassic) baseTechHandle;
-                            techHandle.setTimeout(timeout);
+                            techHandle.setTimeout((int)timeout);
                             callback.invoke();
                             return;
                         }
                         case "MifareUltralight": {
                             MifareUltralight techHandle = (MifareUltralight) baseTechHandle;
-                            techHandle.setTimeout(timeout);
+                            techHandle.setTimeout((int)timeout);
                             callback.invoke();
                             return;
                         }
@@ -1058,8 +1109,23 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
         callback.invoke();
     }
 
+    @Override
+    public void restartTechnologyRequest(Callback callback) {
+
+    }
+
+    @Override
+    public void invalidateSession(Callback callback) {
+
+    }
+
+    @Override
+    public void invalidateSessionWithError(String message, Callback callback) {
+
+    }
+
     @ReactMethod
-    private void registerTagEvent(ReadableMap options, Callback callback) {
+    public void registerTagEvent(ReadableMap options, Callback callback) {
         isReaderModeEnabled = options.getBoolean("isReaderModeEnabled");
         readerModeFlags = options.getInt("readerModeFlags");
         readerModeDelay = options.getInt("readerModeDelay");
@@ -1090,7 +1156,7 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     }
 
     @ReactMethod
-    private void unregisterTagEvent(Callback callback) {
+    public void unregisterTagEvent(Callback callback) {
         Log.d(LOG_TAG, "unregisterTagEvent");
         if (isResumed) {
             enableDisableForegroundDispatch(false);
@@ -1106,7 +1172,7 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     }
 
     @ReactMethod
-    private void hasTagEventRegistration(Callback callback) {
+    public void hasTagEventRegistration(Callback callback) {
         Log.d(LOG_TAG, "isSessionAvailable: " + isForegroundEnabled);
         callback.invoke(null, isForegroundEnabled);
     }
@@ -1117,10 +1183,102 @@ class NfcManager extends ReactContextBaseJavaModule implements ActivityEventList
     }
 
     @ReactMethod
-    public void removeListeners(Integer count) {
+    public void removeListeners(double count) {
         // Keep: Required for RN built in Event Emitter Calls.
     }
 
+    @Override
+    public void iso15693_getSystemInfo(double requestFlag, Callback callback) {
+
+    }
+
+    @Override
+    public void iso15693_readSingleBlock(ReadableMap options, Callback callback) {
+
+    }
+
+    @Override
+    public void iso15693_readMultipleBlocks(ReadableMap options, Callback callback) {
+
+    }
+
+    @Override
+    public void iso15693_writeSingleBlock(ReadableMap options, Callback callback) {
+
+    }
+
+    @Override
+    public void iso15693_lockBlock(ReadableMap options, Callback callback) {
+
+    }
+
+    @Override
+    public void iso15693_writeAFI(ReadableMap options, Callback callback) {
+
+    }
+
+    @Override
+    public void iso15693_lockAFI(ReadableMap options, Callback callback) {
+
+    }
+
+    @Override
+    public void iso15693_writeDSFID(ReadableMap options, Callback callback) {
+
+    }
+
+    @Override
+    public void iso15693_lockDSFID(ReadableMap options, Callback callback) {
+
+    }
+
+    @Override
+    public void iso15693_resetToReady(ReadableMap options, Callback callback) {
+
+    }
+
+    @Override
+    public void iso15693_select(ReadableMap options, Callback callback) {
+
+    }
+
+    @Override
+    public void iso15693_stayQuiet(ReadableMap options, Callback callback) {
+
+    }
+
+    @Override
+    public void iso15693_customCommand(ReadableMap options, Callback callback) {
+
+    }
+
+    @Override
+    public void iso15693_sendRequest(ReadableMap options, Callback callback) {
+
+    }
+
+    @Override
+    public void iso15693_extendedReadSingleBlock(ReadableMap options, Callback callback) {
+
+    }
+
+    @Override
+    public void iso15693_extendedReadMultipleBlocks(ReadableMap options, Callback callback) {
+
+    }
+
+    @Override
+    public void iso15693_extendedWriteSingleBlock(ReadableMap options, Callback callback) {
+
+    }
+
+    @Override
+    public void iso15693_extendedLockBlock(ReadableMap options, Callback callback) {
+
+    }
+
+
+
     @Override
     public void onHostResume() {
         Log.d(LOG_TAG, "onResume");

package/ios/{NfcManager+Felica.m → NfcManager+Felica.mm}

@@ -9,7 +9,7 @@
 
 @implementation NfcManager (Felica)
 
-RCT_EXPORT_METHOD(sendFelicaCommand:(NSArray *)bytes callback: (nonnull RCTResponseSenderBlock)callback)
+- (void)sendFelicaCommand:(NSArray *)bytes callback: (nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 13.0, *)) {
         if ([self tagSession] != nil) {

package/ios/{NfcManager+IsoDep.m → NfcManager+IsoDep.mm}

@@ -9,7 +9,7 @@
 
 @implementation NfcManager (IsoDep)
 
-RCT_EXPORT_METHOD(sendCommandAPDUBytes:(NSArray *)bytes callback: (nonnull RCTResponseSenderBlock)callback)
+- (void)sendCommandAPDUBytes:(NSArray *)bytes callback: (nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 13.0, *)) {
         if ([self tagSession] != nil) {
@@ -39,7 +39,7 @@ RCT_EXPORT_METHOD(sendCommandAPDUBytes:(NSArray *)bytes callback: (nonnull RCTRe
     }
 }
 
-RCT_EXPORT_METHOD(sendCommandAPDU:(NSDictionary *)apduData callback: (nonnull RCTResponseSenderBlock)callback)
+- (void)sendCommandAPDU:(NSDictionary *)apduData callback: (nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 13.0, *)) {
         if ([self tagSession] != nil) {

package/ios/{NfcManager+Mifare.m → NfcManager+Mifare.mm}

@@ -9,7 +9,7 @@
 
 @implementation NfcManager (Mifare)
 
-RCT_EXPORT_METHOD(sendMifareCommand:(NSArray *)bytes callback: (nonnull RCTResponseSenderBlock)callback)
+- (void)sendMifareCommand:(NSArray *)bytes callback: (nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 13.0, *)) {
         if ([self tagSession] != nil) {

package/ios/NfcManager.h

@@ -13,9 +13,17 @@
 #import <UIKit/UIUserActivity.h>
 #endif
 
+#ifdef RCT_NEW_ARCH_ENABLED
+#import <NativeNfcManagerSpec/NativeNfcManagerSpec.h>
+// @interface NfcManager : NSObject <NativeNfcManagerSpec, NFCNDEFReaderSessionDelegate, NFCTagReaderSessionDelegate> {
+@interface NfcManager : RCTEventEmitter <NativeNfcManagerSpec, RCTBridgeModule, NFCNDEFReaderSessionDelegate, NFCTagReaderSessionDelegate> {
+
+}
+#else
 @interface NfcManager : RCTEventEmitter <RCTBridgeModule, NFCNDEFReaderSessionDelegate, NFCTagReaderSessionDelegate> {
 
 }
+#endif
 
 @property (strong, nonatomic) NFCNDEFReaderSession * _Nullable session;
 @property (strong, nonatomic) NFCTagReaderSession * _Nullable tagSession;

package/ios/{NfcManager.m → NfcManager.mm}

@@ -238,22 +238,23 @@ continueUserActivity:(NSUserActivity *)userActivity
     return YES;
 }
     
-RCT_EXPORT_METHOD(getBackgroundNdef: (nonnull RCTResponseSenderBlock)callback)
+- (void)getBackgroundTag: (nonnull RCTResponseSenderBlock)callback
 {
     if (bgNdefRecords != nil) {
-        callback(@[[NSNull null], bgNdefRecords]);
+        // iOS doesn't report the full tag, only the ndefMessage part
+        callback(@[[NSNull null], @{@"ndefMessage": bgNdefRecords}]);
     } else {
         callback(@[[NSNull null], [NSNull null]]);
     }
 }
 
-RCT_EXPORT_METHOD(clearBackgroundNdef: (nonnull RCTResponseSenderBlock)callback)
+- (void)clearBackgroundTag: (nonnull RCTResponseSenderBlock)callback
 {
     bgNdefRecords = nil;
     callback(@[[NSNull null]]);
 }
 
-RCT_EXPORT_METHOD(isSupported: (NSString *)tech callback:(nonnull RCTResponseSenderBlock)callback)
+- (void)isSupported: (NSString *)tech callback:(nonnull RCTResponseSenderBlock)callback
 {
     if ([tech isEqualToString:@""] || [tech isEqualToString:@"Ndef"]) {
         if (@available(iOS 11.0, *)) {
@@ -270,7 +271,7 @@ RCT_EXPORT_METHOD(isSupported: (NSString *)tech callback:(nonnull RCTResponseSen
     callback(@[[NSNull null], @NO]);
 }
 
-RCT_EXPORT_METHOD(start: (nonnull RCTResponseSenderBlock)callback)
+- (void)start: (nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 11.0, *)) {
         if (NFCNDEFReaderSession.readingAvailable) {
@@ -284,7 +285,7 @@ RCT_EXPORT_METHOD(start: (nonnull RCTResponseSenderBlock)callback)
     callback(@[@"Not support in this device", [NSNull null]]);
 }
 
-RCT_EXPORT_METHOD(requestTechnology: (NSArray *)techs options: (NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback)
+-(void)requestTechnology: (NSArray *)techs options: (NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 13.0, *)) {
         if (tagSession == nil && session == nil) {
@@ -306,7 +307,7 @@ RCT_EXPORT_METHOD(requestTechnology: (NSArray *)techs options: (NSDictionary *)o
     }
 }
 
-RCT_EXPORT_METHOD(restartTechnologyRequest:(nonnull RCTResponseSenderBlock)callback)
+- (void)restartTechnologyRequest:(nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 13.0, *)) {
         if (tagSession != nil) {
@@ -321,7 +322,7 @@ RCT_EXPORT_METHOD(restartTechnologyRequest:(nonnull RCTResponseSenderBlock)callb
     }
 }
 
-RCT_EXPORT_METHOD(cancelTechnologyRequest:(nonnull RCTResponseSenderBlock)callback)
+- (void)cancelTechnologyRequest:(nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 13.0, *)) {
         if (tagSession != nil) {
@@ -336,7 +337,7 @@ RCT_EXPORT_METHOD(cancelTechnologyRequest:(nonnull RCTResponseSenderBlock)callba
     }
 }
 
-RCT_EXPORT_METHOD(registerTagEvent:(NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback)
+- (void)registerTagEvent:(NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 11.0, *)) {
         if (session == nil && tagSession == nil) {
@@ -353,7 +354,7 @@ RCT_EXPORT_METHOD(registerTagEvent:(NSDictionary *)options callback:(nonnull RCT
     }
 }
 
-RCT_EXPORT_METHOD(unregisterTagEvent:(nonnull RCTResponseSenderBlock)callback)
+- (void)unregisterTagEvent:(nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 11.0, *)) {
         if (session != nil) {
@@ -368,7 +369,7 @@ RCT_EXPORT_METHOD(unregisterTagEvent:(nonnull RCTResponseSenderBlock)callback)
     }
 }
 
-RCT_EXPORT_METHOD(invalidateSession:(nonnull RCTResponseSenderBlock)callback)
+- (void)invalidateSession:(nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 13.0, *)) {
         if (session != nil) {
@@ -385,7 +386,7 @@ RCT_EXPORT_METHOD(invalidateSession:(nonnull RCTResponseSenderBlock)callback)
     }
 }
 
-RCT_EXPORT_METHOD(invalidateSessionWithError:(NSString *)errorMessage callback:(nonnull RCTResponseSenderBlock)callback)
+- (void)invalidateSessionWithError:(NSString *)errorMessage callback:(nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 13.0, *)) {
         if (session != nil) {
@@ -402,7 +403,7 @@ RCT_EXPORT_METHOD(invalidateSessionWithError:(NSString *)errorMessage callback:(
     }
 }
 
-RCT_EXPORT_METHOD(getTag: (nonnull RCTResponseSenderBlock)callback)
+- (void)getTag: (nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 13.0, *)) {
         NSMutableDictionary* rnTag = @{}.mutableCopy;
@@ -433,7 +434,7 @@ RCT_EXPORT_METHOD(getTag: (nonnull RCTResponseSenderBlock)callback)
     }
 }
 
-RCT_EXPORT_METHOD(getNdefMessage: (nonnull RCTResponseSenderBlock)callback)
+- (void)getNdefMessage: (nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 13.0, *)) {
         id<NFCNDEFTag> ndefTag = nil;
@@ -461,7 +462,7 @@ RCT_EXPORT_METHOD(getNdefMessage: (nonnull RCTResponseSenderBlock)callback)
     }
 }
 
-RCT_EXPORT_METHOD(writeNdefMessage:(NSArray*)bytes options:(NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback)
+- (void)writeNdefMessage:(NSArray*)bytes options:(NSDictionary *)options callback:(nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 13.0, *)) {
         id<NFCNDEFTag> ndefTag = nil;
@@ -496,7 +497,7 @@ RCT_EXPORT_METHOD(writeNdefMessage:(NSArray*)bytes options:(NSDictionary *)optio
     }
 }
 
-RCT_EXPORT_METHOD(makeReadOnly:(nonnull RCTResponseSenderBlock)callback)
+- (void)makeReadOnly:(nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 13.0, *)) {
         id<NFCNDEFTag> ndefTag = nil;
@@ -524,7 +525,7 @@ RCT_EXPORT_METHOD(makeReadOnly:(nonnull RCTResponseSenderBlock)callback)
     }
 }
 
-RCT_EXPORT_METHOD(queryNDEFStatus:(nonnull RCTResponseSenderBlock)callback)
+- (void)queryNdefStatus:(nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 13.0, *)) {
         id<NFCNDEFTag> ndefTag = nil;
@@ -557,7 +558,7 @@ RCT_EXPORT_METHOD(queryNDEFStatus:(nonnull RCTResponseSenderBlock)callback)
     }
 }
 
-RCT_EXPORT_METHOD(setAlertMessage: (NSString *)alertMessage callback:(nonnull RCTResponseSenderBlock)callback)
+- (void)setAlertMessage: (NSString *)alertMessage callback:(nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 11.0, *)) {
         if (session != nil) {
@@ -574,7 +575,7 @@ RCT_EXPORT_METHOD(setAlertMessage: (NSString *)alertMessage callback:(nonnull RC
     }
 }
 
-RCT_EXPORT_METHOD(isSessionAvailable:(nonnull RCTResponseSenderBlock)callback)
+- (void)isSessionAvailable:(nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 11.0, *)) {
         callback(@[[NSNull null], session != nil ? @YES : @NO]);
@@ -583,7 +584,7 @@ RCT_EXPORT_METHOD(isSessionAvailable:(nonnull RCTResponseSenderBlock)callback)
     }
 }
 
-RCT_EXPORT_METHOD(isTagSessionAvailable:(nonnull RCTResponseSenderBlock)callback)
+- (void)isTagSessionAvailable:(nonnull RCTResponseSenderBlock)callback
 {
     if (@available(iOS 11.0, *)) {
         callback(@[[NSNull null], tagSession != nil ? @YES : @NO]);
@@ -591,6 +592,24 @@ RCT_EXPORT_METHOD(isTagSessionAvailable:(nonnull RCTResponseSenderBlock)callback
         callback(@[@"Not support in this device", [NSNull null]]);
     }
 }
+    
+#ifdef RCT_NEW_ARCH_ENABLED
+- (std::shared_ptr<facebook::react::TurboModule>)getTurboModule:(const facebook::react::ObjCTurboModule::InitParams &)params {
+  return std::make_shared<facebook::react::NativeNfcManagerSpecJSI>(params);
+}
+#endif
 
+- (void)echo:(NSString *)value callback:(RCTResponseSenderBlock)callback {
+  callback(@[[NSNull null], value]);
+}
+    
+- (void)hasTagEventRegistration:(RCTResponseSenderBlock)callback {
+    // bypass, Android's interface
+}
+    
+- (void)isEnabled:(RCTResponseSenderBlock)callback {
+    // bypass, Android's interface
+}
+    
 @end
   

package/ios/{Util.m → Util.mm}

@@ -10,7 +10,7 @@
 NSString* getHexString(NSData *data) {
     NSUInteger capacity = data.length * 2;
     NSMutableString *sbuf = [NSMutableString stringWithCapacity:capacity];
-    const unsigned char *buf = data.bytes;
+    const unsigned char *buf = (const unsigned char *)data.bytes;
     NSInteger i;
     for (i=0; i<data.length; ++i) {
         [sbuf appendFormat:@"%02lX", (unsigned long)buf[i]];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "react-native-nfc-manager",
-  "version": "3.16.1",
+  "version": "4.0.0-beta.0",
   "description": "A NFC module for react native.",
   "main": "src/index.js",
   "repository": {
@@ -75,5 +75,13 @@
     "lint:fix": "eslint --fix .",
     "test": "jest -i",
     "release": "dotenv -- release-it --"
+  },
+  "codegenConfig": {
+    "name": "NativeNfcManagerSpec",
+    "type": "modules",
+    "jsSrcsDir": "specs",
+    "android": {
+      "javaPackageName": "community.revteltech.nfc"
+    }
   }
 }

package/react-native-nfc-manager.podspec

@@ -11,12 +11,15 @@ Pod::Spec.new do |s|
   s.authors = package[:author]
   s.summary = package[:description]
   s.source = { git: package[:repository][:url] }
-  s.source_files = "ios/**/*.{h,m}"
+  # s.source_files = "ios/**/*.{h,m}"
+  s.source_files    = "ios/**/*.{h,m,mm,swift}"
   s.platform = :ios, "8.0"
 
-  s.dependency "React-Core"
+  # s.dependency "React-Core"
 
   s.xcconfig = {
     'OTHER_LDFLAGS': '-weak_framework CoreNFC',
   }
+
+  install_modules_dependencies(s)
 end

package/src/NativeNfcManager.js

@@ -1,7 +1,11 @@
 'use strict';
 import {NativeModules, NativeEventEmitter} from 'react-native';
 
-const NativeNfcManager = NativeModules.NfcManager;
+const isTurboModuleEnabled = global?.__turboModuleProxy != null;
+const NativeNfcManager = isTurboModuleEnabled
+  ? require('../specs/NativeNfcManager').default
+  : NativeModules.NfcManager;
+
 const NfcManagerEmitter = new NativeEventEmitter(NativeNfcManager);
 
 function callNative(name, params = []) {

package/src/NfcManager.js

@@ -58,6 +58,14 @@ class NfcManagerBase {
     this._subscribeNativeEvents();
   }
 
+  hello(str) {
+    return NativeNfcManager.hello(str);
+  }
+
+  async echo(msg) {
+    return handleNativeException(callNative('echo', [msg]));
+  }
+
   async start() {
     return handleNativeException(callNative('start'));
   }

package/src/NfcManagerAndroid.js

@@ -37,7 +37,7 @@ class NfcManagerAndroid extends NfcManagerBase {
         this.cleanUpTagRegistration = true;
       }
 
-      return await callNative('requestTechnology', [tech]);
+      return await callNative('requestTechnology', [tech, options]);
     } catch (ex) {
       throw buildNfcExceptionAndroid(ex);
     }

package/src/NfcManagerIOS.js

@@ -63,13 +63,10 @@ class NfcManagerIOS extends NfcManagerBase {
     );
   };
 
-  getBackgroundTag = async () => {
-    // iOS doesn't report the full tag, only the ndefMessage part
-    const ndefMessage = await handleNativeException(callNative('getBackgroundNdef'));
-    return ndefMessage ? { ndefMessage } : null;
-  };
+  getBackgroundTag = () =>
+    handleNativeException(callNative('getBackgroundTag'));
 
-  clearBackgroundTag = async () => callNative('clearBackgroundNdef');
+  clearBackgroundTag = async () => callNative('clearBackgroundTag');
 
   // -------------------------------------
   // public only for iOS

package/src/NfcTech/NdefHandler.js

@@ -31,10 +31,10 @@ class NdefHandler {
 
   async getNdefStatus() {
     if (Platform.OS === 'ios') {
-      return handleNativeException(callNative('queryNDEFStatus'));
+      return handleNativeException(callNative('queryNdefStatus'));
     } else {
       try {
-        const result = await handleNativeException(callNative('getNdefStatus'));
+        const result = await handleNativeException(callNative('queryNdefStatus'));
         return {
           status: result.isWritable
             ? NdefStatus.ReadWrite