@onekeyfe/react-native-lite-card 6.7.0-4 → 6.7.0-41

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
Files changed (237) hide show
  1. package/README.md +12 -2
  2. package/ReactNativeLiteCard.podspec +31 -2
  3. package/android/build.gradle +8 -0
  4. package/android/consumer-rules.pro +4 -0
  5. package/android/src/main/cpp/CMakeLists.txt +6 -2
  6. package/android/src/main/java/com/onekeyfe/reactnativelitecard/ReactNativeLiteCardModule.kt +60 -49
  7. package/android/src/main/java/com/onekeyfe/reactnativelitecard/nfc/gpchannel/GPChannelNatives.kt +7 -7
  8. package/android/src/main/java/com/onekeyfe/reactnativelitecard/onekeyLite/OnekeyLiteCard.kt +117 -39
  9. package/android/src/main/java/com/onekeyfe/reactnativelitecard/onekeyLite/entitys/SendResponse.kt +6 -3
  10. package/android/src/main/java/com/onekeyfe/reactnativelitecard/onekeyLite/nfc/CommandGenerator.kt +24 -2
  11. package/android/src/main/java/com/onekeyfe/reactnativelitecard/onekeyLite/nfc/Connection.kt +46 -19
  12. package/android/src/main/java/com/onekeyfe/reactnativelitecard/onekeyLite/nfc/GPCAPDUGenerator.kt +2 -2
  13. package/ios/Classes/OKLiteCommand/OKLiteCommandTool.m +38 -1
  14. package/ios/Classes/OKNFCBridge.mm +24 -1
  15. package/ios/Classes/OKNFTLite/OKLiteV1.m +20 -10
  16. package/ios/Classes/OKNFTLite/OKLiteV2.m +13 -5
  17. package/ios/Classes/OKNFTLite/OKNFCManager.h +2 -2
  18. package/ios/Classes/OKNFTLite/OKNFCManager.m +110 -18
  19. package/ios/ReactNativeLiteCard.mm +23 -11
  20. package/lib/module/index.js +4 -4
  21. package/lib/typescript/src/NativeReactNativeLiteCard.d.ts +4 -4
  22. package/lib/typescript/src/index.d.ts +2 -2
  23. package/package.json +8 -8
  24. package/sdk/CMakeLists.txt +121 -0
  25. package/sdk/README.md +190 -0
  26. package/sdk/android/implJni.cpp +216 -0
  27. package/sdk/deps/jsoncpp/LICENSE +55 -0
  28. package/sdk/deps/jsoncpp/include/CMakeLists.txt +2 -0
  29. package/sdk/deps/jsoncpp/include/json/allocator.h +98 -0
  30. package/sdk/deps/jsoncpp/include/json/assertions.h +54 -0
  31. package/sdk/deps/jsoncpp/include/json/autolink.h +25 -0
  32. package/sdk/deps/jsoncpp/include/json/config.h +187 -0
  33. package/sdk/deps/jsoncpp/include/json/features.h +61 -0
  34. package/sdk/deps/jsoncpp/include/json/forwards.h +37 -0
  35. package/sdk/deps/jsoncpp/include/json/json.h +15 -0
  36. package/sdk/deps/jsoncpp/include/json/reader.h +411 -0
  37. package/sdk/deps/jsoncpp/include/json/value.h +888 -0
  38. package/sdk/deps/jsoncpp/include/json/version.h +20 -0
  39. package/sdk/deps/jsoncpp/include/json/writer.h +357 -0
  40. package/sdk/deps/jsoncpp/src/lib_json/CMakeLists.txt +117 -0
  41. package/sdk/deps/jsoncpp/src/lib_json/json_reader.cpp +2060 -0
  42. package/sdk/deps/jsoncpp/src/lib_json/json_tool.h +114 -0
  43. package/sdk/deps/jsoncpp/src/lib_json/json_value.cpp +1661 -0
  44. package/sdk/deps/jsoncpp/src/lib_json/json_valueiterator.inl +167 -0
  45. package/sdk/deps/jsoncpp/src/lib_json/json_writer.cpp +1233 -0
  46. package/sdk/deps/jsoncpp/src/lib_json/version.h.in +20 -0
  47. package/sdk/deps/trezor-crypto/AUTHORS +2 -0
  48. package/sdk/deps/trezor-crypto/LICENSE +22 -0
  49. package/sdk/deps/trezor-crypto/include/TrezorCrypto/TrezorCrypto.h +29 -0
  50. package/sdk/deps/trezor-crypto/include/TrezorCrypto/address.h +44 -0
  51. package/sdk/deps/trezor-crypto/include/TrezorCrypto/aes.h +224 -0
  52. package/sdk/deps/trezor-crypto/include/TrezorCrypto/base32.h +49 -0
  53. package/sdk/deps/trezor-crypto/include/TrezorCrypto/base58.h +58 -0
  54. package/sdk/deps/trezor-crypto/include/TrezorCrypto/bignum.h +169 -0
  55. package/sdk/deps/trezor-crypto/include/TrezorCrypto/bip32.h +114 -0
  56. package/sdk/deps/trezor-crypto/include/TrezorCrypto/bip39.h +66 -0
  57. package/sdk/deps/trezor-crypto/include/TrezorCrypto/blake256.h +61 -0
  58. package/sdk/deps/trezor-crypto/include/TrezorCrypto/blake2b.h +50 -0
  59. package/sdk/deps/trezor-crypto/include/TrezorCrypto/blake2s.h +49 -0
  60. package/sdk/deps/trezor-crypto/include/TrezorCrypto/cash_addr.h +109 -0
  61. package/sdk/deps/trezor-crypto/include/TrezorCrypto/chacha20poly1305/ecrypt-config.h +316 -0
  62. package/sdk/deps/trezor-crypto/include/TrezorCrypto/chacha20poly1305/ecrypt-sync.h +289 -0
  63. package/sdk/deps/trezor-crypto/include/TrezorCrypto/chacha20poly1305/ecrypt-types.h +53 -0
  64. package/sdk/deps/trezor-crypto/include/TrezorCrypto/chacha20poly1305/poly1305-donna.h +28 -0
  65. package/sdk/deps/trezor-crypto/include/TrezorCrypto/chacha20poly1305.h +27 -0
  66. package/sdk/deps/trezor-crypto/include/TrezorCrypto/cmac.h +44 -0
  67. package/sdk/deps/trezor-crypto/include/TrezorCrypto/curves.h +60 -0
  68. package/sdk/deps/trezor-crypto/include/TrezorCrypto/ecdsa.h +112 -0
  69. package/sdk/deps/trezor-crypto/include/TrezorCrypto/ed25519-donna/curve25519-donna-32bit.h +87 -0
  70. package/sdk/deps/trezor-crypto/include/TrezorCrypto/ed25519-donna/curve25519-donna-helpers.h +30 -0
  71. package/sdk/deps/trezor-crypto/include/TrezorCrypto/ed25519-donna/ed25519-blake2b.h +21 -0
  72. package/sdk/deps/trezor-crypto/include/TrezorCrypto/ed25519-donna/ed25519-donna-32bit-tables.h +25 -0
  73. package/sdk/deps/trezor-crypto/include/TrezorCrypto/ed25519-donna/ed25519-donna-basepoint-table.h +10 -0
  74. package/sdk/deps/trezor-crypto/include/TrezorCrypto/ed25519-donna/ed25519-donna-impl-base.h +110 -0
  75. package/sdk/deps/trezor-crypto/include/TrezorCrypto/ed25519-donna/ed25519-donna-portable.h +32 -0
  76. package/sdk/deps/trezor-crypto/include/TrezorCrypto/ed25519-donna/ed25519-donna.h +60 -0
  77. package/sdk/deps/trezor-crypto/include/TrezorCrypto/ed25519-donna/ed25519-keccak.h +21 -0
  78. package/sdk/deps/trezor-crypto/include/TrezorCrypto/ed25519-donna/ed25519-sha3.h +21 -0
  79. package/sdk/deps/trezor-crypto/include/TrezorCrypto/ed25519-donna/modm-donna-32bit.h +87 -0
  80. package/sdk/deps/trezor-crypto/include/TrezorCrypto/ed25519-donna.h +60 -0
  81. package/sdk/deps/trezor-crypto/include/TrezorCrypto/ed25519.h +42 -0
  82. package/sdk/deps/trezor-crypto/include/TrezorCrypto/endian.h +132 -0
  83. package/sdk/deps/trezor-crypto/include/TrezorCrypto/groestl.h +104 -0
  84. package/sdk/deps/trezor-crypto/include/TrezorCrypto/hasher.h +90 -0
  85. package/sdk/deps/trezor-crypto/include/TrezorCrypto/hmac.h +60 -0
  86. package/sdk/deps/trezor-crypto/include/TrezorCrypto/memzero.h +16 -0
  87. package/sdk/deps/trezor-crypto/include/TrezorCrypto/monero/base58.h +42 -0
  88. package/sdk/deps/trezor-crypto/include/TrezorCrypto/monero/monero.h +13 -0
  89. package/sdk/deps/trezor-crypto/include/TrezorCrypto/monero/range_proof.h +30 -0
  90. package/sdk/deps/trezor-crypto/include/TrezorCrypto/monero/serialize.h +15 -0
  91. package/sdk/deps/trezor-crypto/include/TrezorCrypto/monero/xmr.h +67 -0
  92. package/sdk/deps/trezor-crypto/include/TrezorCrypto/nano.h +56 -0
  93. package/sdk/deps/trezor-crypto/include/TrezorCrypto/nem.h +199 -0
  94. package/sdk/deps/trezor-crypto/include/TrezorCrypto/nist256p1.h +35 -0
  95. package/sdk/deps/trezor-crypto/include/TrezorCrypto/pbkdf2.h +64 -0
  96. package/sdk/deps/trezor-crypto/include/TrezorCrypto/rand.h +44 -0
  97. package/sdk/deps/trezor-crypto/include/TrezorCrypto/rc4.h +37 -0
  98. package/sdk/deps/trezor-crypto/include/TrezorCrypto/rfc6979.h +40 -0
  99. package/sdk/deps/trezor-crypto/include/TrezorCrypto/ripemd160.h +28 -0
  100. package/sdk/deps/trezor-crypto/include/TrezorCrypto/ripple/base58.h +45 -0
  101. package/sdk/deps/trezor-crypto/include/TrezorCrypto/schnorr.h +48 -0
  102. package/sdk/deps/trezor-crypto/include/TrezorCrypto/script.h +30 -0
  103. package/sdk/deps/trezor-crypto/include/TrezorCrypto/scrypt.h +68 -0
  104. package/sdk/deps/trezor-crypto/include/TrezorCrypto/secp256k1.h +59 -0
  105. package/sdk/deps/trezor-crypto/include/TrezorCrypto/sha2.h +125 -0
  106. package/sdk/deps/trezor-crypto/include/TrezorCrypto/sha3.h +86 -0
  107. package/sdk/deps/trezor-crypto/include/TrezorCrypto/sodium/keypair.h +20 -0
  108. package/sdk/deps/trezor-crypto/include/TrezorCrypto/sodium/private/ed25519_ref10.h +85 -0
  109. package/sdk/deps/trezor-crypto/include/TrezorCrypto/sodium/private/ed25519_ref10_fe_25_5.h +43 -0
  110. package/sdk/deps/trezor-crypto/include/TrezorCrypto/sodium/private/fe_25_5/constants.h +29 -0
  111. package/sdk/deps/trezor-crypto/include/TrezorCrypto/sodium/private/fe_25_5/fe.h +25 -0
  112. package/sdk/deps/trezor-crypto/src/address.c +87 -0
  113. package/sdk/deps/trezor-crypto/src/aes/aes_modes.c +959 -0
  114. package/sdk/deps/trezor-crypto/src/aes/aescrypt.c +307 -0
  115. package/sdk/deps/trezor-crypto/src/aes/aeskey.c +560 -0
  116. package/sdk/deps/trezor-crypto/src/aes/aesopt.h +784 -0
  117. package/sdk/deps/trezor-crypto/src/aes/aestab.c +418 -0
  118. package/sdk/deps/trezor-crypto/src/aes/aestab.h +173 -0
  119. package/sdk/deps/trezor-crypto/src/base32.c +233 -0
  120. package/sdk/deps/trezor-crypto/src/base58.c +298 -0
  121. package/sdk/deps/trezor-crypto/src/bignum.c +808 -0
  122. package/sdk/deps/trezor-crypto/src/bip32.c +852 -0
  123. package/sdk/deps/trezor-crypto/src/bip39.c +266 -0
  124. package/sdk/deps/trezor-crypto/src/bip39_english.h +2074 -0
  125. package/sdk/deps/trezor-crypto/src/blake256.c +235 -0
  126. package/sdk/deps/trezor-crypto/src/blake2_common.h +39 -0
  127. package/sdk/deps/trezor-crypto/src/blake2b.c +333 -0
  128. package/sdk/deps/trezor-crypto/src/blake2s.c +318 -0
  129. package/sdk/deps/trezor-crypto/src/cash_addr.c +195 -0
  130. package/sdk/deps/trezor-crypto/src/chacha20poly1305/chacha20poly1305.c +60 -0
  131. package/sdk/deps/trezor-crypto/src/chacha20poly1305/chacha_merged.c +246 -0
  132. package/sdk/deps/trezor-crypto/src/chacha20poly1305/ecrypt-machine.h +49 -0
  133. package/sdk/deps/trezor-crypto/src/chacha20poly1305/ecrypt-portable.h +275 -0
  134. package/sdk/deps/trezor-crypto/src/chacha20poly1305/poly1305-donna-32.h +219 -0
  135. package/sdk/deps/trezor-crypto/src/chacha20poly1305/poly1305-donna.c +179 -0
  136. package/sdk/deps/trezor-crypto/src/chacha20poly1305/rfc7539.c +48 -0
  137. package/sdk/deps/trezor-crypto/src/chacha20poly1305/rfc7539.h +10 -0
  138. package/sdk/deps/trezor-crypto/src/check_mem.h +30 -0
  139. package/sdk/deps/trezor-crypto/src/cmac.c +342 -0
  140. package/sdk/deps/trezor-crypto/src/curves.c +48 -0
  141. package/sdk/deps/trezor-crypto/src/ecdsa.c +1355 -0
  142. package/sdk/deps/trezor-crypto/src/ed25519-donna/README.md +183 -0
  143. package/sdk/deps/trezor-crypto/src/ed25519-donna/curve25519-donna-32bit.c +681 -0
  144. package/sdk/deps/trezor-crypto/src/ed25519-donna/curve25519-donna-helpers.c +66 -0
  145. package/sdk/deps/trezor-crypto/src/ed25519-donna/curve25519-donna-scalarmult-base.c +67 -0
  146. package/sdk/deps/trezor-crypto/src/ed25519-donna/curve25519-donna-scalarmult-base.h +8 -0
  147. package/sdk/deps/trezor-crypto/src/ed25519-donna/ed25519-blake2b.c +8 -0
  148. package/sdk/deps/trezor-crypto/src/ed25519-donna/ed25519-donna-32bit-tables.c +63 -0
  149. package/sdk/deps/trezor-crypto/src/ed25519-donna/ed25519-donna-basepoint-table.c +261 -0
  150. package/sdk/deps/trezor-crypto/src/ed25519-donna/ed25519-donna-impl-base.c +722 -0
  151. package/sdk/deps/trezor-crypto/src/ed25519-donna/ed25519-hash-custom-blake2b.h +23 -0
  152. package/sdk/deps/trezor-crypto/src/ed25519-donna/ed25519-hash-custom-keccak.h +23 -0
  153. package/sdk/deps/trezor-crypto/src/ed25519-donna/ed25519-hash-custom-sha3.h +23 -0
  154. package/sdk/deps/trezor-crypto/src/ed25519-donna/ed25519-hash-custom.h +23 -0
  155. package/sdk/deps/trezor-crypto/src/ed25519-donna/ed25519-keccak.c +8 -0
  156. package/sdk/deps/trezor-crypto/src/ed25519-donna/ed25519-sha3.c +8 -0
  157. package/sdk/deps/trezor-crypto/src/ed25519-donna/ed25519.c +311 -0
  158. package/sdk/deps/trezor-crypto/src/ed25519-donna/modm-donna-32bit.c +517 -0
  159. package/sdk/deps/trezor-crypto/src/groestl.c +783 -0
  160. package/sdk/deps/trezor-crypto/src/groestl_internal.h +419 -0
  161. package/sdk/deps/trezor-crypto/src/hasher.c +186 -0
  162. package/sdk/deps/trezor-crypto/src/hmac.c +179 -0
  163. package/sdk/deps/trezor-crypto/src/memzero.c +6 -0
  164. package/sdk/deps/trezor-crypto/src/monero/base58.c +245 -0
  165. package/sdk/deps/trezor-crypto/src/monero/int-util.h +77 -0
  166. package/sdk/deps/trezor-crypto/src/monero/range_proof.c +115 -0
  167. package/sdk/deps/trezor-crypto/src/monero/serialize.c +54 -0
  168. package/sdk/deps/trezor-crypto/src/monero/xmr.c +136 -0
  169. package/sdk/deps/trezor-crypto/src/nano.c +151 -0
  170. package/sdk/deps/trezor-crypto/src/nem.c +569 -0
  171. package/sdk/deps/trezor-crypto/src/nist256p1.c +63 -0
  172. package/sdk/deps/trezor-crypto/src/nist256p1.table +1664 -0
  173. package/sdk/deps/trezor-crypto/src/options.h +43 -0
  174. package/sdk/deps/trezor-crypto/src/pbkdf2.c +177 -0
  175. package/sdk/deps/trezor-crypto/src/rand.c +51 -0
  176. package/sdk/deps/trezor-crypto/src/rc4.c +56 -0
  177. package/sdk/deps/trezor-crypto/src/ripemd160.c +343 -0
  178. package/sdk/deps/trezor-crypto/src/ripple/base58.c +76 -0
  179. package/sdk/deps/trezor-crypto/src/schnorr.c +208 -0
  180. package/sdk/deps/trezor-crypto/src/script.c +64 -0
  181. package/sdk/deps/trezor-crypto/src/scrypt.c +343 -0
  182. package/sdk/deps/trezor-crypto/src/secp256k1.c +160 -0
  183. package/sdk/deps/trezor-crypto/src/secp256k1.table +1664 -0
  184. package/sdk/deps/trezor-crypto/src/setup.py +38 -0
  185. package/sdk/deps/trezor-crypto/src/sha2.c +1314 -0
  186. package/sdk/deps/trezor-crypto/src/sha3.c +395 -0
  187. package/sdk/deps/trezor-crypto/src/shell.nix +6 -0
  188. package/sdk/deps/trezor-crypto/src/sodium/keypair.c +63 -0
  189. package/sdk/deps/trezor-crypto/src/sodium/private/ed25519_ref10.c +481 -0
  190. package/sdk/deps/trezor-crypto/src/sodium/private/ed25519_ref10_fe_25_5.c +885 -0
  191. package/sdk/deps/trezor-crypto/src/sodium/private/fe_25_5/fe.c +237 -0
  192. package/sdk/gpc/include/scp03/scp03.hpp +80 -0
  193. package/sdk/gpc/include/scp11/scp11.hpp +492 -0
  194. package/sdk/gpc/include/scp11/scp11c.hpp +58 -0
  195. package/sdk/gpc/include/tag.h +68 -0
  196. package/sdk/gpc/include/tlv.hpp +94 -0
  197. package/sdk/gpc/include/tlvparse.hpp +24 -0
  198. package/sdk/gpc/src/scp03.cpp +243 -0
  199. package/sdk/gpc/src/scp11.cpp +798 -0
  200. package/sdk/gpc/src/scp11c.cpp +136 -0
  201. package/sdk/gpc/src/tlv.cpp +159 -0
  202. package/sdk/gpc/src/tlvparse.c +174 -0
  203. package/{framework/GPChannelSDKCore.xcframework/ios-arm64/GPChannelSDKCore.framework/Headers → sdk/include}/GPChannelSDK.h +0 -0
  204. package/sdk/include/GPChannelSDKCore.h +10 -0
  205. package/sdk/include/context/BaseContext.h +56 -0
  206. package/sdk/include/device/ApduBuilder.hpp +72 -0
  207. package/sdk/include/mSIGNA/stdutils/uchar_vector.h +36 -0
  208. package/sdk/include/utility/Apdu.hpp +172 -0
  209. package/sdk/include/utility/Debug.hpp +3 -0
  210. package/sdk/include/utility/util.h +104 -0
  211. package/sdk/scripts/generate-source-id.rb +22 -0
  212. package/sdk/source-id-manifest.txt +19 -0
  213. package/sdk/source-id.cmake +31 -0
  214. package/sdk/src/ApduBuilder.cpp +332 -0
  215. package/sdk/src/GPChannelSDK.cpp +258 -0
  216. package/sdk/src/random.c +25 -0
  217. package/sdk/src/version.c +3 -0
  218. package/sdk/tests/android/GPChannelProxy.java +55 -0
  219. package/sdk/tests/android_verify.py +124 -0
  220. package/sdk/tests/safety.cpp +757 -0
  221. package/sdk/tests/verify.py +284 -0
  222. package/src/NativeReactNativeLiteCard.ts +4 -2
  223. package/src/index.tsx +14 -3
  224. package/android/src/main/jniLibs/arm64-v8a/libgpchannelNDK.so +0 -0
  225. package/android/src/main/jniLibs/armeabi-v7a/libgpchannelNDK.so +0 -0
  226. package/framework/GPChannelSDKCore.xcframework/Info.plist +0 -52
  227. package/framework/GPChannelSDKCore.xcframework/ios-arm64/GPChannelSDKCore.framework/GPChannelSDKCore +0 -0
  228. package/framework/GPChannelSDKCore.xcframework/ios-arm64/GPChannelSDKCore.framework/Headers/GPChannelSDKCore.h +0 -19
  229. package/framework/GPChannelSDKCore.xcframework/ios-arm64/GPChannelSDKCore.framework/Info.plist +0 -0
  230. package/framework/GPChannelSDKCore.xcframework/ios-arm64/GPChannelSDKCore.framework/Modules/module.modulemap +0 -7
  231. package/framework/GPChannelSDKCore.xcframework/ios-arm64/GPChannelSDKCore.framework/_CodeSignature/CodeResources +0 -147
  232. package/framework/GPChannelSDKCore.xcframework/ios-arm64_x86_64-simulator/GPChannelSDKCore.framework/GPChannelSDKCore +0 -0
  233. package/framework/GPChannelSDKCore.xcframework/ios-arm64_x86_64-simulator/GPChannelSDKCore.framework/Headers/GPChannelSDK.h +0 -315
  234. package/framework/GPChannelSDKCore.xcframework/ios-arm64_x86_64-simulator/GPChannelSDKCore.framework/Headers/GPChannelSDKCore.h +0 -19
  235. package/framework/GPChannelSDKCore.xcframework/ios-arm64_x86_64-simulator/GPChannelSDKCore.framework/Info.plist +0 -0
  236. package/framework/GPChannelSDKCore.xcframework/ios-arm64_x86_64-simulator/GPChannelSDKCore.framework/Modules/module.modulemap +0 -7
  237. package/framework/GPChannelSDKCore.xcframework/ios-arm64_x86_64-simulator/GPChannelSDKCore.framework/_CodeSignature/CodeResources +0 -147
@@ -8,7 +8,8 @@
8
8
 
9
9
  #if !TARGET_OS_SIMULATOR
10
10
 
11
- #import <GPChannelSDKCore/GPChannelSDKCore.h>
11
+ #import "GPChannelSDK.h"
12
+ #import "GPChannelSDKCore.h"
12
13
  #import "OKNFCLiteDefine.h"
13
14
  #import "NFCConfig.h"
14
15
 
@@ -19,6 +20,22 @@
19
20
  #import "OKNFCBridge.h"
20
21
  #import "LCLogger.h"
21
22
 
23
+ #if !TARGET_OS_SIMULATOR
24
+ static NSString *sourceIdForLog() {
25
+ NSString *source = [NSString stringWithUTF8String:(const char *)GPChannelSDKCoreVersionString];
26
+ if (source.length != 74 || ![source hasPrefix:@"source-v1:"]) return @"unavailable";
27
+ for (NSUInteger index = 10; index < source.length; ++index) {
28
+ unichar digit = [source characterAtIndex:index];
29
+ if (!((digit >= '0' && digit <= '9') || (digit >= 'a' && digit <= 'f'))) return @"unavailable";
30
+ }
31
+ NSMutableArray<NSString *> *groups = [NSMutableArray array];
32
+ for (NSUInteger offset = 10; offset < source.length; offset += 8) {
33
+ [groups addObject:[source substringWithRange:NSMakeRange(offset, 8)]];
34
+ }
35
+ return [@"source-v1:" stringByAppendingString:[groups componentsJoinedByString:@"-"]];
36
+ }
37
+ #endif
38
+
22
39
  @implementation OKNFCBridge
23
40
 
24
41
  #if !TARGET_OS_SIMULATOR
@@ -39,6 +56,11 @@
39
56
  } else {
40
57
  rv = JUB_GPC_BuildAPDU(cla, ins, p1, p2, c_data, &c_apdu);
41
58
  }
59
+ @try {
60
+ [LCLogger info:[NSString stringWithFormat:@"stage=command_build nativeSourceId=%@ safe=%d sdkReturnCode=%lu outputPresent=%d", sourceIdForLog(), encrypt, (unsigned long)rv, c_apdu != nullptr]];
61
+ } @catch (NSException *exception) {
62
+ // Diagnostics must not replace the SDK result.
63
+ }
42
64
 
43
65
  if (JUBR_OK != rv) {
44
66
  return nil;
@@ -64,6 +86,7 @@
64
86
  JUB_UINT16 wRet = 0;
65
87
  JUB_CHAR_PTR pDecResp = nullptr;
66
88
  rv = JUB_GPC_ParseSafeAPDUResponse(c_data ,&wRet, &pDecResp);
89
+ [LCLogger info:[NSString stringWithFormat:@"stage=parse_safe_response parseReturnCode=%lu parsedSW=%u parsePresent=%d", (unsigned long)rv, wRet, pDecResp != nullptr]];
67
90
  if (JUBR_OK != rv) {
68
91
  return nil;
69
92
  }
@@ -44,7 +44,7 @@
44
44
  return @{
45
45
  @"hasBackup":[NSNull null],
46
46
  @"pinRetryCount":@(_pinRTL),
47
- @"isNewCard":@(_status == OKNFCLiteStatusNewCard),
47
+ @"isNewCard":@((BOOL)(_status == OKNFCLiteStatusNewCard)),
48
48
  @"serialNum":_SN
49
49
  };
50
50
  }
@@ -98,6 +98,7 @@
98
98
 
99
99
  - (BOOL)syncLiteInfo {
100
100
 
101
+ self.status = OKNFCLiteStatusError;
101
102
  OKNFCLiteStatus status = OKNFCLiteStatusError;
102
103
  self.pinRTL = 0;
103
104
  NSUInteger PinStatus = OKNFC_PIN_ERROR;
@@ -112,6 +113,11 @@
112
113
  return NO;
113
114
  }
114
115
  PinStatus = [self getPINStatus];
116
+ [LCLogger info:[NSString stringWithFormat:@"stage=pin_state_read readSucceeded=%d", PinStatus != OKNFC_PIN_ERROR]];
117
+ if (PinStatus == OKNFC_PIN_ERROR) {
118
+ self.status = OKNFCLiteStatusError;
119
+ return NO;
120
+ }
115
121
  status = PinStatus == OKNFC_PIN_UNSET ? OKNFCLiteStatusNewCard : OKNFCLiteStatusActivated;
116
122
  self.status = status;
117
123
  self.pinRTL = PinStatus == OKNFC_PIN_UNSET ? 10 : PinStatus;
@@ -415,10 +421,13 @@
415
421
  if (sw1 != OKNFC_SW1_OK) {
416
422
  if (sw1 == FailedVerificationCode) {
417
423
  self.pinRTL = sw2 & PinRTLBitMask;
424
+ result = OKNFCLitePINVerifyResultNotMatch;
418
425
  } else if (sw1 == AuthenticationLockCode) {
419
426
  self.pinRTL = 0;
427
+ result = OKNFCLitePINVerifyResultNotMatch;
428
+ } else {
429
+ result = OKNFCLitePINVerifyResultError;
420
430
  }
421
- result = OKNFCLitePINVerifyResultNotMatch;
422
431
  dispatch_semaphore_signal(sema);
423
432
  return;
424
433
  }
@@ -486,7 +495,7 @@
486
495
  [self.commandTool sendCommandWithAPDU:[modal buildAPDU]
487
496
  modal:modal
488
497
  completionHandler:^(NSData * _Nonnull responseData, uint8_t sw1, uint8_t sw2, NSError * _Nullable error, NSString * _Nonnull parseRespon) {
489
- if (sw1 != OKNFC_SW1_OK) {
498
+ if (error != nil || sw1 != OKNFC_SW1_OK || responseData.length == 0) {
490
499
  [LCLogger error:@"获取 PIN 状态失败"];
491
500
  dispatch_semaphore_signal(sema);
492
501
  return;
@@ -498,12 +507,13 @@
498
507
  return;
499
508
  } else {
500
509
  OKLiteCommandModal *modal2 = [[OKLiteCommandModal alloc] initWithCommand:OKLiteCommandPinRTL version:self.version];
501
- [self.commandTool sendCommandWithAPDU:[modal2 buildAPDU] modal:modal completionHandler:^(NSData * _Nonnull responseData, uint8_t sw1, uint8_t sw2, NSError * _Nullable error, NSString * _Nonnull parseRespon) {
502
- if (sw1 == OKNFC_SW1_OK) {
503
- unsigned int outVal;
510
+ [self.commandTool sendCommandWithAPDU:[modal2 buildAPDU] modal:modal2 completionHandler:^(NSData * _Nonnull responseData, uint8_t sw1, uint8_t sw2, NSError * _Nullable error, NSString * _Nonnull parseRespon) {
511
+ if (error == nil && sw1 == OKNFC_SW1_OK && responseData.length > 0) {
512
+ unsigned int outVal = 0;
504
513
  NSScanner* scanner = [NSScanner scannerWithString:responseData.toHexString];
505
- [scanner scanHexInt:&outVal];
506
- pinStatus = outVal;
514
+ if ([scanner scanHexInt:&outVal]) {
515
+ pinStatus = outVal;
516
+ }
507
517
  }
508
518
  dispatch_semaphore_signal(sema);
509
519
  }];
@@ -518,7 +528,7 @@
518
528
  __block BOOL success = NO;
519
529
  dispatch_semaphore_t sema = dispatch_semaphore_create(0);
520
530
  OKLiteCommandModal *modal = [[OKLiteCommandModal alloc] initWithCommand:OKLiteCommandImportMnemonic version:self.version];
521
- modal.parseResp = true;
531
+ modal.parseResp = self.version == OKNFCLiteVersionV2;
522
532
  [self.commandTool sendCommandWithAPDU:[modal importMnemonic:mnc] modal:modal completionHandler:^(NSData * _Nonnull responseData, uint8_t sw1, uint8_t sw2, NSError * _Nullable error, NSString * _Nonnull parseRespon) {
523
533
  if (sw1 != OKNFC_SW1_OK) {
524
534
  dispatch_semaphore_signal(sema);
@@ -537,7 +547,7 @@
537
547
  __block NSString *mnc = nil;
538
548
  dispatch_semaphore_t sema = dispatch_semaphore_create(0);
539
549
  OKLiteCommandModal *modal = [[OKLiteCommandModal alloc] initWithCommand:OKLiteCommandExportMnemonic version:self.version];
540
- modal.parseResp = true;
550
+ modal.parseResp = self.version == OKNFCLiteVersionV2;
541
551
  [self.commandTool sendCommandWithAPDU:[modal buildAPDU] modal:modal completionHandler:^(NSData * _Nonnull responseData, uint8_t sw1, uint8_t sw2, NSError * _Nullable error, NSString * _Nonnull parseRespon) {
542
552
  if (sw1 != OKNFC_SW1_OK) {
543
553
  dispatch_semaphore_signal(sema);
@@ -80,12 +80,20 @@
80
80
  OKNFCLitePINVerifyResult oldPinVerifyResult = [self verifyPin:pin];
81
81
  if (oldPinVerifyResult == OKNFCLitePINVerifyResultPass) {
82
82
  [self setPin:pin];
83
- } else if (oldPinVerifyResult == OKNFCLitePINVerifyResultNotMatch) {
84
- status = OKNFCLiteSetMncStatusPinNotMatch;
85
- if (self.pinRTL <= 0) {
86
- BOOL restSeccuss = [self resetSync];
87
- status = restSeccuss ? OKNFCLiteSetMncStatusWiped : OKNFCLiteSetMncStatusError;
83
+ } else {
84
+ if (oldPinVerifyResult == OKNFCLitePINVerifyResultNotMatch) {
85
+ status = OKNFCLiteSetMncStatusPinNotMatch;
86
+ if (self.pinRTL <= 0) {
87
+ BOOL restSeccuss = [self resetSync];
88
+ status = restSeccuss ? OKNFCLiteSetMncStatusWiped : OKNFCLiteSetMncStatusError;
89
+ }
88
90
  }
91
+ if (status == OKNFCLiteSetMncStatusWiped) {
92
+ self.status = OKNFCLiteStatusNewCard;
93
+ }
94
+ [self.delegate endNFCSessionWithError:YES];
95
+ callBack(self,status);
96
+ return;
89
97
  }
90
98
  }
91
99
 
@@ -30,11 +30,11 @@
30
30
 
31
31
  - (void)reset:(ResetCallback)callBack;
32
32
 
33
- - (void)setMnemonic:(NSString *)mnemonic withPin:(NSString *)pin overwrite:(BOOL)overwrite complete:(SetMnemonicCallback)complete;
33
+ - (void)setMnemonic:(NSString *)mnemonic withPin:(NSString *)pin overwrite:(BOOL)overwrite expectedSerial:(NSString * _Nullable)expectedSerial complete:(SetMnemonicCallback)complete;
34
34
 
35
35
  - (void)getMnemonicWithPin:(NSString *)pin complete:(GetMnemonicCallback)complete;
36
36
 
37
- - (void)changePin:(NSString *)oldPin to:(NSString *)newPin complete:(ChangePinCallback)complete;
37
+ - (void)changePin:(NSString *)oldPin to:(NSString *)newPin expectedSerial:(NSString * _Nullable)expectedSerial complete:(ChangePinCallback)complete;
38
38
 
39
39
 
40
40
  @end
@@ -27,14 +27,36 @@
27
27
  #define kChangePinBlock @"kChangePinBlock"
28
28
  #define kResetBlock @"kResetBlock"
29
29
 
30
+ static NSString *backupInputReason(NSString *input, NSUInteger maxBytes) {
31
+ if (!input) return @"missing";
32
+ if (!input.length) return @"empty";
33
+ if (input.length > maxBytes * 2) return @"too_large";
34
+ for (NSUInteger index = 0; index < input.length; ++index) {
35
+ const unichar digit = [input characterAtIndex:index];
36
+ if (!((digit >= '0' && digit <= '9') || (digit >= 'a' && digit <= 'f') ||
37
+ (digit >= 'A' && digit <= 'F'))) return @"non_hex";
38
+ }
39
+ return @"accepted";
40
+ }
41
+
42
+ static void logBackupPreflight(NSString *input, BOOL overwrite, NSString *reason, NSInteger version) {
43
+ @try {
44
+ [LCLogger info:[NSString stringWithFormat:@"operation=setMnemonic stage=input_preflight_%@ inputPresent=%d inputChars=%lu odd=%d versionKnown=%d cardVersion=%ld overwrite=%d reason=%@ accepted=%d", version ? @"detected" : @"entry", input != nil, (unsigned long)input.length, input.length % 2 != 0, version != 0, (long)version, overwrite, reason, [reason isEqualToString:@"accepted"]]];
45
+ } @catch (NSException *exception) {
46
+ // Diagnostics must not alter the input decision or callback.
47
+ }
48
+ }
30
49
 
31
50
 
32
51
 
33
52
  @interface OKNFCManager() <NFCTagReaderSessionDelegate,OKNFCManagerDelegate>
34
53
  @property (nonatomic, strong) NFCTagReaderSession *session;
54
+ @property (nonatomic, assign) NSUInteger diagnosticID;
55
+ @property (nonatomic, assign) NSUInteger diagnosticSessionID;
35
56
  @property (nonatomic, copy) NSString *pin;
36
57
  @property (nonatomic, copy) NSString *neoPin;
37
58
  @property (nonatomic, copy) NSString *exportMnemonic;
59
+ @property (nonatomic, copy) NSString *expectedSerial;
38
60
  @property (nonatomic, assign) BOOL certVerified;
39
61
  @property (nonatomic, assign) OKNFCLiteApp selectNFCApp;
40
62
  @property (nonatomic, strong) OKLiteV1 *lite;
@@ -48,6 +70,20 @@
48
70
 
49
71
  @implementation OKNFCManager
50
72
 
73
+ - (instancetype)init {
74
+ self = [super init];
75
+ if (self) {
76
+ static NSUInteger nextID = 0;
77
+ @synchronized (OKNFCManager.class) { _diagnosticID = ++nextID; }
78
+ }
79
+ return self;
80
+ }
81
+
82
+ - (void)logSessionStage:(NSString *)stage details:(NSString *)details {
83
+ [LCLogger info:[NSString stringWithFormat:@"managerID=%lu sessionID=%lu operation=%ld stage=%@ wallTimeMs=%.0f %@", (unsigned long)self.diagnosticID, (unsigned long)self.diagnosticSessionID, (long)self.sessionType, stage, NSDate.date.timeIntervalSince1970 * 1000, details]];
84
+ }
85
+
86
+
51
87
  #pragma mark - OKNFCManagerDelegate
52
88
 
53
89
  - (id<NFCISO7816Tag>)getNFCsessionTag {
@@ -61,6 +97,7 @@
61
97
 
62
98
 
63
99
  - (void)endNFCSessionWithError:(BOOL)isError {
100
+ [self logSessionStage:@"invalidate_request" details:[NSString stringWithFormat:@"isError=%d", isError]];
64
101
  self.sessionEndedByApp = YES;
65
102
  self.session.alertMessage = @"";
66
103
  if (isError) {
@@ -115,6 +152,7 @@
115
152
  } break;
116
153
  case OKNFCLiteSessionTypeSetMnemonic:
117
154
  case OKNFCLiteSessionTypeSetMnemonicForce: {
155
+ self.expectedSerial = nil;
118
156
  SetMnemonicCallback callback = [self takeCompletionForKey:kSetMnemonicBlock];
119
157
  if (callback) {
120
158
  callback(self.lite, asCancel ? OKNFCLiteSetMncStatusCancel : OKNFCLiteSetMncStatusError);
@@ -127,7 +165,11 @@
127
165
  }
128
166
  } break;
129
167
  case OKNFCLiteSessionTypeChangePin: {
130
- ChangePinCallback callback = [self takeCompletionForKey:kChangePinBlock];
168
+ ChangePinCallback callback;
169
+ @synchronized (self) {
170
+ self.expectedSerial = nil;
171
+ callback = [self takeCompletionForKey:kChangePinBlock];
172
+ }
131
173
  if (callback) {
132
174
  callback(self.lite, asCancel ? OKNFCLiteChangePinStatusCancel : OKNFCLiteChangePinStatusError);
133
175
  }
@@ -138,6 +180,8 @@
138
180
  }
139
181
 
140
182
  - (void)beginNewNFCSession {
183
+ self.diagnosticSessionID += 1;
184
+ [self logSessionStage:@"begin" details:@""];
141
185
  self.sessionEndedByApp = NO;
142
186
  self.session = [[NFCTagReaderSession alloc] initWithPollingOption:NFCPollingISO14443 delegate:self queue:dispatch_get_global_queue(2, 0)];
143
187
  [self.session beginSession];
@@ -146,26 +190,25 @@
146
190
  #pragma mark - NFCTagReaderSessionDelegate
147
191
 
148
192
  - (void)tagReaderSession:(NFCTagReaderSession *)session didDetectTags:(NSArray<__kindof id<NFCTag>> *)tags {
149
- [LCLogger debug:@"tagReaderSession didDetectTags"];
193
+ [self logSessionStage:@"detect" details:[NSString stringWithFormat:@"tagCount=%lu currentSession=%d", (unsigned long)tags.count, session == self.session]];
150
194
 
151
195
  id<NFCISO7816Tag> tag = [tags.firstObject asNFCISO7816Tag];
152
196
  if (!tag) { return; }
153
197
 
154
198
  [session connectToTag:tag completionHandler:^(NSError * _Nullable error) {
155
199
  if (error) {
156
- NSString *errMsg = [NSString stringWithFormat:@"connectToTag error: %@", error.localizedDescription];
157
- [LCLogger error:errMsg];
158
- // [kTools debugTipMessage:errMsg];
200
+ [self logSessionStage:@"connect_failure" details:[NSString stringWithFormat:@"code=%ld coreNFCDomain=%d", (long)error.code, [error.domain isEqualToString:NFCErrorDomain]]];
159
201
  [self endNFCSessionWithError:YES];
160
202
  [self finishPendingRequestAsCancel:NO sessionError:nil];
161
203
  return;
162
204
  }
205
+ [self logSessionStage:@"connect_success" details:@""];
163
206
  [self nfcSessionComplete:session];
164
207
  }];
165
208
  }
166
209
 
167
210
  - (void)tagReaderSession:(NFCTagReaderSession *)session didInvalidateWithError:(NSError *)error {
168
- [LCLogger debug:[NSString stringWithFormat:@"tagReaderSession didInvalidateWithError: %@", error.localizedDescription]];
211
+ [self logSessionStage:@"invalidated" details:[NSString stringWithFormat:@"code=%ld coreNFCDomain=%d endedByApp=%d currentSession=%d", (long)error.code, [error.domain isEqualToString:NFCErrorDomain], self.sessionEndedByApp, session == self.session]];
169
212
  // When the app ended the session, the card operation that ended it reports
170
213
  // the real result; treating this as a cancel would race with it.
171
214
  if ((error.code == 200 || error.code == 6) && !self.sessionEndedByApp) {
@@ -175,7 +218,7 @@
175
218
  }
176
219
 
177
220
  - (void)tagReaderSessionDidBecomeActive:(NFCTagReaderSession *)session {
178
- [LCLogger debug:@"tagReaderSessionDidBecomeActive"];
221
+ [self logSessionStage:@"active" details:[NSString stringWithFormat:@"currentSession=%d", session == self.session]];
179
222
  }
180
223
 
181
224
  #pragma mark - Tasks
@@ -256,13 +299,23 @@
256
299
  - (void)setMnemonic:(NSString *)mnemonic
257
300
  withPin:(NSString *)pin
258
301
  overwrite:(BOOL)overwrite
302
+ expectedSerial:(NSString * _Nullable)expectedSerial
259
303
  complete:(SetMnemonicCallback)complete {
260
304
 
305
+ NSString *reason = backupInputReason(mnemonic, 65535);
306
+ BOOL accepted = [reason isEqualToString:@"accepted"];
307
+ logBackupPreflight(mnemonic, overwrite, reason, 0);
308
+ if (!accepted) {
309
+ complete(nil, OKNFCLiteSetMncStatusError);
310
+ return;
311
+ }
261
312
  if (pin.length != OKNFC_PIN_LENGTH) {
313
+ [self logSessionStage:@"input_rejected" details:@"operation=setMnemonic"];
262
314
  return;
263
315
  }
264
316
  self.pin = pin;
265
317
  self.exportMnemonic = mnemonic;
318
+ self.expectedSerial = expectedSerial;
266
319
  if(overwrite) {
267
320
  // 写入强制覆盖
268
321
  self.sessionType = OKNFCLiteSessionTypeSetMnemonicForce;
@@ -277,9 +330,31 @@
277
330
  - (void)_setMnemonic:(BOOL)force {
278
331
  NSString *mnemonic = self.exportMnemonic;
279
332
  NSString *pin = self.pin;
333
+ NSString *expectedSerial = self.expectedSerial;
334
+ self.expectedSerial = nil;
280
335
  // Clear sensitive data from properties immediately
281
336
  self.exportMnemonic = nil;
282
337
  self.pin = nil;
338
+ const NSUInteger maxBytes = self.lite.version == OKNFCLiteVersionV2 ? 65511 : 65535;
339
+ NSString *reason = backupInputReason(mnemonic, maxBytes);
340
+ BOOL accepted = [reason isEqualToString:@"accepted"];
341
+ logBackupPreflight(mnemonic, force, reason, self.lite.version + 1);
342
+ if (!accepted) {
343
+ SetMnemonicCallback callback = [self takeCompletionForKey:kSetMnemonicBlock];
344
+ [self endNFCSessionWithError:YES];
345
+ if (callback) callback(nil, OKNFCLiteSetMncStatusError);
346
+ return;
347
+ }
348
+ if (expectedSerial != nil) {
349
+ BOOL infoValid = [self.lite syncLiteInfo];
350
+ if (!infoValid || ![expectedSerial isEqualToString:self.lite.SN]) {
351
+ [self logSessionStage:infoValid ? @"identity_mismatch" : @"identity_read_failed" details:@"operation=setMnemonic"];
352
+ SetMnemonicCallback callback = [self takeCompletionForKey:kSetMnemonicBlock];
353
+ [self endNFCSessionWithError:YES];
354
+ if (callback) callback(self.lite, infoValid ? OKNFCLiteSetMncStatusSNNotMatch : OKNFCLiteSetMncStatusError);
355
+ return;
356
+ }
357
+ }
283
358
  __weak typeof(self) weakSelf = self;
284
359
  [self.lite setMnemonic:mnemonic withPin:pin overwrite:force complete:^(OKLiteV1 *lite, OKNFCLiteSetMncStatus status) {
285
360
  SetMnemonicCallback callback = [weakSelf takeCompletionForKey:kSetMnemonicBlock];
@@ -293,6 +368,7 @@
293
368
 
294
369
  - (void)getMnemonicWithPin:(NSString *)pin complete:(GetMnemonicCallback)complete {
295
370
  if (pin.length != OKNFC_PIN_LENGTH) {
371
+ [self logSessionStage:@"input_rejected" details:@"operation=getMnemonicWithPin"];
296
372
  return;
297
373
  }
298
374
  self.pin = pin;
@@ -316,26 +392,42 @@
316
392
 
317
393
  #pragma mark - changePin
318
394
 
319
- - (void)changePin:(NSString *)oldPin to:(NSString *)newPin complete:(ChangePinCallback)complete {
395
+ - (void)changePin:(NSString *)oldPin to:(NSString *)newPin expectedSerial:(NSString *)expectedSerial complete:(ChangePinCallback)complete {
320
396
  self.pin = oldPin;
321
397
  self.neoPin = newPin;
398
+ self.expectedSerial = expectedSerial;
322
399
  self.sessionType = OKNFCLiteSessionTypeChangePin;
323
400
  [self.completionBlocks setObject:complete forKey:kChangePinBlock];
324
401
  [self beginNewNFCSession];
325
402
  }
326
403
 
327
404
  - (void)_changePin {
328
- NSString *oldPin = self.pin;
329
- NSString *newPin = self.neoPin;
330
- // Clear sensitive data from properties immediately
331
- self.pin = nil;
332
- self.neoPin = nil;
333
- __weak typeof(self) weakSelf = self;
334
- [self.lite changePin:oldPin to:newPin complete:^(OKLiteV1 *lite, OKNFCLiteChangePinStatus status) {
335
- ChangePinCallback callback = [weakSelf takeCompletionForKey:kChangePinBlock];
336
- if (callback) {
337
- callback(lite, status);
405
+ NSString *oldPin;
406
+ NSString *newPin;
407
+ NSString *expectedSerial;
408
+ ChangePinCallback callback;
409
+ @synchronized (self) {
410
+ // Claim the request and its guard together so cancellation cannot
411
+ // turn a late connection into an unguarded PIN change.
412
+ callback = [self takeCompletionForKey:kChangePinBlock];
413
+ if (!callback) return;
414
+ oldPin = self.pin;
415
+ newPin = self.neoPin;
416
+ expectedSerial = self.expectedSerial;
417
+ self.pin = nil;
418
+ self.neoPin = nil;
419
+ self.expectedSerial = nil;
420
+ }
421
+ if (expectedSerial != nil) {
422
+ BOOL infoValid = [self.lite syncLiteInfo];
423
+ if (!infoValid || !self.lite.SN.length || ![expectedSerial isEqualToString:self.lite.SN]) {
424
+ [self endNFCSessionWithError:YES];
425
+ callback(self.lite, infoValid ? OKNFCLiteChangePinStatusSNNotMatch : OKNFCLiteChangePinStatusError);
426
+ return;
338
427
  }
428
+ }
429
+ [self.lite changePin:oldPin to:newPin complete:^(OKLiteV1 *lite, OKNFCLiteChangePinStatus status) {
430
+ callback(lite, status);
339
431
  }];
340
432
  }
341
433
 
@@ -30,14 +30,21 @@ typedef NS_ENUM(NSInteger, NFCLiteExceptions) {
30
30
 
31
31
  // React Native aborts the app when a callback runs twice, and NFC results can
32
32
  // arrive from more than one CoreNFC thread, so only the first result is sent.
33
- static RCTResponseSenderBlock OKLiteCallbackOnce(RCTResponseSenderBlock callback)
33
+ static RCTResponseSenderBlock OKLiteCallbackOnce(NSString *operation, RCTResponseSenderBlock callback)
34
34
  {
35
+ static std::atomic<unsigned long> nextOperationID{0};
36
+ unsigned long operationID = ++nextOperationID;
37
+ NSTimeInterval started = NSProcessInfo.processInfo.systemUptime;
38
+ [LCLogger info:[NSString stringWithFormat:@"operation=%@ operationID=%lu stage=entry wallTimeMs=%.0f", operation, operationID, NSDate.date.timeIntervalSince1970 * 1000]];
35
39
  auto invoked = std::make_shared<std::atomic<bool>>(false);
36
40
  return ^(NSArray *response) {
37
41
  if (invoked->exchange(true)) {
38
- [LCLogger warn:@"Dropped a repeated Lite card callback"];
42
+ [LCLogger warn:[NSString stringWithFormat:@"operation=%@ operationID=%lu stage=callback_dropped", operation, operationID]];
39
43
  return;
40
44
  }
45
+ id error = response.firstObject;
46
+ NSNumber *code = [error isKindOfClass:NSDictionary.class] ? error[@"code"] : @0;
47
+ [LCLogger info:[NSString stringWithFormat:@"operation=%@ operationID=%lu stage=callback code=%ld elapsedMs=%.0f wallTimeMs=%.0f", operation, operationID, (long)code.integerValue, (NSProcessInfo.processInfo.systemUptime - started) * 1000, NSDate.date.timeIntervalSince1970 * 1000]];
41
48
  callback(response);
42
49
  };
43
50
  }
@@ -74,7 +81,7 @@ static RCTResponseSenderBlock OKLiteCallbackOnce(RCTResponseSenderBlock callback
74
81
 
75
82
  - (void)getLiteInfo:(RCTResponseSenderBlock)callBack
76
83
  {
77
- callBack = OKLiteCallbackOnce(callBack);
84
+ callBack = OKLiteCallbackOnce(@"getLiteInfo", callBack);
78
85
  if ([ReactNativeLiteCard checkSDKVaild:callBack]) {
79
86
  __block OKNFCManager *liteManager = [[OKNFCManager alloc] init];
80
87
  [liteManager getLiteInfo:^(OKLiteV1 *lite, OKNFCLiteStatus status) {
@@ -90,12 +97,12 @@ static RCTResponseSenderBlock OKLiteCallbackOnce(RCTResponseSenderBlock callback
90
97
  }
91
98
  }
92
99
 
93
- - (void)setMnemonic:(NSString *)mnemonic pwd:(NSString *)pwd overwrite:(BOOL)overwrite callback:(RCTResponseSenderBlock)callBack
100
+ - (void)setMnemonic:(NSString *)mnemonic pwd:(NSString *)pwd overwrite:(BOOL)overwrite expectedSerial:(NSString * _Nullable)expectedSerial callback:(RCTResponseSenderBlock)callBack
94
101
  {
95
- callBack = OKLiteCallbackOnce(callBack);
102
+ callBack = OKLiteCallbackOnce(@"setMnemonic", callBack);
96
103
  if ([ReactNativeLiteCard checkSDKVaild:callBack]) {
97
104
  __block OKNFCManager *liteManager = [[OKNFCManager alloc] init];
98
- [liteManager setMnemonic:mnemonic withPin:pwd overwrite:overwrite complete:^(OKLiteV1 *lite, OKNFCLiteSetMncStatus status) {
105
+ [liteManager setMnemonic:mnemonic withPin:pwd overwrite:overwrite expectedSerial:expectedSerial complete:^(OKLiteV1 *lite, OKNFCLiteSetMncStatus status) {
99
106
  NSDictionary *cardInfo = [lite cardInfo];
100
107
  switch (status) {
101
108
  case OKNFCLiteSetMncStatusSuccess:
@@ -130,7 +137,7 @@ static RCTResponseSenderBlock OKLiteCallbackOnce(RCTResponseSenderBlock callback
130
137
 
131
138
  - (void)getMnemonicWithPin:(NSString *)pwd callback:(RCTResponseSenderBlock)callBack
132
139
  {
133
- callBack = OKLiteCallbackOnce(callBack);
140
+ callBack = OKLiteCallbackOnce(@"getMnemonicWithPin", callBack);
134
141
  if ([ReactNativeLiteCard checkSDKVaild:callBack]) {
135
142
  __block OKNFCManager *liteManager = [[OKNFCManager alloc] init];
136
143
  [liteManager getMnemonicWithPin:pwd complete:^(OKLiteV1 *lite, NSString *mnemonic, OKNFCLiteGetMncStatus status) {
@@ -168,17 +175,20 @@ static RCTResponseSenderBlock OKLiteCallbackOnce(RCTResponseSenderBlock callback
168
175
  }
169
176
  }
170
177
 
171
- - (void)changePin:(NSString *)oldPin newPin:(NSString *)newPin callback:(RCTResponseSenderBlock)callBack
178
+ - (void)changePin:(NSString *)oldPin newPin:(NSString *)newPin expectedSerial:(NSString * _Nullable)expectedSerial callback:(RCTResponseSenderBlock)callBack
172
179
  {
173
- callBack = OKLiteCallbackOnce(callBack);
180
+ callBack = OKLiteCallbackOnce(@"changePin", callBack);
174
181
  if ([ReactNativeLiteCard checkSDKVaild:callBack]) {
175
182
  __block OKNFCManager *liteManager = [[OKNFCManager alloc] init];
176
- [liteManager changePin:oldPin to:newPin complete:^(OKLiteV1 *lite, OKNFCLiteChangePinStatus status) {
183
+ [liteManager changePin:oldPin to:newPin expectedSerial:expectedSerial complete:^(OKLiteV1 *lite, OKNFCLiteChangePinStatus status) {
177
184
  NSDictionary *cardInfo = [lite cardInfo];
178
185
  switch (status) {
179
186
  case OKNFCLiteChangePinStatusSuccess: {
180
187
  callBack(@[[NSNull null],@(true),cardInfo]);
181
188
  } break;
189
+ case OKNFCLiteChangePinStatusSNNotMatch: {
190
+ callBack(@[@{@"code":@(NFCLiteExceptionsDeviceMismatch),@"message":@""},[NSNull null],[NSNull null]]);
191
+ } break;
182
192
  case OKNFCLiteChangePinStatusWiped: {
183
193
  callBack(@[@{@"code":@(NFCLiteExceptionsAutoReset),@"message":@""},[NSNull null],[NSNull null]]);
184
194
  } break;
@@ -204,7 +214,7 @@ static RCTResponseSenderBlock OKLiteCallbackOnce(RCTResponseSenderBlock callback
204
214
 
205
215
  - (void)reset:(RCTResponseSenderBlock)callBack
206
216
  {
207
- callBack = OKLiteCallbackOnce(callBack);
217
+ callBack = OKLiteCallbackOnce(@"reset", callBack);
208
218
  if ([ReactNativeLiteCard checkSDKVaild:callBack]) {
209
219
  __block OKNFCManager *liteManager = [[OKNFCManager alloc] init];
210
220
  [liteManager reset:^(OKLiteV1 *lite, BOOL isSuccess, NSError *error) {
@@ -232,11 +242,13 @@ static RCTResponseSenderBlock OKLiteCallbackOnce(RCTResponseSenderBlock callback
232
242
  }
233
243
 
234
244
  + (BOOL)checkSDKVaild:(RCTResponseSenderBlock)callback {
245
+ [LCLogger info:@"stage=sdk_check"];
235
246
  if (![NFCNDEFReaderSession readingAvailable]) {
236
247
  callback(@[@{@"code":@(NFCLiteExceptionsNotNFCPermission),@"message":@""},[NSNull null],[NSNull null]]);
237
248
  return NO;
238
249
  }
239
250
  if ([NFCConfig envFor:@"crt"].length > 0 && [NFCConfig envFor:@"sk"].length > 0) {
251
+ [LCLogger info:@"stage=sdk_check_success"];
240
252
  return YES;
241
253
  }
242
254
  callback(@[@{@"code":@(NFCLiteExceptionsInitChannel),@"message":@""},[NSNull null],[NSNull null]]);
@@ -26,9 +26,9 @@ class OnekeyLite {
26
26
  OKLiteManager.checkNFCPermission(this.convertToPromise(resolve));
27
27
  });
28
28
  }
29
- setMnemonic(mnemonic, pwd, overwrite = false) {
29
+ setMnemonic(mnemonic, pwd, overwrite = false, expectedSerial) {
30
30
  return new Promise(resolve => {
31
- OKLiteManager.setMnemonic(mnemonic, pwd, overwrite, this.convertToPromise(resolve));
31
+ OKLiteManager.setMnemonic(mnemonic, pwd, overwrite, expectedSerial ?? null, this.convertToPromise(resolve));
32
32
  });
33
33
  }
34
34
  getMnemonicWithPin(pwd) {
@@ -36,9 +36,9 @@ class OnekeyLite {
36
36
  OKLiteManager.getMnemonicWithPin(pwd, this.convertToPromise(resolve));
37
37
  });
38
38
  }
39
- changePin(oldPin, newPin) {
39
+ changePin(oldPin, newPin, expectedSerial) {
40
40
  return new Promise(resolve => {
41
- OKLiteManager.changePin(oldPin, newPin, this.convertToPromise(resolve));
41
+ OKLiteManager.changePin(oldPin, newPin, expectedSerial ?? null, this.convertToPromise(resolve));
42
42
  });
43
43
  }
44
44
  reset() {
@@ -4,7 +4,7 @@ export type CallbackError = {
4
4
  message: string | null;
5
5
  } | null;
6
6
  export type CardInfo = {
7
- hasBackup: boolean;
7
+ hasBackup: boolean | null;
8
8
  isNewCard: boolean;
9
9
  serialNum: string;
10
10
  pinRetryCount: number;
@@ -39,15 +39,15 @@ export declare enum CardErrors {
39
39
  NotInitializedError = 4002
40
40
  }
41
41
  type KeyValuePair = {
42
- code: string;
42
+ code: number;
43
43
  message: string;
44
44
  };
45
45
  export interface Spec extends TurboModule {
46
46
  getLiteInfo(callback: (error: CallbackError | null, data: CardInfo | null, cardInfo: CardInfo | null) => void): void;
47
47
  checkNFCPermission(callback: (error: CallbackError | null, data: boolean | null, cardInfo: CardInfo | null) => void): void;
48
- setMnemonic(mnemonic: string, pwd: string, overwrite: boolean, callback: (error: CallbackError | null, data: boolean | null, cardInfo: CardInfo | null) => void): void;
48
+ setMnemonic(mnemonic: string, pwd: string, overwrite: boolean, expectedSerial: string | null, callback: (error: CallbackError | null, data: boolean | null, cardInfo: CardInfo | null) => void): void;
49
49
  getMnemonicWithPin(pwd: string, callback: (error: CallbackError | null, data: string | null, cardInfo: CardInfo | null) => void): void;
50
- changePin(oldPin: string, newPin: string, callback: (error: CallbackError | null, data: boolean | null, cardInfo: CardInfo | null) => void): void;
50
+ changePin(oldPin: string, newPin: string, expectedSerial: string | null, callback: (error: CallbackError | null, data: boolean | null, cardInfo: CardInfo | null) => void): void;
51
51
  reset(callback: (error: CallbackError | null, data: boolean | null, cardInfo: CardInfo | null) => void): void;
52
52
  cancel(): void;
53
53
  intoSetting(): void;
@@ -9,9 +9,9 @@ declare class OnekeyLite {
9
9
  addAccordListener(): import("react-native").EventSubscription;
10
10
  getLiteInfo(): Promise<PromiseResult<CardInfo>>;
11
11
  checkNFCPermission(): Promise<PromiseResult<boolean>>;
12
- setMnemonic(mnemonic: string, pwd: string, overwrite?: boolean): Promise<PromiseResult<boolean>>;
12
+ setMnemonic(mnemonic: string, pwd: string, overwrite?: boolean, expectedSerial?: string): Promise<PromiseResult<boolean>>;
13
13
  getMnemonicWithPin(pwd: string): Promise<PromiseResult<string>>;
14
- changePin(oldPin: string, newPin: string): Promise<PromiseResult<boolean>>;
14
+ changePin(oldPin: string, newPin: string, expectedSerial?: string): Promise<PromiseResult<boolean>>;
15
15
  reset(): Promise<PromiseResult<boolean>>;
16
16
  convertToPromise<T>(resolve: (value: PromiseResult<T> | PromiseLike<PromiseResult<T>>) => void): (...result: CallbackResult<T>) => void;
17
17
  cancel(): void;
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@onekeyfe/react-native-lite-card",
3
- "version": "6.7.0-4",
3
+ "version": "6.7.0-41",
4
4
  "description": "OneKey Lite NFC card operations and connection events for React Native",
5
5
  "main": "./lib/module/index.js",
6
6
  "types": "./lib/typescript/src/index.d.ts",
@@ -18,7 +18,7 @@
18
18
  "keys",
19
19
  "android",
20
20
  "ios",
21
- "framework",
21
+ "sdk",
22
22
  "cpp",
23
23
  "*.podspec",
24
24
  "react-native.config.js",
@@ -66,11 +66,11 @@
66
66
  "@eslint/compat": "^1.3.2",
67
67
  "@eslint/eslintrc": "^3.3.1",
68
68
  "@eslint/js": "^9.35.0",
69
- "@react-native/babel-preset": "0.86.2",
70
- "@react-native/eslint-config": "0.86.2",
69
+ "@react-native/babel-preset": "0.88.0",
70
+ "@react-native/eslint-config": "0.88.0",
71
71
  "@release-it/conventional-changelog": "^10.0.1",
72
72
  "@types/jest": "^29.5.14",
73
- "@types/react": "^19.2.0",
73
+ "@types/react": "^19.3.0",
74
74
  "commitlint": "^19.8.1",
75
75
  "del-cli": "^6.0.0",
76
76
  "eslint": "^9.35.0",
@@ -79,8 +79,8 @@
79
79
  "jest": "^29.7.0",
80
80
  "lefthook": "^2.0.3",
81
81
  "prettier": "^2.8.8",
82
- "react": "19.2.3",
83
- "react-native": "patch:react-native@npm%3A0.86.2#~/.yarn/patches/react-native-npm-0.86.2-c9d546616f.patch",
82
+ "react": "19.3.0",
83
+ "react-native": "patch:react-native@npm%3A0.88.0#~/.yarn/patches/react-native-npm-0.88.0-60c6201dd2.patch",
84
84
  "react-native-builder-bob": "^0.40.13",
85
85
  "release-it": "^19.0.4",
86
86
  "turbo": "^2.5.6",
@@ -129,7 +129,7 @@
129
129
  "useTabs": false
130
130
  },
131
131
  "jest": {
132
- "preset": "react-native",
132
+ "preset": "@react-native/jest-preset",
133
133
  "modulePathIgnorePatterns": [
134
134
  "<rootDir>/example/node_modules",
135
135
  "<rootDir>/lib/"