feat: add setAlertMessage, enhance cancelTechnologyRequest

* setAlertMessage is no-op for Android, and the same as setAlertMessageIOS
for iOS.
* cancelTechnology won't throw any exceptions by default.

__tests__/NfcManager.test.js

@@ -1,7 +1,11 @@
 jest.mock('../src/NativeNfcManager');
 
 import {Platform} from 'react-native';
-import {NfcManagerEmitter, callNative} from '../src/NativeNfcManager';
+import {
+  NativeNfcManager,
+  NfcManagerEmitter,
+  callNative,
+} from '../src/NativeNfcManager';
 
 describe('NfcManager (ios)', () => {
   Platform.setOS('ios');
@@ -92,6 +96,30 @@ describe('NfcManager (ios)', () => {
     expect(options.invalidateAfterFirstRead).toBe(false);
   });
 
+  test('API: cancelTechnologyRequest', async () => {
+    // won't throw any error during cancellation by default
+    NativeNfcManager.setNextError('fake-error');
+    await NfcManager.cancelTechnologyRequest();
+
+    NativeNfcManager.setNextError('fake-error-again');
+    try {
+      // default can be overriden by throwOnError
+      await NfcManager.cancelTechnologyRequest({throwOnError: true});
+    } catch (ex) {
+      expect(ex).toEqual('fake-error-again');
+    }
+  });
+
+  test('API: setAlertMessage', () => {
+    NfcManager.setAlertMessageIOS('hello');
+    expect(lastNativeCall()[0]).toEqual('setAlertMessage');
+    expect(lastNativeCall()[1]).toEqual(['hello']);
+
+    NfcManager.setAlertMessage('hello');
+    expect(lastNativeCall()[0]).toEqual('setAlertMessage');
+    expect(lastNativeCall()[1]).toEqual(['hello']);
+  });
+
   test('NfcErrorIOS', () => {
     expect(NfcErrorIOS.parse({})).toEqual(NfcErrorIOS.errCodes.unknown);
     expect(NfcErrorIOS.parse('nosucherror')).toEqual(

__tests__/NfcManagerAndroid.test.js

@@ -50,4 +50,10 @@ describe('NfcManager (android)', () => {
       Array.from({length: 4}).map((_, i) => i),
     );
   });
+
+  test('API: setAlertMessage', async () => {
+    // test if the method stub exists and can be called without exception
+    await NfcManager.setAlertMessage();
+    expect(true).toBe(true);
+  });
 });

index.d.ts

@@ -73,6 +73,10 @@ declare module 'react-native-nfc-manager' {
     readerModeDelay?: number;
   }
 
+  export interface CancelTechReqOpts {
+    throwOnError?: boolean = false;
+  }
+
   interface NdefHandler {
     writeNdefMessage: (bytes: number[]) => Promise<void>;
     getNdefMessage: () => Promise<TagEvent | null>;
@@ -185,8 +189,9 @@ declare module 'react-native-nfc-manager' {
       tech: NfcTech | NfcTech[],
       options?: RegisterTagEventOpts,
     ): Promise<NfcTech | null>;
-    cancelTechnologyRequest: () => Promise<void>;
+    cancelTechnologyRequest: (options?: CancelTechReqOpts) => Promise<void>;
     getTag: () => Promise<TagEvent | null>;
+    setAlertMessage: (alertMessage: string) => Promise<void>;
 
     /**
      * common tech handler getters for both iOS / Android

src/NfcManager.js

@@ -41,6 +41,10 @@ function NotImpl() {
   throw new Error('not implemented');
 }
 
+async function DoNothing() {
+  // allow derived class to not implment it
+}
+
 class NfcManagerBase {
   constructor() {
     this._subscribeNativeEvents();
@@ -84,6 +88,8 @@ class NfcManagerBase {
 
   cancelTechnologyRequest = NotImpl;
 
+  setAlertMessage = DoNothing;
+
   async writeNdefMessage(bytes) {
     return callNative('writeNdefMessage', [bytes]);
   }

src/NfcManagerAndroid.js

@@ -39,12 +39,20 @@ class NfcManagerAndroid extends NfcManagerBase {
     }
   };
 
-  cancelTechnologyRequest = async () => {
-    await callNative('cancelTechnologyRequest');
+  cancelTechnologyRequest = async (options = {}) => {
+    const {throwOnError = false} = options;
 
-    if (!this.cleanUpTagRegistration) {
-      await this.unregisterTagEvent();
-      this.cleanUpTagRegistration = false;
+    try {
+      await callNative('cancelTechnologyRequest');
+
+      if (!this.cleanUpTagRegistration) {
+        await this.unregisterTagEvent();
+        this.cleanUpTagRegistration = false;
+      }
+    } catch (ex) {
+      if (throwOnError) {
+        throw ex;
+      }
     }
   };
 

src/NfcManagerIOS.js

@@ -47,16 +47,28 @@ class NfcManagerIOS extends NfcManagerBase {
     }
   };
 
-  cancelTechnologyRequest = async () => callNative('cancelTechnologyRequest');
+  cancelTechnologyRequest = async (options = {}) => {
+    const {throwOnError = false} = options;
+
+    try {
+      return await callNative('cancelTechnologyRequest');
+    } catch (ex) {
+      if (throwOnError) {
+        throw ex;
+      }
+    }
+  };
 
   // -------------------------------------
   // public only for iOS
   // -------------------------------------
+  setAlertMessage = (alertMessage) => {
+    // override the parent one
+    return callNative('setAlertMessage', [alertMessage]);
+  };
+
   setAlertMessageIOS = (alertMessage) => {
-    if (Platform.OS !== 'ios') {
-      return Promise.resolve(); //no-op
-    }
-    callNative('setAlertMessage', [alertMessage]);
+    return callNative('setAlertMessage', [alertMessage]);
   };
 
   invalidateSessionIOS = () => callNative('invalidateSession');

src/__mocks__/NativeNfcManager.js

@@ -1,6 +1,11 @@
+let _nextError = null;
+
 const NativeNfcManager = {
   MIFARE_BLOCK_SIZE: 16,
   MIFARE_ULTRALIGHT_PAGE_SIZE: 4,
+  setNextError: (err) => {
+    _nextError = err;
+  },
 };
 
 const NfcManagerEmitterListener = {};
@@ -14,6 +19,12 @@ const NfcManagerEmitter = {
   },
 };
 
-const callNative = jest.fn();
+const callNative = jest.fn((...args) => {
+  if (_nextError) {
+    const err = _nextError;
+    _nextError = null;
+    return Promise.reject(err);
+  }
+});
 
 export {NativeNfcManager, NfcManagerEmitter, callNative};