@onekeyfe/react-native-lite-card 1.0.3 → 1.0.5

package/android/src/main/java/so/onekey/app/wallet/lite/OKLiteManager.kt

@@ -373,8 +373,6 @@ class OKLiteManager(private val context: ReactApplicationContext) :
             return
         }
         NfcPermissionUtils.checkPermission(topActivity) {
-            // 没有 NFC 使用权限
-            Log.d(TAG, "NFC device not permission")
             callback.invoke(null, null, null)
             return
         }

package/android/src/main/java/so/onekey/app/wallet/lite/onekeyLite/nfc/Connection.kt

@@ -1,5 +1,6 @@
 package so.onekey.app.wallet.lite.onekeyLite.nfc
 
+import android.nfc.TagLostException
 import android.nfc.tech.IsoDep
 import org.haobtc.onekey.card.gpchannel.GPChannelNatives
 import org.haobtc.onekey.card.gpchannel.GPChannelNatives.nativeGPCFinalize
@@ -42,6 +43,8 @@ class Connection(val isoDep: IsoDep, private val mCommandGenerator: CommandGener
                 val sw2 = response[response.size - 1]
 
                 return SendResponse(byteArr2HexStr(response), sw1, sw2, byteArr2HexStr(resp))
+            } catch (e: TagLostException) {
+                throw NFCExceptions.InterruptException()
             } catch (e: IOException) {
                 e.printStackTrace()
                 return SendResponse("0xFFFF", 0xFF.toByte(), 0xFF.toByte())

package/android/src/main/java/so/onekey/app/wallet/lite/utils/NfcPermissionUtils.kt

@@ -16,8 +16,8 @@ object NfcPermissionUtils {
 
     inline fun checkMiuiPermission(activity: Activity, doNext: () -> Unit): Int {
         when (MiUtil.checkNfcPermission(activity)) {
-            MiUtil.PermissionResult.PERMISSION_GRANTED -> doNext()
-            else -> doNext()
+            MiUtil.PermissionResult.PERMISSION_GRANTED -> doNext.invoke()
+            else -> {}
         }
         return MiUtil.checkNfcPermission(activity)
     }

package/lib/commonjs/index.js

@@ -5,7 +5,6 @@ Object.defineProperty(exports, "__esModule", {
 });
 exports.default = void 0;
 var _reactNative = require("react-native");
-var _types = require("./types");
 const {
   OKLiteManager
 } = _reactNative.NativeModules;
@@ -27,32 +26,44 @@ class OnekeyLite {
     const eventEmitter = new _reactNative.NativeEventEmitter(OKLiteManager);
     return eventEmitter.addListener('nfc_active_connection', () => {});
   }
-  getLiteInfo(result) {
-    OKLiteManager.getLiteInfo(result);
+  getLiteInfo() {
+    return new Promise(resolve => {
+      OKLiteManager.getLiteInfo(this.convertToPromise(resolve));
+    });
   }
-  checkNFCPermission(result) {
-    OKLiteManager.checkNFCPermission(result);
+  checkNFCPermission() {
+    return new Promise(resolve => {
+      OKLiteManager.checkNFCPermission(this.convertToPromise(resolve));
+    });
   }
-  setMnemonic(mnemonic, pwd, result, overwrite = false) {
-    OKLiteManager.setMnemonic(mnemonic, pwd, overwrite, result);
+  setMnemonic(mnemonic, pwd, overwrite = false) {
+    return new Promise(resolve => {
+      OKLiteManager.setMnemonic(mnemonic, pwd, overwrite, this.convertToPromise(resolve));
+    });
   }
-  getMnemonicWithPin(pwd, result) {
-    try {
-      OKLiteManager.getMnemonicWithPin(pwd, async (error, data, state) => {
-        result(error, data ? await data : null, state);
-      });
-    } catch (error) {
-      result({
-        code: _types.CardErrors.ExecFailure,
-        message: null
-      }, null, null);
-    }
+  getMnemonicWithPin(pwd) {
+    return new Promise(resolve => {
+      OKLiteManager.getMnemonicWithPin(pwd, this.convertToPromise(resolve));
+    });
   }
-  changePin(oldPin, newPin, result) {
-    OKLiteManager.changePin(oldPin, newPin, result);
+  changePin(oldPin, newPin) {
+    return new Promise(resolve => {
+      OKLiteManager.changePin(oldPin, newPin, this.convertToPromise(resolve));
+    });
   }
-  reset(result) {
-    OKLiteManager.reset(result);
+  reset() {
+    return new Promise(resolve => {
+      OKLiteManager.reset(this.convertToPromise(resolve));
+    });
+  }
+  convertToPromise(resolve) {
+    return (...result) => {
+      resolve({
+        error: result[0],
+        data: result[1],
+        cardInfo: result[2]
+      });
+    };
   }
   cancel() {
     if (_reactNative.Platform.OS === 'android') OKLiteManager.cancel();

package/lib/commonjs/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["_reactNative","require","_types","OKLiteManager","NativeModules","OnekeyLite","UiEventEmitter","constructor","Platform","OS","NativeEventEmitter","addConnectListener","listener","removeConnectListeners","addListener","removeAllListeners","addAccordListener","eventEmitter","getLiteInfo","result","checkNFCPermission","setMnemonic","mnemonic","pwd","overwrite","getMnemonicWithPin","error","data","state","code","CardErrors","ExecFailure","message","changePin","oldPin","newPin","reset","cancel","intoSetting","Linking","openSettings","onekeyLite","_default","exports","default"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":";;;;;;AAAA,IAAAA,YAAA,GAAAC,OAAA;AAOA,IAAAC,MAAA,GAAAD,OAAA;AAIA,MAAM;EAAEE;AAAc,CAAC,GAAGC,0BAAa;AAOvC,MAAMC,UAAU,CAAC;EACfC,cAAc,GAA8B,IAAI;EAEhDC,WAAWA,CAAA,EAAG;IACZ,IAAIC,qBAAQ,CAACC,EAAE,KAAK,SAAS,EAAE;IAC/B,IAAI,CAACH,cAAc,GAAG,IAAII,+BAAkB,CAACP,aAAa,CAAC;EAC7D;EAEAQ,kBAAkBA,CAACC,QAA4C,EAAE;IAC/D,IAAI,CAACC,sBAAsB,CAAC,CAAC;IAC7B,OAAO,IAAI,CAACP,cAAc,EAAEQ,WAAW,CAAC,cAAc,EAAEF,QAAQ,CAAC;EACnE;EAEAC,sBAAsBA,CAAA,EAAG;IACvB,OAAO,IAAI,CAACP,cAAc,EAAES,kBAAkB,CAAC,cAAc,CAAC;EAChE;EAEAC,iBAAiBA,CAAA,EAAG;IAClB,IAAIR,qBAAQ,CAACC,EAAE,KAAK,SAAS,EAAE;IAC/B,MAAMQ,YAAY,GAAG,IAAIP,+BAAkB,CAACP,aAAa,CAAC;IAC1D,OAAOc,YAAY,CAACH,WAAW,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC,CAAC;EACpE;EAEAI,WAAWA,CAACC,MAA0B,EAAE;IACtChB,aAAa,CAACe,WAAW,CAACC,MAAM,CAAC;EACnC;EAEAC,kBAAkBA,CAACD,MAAyB,EAAE;IAC5ChB,aAAa,CAACiB,kBAAkB,CAACD,MAAM,CAAC;EAC1C;EAEAE,WAAWA,CACTC,QAAgB,EAChBC,GAAW,EACXJ,MAAyB,EACzBK,SAAS,GAAG,KAAK,EACjB;IACArB,aAAa,CAACkB,WAAW,CAACC,QAAQ,EAAEC,GAAG,EAAEC,SAAS,EAAEL,MAAM,CAAC;EAC7D;EAEAM,kBAAkBA,CAACF,GAAW,EAAEJ,MAAwB,EAAE;IACxD,IAAI;MACFhB,aAAa,CAACsB,kBAAkB,CAC9BF,GAAG,EACH,OACEG,KAA2B,EAC3BC,IAAmB,EACnBC,KAAsB,KACnB;QACHT,MAAM,CAACO,KAAK,EAAEC,IAAI,GAAG,MAAMA,IAAI,GAAG,IAAI,EAAEC,KAAK,CAAC;MAChD,CACF,CAAC;IACH,CAAC,CAAC,OAAOF,KAAK,EAAE;MACdP,MAAM,CAAC;QAAEU,IAAI,EAAEC,iBAAU,CAACC,WAAW;QAAEC,OAAO,EAAE;MAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC;IACrE;EACF;EAEAC,SAASA,CAACC,MAAc,EAAEC,MAAc,EAAEhB,MAAyB,EAAE;IACnEhB,aAAa,CAAC8B,SAAS,CAACC,MAAM,EAAEC,MAAM,EAAEhB,MAAM,CAAC;EACjD;EAEAiB,KAAKA,CAACjB,MAAyB,EAAE;IAC/BhB,aAAa,CAACiC,KAAK,CAACjB,MAAM,CAAC;EAC7B;EAEAkB,MAAMA,CAAA,EAAG;IACP,IAAI7B,qBAAQ,CAACC,EAAE,KAAK,SAAS,EAAEN,aAAa,CAACkC,MAAM,CAAC,CAAC;EACvD;EAEAC,WAAWA,CAAA,EAAG;IACZ,IAAI9B,qBAAQ,CAACC,EAAE,KAAK,SAAS,EAAE;MAC7BN,aAAa,CAACmC,WAAW,CAAC,CAAC;IAC7B,CAAC,MAAM;MACLC,oBAAO,CAACC,YAAY,CAAC,CAAC;IACxB;EACF;AACF;AAEA,MAAMC,UAAU,GAAG,IAAIpC,UAAU,CAAC,CAAC;AAAC,IAAAqC,QAAA,GAAAC,OAAA,CAAAC,OAAA,GACrBH,UAAU"}
+{"version":3,"names":["_reactNative","require","OKLiteManager","NativeModules","OnekeyLite","UiEventEmitter","constructor","Platform","OS","NativeEventEmitter","addConnectListener","listener","removeConnectListeners","addListener","removeAllListeners","addAccordListener","eventEmitter","getLiteInfo","Promise","resolve","convertToPromise","checkNFCPermission","setMnemonic","mnemonic","pwd","overwrite","getMnemonicWithPin","changePin","oldPin","newPin","reset","result","error","data","cardInfo","cancel","intoSetting","Linking","openSettings","onekeyLite","_default","exports","default"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"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"}

package/lib/commonjs/types.js.map

@@ -1 +1 @@
-{"version":3,"names":["CardErrors","exports"],"sourceRoot":"../../src","sources":["types.ts"],"mappings":";;;;;;IAeYA,UAAU,GAAAC,OAAA,CAAAD,UAAA,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA"}
+{"version":3,"names":["CardErrors","exports"],"sourceRoot":"../../src","sources":["types.ts"],"mappings":";;;;;;IAqBYA,UAAU,GAAAC,OAAA,CAAAD,UAAA,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA"}

package/lib/module/index.js

@@ -1,5 +1,4 @@
 import { Linking, NativeEventEmitter, NativeModules, Platform } from 'react-native';
-import { CardErrors } from './types';
 const {
   OKLiteManager
 } = NativeModules;
@@ -21,32 +20,44 @@ class OnekeyLite {
     const eventEmitter = new NativeEventEmitter(OKLiteManager);
     return eventEmitter.addListener('nfc_active_connection', () => {});
   }
-  getLiteInfo(result) {
-    OKLiteManager.getLiteInfo(result);
+  getLiteInfo() {
+    return new Promise(resolve => {
+      OKLiteManager.getLiteInfo(this.convertToPromise(resolve));
+    });
   }
-  checkNFCPermission(result) {
-    OKLiteManager.checkNFCPermission(result);
+  checkNFCPermission() {
+    return new Promise(resolve => {
+      OKLiteManager.checkNFCPermission(this.convertToPromise(resolve));
+    });
   }
-  setMnemonic(mnemonic, pwd, result, overwrite = false) {
-    OKLiteManager.setMnemonic(mnemonic, pwd, overwrite, result);
+  setMnemonic(mnemonic, pwd, overwrite = false) {
+    return new Promise(resolve => {
+      OKLiteManager.setMnemonic(mnemonic, pwd, overwrite, this.convertToPromise(resolve));
+    });
   }
-  getMnemonicWithPin(pwd, result) {
-    try {
-      OKLiteManager.getMnemonicWithPin(pwd, async (error, data, state) => {
-        result(error, data ? await data : null, state);
-      });
-    } catch (error) {
-      result({
-        code: CardErrors.ExecFailure,
-        message: null
-      }, null, null);
-    }
+  getMnemonicWithPin(pwd) {
+    return new Promise(resolve => {
+      OKLiteManager.getMnemonicWithPin(pwd, this.convertToPromise(resolve));
+    });
   }
-  changePin(oldPin, newPin, result) {
-    OKLiteManager.changePin(oldPin, newPin, result);
+  changePin(oldPin, newPin) {
+    return new Promise(resolve => {
+      OKLiteManager.changePin(oldPin, newPin, this.convertToPromise(resolve));
+    });
   }
-  reset(result) {
-    OKLiteManager.reset(result);
+  reset() {
+    return new Promise(resolve => {
+      OKLiteManager.reset(this.convertToPromise(resolve));
+    });
+  }
+  convertToPromise(resolve) {
+    return (...result) => {
+      resolve({
+        error: result[0],
+        data: result[1],
+        cardInfo: result[2]
+      });
+    };
   }
   cancel() {
     if (Platform.OS === 'android') OKLiteManager.cancel();

package/lib/module/index.js.map

@@ -1 +1 @@
-{"version":3,"names":["Linking","NativeEventEmitter","NativeModules","Platform","CardErrors","OKLiteManager","OnekeyLite","UiEventEmitter","constructor","OS","addConnectListener","listener","removeConnectListeners","addListener","removeAllListeners","addAccordListener","eventEmitter","getLiteInfo","result","checkNFCPermission","setMnemonic","mnemonic","pwd","overwrite","getMnemonicWithPin","error","data","state","code","ExecFailure","message","changePin","oldPin","newPin","reset","cancel","intoSetting","openSettings","onekeyLite"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"AAAA,SACEA,OAAO,EACPC,kBAAkB,EAClBC,aAAa,EACbC,QAAQ,QACH,cAAc;AAErB,SAASC,UAAU,QAAQ,SAAS;AAIpC,MAAM;EAAEC;AAAc,CAAC,GAAGH,aAAa;AAOvC,MAAMI,UAAU,CAAC;EACfC,cAAc,GAA8B,IAAI;EAEhDC,WAAWA,CAAA,EAAG;IACZ,IAAIL,QAAQ,CAACM,EAAE,KAAK,SAAS,EAAE;IAC/B,IAAI,CAACF,cAAc,GAAG,IAAIN,kBAAkB,CAACI,aAAa,CAAC;EAC7D;EAEAK,kBAAkBA,CAACC,QAA4C,EAAE;IAC/D,IAAI,CAACC,sBAAsB,CAAC,CAAC;IAC7B,OAAO,IAAI,CAACL,cAAc,EAAEM,WAAW,CAAC,cAAc,EAAEF,QAAQ,CAAC;EACnE;EAEAC,sBAAsBA,CAAA,EAAG;IACvB,OAAO,IAAI,CAACL,cAAc,EAAEO,kBAAkB,CAAC,cAAc,CAAC;EAChE;EAEAC,iBAAiBA,CAAA,EAAG;IAClB,IAAIZ,QAAQ,CAACM,EAAE,KAAK,SAAS,EAAE;IAC/B,MAAMO,YAAY,GAAG,IAAIf,kBAAkB,CAACI,aAAa,CAAC;IAC1D,OAAOW,YAAY,CAACH,WAAW,CAAC,uBAAuB,EAAE,MAAM,CAAC,CAAC,CAAC;EACpE;EAEAI,WAAWA,CAACC,MAA0B,EAAE;IACtCb,aAAa,CAACY,WAAW,CAACC,MAAM,CAAC;EACnC;EAEAC,kBAAkBA,CAACD,MAAyB,EAAE;IAC5Cb,aAAa,CAACc,kBAAkB,CAACD,MAAM,CAAC;EAC1C;EAEAE,WAAWA,CACTC,QAAgB,EAChBC,GAAW,EACXJ,MAAyB,EACzBK,SAAS,GAAG,KAAK,EACjB;IACAlB,aAAa,CAACe,WAAW,CAACC,QAAQ,EAAEC,GAAG,EAAEC,SAAS,EAAEL,MAAM,CAAC;EAC7D;EAEAM,kBAAkBA,CAACF,GAAW,EAAEJ,MAAwB,EAAE;IACxD,IAAI;MACFb,aAAa,CAACmB,kBAAkB,CAC9BF,GAAG,EACH,OACEG,KAA2B,EAC3BC,IAAmB,EACnBC,KAAsB,KACnB;QACHT,MAAM,CAACO,KAAK,EAAEC,IAAI,GAAG,MAAMA,IAAI,GAAG,IAAI,EAAEC,KAAK,CAAC;MAChD,CACF,CAAC;IACH,CAAC,CAAC,OAAOF,KAAK,EAAE;MACdP,MAAM,CAAC;QAAEU,IAAI,EAAExB,UAAU,CAACyB,WAAW;QAAEC,OAAO,EAAE;MAAK,CAAC,EAAE,IAAI,EAAE,IAAI,CAAC;IACrE;EACF;EAEAC,SAASA,CAACC,MAAc,EAAEC,MAAc,EAAEf,MAAyB,EAAE;IACnEb,aAAa,CAAC0B,SAAS,CAACC,MAAM,EAAEC,MAAM,EAAEf,MAAM,CAAC;EACjD;EAEAgB,KAAKA,CAAChB,MAAyB,EAAE;IAC/Bb,aAAa,CAAC6B,KAAK,CAAChB,MAAM,CAAC;EAC7B;EAEAiB,MAAMA,CAAA,EAAG;IACP,IAAIhC,QAAQ,CAACM,EAAE,KAAK,SAAS,EAAEJ,aAAa,CAAC8B,MAAM,CAAC,CAAC;EACvD;EAEAC,WAAWA,CAAA,EAAG;IACZ,IAAIjC,QAAQ,CAACM,EAAE,KAAK,SAAS,EAAE;MAC7BJ,aAAa,CAAC+B,WAAW,CAAC,CAAC;IAC7B,CAAC,MAAM;MACLpC,OAAO,CAACqC,YAAY,CAAC,CAAC;IACxB;EACF;AACF;AAEA,MAAMC,UAAU,GAAG,IAAIhC,UAAU,CAAC,CAAC;AACnC,eAAegC,UAAU"}
+{"version":3,"names":["Linking","NativeEventEmitter","NativeModules","Platform","OKLiteManager","OnekeyLite","UiEventEmitter","constructor","OS","addConnectListener","listener","removeConnectListeners","addListener","removeAllListeners","addAccordListener","eventEmitter","getLiteInfo","Promise","resolve","convertToPromise","checkNFCPermission","setMnemonic","mnemonic","pwd","overwrite","getMnemonicWithPin","changePin","oldPin","newPin","reset","result","error","data","cardInfo","cancel","intoSetting","openSettings","onekeyLite"],"sourceRoot":"../../src","sources":["index.ts"],"mappings":"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"}

package/lib/module/types.js.map

@@ -1 +1 @@
-{"version":3,"names":["CardErrors"],"sourceRoot":"../../src","sources":["types.ts"],"mappings":"AAeA,WAAYA,UAAU,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA"}
+{"version":3,"names":["CardErrors"],"sourceRoot":"../../src","sources":["types.ts"],"mappings":"AAqBA,WAAYA,UAAU,0BAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAVA,UAAU,CAAVA,UAAU;EAAA,OAAVA,UAAU;AAAA"}

package/lib/typescript/src/index.d.ts

@@ -1,5 +1,5 @@
 import { NativeEventEmitter } from 'react-native';
-import type { Callback, CardInfo } from './types';
+import type { CardInfo, PromiseResult } from './types';
 export type NfcConnectUiState = {
     code: number;
     message: string;
@@ -10,12 +10,13 @@ declare class OnekeyLite {
     addConnectListener(listener: (event: NfcConnectUiState) => void): import("react-native").EmitterSubscription | undefined;
     removeConnectListeners(): void | undefined;
     addAccordListener(): import("react-native").EmitterSubscription | undefined;
-    getLiteInfo(result: Callback<CardInfo>): void;
-    checkNFCPermission(result: Callback<boolean>): void;
-    setMnemonic(mnemonic: string, pwd: string, result: Callback<boolean>, overwrite?: boolean): void;
-    getMnemonicWithPin(pwd: string, result: Callback<string>): void;
-    changePin(oldPin: string, newPin: string, result: Callback<boolean>): void;
-    reset(result: Callback<boolean>): void;
+    getLiteInfo(): Promise<PromiseResult<CardInfo>>;
+    checkNFCPermission(): Promise<PromiseResult<boolean>>;
+    setMnemonic(mnemonic: string, pwd: string, overwrite?: boolean): Promise<PromiseResult<boolean>>;
+    getMnemonicWithPin(pwd: string): Promise<PromiseResult<string>>;
+    changePin(oldPin: string, newPin: string): Promise<PromiseResult<boolean>>;
+    reset(): Promise<PromiseResult<boolean>>;
+    convertToPromise<T>(resolve: (value: PromiseResult<T> | PromiseLike<PromiseResult<T>>) => void): (error: import("./types").CallbackError, data: T | null, cardInfo: CardInfo) => void;
     cancel(): void;
     intoSetting(): void;
 }

package/lib/typescript/src/index.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAGnB,MAAM,cAAc,CAAC;AAItB,OAAO,KAAK,EAAE,QAAQ,EAAiB,QAAQ,EAAE,MAAM,SAAS,CAAC;AAIjE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,cAAM,UAAU;IACd,cAAc,EAAE,kBAAkB,GAAG,IAAI,CAAQ;;IAOjD,kBAAkB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI;IAK/D,sBAAsB;IAItB,iBAAiB;IAMjB,WAAW,CAAC,MAAM,EAAE,QAAQ,CAAC,QAAQ,CAAC;IAItC,kBAAkB,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC;IAI5C,WAAW,CACT,QAAQ,EAAE,MAAM,EAChB,GAAG,EAAE,MAAM,EACX,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC,EACzB,SAAS,UAAQ;IAKnB,kBAAkB,CAAC,GAAG,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,CAAC;IAiBxD,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC;IAInE,KAAK,CAAC,MAAM,EAAE,QAAQ,CAAC,OAAO,CAAC;IAI/B,MAAM;IAIN,WAAW;CAOZ;AAED,QAAA,MAAM,UAAU,YAAmB,CAAC;AACpC,eAAe,UAAU,CAAC"}
+{"version":3,"file":"index.d.ts","sourceRoot":"","sources":["../../../src/index.ts"],"names":[],"mappings":"AAAA,OAAO,EAEL,kBAAkB,EAGnB,MAAM,cAAc,CAAC;AAEtB,OAAO,KAAK,EAAkB,QAAQ,EAAE,aAAa,EAAE,MAAM,SAAS,CAAC;AAIvE,MAAM,MAAM,iBAAiB,GAAG;IAC9B,IAAI,EAAE,MAAM,CAAC;IACb,OAAO,EAAE,MAAM,CAAC;CACjB,CAAC;AAEF,cAAM,UAAU;IACd,cAAc,EAAE,kBAAkB,GAAG,IAAI,CAAQ;;IAOjD,kBAAkB,CAAC,QAAQ,EAAE,CAAC,KAAK,EAAE,iBAAiB,KAAK,IAAI;IAK/D,sBAAsB;IAItB,iBAAiB;IAMjB,WAAW;IAMX,kBAAkB;IAMlB,WAAW,CAAC,QAAQ,EAAE,MAAM,EAAE,GAAG,EAAE,MAAM,EAAE,SAAS,UAAQ;IAW5D,kBAAkB,CAAC,GAAG,EAAE,MAAM;IAM9B,SAAS,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM;IAMxC,KAAK;IAML,gBAAgB,CAAC,CAAC,EAChB,OAAO,EAAE,CAAC,KAAK,EAAE,aAAa,CAAC,CAAC,CAAC,GAAG,WAAW,CAAC,aAAa,CAAC,CAAC,CAAC,CAAC,KAAK,IAAI;IAO5E,MAAM;IAIN,WAAW;CAOZ;AAED,QAAA,MAAM,UAAU,YAAmB,CAAC;AACpC,eAAe,UAAU,CAAC"}

package/lib/typescript/src/types.d.ts

@@ -1,4 +1,13 @@
-export type Callback<T> = (error: CallbackError | null, data: T | null, state: CardInfo | null) => void;
+export type CallbackResult<T> = [
+    error: CallbackError | null,
+    data: T | null,
+    cardInfo: CardInfo | null
+];
+export type PromiseResult<T> = {
+    error: CallbackError | null;
+    data: T | null;
+    cardInfo: CardInfo | null;
+};
 export type CallbackError = {
     code: number;
     message: string | null;

package/lib/typescript/src/types.d.ts.map

@@ -1 +1 @@
-{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,QAAQ,CAAC,CAAC,IAAI,CACxB,KAAK,EAAE,aAAa,GAAG,IAAI,EAC3B,IAAI,EAAE,CAAC,GAAG,IAAI,EACd,KAAK,EAAE,QAAQ,GAAG,IAAI,KACnB,IAAI,CAAC;AAEV,MAAM,MAAM,aAAa,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,CAAC;AAE5E,MAAM,MAAM,QAAQ,GAAG;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,IAAI,CAAC;AAET,oBAAY,UAAU;IACpB,WAAW,OAAO;IAClB,YAAY,OAAO;IACnB,YAAY,OAAO;IACnB,gBAAgB,OAAO;IAEvB,cAAc,OAAO;IACrB,cAAc,OAAO;IACrB,cAAc,OAAO;IACrB,UAAU,OAAO;IAEjB,aAAa,OAAO;IACpB,kBAAkB,OAAO;IACzB,cAAc,OAAO;IACrB,iBAAiB,OAAO;IACxB,QAAQ,OAAO;IACf,mBAAmB,OAAO;IAE1B,WAAW,OAAO;IAClB,gBAAgB,OAAO;IACvB,mBAAmB,OAAO;CAC3B"}
+{"version":3,"file":"types.d.ts","sourceRoot":"","sources":["../../../src/types.ts"],"names":[],"mappings":"AAAA,MAAM,MAAM,cAAc,CAAC,CAAC,IAAI;IAC9B,KAAK,EAAE,aAAa,GAAG,IAAI;IAC3B,IAAI,EAAE,CAAC,GAAG,IAAI;IACd,QAAQ,EAAE,QAAQ,GAAG,IAAI;CAC1B,CAAC;AAEF,MAAM,MAAM,aAAa,CAAC,CAAC,IAAI;IAC7B,KAAK,EAAE,aAAa,GAAG,IAAI,CAAC;IAC5B,IAAI,EAAE,CAAC,GAAG,IAAI,CAAC;IACf,QAAQ,EAAE,QAAQ,GAAG,IAAI,CAAC;CAC3B,CAAC;AAEF,MAAM,MAAM,aAAa,GAAG;IAAE,IAAI,EAAE,MAAM,CAAC;IAAC,OAAO,EAAE,MAAM,GAAG,IAAI,CAAA;CAAE,GAAG,IAAI,CAAC;AAE5E,MAAM,MAAM,QAAQ,GAAG;IACrB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,OAAO,CAAC;IACnB,SAAS,EAAE,MAAM,CAAC;IAClB,aAAa,EAAE,MAAM,CAAC;CACvB,GAAG,IAAI,CAAC;AAET,oBAAY,UAAU;IACpB,WAAW,OAAO;IAClB,YAAY,OAAO;IACnB,YAAY,OAAO;IACnB,gBAAgB,OAAO;IAEvB,cAAc,OAAO;IACrB,cAAc,OAAO;IACrB,cAAc,OAAO;IACrB,UAAU,OAAO;IAEjB,aAAa,OAAO;IACpB,kBAAkB,OAAO;IACzB,cAAc,OAAO;IACrB,iBAAiB,OAAO;IACxB,QAAQ,OAAO;IACf,mBAAmB,OAAO;IAE1B,WAAW,OAAO;IAClB,gBAAgB,OAAO;IACvB,mBAAmB,OAAO;CAC3B"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@onekeyfe/react-native-lite-card",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "lite card",
   "main": "lib/commonjs/index",
   "module": "lib/module/index",

package/src/index.ts

@@ -5,9 +5,7 @@ import {
   Platform,
 } from 'react-native';
 
-import { CardErrors } from './types';
-
-import type { Callback, CallbackError, CardInfo } from './types';
+import type { CallbackResult, CardInfo, PromiseResult } from './types';
 
 const { OKLiteManager } = NativeModules;
 
@@ -39,46 +37,53 @@ class OnekeyLite {
     return eventEmitter.addListener('nfc_active_connection', () => {});
   }
 
-  getLiteInfo(result: Callback<CardInfo>) {
-    OKLiteManager.getLiteInfo(result);
+  getLiteInfo() {
+    return new Promise<PromiseResult<CardInfo>>((resolve) => {
+      OKLiteManager.getLiteInfo(this.convertToPromise(resolve));
+    });
   }
 
-  checkNFCPermission(result: Callback<boolean>) {
-    OKLiteManager.checkNFCPermission(result);
+  checkNFCPermission() {
+    return new Promise<PromiseResult<boolean>>((resolve) => {
+      OKLiteManager.checkNFCPermission(this.convertToPromise(resolve));
+    });
   }
 
-  setMnemonic(
-    mnemonic: string,
-    pwd: string,
-    result: Callback<boolean>,
-    overwrite = false
-  ) {
-    OKLiteManager.setMnemonic(mnemonic, pwd, overwrite, result);
-  }
-
-  getMnemonicWithPin(pwd: string, result: Callback<string>) {
-    try {
-      OKLiteManager.getMnemonicWithPin(
+  setMnemonic(mnemonic: string, pwd: string, overwrite = false) {
+    return new Promise<PromiseResult<boolean>>((resolve) => {
+      OKLiteManager.setMnemonic(
+        mnemonic,
         pwd,
-        async (
-          error: CallbackError | null,
-          data: string | null,
-          state: CardInfo | null
-        ) => {
-          result(error, data ? await data : null, state);
-        }
+        overwrite,
+        this.convertToPromise(resolve)
       );
-    } catch (error) {
-      result({ code: CardErrors.ExecFailure, message: null }, null, null);
-    }
+    });
   }
 
-  changePin(oldPin: string, newPin: string, result: Callback<boolean>) {
-    OKLiteManager.changePin(oldPin, newPin, result);
+  getMnemonicWithPin(pwd: string) {
+    return new Promise<PromiseResult<string>>((resolve) => {
+      OKLiteManager.getMnemonicWithPin(pwd, this.convertToPromise(resolve));
+    });
   }
 
-  reset(result: Callback<boolean>) {
-    OKLiteManager.reset(result);
+  changePin(oldPin: string, newPin: string) {
+    return new Promise<PromiseResult<boolean>>((resolve) => {
+      OKLiteManager.changePin(oldPin, newPin, this.convertToPromise(resolve));
+    });
+  }
+
+  reset() {
+    return new Promise<PromiseResult<boolean>>((resolve) => {
+      OKLiteManager.reset(this.convertToPromise(resolve));
+    });
+  }
+
+  convertToPromise<T>(
+    resolve: (value: PromiseResult<T> | PromiseLike<PromiseResult<T>>) => void
+  ) {
+    return (...result: CallbackResult<T>) => {
+      resolve({ error: result[0], data: result[1], cardInfo: result[2] });
+    };
   }
 
   cancel() {

package/src/types.ts

@@ -1,8 +1,14 @@
-export type Callback<T> = (
+export type CallbackResult<T> = [
   error: CallbackError | null,
   data: T | null,
-  state: CardInfo | null
-) => void;
+  cardInfo: CardInfo | null
+];
+
+export type PromiseResult<T> = {
+  error: CallbackError | null;
+  data: T | null;
+  cardInfo: CardInfo | null;
+};
 
 export type CallbackError = { code: number; message: string | null } | null;