upgrade sdk ( android: 4.2.2 & iOS 4.1.8)

android/build.gradle

@@ -16,7 +16,7 @@ android {
 
 dependencies {
     implementation 'com.facebook.react:react-native:+'
-    implementation files('libs/geetest_sensebot_android_v4.0.7_20190311.aar')
+    implementation 'com.geetest.sensebot:sensebot:4.2.2'
 }
 
 def safeExtGet(prop, fallback) {

android/gradle/wrapper/gradle-wrapper.properties

@@ -0,0 +1,6 @@
+#Wed Jul 01 10:26:03 EEST 2020
+distributionBase=GRADLE_USER_HOME
+distributionPath=wrapper/dists
+zipStoreBase=GRADLE_USER_HOME
+zipStorePath=wrapper/dists
+distributionUrl=https\://services.gradle.org/distributions/gradle-6.1.1-all.zip

android/gradlew

@@ -0,0 +1,172 @@
+#!/usr/bin/env sh
+
+##############################################################################
+##
+##  Gradle start up script for UN*X
+##
+##############################################################################
+
+# Attempt to set APP_HOME
+# Resolve links: $0 may be a link
+PRG="$0"
+# Need this for relative symlinks.
+while [ -h "$PRG" ] ; do
+    ls=`ls -ld "$PRG"`
+    link=`expr "$ls" : '.*-> \(.*\)$'`
+    if expr "$link" : '/.*' > /dev/null; then
+        PRG="$link"
+    else
+        PRG=`dirname "$PRG"`"/$link"
+    fi
+done
+SAVED="`pwd`"
+cd "`dirname \"$PRG\"`/" >/dev/null
+APP_HOME="`pwd -P`"
+cd "$SAVED" >/dev/null
+
+APP_NAME="Gradle"
+APP_BASE_NAME=`basename "$0"`
+
+# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+DEFAULT_JVM_OPTS=""
+
+# Use the maximum available, or set MAX_FD != -1 to use that value.
+MAX_FD="maximum"
+
+warn () {
+    echo "$*"
+}
+
+die () {
+    echo
+    echo "$*"
+    echo
+    exit 1
+}
+
+# OS specific support (must be 'true' or 'false').
+cygwin=false
+msys=false
+darwin=false
+nonstop=false
+case "`uname`" in
+  CYGWIN* )
+    cygwin=true
+    ;;
+  Darwin* )
+    darwin=true
+    ;;
+  MINGW* )
+    msys=true
+    ;;
+  NONSTOP* )
+    nonstop=true
+    ;;
+esac
+
+CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar
+
+# Determine the Java command to use to start the JVM.
+if [ -n "$JAVA_HOME" ] ; then
+    if [ -x "$JAVA_HOME/jre/sh/java" ] ; then
+        # IBM's JDK on AIX uses strange locations for the executables
+        JAVACMD="$JAVA_HOME/jre/sh/java"
+    else
+        JAVACMD="$JAVA_HOME/bin/java"
+    fi
+    if [ ! -x "$JAVACMD" ] ; then
+        die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+    fi
+else
+    JAVACMD="java"
+    which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+
+Please set the JAVA_HOME variable in your environment to match the
+location of your Java installation."
+fi
+
+# Increase the maximum file descriptors if we can.
+if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then
+    MAX_FD_LIMIT=`ulimit -H -n`
+    if [ $? -eq 0 ] ; then
+        if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then
+            MAX_FD="$MAX_FD_LIMIT"
+        fi
+        ulimit -n $MAX_FD
+        if [ $? -ne 0 ] ; then
+            warn "Could not set maximum file descriptor limit: $MAX_FD"
+        fi
+    else
+        warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT"
+    fi
+fi
+
+# For Darwin, add options to specify how the application appears in the dock
+if $darwin; then
+    GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\""
+fi
+
+# For Cygwin, switch paths to Windows format before running java
+if $cygwin ; then
+    APP_HOME=`cygpath --path --mixed "$APP_HOME"`
+    CLASSPATH=`cygpath --path --mixed "$CLASSPATH"`
+    JAVACMD=`cygpath --unix "$JAVACMD"`
+
+    # We build the pattern for arguments to be converted via cygpath
+    ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null`
+    SEP=""
+    for dir in $ROOTDIRSRAW ; do
+        ROOTDIRS="$ROOTDIRS$SEP$dir"
+        SEP="|"
+    done
+    OURCYGPATTERN="(^($ROOTDIRS))"
+    # Add a user-defined pattern to the cygpath arguments
+    if [ "$GRADLE_CYGPATTERN" != "" ] ; then
+        OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)"
+    fi
+    # Now convert the arguments - kludge to limit ourselves to /bin/sh
+    i=0
+    for arg in "$@" ; do
+        CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -`
+        CHECK2=`echo "$arg"|egrep -c "^-"`                                 ### Determine if an option
+
+        if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then                    ### Added a condition
+            eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"`
+        else
+            eval `echo args$i`="\"$arg\""
+        fi
+        i=$((i+1))
+    done
+    case $i in
+        (0) set -- ;;
+        (1) set -- "$args0" ;;
+        (2) set -- "$args0" "$args1" ;;
+        (3) set -- "$args0" "$args1" "$args2" ;;
+        (4) set -- "$args0" "$args1" "$args2" "$args3" ;;
+        (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;;
+        (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;;
+        (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;;
+        (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;;
+        (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;;
+    esac
+fi
+
+# Escape application args
+save () {
+    for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done
+    echo " "
+}
+APP_ARGS=$(save "$@")
+
+# Collect all arguments for the java command, following the shell quoting and substitution rules
+eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS"
+
+# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong
+if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then
+  cd "$(dirname "$0")"
+fi
+
+exec "$JAVACMD" "$@"

android/gradlew.bat

@@ -0,0 +1,84 @@
+@if "%DEBUG%" == "" @echo off
+@rem ##########################################################################
+@rem
+@rem  Gradle startup script for Windows
+@rem
+@rem ##########################################################################
+
+@rem Set local scope for the variables with windows NT shell
+if "%OS%"=="Windows_NT" setlocal
+
+set DIRNAME=%~dp0
+if "%DIRNAME%" == "" set DIRNAME=.
+set APP_BASE_NAME=%~n0
+set APP_HOME=%DIRNAME%
+
+@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script.
+set DEFAULT_JVM_OPTS=
+
+@rem Find java.exe
+if defined JAVA_HOME goto findJavaFromJavaHome
+
+set JAVA_EXE=java.exe
+%JAVA_EXE% -version >NUL 2>&1
+if "%ERRORLEVEL%" == "0" goto init
+
+echo.
+echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH.
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:findJavaFromJavaHome
+set JAVA_HOME=%JAVA_HOME:"=%
+set JAVA_EXE=%JAVA_HOME%/bin/java.exe
+
+if exist "%JAVA_EXE%" goto init
+
+echo.
+echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME%
+echo.
+echo Please set the JAVA_HOME variable in your environment to match the
+echo location of your Java installation.
+
+goto fail
+
+:init
+@rem Get command-line arguments, handling Windows variants
+
+if not "%OS%" == "Windows_NT" goto win9xME_args
+
+:win9xME_args
+@rem Slurp the command line arguments.
+set CMD_LINE_ARGS=
+set _SKIP=2
+
+:win9xME_args_slurp
+if "x%~1" == "x" goto execute
+
+set CMD_LINE_ARGS=%*
+
+:execute
+@rem Setup the command line
+
+set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar
+
+@rem Execute Gradle
+"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS%
+
+:end
+@rem End local scope for the variables with windows NT shell
+if "%ERRORLEVEL%"=="0" goto mainEnd
+
+:fail
+rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of
+rem the _cmd.exe /c_ return code!
+if  not "" == "%GRADLE_EXIT_CONSOLE%" exit 1
+exit /b 1
+
+:mainEnd
+if "%OS%"=="Windows_NT" endlocal
+
+:omega

android/src/main/java/com/rnlib/geetestsensebot/RNLGeetestSensebotModule.java

@@ -47,9 +47,6 @@ public class RNLGeetestSensebotModule extends ReactContextBaseJavaModule impleme
     public void start(final ReadableMap option) {
         GT3ConfigBean gt3ConfigBean = getSharedGT3ConfigBean();
         try {
-            // debug
-            boolean debug = option.getBoolean("debug");
-            gt3ConfigBean.setDebug(debug);
             // view load timeout
             int timeout = option.getInt("loadTimeout");
             gt3ConfigBean.setTimeout(timeout);
@@ -109,6 +106,11 @@ public class RNLGeetestSensebotModule extends ReactContextBaseJavaModule impleme
             mGT3ConfigBean.setPattern(1); // 1 -> bind 自定义按钮
 
             mGT3ConfigBean.setListener(new GT3Listener() {
+                @Override
+                public void onReceiveCaptchaCode(int i) {
+
+                }
+
                 @Override
                 public void onDialogResult(String s) {
                     super.onDialogResult(s);

ios/SDK/GT3Captcha.framework/Headers/GT3AsyncTaskProtocol.h

@@ -0,0 +1,27 @@
+//
+//  GT3AsyncTaskProtocol.h
+//  GT3Captcha
+//
+//  Created by NikoXu on 2019/12/10.
+//  Copyright © 2019 Geetest. All rights reserved.
+//
+
+#import "GT3Parameter.h"
+#import "GT3Error.h"
+
+NS_ASSUME_NONNULL_BEGIN
+
+@protocol GT3AsyncTaskProtocol <NSObject>
+
+/** 用于自定义验证注册的任务 */
+- (void)executeRegisterTaskWithCompletion:(void(^)(GT3RegisterParameter * _Nullable params, GT3Error * _Nullable error))completion;
+
+/** 用于自定义验证结果校验的任务 */
+- (void)executeValidationTaskWithValidateParam:(GT3ValidationParam *)param completion:(void(^)(BOOL validationResult, GT3Error * _Nullable error))completion;
+
+/** 用于取消所有自定义的任务 */
+- (void)cancel;
+
+@end
+
+NS_ASSUME_NONNULL_END

ios/SDK/GT3Captcha.framework/Headers/GT3Captcha.h

@@ -19,3 +19,6 @@ FOUNDATION_EXPORT const unsigned char GT3CaptchaVersionString[];
 #import <GT3Captcha/GT3Utils.h>
 #import <GT3Captcha/GT3Error.h>
 
+#import <GT3Captcha/GT3AsyncTaskProtocol.h>
+#import <GT3Captcha/GT3Parameter.h>
+

ios/SDK/GT3Captcha.framework/Headers/GT3CaptchaManager.h

@@ -7,6 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
+#import "GT3AsyncTaskProtocol.h"
 #import "GT3Utils.h"
 #import "GT3Error.h"
 
@@ -46,11 +47,6 @@
 
 #pragma mark 基本方法
 
-/** 验证单例 */
-+ (instancetype)sharedGTManagerWithAPI1:(NSString *)api_1
-                                   API2:(NSString *)api_2
-                                timeout:(NSTimeInterval)timeout;
-
 /**
  *  @abstract 验证初始化方法
  *
@@ -84,16 +80,16 @@
  *  @discussion
  *  从后端sdk获取的验证参数, 其中单个challenge只能使用在同一次验证会话中
  *
- *  @param gt_public_key    在官网申请的captcha_id
+ *  @param gt_id            在官网申请的captcha_id
  *  @param gt_challenge     根据极验服务器sdk生成的challenge
  *  @param gt_success_code  网站主服务器监测geetest服务的可用状态 0/1 不可用/可用
  *  @param api_2            用于二次验证的接口.网站主根据极验服务端sdk来部署.
  *
  */
-- (void)configureGTest:(NSString *)gt_public_key
+- (void)configureGTest:(NSString *)gt_id
              challenge:(NSString *)gt_challenge
                success:(NSNumber *)gt_success_code
-              withAPI2:(NSString *)api_2;
+              withAPI2:(NSString *)api_2 API_DEPRECATED_WITH_REPLACEMENT("registerCaptchaWithCustomAsyncTask:completion:", ios(2.0, 6.0));
 
 /**
  *
@@ -103,6 +99,22 @@
  */
 - (void)registerCaptcha:(GT3CaptchaDefaultBlock)completionHandler;
 
+/**
+ *
+ *  @abstract 注册验证，并且自定义 API1 及 API2 流程
+ *
+ *  @param customAsyncTask 自定义 API1 及 API2 任务对象
+ *  @param completionHandler 注册成功后的回调
+ *
+ *  @discussion
+ *  因管理器内部以弱引用方式持有 customAsyncTask，需要开发者自己
+ *  在调用类中保持，以保证管理器在后续流程中能正常访问到该对象。
+ *
+ *  @seealso GT3AsyncTaskProtocol
+ *
+ */
+- (void)registerCaptchaWithCustomAsyncTask:(id<GT3AsyncTaskProtocol>)customAsyncTask completion:(GT3CaptchaDefaultBlock)completionHandler;
+
 /**
  *  ❗️<b>必要方法</b>❗️
  *  @abstract 开始验证
@@ -153,6 +165,23 @@
  */
 - (void)useGTViewWithTimeout:(NSTimeInterval)timeout;
 
+/**
+*  @abstract 设置图形验证的圆角大小
+*
+*  @param cornerRadius 圆角大小, 大小不超过 30 px
+*/
+- (void)useGTViewWithCornerRadius:(CGFloat)cornerRadius;
+
+/**
+ *  @abstract 验证静态参数
+ *
+ *  @discussion
+ *  内部将参数转换成表单格式，并拼接到静态资源的请求上
+ *
+ *  @param params 自定义参数
+ */
+- (void)useGTViewWithParams:(NSDictionary *)params;
+
 /**
  *  @abstract 验证标题
  *
@@ -190,12 +219,33 @@
  *  @abstract 切换验证语言
  *
  *  @discussion
- *  默认中文
+ *  默认跟随系统语言。不支持的语言则显示为英文。
  *
  *  @param type 语言类型
  */
 - (void)useLanguage:(GT3LanguageType)type;
 
+/**
+ *  @abstract 切换验证语言
+ *
+ *  @discussion
+ *  未设置或传 nil，默认跟随系统语言。不支持的语言则使用英文。
+ *
+ *  @param lang 语言简码。请参考相关的语言简码列表。
+ */
+- (void)useLanguageCode:(NSString *)lang;
+
+/**
+ *  @abstract 切换验证服务集群节点
+ *
+ *  @discussion
+ *  默认中国节点。使用其他节点需要使用相应的配置，否则无法正确访问验证服务。
+ *  使用该方法前，请充分了解极验的服务集群节点。
+ *
+ *  @param node 集群节点
+ */
+- (void)useServiceNode:(GT3CaptchaServiceNode)node;
+
 /**
  *  @abstract 完全使用HTTPS协议请求验证
  *
@@ -233,6 +283,20 @@
  */
 - (void)enableDebugMode:(BOOL)enable;
 
+/**
+ * @abstract 设置是否允许打印日志
+ *
+ * @param enabled YES，允许打印日志 NO，禁止打印日志
+ */
++ (void)setLogEnabled:(BOOL)enabled;
+
+/**
+ * @abstract 是否允许打印日志
+ *
+ * @return YES，允许打印日志 NO，禁止打印日志
+ */
++ (BOOL)isLogEnabled;
+
 @end
 
 #pragma mark - 验证代理方法

ios/SDK/GT3Captcha.framework/Headers/GT3Error.h

@@ -14,6 +14,8 @@ NS_ASSUME_NONNULL_BEGIN
  *  极验定义的错误类型
  */
 typedef NS_ENUM(NSUInteger, GT3ErrorType) {
+    /** 未知错误类型 */
+    GT3ErrorTypeUnknown = 0,
     /** 用户中断验证导致 */
     GT3ErrorTypeUser,
     /** 服务端返回错误 */
@@ -26,8 +28,8 @@ typedef NS_ENUM(NSUInteger, GT3ErrorType) {
     GT3ErrorTypeJavaScript,
     /** 内部解码错误类型 */
     GT3ErrorTypeDecode,
-    /** 未知错误类型 */
-    GT3ErrorTypeUnknown
+    /** 外部错误类型 */
+    GT3ErrorTypeExtern
 };
 
 /**

ios/SDK/GT3Captcha.framework/Headers/GT3Parameter.h

@@ -0,0 +1,39 @@
+//
+//  GT3Parameter.h
+//  GT3Captcha
+//
+//  Created by NikoXu on 2019/12/10.
+//  Copyright © 2019 Geetest. All rights reserved.
+//
+
+#import <Foundation/Foundation.h>
+
+NS_ASSUME_NONNULL_BEGIN
+
+@interface GT3RegisterParameter : NSObject
+
+/** 验证ID(gt) */
+@property (nonatomic, strong) NSString *gt;
+
+/** 验证流水号 */
+@property (nonatomic, strong) NSString *challenge;
+
+/** 验证当机状态。@(1) 为正常, @(0) 为宕机。*/
+@property (nonatomic, strong) NSNumber *success;
+
+@end
+
+@interface GT3ValidationParam : NSObject
+
+/** 验证初步判定结果。@"1" 通过, @"0" 未通过。*/
+@property (nonatomic, strong) NSString *code;
+
+/** 验证结果校验数据。使用该数据，通过 validate 接口进行结果校验，以获得最终验证结果。*/
+@property (nullable, nonatomic, strong) NSDictionary *result;
+
+/** 附带的消息。*/
+@property (nullable, nonatomic, strong) NSString *message;
+
+@end
+
+NS_ASSUME_NONNULL_END

ios/SDK/GT3Captcha.framework/Headers/GT3Utils.h

@@ -9,6 +9,14 @@
 #ifndef GTFramework_GTUtils_h
 #define GTFramework_GTUtils_h
 
+#if __has_feature(objc_generics)
+#define GT3_GENERICS(class, ...) class<__VA_ARGS__>
+#define GT3_GENERICS_TYPE(type) type
+#else
+#define GT3_GENERICS(class, ...) class
+#define GT3_GENERICS_TYPE(type) id
+#endif
+
 #import <UIKit/UIKit.h>
 
 
@@ -38,6 +46,17 @@ typedef NS_ENUM(NSInteger, GT3CaptchaState) {
     GT3CaptchaStateError
 };
 
+/**
+ * 验证集群节点
+ */
+typedef NS_ENUM(NSInteger, GT3CaptchaServiceNode) {
+    /** 中国服务集群*/
+    GT3CaptchaServiceNodeCN = 0,
+    /** 北美服务集群*/
+    GT3CaptchaServiceNodeNA,
+    /** 默认服务集群*/
+    GT3CaptchaServiceNodeDefault = GT3CaptchaServiceNodeCN
+};
 
 /**
  * 验证模式枚举量