2.0

README.md

@@ -1,206 +1,202 @@
 # react-native-geetest-sensebot
 
-[GEETEST极验行为验证](https://docs.geetest.com/install/overview/start/) for React Native
+[GEETEST极验行为验证](https://docs.geetest.com/install/overview/start/) [![npm version](https://badge.fury.io/js/%40yyyyu%2Freact-native-geetest-sensebot.svg)](https://www.npmjs.com/package/@yyyyu/react-native-geetest-sensebot)
 
-## 安装
+**SDK Version**
+iOS: v0.11.7_20190314
+Android: v4.0.7_20190311
 
-```bash
-yarn add @yyyyu/react-native-geetest-sensebot
-```
+**测试环境**
+Xcode 10.2.1
+react-native 0.59.5
 
-or
+## Getting Started
 
 ```bash
-npm install --save @yyyyu/react-native-geetest-sensebot
+yarn add @yyyyu/react-native-geetest-sensebot
+# or
+npm i @yyyyu/react-native-geetest-sensebot --save
 ```
 
-## 配置
-
-### ios
-
-#### 1. 自动配置(推荐)
-
 ```bash
 react-native link @yyyyu/react-native-geetest-sensebot
 ```
 
-如果项目**使用 Pods 管理依赖**需要在 Podfile 中添加
+### iOS 如果没有使用 CocoaPods
 
-```ruby
-pod 'React', :path => '../node_modules/react-native', :subspecs => ['Dependency']
-pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
-```
+在 Linked Frameworks and Libraries 中添加 node_modules/@yyyyu/react-native-geetest-sensebot/ios/SDK/GT3Captcha.framework
 
-#### 2. 手动配置
+![add framework](doc/images/ios-add-framework.png)
 
-1. 使用 Xcode 打开项目，在项目依赖目录(Libraries)下添加 node_modules 中的 @yyyyu/react-native-geetest-sensebot 项目
-2. 在 Linked Frameworks and Libraries 添加 libRCTGeetestSensebot.a
+如果编译报错 <span style="color:red;font-weight:bold;">Framework not found GT3Captcha</span>, 在 Framework Search Paths 添加 $(SRCROOT)/../node_modules/@yyyyu/react-native-geetest-sensebot/ios/SDK
 
-#### 额外配置
-
-**手动配置和非 Pods 管理依赖情况下**需要将 **node_modules/@yyyyu/react-native-geetest-sensebot/ios/SDK/GT3Captcha.framework** 添加到 framework 依赖中
-
-### android
-
-#### 1. 自动配置(如果 IOS 已经运行过，不需要重复运行)
-
-```bash
-react-native link @yyyyu/react-native-geetest-sensebot
-```
+![add framework search path](doc/images/ios-add-framework-search-paths.png)
 
-#### 2. 手动配置
+### Android
 
-1. 在 android/settings.gradle 文件中添加
+1. android/build.gradle
 
-    ```Groovy
-    include ':react-native-geetest-sensebot'
-    project(':react-native-geetest-sensebot').projectDir = new File(rootProject.projectDir, '../node_modules/@yyyyu/react-native-geetest-sensebot/android')
-    ```
-
-2. 在 android/app/build.gradle 文件中依赖部分添加
-
-    ```Groovy
-    dependencies {
-        // other dependencies
-        compile project(':react-native-geetest-sensebot')
-    }
-    ```
-
-3. 在 MainApplication.java 文件中添加
-
-    ```Java
-    import com.rnlib.geetest.sensebot.ReactGeetestSensebotPackage;
-
-    @Override
-    protected List<ReactPackage> getPackages() {
-        return Arrays.<ReactPackage>asList(
-            // other packages
-            new ReactGeetestSensebotPackage()
-        );
-    }
-    ```
-
-#### 额外配置
-
-1. 在 android/build.gradle 文件中添加
-    ```Groovy
-    allprojects {
-        repositories {
-            // ...other
-            flatDir {
-                dirs project(':react-native-geetest-sensebot').file('libs')
-            }
+```Groovy
+allprojects {
+    repositories {
+        // ...
+        // 与 android/app/build.gradle 中名称一致
+        flatDir {
+            dirs project(':@yyyyu_react-native-geetest-sensebot').file('libs')
         }
     }
-    ```
-
-2. android/app/build.gradle 中修改构建工具版本大于 25 (buildToolsVersion >= 25)
-
-3. AndroidManifest.xml
-    ```xml
-    // 如果存在 android:allowBackup="false" 则添加 tools:replace="android:allowBackup"
-    <manifest xmlns:tools="http://schemas.android.com/tools">
-        <application
-          android:allowBackup="false"
-            tools:replace="android:allowBackup">
-
-        </application>
-    </manifest>
-    ```
-
-## JS API
-
-```javascript
-import GeetestSensebot from '@yyyyu/react-native-geetest-sensebot'
-
-const api1 = 'http://www.geetest.com/demo/gt/register-test'
-const api2 = 'http://www.geetest.com/demo/gt/validate-test'
-
-GeetestSensebot.configApi(api1, api2)
-GeetestSensebot.captcha()
-```
-
-#### configApi 配置 api 请求地址
-
-```javascript
-GeetestSensebot.configApi('api1 address', 'api2 address')
+}
 ```
 
-#### captcha 进行行为认证
+2. AndroidManifest.xml 中添加权限
 
-```javascript
-GeetestSensebot.captcha({
-  api1ReqReplacer: (DefaultApi1Req) => { return ModifyApi1Req },
-  api1RespHandler: (Api1Resq) => { return { success: number, gt: string, challenge: string } },
-  api2ReqReplacer: (DefaultApi2Req) => { return ModifyApi2Req },
-  api2RespHandler: (Api2Resq) => { // do anything }
-})
+```xml
+// ...
+<uses-permission android:name="android.permission.INTERNET" />
+<uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
+<uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
+<uses-permission android:name="android.permission.READ_PHONE_STATE" />
 ```
 
-因为 api1、api2 由使用者自行配置，所以接口的请求及返回处理方式不一定按照官方实例的方式进行，所以这里提供了 4 个可选方法，用于替换 Request 以及处理 Response，关于创建 Request 及处理 Response 参考 [MDN Request](https://developer.mozilla.org/en-US/docs/Web/API/Request)、[MDN Response](https://developer.mozilla.org/en-US/docs/Web/API/Response)，同时这 4 个方法均为可选参数，不传会使用默认的方式，函数支持使用 es7 async
+## Example
 
-关于 **api1RespHandler** 特别说明，由于行为验证需要将 api1 的结果数据传递到 sdk 组件中，所以需要规定一个格式才能流程正常进行下去，api1RespHandler 返回值格式必须为
-```json
-{
-  "success": number,
-  "gt": string,
-  "challenge": string
-}
-```
-
-错误处理方式
 ```javascript
-import GeetestSensebot, { GSError, ERROR_TYPE } from '@yyyyu/react-native-geetest-sensebot'
-try {
-  // await GeetestSensebot.captcha() ...
-} catch (e) {
-  if (e instanceof GSError) {
-    const { errCode, errMsg } = e
-    if (errCode === ERROR_TYPE.API1) {
-    	// api1 出现错误
-    }
-    if (errCode === ERROR_TYPE.API2) {
-    	// api2 出现错误
+import React, { Component } from 'react'
+import { View, Button } from 'react-native'
+import RNGeetestSensebot from '@yyyyu/react-native-geetest-sensebot'
+
+export default class App extends Component {
+  geetest = async () => {
+    let api1Result
+    try {
+      const api1Response = await fetch('http://www.geetest.com/demo/gt/register-test')
+      api1Result = await api1Response.json()
+    } catch (e) {
+      return console.log('API1 request failed, message: %s.', e.message)
     }
-    if (errCode === ERROR_TYPE.CAPTCHA) {
-    	// 行为认证过程出现错误
-    }
-    console.error(errMsg)
-    // 由于这个过程涉及多个接口，出错情况多种多样，所以报错使用过程来区分
-    // 原 SDK IOS 有错误代码及描述信息，Android 只有错误代码
-    // errCode 是自己定义的，errMsg IOS 使用描述信息 Android 使用错误代码
-    // errMsg 参数只适用于开发，如果显示给用户建议自行定义错误描述
-  }
-}
-```
 
-官方 API
-- API1 [http://www.geetest.com/demo/gt/register-test](http://www.geetest.com/demo/gt/register-test) GET 请求 无参数 返回 json 对象格式为
-    ```json
-    {
-      "success": number,
-      "challenge": string,
-      "gt": string,
-      "new_captcha": boolean
+    let geetestResult
+    try {
+      geetestResult = await RNGeetestSensebot.start({
+        api1Result,
+        // optional default false
+        debug: true,
+        // optional default 10s
+        loadTimeout: 10000,
+        // optional default 10s
+        reqTimeout: 10000,
+        // optional default system
+        lang: RNGeetestSensebot.Lang.System,
+        // optional default false
+        enableBackgroundCancel: true,
+        // optional default transparent
+        backgroundColorIOS: 'red',
+        // optional default none
+        backgroundBlurEffectIOS: RNGeetestSensebot.BackgroundBlurEffectIOS.Regular,
+        // optional
+        onEvent: (code, data) => {
+          if (code === RNGeetestSensebot.Event.FAILED) {
+            console.log('Validate failed, reason: %s', data[0])
+          } else {
+            console.log(RNGeetestSensebot.Event[code], data)
+          }
+        }
+      })
+    } catch (e) {
+      return console.log('Error, code: %d, message: %s.', e.code, e.message)
     }
-    ```
-- API2 [http://www.geetest.com/demo/gt/validate-test](http://www.geetest.com/demo/gt/validate-test) POST 请求 请求参数包含
-    ```json
-    {
-      "geetest_challenge": string,
-      "geetest_seccode": string,
-      "geetest_validate": string
+
+    let api2Result
+    try {
+      const api2Response = await fetch('http://www.geetest.com/demo/gt/validate-test', {
+        method: 'POST',
+        headers: { 'Content-Type': 'application/json;charset=UTF-8' },
+        body: JSON.stringify(geetestResult)
+      })
+      api2Result = await api2Response.json()
+    } catch (e) {
+      return console.log('API2 request failed, message: %s.', e.message)
     }
-    ```
 
-#### setMaskColor 设置认证页面背景颜色 iosOnly
+    console.log('Validate result: %o.', api2Result)
+  }
 
-```javascript
-GeetestSensebot.setMaskColor('color string')
+  render() {
+    return (
+      <View style={{ flex: 1, justifyContent: 'center', alignItems: 'center' }}>
+        <Button title='StartGeetest' onPress={this.geetest} color='#26c6aa' />
+      </View>
+    )
+  }
+}
 ```
 
-#### enableDebug 设置是否输出调试信息 iosOnly
+## Option
 
 ```javascript
-GeetestSensebot.enableDebug(true)
+interface Option {
+  // API1
+  api1Result: API1Result;
+  // debug
+  debug?: boolean;
+  // view 加载超时时间，默认10000
+  loadTimeout?: number;
+  // 第二步向极验服务器发送请求超时时间，默认10000
+  reqTimeout?: number;
+  // 语言，如果为null则使用系统默认语言
+  lang?: Lang;
+  // 点击背景是否可以取消验证
+  enableBackgroundCancel?: boolean;
+  // 背景色 IOS Only
+  backgroundColorIOS?: any;
+  // 背景模糊类型 IOS Only
+  backgroundBlurEffectIOS?: BackgroundBlurEffectIOS;
+  // 事件监听
+  onEvent?: (code: Event, data?: Array<number | string>) => void;
+}
+interface API1Result {
+  success: 0 | 1;
+  challenge: string;
+  gt: string;
+  new_captcha: boolean;
+}
+enum Lang {
+  System = "system",
+  ZH = "zh",
+  ZH_TW = "zh-tw",
+  ZH_HK = "zh-hk",
+  EN = "en",
+  ID = "id",
+  JA = "ja",
+  KO = "ko",
+  RU = "ru",
+  AR = "ar",
+  ES = "es",
+  PT_PT = "pt-pt",
+  FR = "fr",
+  DE = "de"
+}
+enum BackgroundBlurEffectIOS {
+  None = -1,
+  ExtraLight = 0,
+  Light = 1,
+  Dark = 2,
+  Regular = 3,
+  Prominent = 4
+}
+enum Event {
+  RESULT = 1,
+  CLOSED = 2,
+  FAILED = 3,
+  ERROR = 0
+}
+enum Error {
+  PARAMETER_PARSE_FAILED = -1,
+  ANDROID_ACTIVITY_DESTROYED = -2
+}
+interface Result {
+  geetest_challenge: string;
+  geetest_seccode: string;
+  geetest_validate: string;
+}
 ```

RNGeetestSensebot.podspec → RNLGeetestSensebot.podspec

@@ -3,7 +3,7 @@ require 'json'
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name                = 'RNGeetestSensebot'
+  s.name                = 'RNLGeetestSensebot'
   s.version             = package['version']
   s.summary             = package['description']
   s.description         = package['description']
@@ -14,8 +14,9 @@ Pod::Spec.new do |s|
 
   s.requires_arc        = true
   s.platform            = :ios, '8.0'
-  s.source_files        = 'ios/RCTGeetestSensebot.{h,m}', 'ios/Helper/*.{h,m}'
+  s.source_files        = 'ios/RNLGeetestSensebot.{h,m}'
   s.vendored_frameworks = 'ios/SDK/GT3Captcha.framework'
   s.resource            = 'ios/SDK/GT3Captcha.bundle'
   s.framework           = 'JavaScriptCore', 'WebKit'
+  s.pod_target_xcconfig = { 'HEADER_SEARCH_PATHS' => '$(BUILT_PRODUCTS_DIR)/../include' }
 end

android/build.gradle

@@ -1,3 +1,7 @@
+def safeExtGet(prop, fallback) {
+    rootProject.ext.has(prop) ? rootProject.ext.get(prop) : fallback
+}
+
 buildscript {
     repositories {
         jcenter()
@@ -11,12 +15,12 @@ buildscript {
 apply plugin: 'com.android.library'
 
 android {
-    compileSdkVersion 23
-    buildToolsVersion "25.0.3"
+    compileSdkVersion safeExtGet('compileSdkVersion', 28)
+    buildToolsVersion safeExtGet('buildToolsVersion', "28.0.3")
 
     defaultConfig {
-        minSdkVersion 16
-        targetSdkVersion 22
+        minSdkVersion safeExtGet('minSdkVersion', 16)
+        targetSdkVersion safeExtGet('targetSdkVersion', 28)
         versionCode 1
         versionName "1.0"
     }
@@ -33,6 +37,6 @@ repositories {
 }
 
 dependencies {
-    compile 'com.facebook.react:react-native:+'
-    compile(name: 'geetest_testbutton_android_v3.5.3', ext: 'aar')
+    implementation 'com.facebook.react:react-native:+'
+    implementation(name: 'geetest_sensebot_android_v4.0.7_20190311', ext: 'aar')
 }

android/proguard-rules.pro

@@ -1,2 +1,2 @@
 -dontwarn com.geetest.sdk.**
--keep class com.geetest.sdk.** { *; }
+-keep class com.geetest.sdk.**{*;}

android/src/main/AndroidManifest.xml

@@ -1,9 +1,4 @@
 <manifest xmlns:android="http://schemas.android.com/apk/res/android"
-    package="com.rnlib.geetest.sensebot">
+    package="com.rnlib.geetestsensebot">
 
-    <uses-permission android:name="android.permission.INTERNET" />
-    <uses-permission android:name="android.permission.ACCESS_WIFI_STATE" />
-    <uses-permission android:name="android.permission.ACCESS_NETWORK_STATE" />
-    <uses-permission android:name="android.permission.CHANGE_WIFI_STATE" />
-    <uses-permission android:name="android.permission.READ_PHONE_STATE" />
 </manifest>

android/src/main/java/com/rnlib/geetest/sensebot/ReactGSEventType.java

@@ -1,16 +0,0 @@
-package com.rnlib.geetest.sensebot;
-
-public enum ReactGSEventType {
-    GS_CAPTCHA(1),
-    GS_ERROR(-1);
-
-    private final int eventType;
-
-    ReactGSEventType(int eventType) {
-        this.eventType = eventType;
-    }
-
-    public int getValue() {
-        return eventType;
-    }
-}

android/src/main/java/com/rnlib/geetest/sensebot/ReactGeetestSensebotModule.java

@@ -1,152 +0,0 @@
-package com.rnlib.geetest.sensebot;
-
-import com.facebook.react.bridge.Promise;
-import com.facebook.react.bridge.ReactApplicationContext;
-import com.facebook.react.bridge.ReactContextBaseJavaModule;
-import com.facebook.react.bridge.ReactMethod;
-import com.facebook.react.bridge.WritableMap;
-import com.facebook.react.bridge.WritableNativeMap;
-import com.facebook.react.modules.core.DeviceEventManagerModule;
-import com.geetest.sdk.Bind.GT3GeetestBindListener;
-import com.geetest.sdk.Bind.GT3GeetestUtilsBind;
-
-import org.json.JSONObject;
-
-public class ReactGeetestSensebotModule extends ReactContextBaseJavaModule {
-    private final ReactApplicationContext mReactContext;
-    private static final String ReactGSEventName = "RNGeetestSensebotEvent";
-    private static final String urlPlaceHolder = "";
-    private GT3GeetestUtilsBind gt3GeetestUtils;
-
-    public ReactGeetestSensebotModule(ReactApplicationContext reactContext) {
-        super(reactContext);
-        mReactContext = reactContext;
-    }
-
-    @Override
-    public String getName() {
-        return "GeetestSensebot";
-    }
-
-    @ReactMethod
-    public void initCaptchaMgr(Integer maskColor, Boolean isDebug, Promise promise) {
-        gt3GeetestUtils = new GT3GeetestUtilsBind(mReactContext.getCurrentActivity());
-        gt3GeetestUtils.setTimeout(5000);
-        gt3GeetestUtils.getISonto();
-        gt3GeetestUtils.setDialogTouch(true);
-
-        promise.resolve(true);
-    }
-
-    @ReactMethod
-    public void captcha(final Integer success, final String gt, final String challenge, String api2, Promise promise) {
-        if (gt3GeetestUtils == null) {
-            promise.resolve(false);
-            return;
-        }
-
-        // api1 result pass to captcha
-        JSONObject captchaParams = new JSONObject();
-        try {
-            captchaParams.put("success", success.intValue());
-            captchaParams.put("gt", gt);
-            captchaParams.put("challenge", challenge);
-        } catch (Exception ignored) {
-        }
-        gt3GeetestUtils.gtSetApi1Json(captchaParams);
-
-        // start captcha
-        mReactContext.runOnUiQueueThread(new Runnable() {
-            @Override
-            public void run() {
-                gt3GeetestUtils.getGeetest(mReactContext.getCurrentActivity(), urlPlaceHolder, urlPlaceHolder, null, new GT3GeetestBindListener() {
-                    // 行为验证结果
-                    @Override
-                    public void gt3GetDialogResult(boolean status, String resultString) {
-                        if (status) {
-                            JSONObject resultJson;
-                            try {
-                                resultJson = new JSONObject(resultString);
-                            } catch (Exception e) {
-                                resultJson = new JSONObject();
-                            }
-                            WritableMap eventBody = new WritableNativeMap();
-                            eventBody.putInt("type", ReactGSEventType.GS_CAPTCHA.getValue());
-
-                            WritableMap eventPayload = new WritableNativeMap();
-                            eventPayload.putString("code", "1");
-                            eventPayload.putString("message", "Success");
-
-                            WritableMap eventResult = new WritableNativeMap();
-                            try {
-                                eventResult.putString("geetest_challenge", resultJson.getString("geetest_challenge"));
-                                eventResult.putString("geetest_validate", resultJson.getString("geetest_validate"));
-                                eventResult.putString("geetest_seccode", resultJson.getString("geetest_seccode"));
-                            } catch (Exception ignored) {
-                            }
-
-                            eventPayload.putMap("result", eventResult);
-                            eventBody.putMap("payload", eventPayload);
-
-                            sendEvent(eventBody);
-
-                            gt3GeetestUtils.gt3TestFinish();
-                        }
-                    }
-
-                    // 没有进行行为验证就关闭了验证码
-                    @Override
-                    public void gt3CloseDialog(int i) {
-                        WritableMap eventBody = new WritableNativeMap();
-                        eventBody.putInt("type", ReactGSEventType.GS_CAPTCHA.getValue());
-                        eventBody.putString("errCode", "close view");
-                        eventBody.putString("errMsg", "user close captcha view.");
-
-                        sendEvent(eventBody);
-                    }
-
-                    // 自定义 api2
-                    @Override
-                    public boolean gt3SetIsCustom() {
-                        return true;
-                    }
-
-                    // 框架出错
-                    @Override
-                    public void gt3DialogOnError(String errCode) {
-                        WritableMap eventBody = new WritableNativeMap();
-                        eventBody.putInt("type", ReactGSEventType.GS_ERROR.getValue());
-                        eventBody.putString("errCode", errCode);
-                        eventBody.putString("errMsg", errCode);
-
-                        sendEvent(eventBody);
-                    }
-                });
-            }
-        });
-
-        promise.resolve(true);
-    }
-
-    @ReactMethod
-    public void stopCaptcha(Promise promise) {
-        if (gt3GeetestUtils != null) {
-            mReactContext.runOnUiQueueThread(new Runnable() {
-                @Override
-                public void run() {
-                    gt3GeetestUtils.cancelUtils();
-                    gt3GeetestUtils.gt3TestClose();
-                    gt3GeetestUtils = null;
-                }
-            });
-        }
-
-        promise.resolve(true);
-    }
-
-    private void sendEvent(WritableMap mBody) {
-        mReactContext
-                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
-                .emit(ReactGSEventName, mBody);
-    }
-}

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

@@ -0,0 +1,225 @@
+package com.rnlib.geetestsensebot;
+
+import android.app.Activity;
+
+import com.facebook.react.bridge.Arguments;
+import com.facebook.react.bridge.LifecycleEventListener;
+import com.facebook.react.bridge.ReactApplicationContext;
+import com.facebook.react.bridge.ReactContextBaseJavaModule;
+import com.facebook.react.bridge.ReactMethod;
+import com.facebook.react.bridge.ReadableMap;
+import com.facebook.react.bridge.UiThreadUtil;
+import com.facebook.react.bridge.WritableArray;
+import com.facebook.react.bridge.WritableMap;
+import com.facebook.react.modules.core.DeviceEventManagerModule;
+import com.geetest.sdk.GT3ConfigBean;
+import com.geetest.sdk.GT3ErrorBean;
+import com.geetest.sdk.GT3GeetestUtils;
+import com.geetest.sdk.GT3Listener;
+
+import org.json.JSONObject;
+
+import javax.annotation.Nonnull;
+import javax.annotation.Nullable;
+
+public class RNLGeetestSensebotModule extends ReactContextBaseJavaModule {
+    private static final String NAME = "RNLGeetestSensebot";
+    private static final String EVENT_NAME = "RNLGeetestSensebotEvent";
+
+    private final ReactApplicationContext mReactContext;
+    private GT3GeetestUtils mGT3GeetestUtils;
+
+    RNLGeetestSensebotModule(ReactApplicationContext reactContext) {
+        super(reactContext);
+        mReactContext = reactContext;
+    }
+
+    @Nonnull
+    @Override
+    public String getName() {
+        return NAME;
+    }
+
+    @ReactMethod
+    public void start(final ReadableMap option) {
+        GT3ConfigBean mGT3ConfigBean = new GT3ConfigBean();
+        mGT3ConfigBean.setPattern(1); // 1 -> bind 自定义按钮
+        try {
+            // debug
+            boolean debug = option.getBoolean("debug");
+            mGT3ConfigBean.setDebug(debug);
+            // view load timeout
+            int timeout = option.getInt("loadTimeout");
+            mGT3ConfigBean.setTimeout(timeout);
+            // request timeout
+            int webviewTimeout = option.getInt("reqTimeout");
+            mGT3ConfigBean.setWebviewTimeout(webviewTimeout);
+            // lang
+            String lang = option.getString("lang");
+            if (lang != null && !lang.equals("system")) {
+                mGT3ConfigBean.setLang(lang);
+            }
+            // enable background cancel
+            boolean canceledOnTouchOutside = option.getBoolean("enableBackgroundCancel");
+            mGT3ConfigBean.setCanceledOnTouchOutside(canceledOnTouchOutside);
+            // api1 json result
+            mGT3ConfigBean.setApi1Json(new JSONObject(
+                    option.getString("api1Result")));
+        } catch (Exception e) {
+            sendEvent(Event.Error.getCode(),
+                    Error.ParameterParseFailed.getCode(), e.getMessage());
+            return;
+        }
+
+        mGT3ConfigBean.setListener(new GT3Listener() {
+            @Override
+            public void onDialogResult(String s) {
+                super.onDialogResult(s);
+                sendEvent(Event.Result.getCode(), s);
+            }
+
+            @Override
+            public void onClosed(int i) {
+                sendEvent(Event.Closed.getCode());
+            }
+
+            @Override
+            public void onFailed(GT3ErrorBean gt3ErrorBean) {
+                WritableMap result = Arguments.createMap();
+                result.putString("errorCode", gt3ErrorBean.errorCode);
+                result.putString("errorDesc", gt3ErrorBean.errorDesc);
+                result.putDouble("duration", gt3ErrorBean.duration);
+                result.putString("challenge", gt3ErrorBean.challenge);
+                result.putString("type", gt3ErrorBean.type);
+                result.putString("sdkVersion", gt3ErrorBean.sdkVersion);
+                JSONObject json = new JSONObject(result.toHashMap());
+                sendEvent(Event.Failed.getCode(), json.toString());
+            }
+
+            @Override
+            public void onButtonClick() {
+
+            }
+
+            @Override
+            public void onSuccess(String s) {
+
+            }
+
+            @Override
+            public void onStatistics(String s) {
+
+            }
+        });
+
+        Activity activity = mReactContext.getCurrentActivity();
+        if (activity == null) {
+            sendEvent(Event.Error.getCode(),
+                    Error.AndroidActivityDestroyed.getCode(), "Activity has been destroyed.");
+            return;
+        }
+        mGT3GeetestUtils = new GT3GeetestUtils(activity);
+        mGT3GeetestUtils.init(mGT3ConfigBean);
+        mReactContext.addLifecycleEventListener(new LifecycleEventListener() {
+            @Override
+            public void onHostResume() {
+
+            }
+
+            @Override
+            public void onHostPause() {
+
+            }
+
+            @Override
+            public void onHostDestroy() {
+                if (mGT3GeetestUtils != null) {
+                    mGT3GeetestUtils.destory();
+                }
+            }
+        });
+        UiThreadUtil.runOnUiThread(new Runnable() {
+            @Override
+            public void run() {
+                if (mGT3GeetestUtils != null) {
+                    mGT3GeetestUtils.startCustomFlow();
+                    mGT3GeetestUtils.getGeetest();
+                }
+            }
+        });
+    }
+
+    @ReactMethod
+    public void stop() {
+        if (mGT3GeetestUtils != null) {
+            UiThreadUtil.runOnUiThread(new Runnable() {
+                @Override
+                public void run() {
+                    if (mGT3GeetestUtils != null) {
+                        mGT3GeetestUtils.destory();
+                        mGT3GeetestUtils = null;
+                    }
+                }
+            });
+        }
+    }
+
+    private void sendEvent(int code, @Nullable Object... data) {
+        WritableArray event = Arguments.createArray();
+        event.pushInt(code);
+        if (data != null) {
+            for (Object i : data) {
+                if (i == null) {
+                    event.pushNull();
+                } else if (i instanceof Boolean) {
+                    event.pushBoolean((boolean) i);
+                } else if (i instanceof Double) {
+                    event.pushDouble((double) i);
+                } else if (i instanceof Integer) {
+                    event.pushInt((int) i);
+                } else if (i instanceof String) {
+                    event.pushString((String) i);
+                } else if (i instanceof WritableArray) {
+                    event.pushArray((WritableArray) i);
+                } else if (i instanceof WritableMap) {
+                    event.pushMap((WritableMap) i);
+                }
+            }
+        }
+        mReactContext
+                .getJSModule(DeviceEventManagerModule.RCTDeviceEventEmitter.class)
+                .emit(EVENT_NAME, event);
+    }
+
+    private enum Event {
+        Result(1),
+        Closed(2),
+        Failed(3),
+        Error(0);
+
+        private final int code;
+
+        Event(int code) {
+            this.code = code;
+        }
+
+        public int getCode() {
+            return this.code;
+        }
+    }
+
+    private enum Error {
+        ParameterParseFailed(-1),
+        AndroidActivityDestroyed(-2);
+
+        private final int code;
+
+        Error(int code) {
+            this.code = code;
+        }
+
+        public int getCode() {
+            return this.code;
+        }
+    }
+}

android/src/main/java/com/rnlib/geetest/sensebot/ReactGeetestSensebotPackage.java → android/src/main/java/com/rnlib/geetestsensebot/RNLGeetestSensebotPackage.java

@@ -1,4 +1,4 @@
-package com.rnlib.geetest.sensebot;
+package com.rnlib.geetestsensebot;
 
 import com.facebook.react.ReactPackage;
 import com.facebook.react.bridge.JavaScriptModule;
@@ -10,10 +10,10 @@ import java.util.Arrays;
 import java.util.Collections;
 import java.util.List;
 
-public class ReactGeetestSensebotPackage implements ReactPackage {
+public class RNLGeetestSensebotPackage implements ReactPackage {
     @Override
     public List<NativeModule> createNativeModules(ReactApplicationContext reactContext) {
-        return Arrays.<NativeModule>asList(new ReactGeetestSensebotModule(reactContext));
+        return Arrays.<NativeModule>asList(new RNLGeetestSensebotModule(reactContext));
     }
 
     // Deprecated from RN 0.47

dist/index.d.ts

@@ -0,0 +1,63 @@
+declare namespace GeetestSensebot {
+    enum Lang {
+        System = "system",
+        ZH = "zh",
+        ZH_TW = "zh-tw",
+        ZH_HK = "zh-hk",
+        EN = "en",
+        ID = "id",
+        JA = "ja",
+        KO = "ko",
+        RU = "ru",
+        AR = "ar",
+        ES = "es",
+        PT_PT = "pt-pt",
+        FR = "fr",
+        DE = "de"
+    }
+    enum BackgroundBlurEffectIOS {
+        None = -1,
+        ExtraLight = 0,
+        Light = 1,
+        Dark = 2,
+        Regular = 3,
+        Prominent = 4
+    }
+    interface Option {
+        api1Result: API1Result;
+        debug?: boolean;
+        loadTimeout?: number;
+        reqTimeout?: number;
+        lang?: Lang;
+        enableBackgroundCancel?: boolean;
+        backgroundColorIOS?: any;
+        backgroundBlurEffectIOS?: BackgroundBlurEffectIOS;
+        onEvent?: (code: Event, data?: Array<number | string>) => void;
+    }
+    interface API1Result {
+        success: 0 | 1;
+        challenge: string;
+        gt: string;
+        new_captcha: boolean;
+        [key: string]: any;
+    }
+    interface Result {
+        geetest_challenge: string;
+        geetest_seccode: string;
+        geetest_validate: string;
+        [key: string]: any;
+    }
+    enum Event {
+        RESULT = 1,
+        CLOSED = 2,
+        FAILED = 3,
+        ERROR = 0
+    }
+    enum Error {
+        PARAMETER_PARSE_FAILED = -1,
+        ANDROID_ACTIVITY_DESTROYED = -2
+    }
+    function start(option: Option): Promise<Result>;
+    function stop(): void;
+}
+export default GeetestSensebot;

dist/index.js

@@ -0,0 +1,137 @@
+import { NativeModules, NativeEventEmitter, Platform, processColor } from 'react-native';
+const Exception = Error;
+var RNLGeetestSensebot;
+(function (RNLGeetestSensebot_1) {
+    // API
+    const RNLGeetestSensebot = NativeModules.RNLGeetestSensebot;
+    RNLGeetestSensebot_1.start = RNLGeetestSensebot.start;
+    RNLGeetestSensebot_1.stop = RNLGeetestSensebot.stop;
+    // Event
+    const EventName = 'RNLGeetestSensebotEvent';
+    const EventEmitter = new NativeEventEmitter(RNLGeetestSensebot);
+    RNLGeetestSensebot_1.addListener = (listener) => EventEmitter.addListener(EventName, listener);
+})(RNLGeetestSensebot || (RNLGeetestSensebot = {}));
+var GeetestSensebot;
+(function (GeetestSensebot) {
+    let Lang;
+    (function (Lang) {
+        Lang["System"] = "system";
+        Lang["ZH"] = "zh";
+        Lang["ZH_TW"] = "zh-tw";
+        Lang["ZH_HK"] = "zh-hk";
+        Lang["EN"] = "en";
+        Lang["ID"] = "id";
+        Lang["JA"] = "ja";
+        Lang["KO"] = "ko";
+        Lang["RU"] = "ru";
+        Lang["AR"] = "ar";
+        Lang["ES"] = "es";
+        Lang["PT_PT"] = "pt-pt";
+        Lang["FR"] = "fr";
+        Lang["DE"] = "de";
+    })(Lang = GeetestSensebot.Lang || (GeetestSensebot.Lang = {}));
+    let BackgroundBlurEffectIOS;
+    (function (BackgroundBlurEffectIOS) {
+        BackgroundBlurEffectIOS[BackgroundBlurEffectIOS["None"] = -1] = "None";
+        BackgroundBlurEffectIOS[BackgroundBlurEffectIOS["ExtraLight"] = 0] = "ExtraLight";
+        BackgroundBlurEffectIOS[BackgroundBlurEffectIOS["Light"] = 1] = "Light";
+        BackgroundBlurEffectIOS[BackgroundBlurEffectIOS["Dark"] = 2] = "Dark";
+        BackgroundBlurEffectIOS[BackgroundBlurEffectIOS["Regular"] = 3] = "Regular";
+        BackgroundBlurEffectIOS[BackgroundBlurEffectIOS["Prominent"] = 4] = "Prominent";
+    })(BackgroundBlurEffectIOS = GeetestSensebot.BackgroundBlurEffectIOS || (GeetestSensebot.BackgroundBlurEffectIOS = {}));
+    let Event;
+    (function (Event) {
+        // 验证结果
+        Event[Event["RESULT"] = 1] = "RESULT";
+        // 验证窗口关闭
+        Event[Event["CLOSED"] = 2] = "CLOSED";
+        // 验证失败
+        Event[Event["FAILED"] = 3] = "FAILED";
+        // 发生错误
+        Event[Event["ERROR"] = 0] = "ERROR";
+    })(Event = GeetestSensebot.Event || (GeetestSensebot.Event = {}));
+    let Error;
+    (function (Error) {
+        // 参数解析错误
+        Error[Error["PARAMETER_PARSE_FAILED"] = -1] = "PARAMETER_PARSE_FAILED";
+        // 安卓 activity 已经销毁
+        Error[Error["ANDROID_ACTIVITY_DESTROYED"] = -2] = "ANDROID_ACTIVITY_DESTROYED";
+    })(Error = GeetestSensebot.Error || (GeetestSensebot.Error = {}));
+    const defaultOption = {
+        api1Result: '',
+        debug: false,
+        loadTimeout: 10000,
+        reqTimeout: 10000,
+        lang: Lang.System,
+        enableBackgroundCancel: false,
+        backgroundColorIOS: 0,
+        backgroundBlurEffectIOS: BackgroundBlurEffectIOS.None,
+    };
+    function parseConfig(c) {
+        const config = Object.assign({}, defaultOption);
+        config.api1Result = JSON.stringify(c.api1Result);
+        if (typeof c.debug === 'boolean') {
+            config.debug = c.debug;
+        }
+        if (typeof c.loadTimeout === 'number') {
+            config.loadTimeout = c.loadTimeout >> 0;
+        }
+        if (typeof c.reqTimeout === 'number') {
+            config.reqTimeout = c.reqTimeout >> 0;
+        }
+        if (typeof c.lang === 'string') {
+            config.lang = c.lang;
+        }
+        if (typeof c.enableBackgroundCancel === 'boolean') {
+            config.enableBackgroundCancel = c.enableBackgroundCancel;
+        }
+        if (c.backgroundColorIOS !== undefined) {
+            config.backgroundColorIOS = processColor(c.backgroundColorIOS);
+        }
+        if (typeof c.backgroundBlurEffectIOS === 'number') {
+            config.backgroundBlurEffectIOS = c.backgroundBlurEffectIOS;
+        }
+        return config;
+    }
+    let eventListener;
+    // 进行行为认证
+    function start(option) {
+        return new Promise((resolve, reject) => {
+            eventListener = RNLGeetestSensebot.addListener(([code, ...data]) => {
+                switch (code) {
+                    case Event.RESULT:
+                        stop();
+                        resolve(JSON.parse(data[0]));
+                        break;
+                    case Event.FAILED:
+                        // iOS 只要认证错误就会触发, android 多次认证错误最后自动关闭 view 时才会触发
+                        if (Platform.OS === 'android') {
+                            stop();
+                        }
+                        break;
+                    case Event.ERROR:
+                        stop();
+                        const error = new Exception(data[1]);
+                        Object.defineProperty(error, 'name', { value: 'RNGeetestError', writable: false });
+                        Object.defineProperty(error, 'code', { value: data[0], writable: false });
+                        reject(error);
+                        break;
+                }
+                if (typeof option.onEvent === 'function') {
+                    option.onEvent(code, data);
+                }
+            });
+            RNLGeetestSensebot.start(parseConfig(option));
+        });
+    }
+    GeetestSensebot.start = start;
+    // 清理行为认证资源占用
+    function stop() {
+        if (eventListener && typeof eventListener.remove === 'function') {
+            eventListener.remove();
+        }
+        RNLGeetestSensebot.stop();
+    }
+    GeetestSensebot.stop = stop;
+})(GeetestSensebot || (GeetestSensebot = {}));
+export default GeetestSensebot;

index.js

@@ -1,21 +0,0 @@
-import {
-  enableDebug,
-  configApi,
-  setMaskColor,
-  captcha,
-
-  GSError
-} from './src/api'
-import { ERROR_TYPE } from './src/constant'
-
-export {
-  GSError,
-  ERROR_TYPE
-}
-
-export default {
-  enableDebug,
-  configApi,
-  setMaskColor,
-  captcha
-}

index.ts

@@ -0,0 +1,201 @@
+import {
+    NativeModules,
+    NativeEventEmitter,
+    EmitterSubscription,
+    Platform,
+    processColor
+} from 'react-native'
+
+const Exception = Error
+
+namespace RNLGeetestSensebot {
+    export type Option = Pick<GeetestSensebot.Option,
+        'debug' | 'loadTimeout' | 'reqTimeout' | 'enableBackgroundCancel'> & {
+        api1Result: string;
+        lang?: string;
+        backgroundColorIOS?: number;
+        backgroundBlurEffectIOS?: number;
+    }
+
+    // API
+    const RNLGeetestSensebot = NativeModules.RNLGeetestSensebot
+
+    export const start: (obj: Option) => void = RNLGeetestSensebot.start
+
+    export const stop: () => void = RNLGeetestSensebot.stop
+
+    // Event
+    const EventName = 'RNLGeetestSensebotEvent'
+
+    const EventEmitter = new NativeEventEmitter(RNLGeetestSensebot)
+
+    export const addListener = (listener: (data: any) => void) =>
+        EventEmitter.addListener(EventName, listener)
+}
+
+namespace GeetestSensebot {
+    export enum Lang {
+        System = 'system', // 跟随系统
+        ZH = 'zh', // 简体中文
+        ZH_TW = 'zh-tw', // 繁体中文
+        ZH_HK = 'zh-hk', // 繁体中文
+        EN = 'en', // 英语
+        ID = 'id', // 印尼语
+        JA = 'ja', // 日语
+        KO = 'ko', // 韩语
+        RU = 'ru', // 俄语
+        AR = 'ar', // 阿拉伯语
+        ES = 'es', // 西班牙语
+        PT_PT = 'pt-pt', // 葡萄牙语
+        FR = 'fr', // 法语
+        DE = 'de', // 德语
+    }
+
+    export enum BackgroundBlurEffectIOS {
+        None = -1,
+        ExtraLight = 0,
+        Light,
+        Dark,
+        Regular, // NS_ENUM_AVAILABLE_IOS(10_0)
+        Prominent, // NS_ENUM_AVAILABLE_IOS(10_0)
+    }
+
+    export interface Option {
+        // API1
+        api1Result: API1Result;
+        // debug
+        debug?: boolean;
+        // view 加载超时时间，默认10000
+        loadTimeout?: number;
+        // 第二步向极验服务器发送请求超时时间，默认10000
+        reqTimeout?: number;
+        // 语言，如果为null则使用系统默认语言
+        lang?: Lang;
+        // 点击背景是否可以取消验证
+        enableBackgroundCancel?: boolean;
+        // 背景色 IOS Only
+        backgroundColorIOS?: any;
+        // 背景模糊类型 IOS Only
+        backgroundBlurEffectIOS?: BackgroundBlurEffectIOS;
+        // 事件监听
+        onEvent?: (code: Event, data?: Array<number | string>) => void;
+    }
+
+    export interface API1Result {
+        success: 0 | 1;
+        challenge: string;
+        gt: string;
+        new_captcha: boolean;
+        [key: string]: any;
+    }
+
+    export interface Result {
+        geetest_challenge: string;
+        geetest_seccode: string;
+        geetest_validate: string;
+        [key: string]: any;
+    }
+
+    export enum Event {
+        // 验证结果
+        RESULT = 1,
+        // 验证窗口关闭
+        CLOSED = 2,
+        // 验证失败
+        FAILED = 3,
+        // 发生错误
+        ERROR = 0,
+    }
+
+    export enum Error {
+        // 参数解析错误
+        PARAMETER_PARSE_FAILED = -1,
+        // 安卓 activity 已经销毁
+        ANDROID_ACTIVITY_DESTROYED = -2,
+    }
+
+    const defaultOption: RNLGeetestSensebot.Option = {
+        api1Result: '',
+        debug: false,
+        loadTimeout: 10000,
+        reqTimeout: 10000,
+        lang: Lang.System,
+        enableBackgroundCancel: false,
+        backgroundColorIOS: 0, // processColor('transparent')
+        backgroundBlurEffectIOS: BackgroundBlurEffectIOS.None,
+    }
+
+    function parseConfig(c: Option): RNLGeetestSensebot.Option {
+        const config = Object.assign({}, defaultOption)
+
+        config.api1Result = JSON.stringify(c.api1Result)
+        if (typeof c.debug === 'boolean') {
+            config.debug = c.debug
+        }
+        if (typeof c.loadTimeout === 'number') {
+            config.loadTimeout = c.loadTimeout >> 0
+        }
+        if (typeof c.reqTimeout === 'number') {
+            config.reqTimeout = c.reqTimeout >> 0
+        }
+        if (typeof c.lang === 'string') {
+            config.lang = c.lang
+        }
+        if (typeof c.enableBackgroundCancel === 'boolean') {
+            config.enableBackgroundCancel = c.enableBackgroundCancel
+        }
+        if (c.backgroundColorIOS !== undefined) {
+            config.backgroundColorIOS = processColor(c.backgroundColorIOS)
+        }
+        if (typeof c.backgroundBlurEffectIOS === 'number') {
+            config.backgroundBlurEffectIOS = c.backgroundBlurEffectIOS
+        }
+
+        return config
+    }
+
+    let eventListener: EmitterSubscription
+
+    // 进行行为认证
+    export function start(option: Option): Promise<Result> {
+        return new Promise((resolve, reject) => {
+            eventListener = RNLGeetestSensebot.addListener(([code, ...data]) => {
+                switch (code) {
+                    case Event.RESULT:
+                        stop()
+                        resolve(JSON.parse(data[0]))
+                        break
+                    case Event.FAILED:
+                        // iOS 只要认证错误就会触发, android 多次认证错误最后自动关闭 view 时才会触发
+                        if (Platform.OS === 'android') {
+                            stop()
+                        }
+                        break
+                    case Event.ERROR:
+                        stop()
+                        const error = new Exception(data[1])
+                        Object.defineProperty(error, 'name',
+                            { value: 'RNGeetestError', writable: false })
+                        Object.defineProperty(error, 'code',
+                            { value: data[0], writable: false })
+                        reject(error)
+                        break
+                }
+                if (typeof option.onEvent === 'function') {
+                    option.onEvent(code, data)
+                }
+            })
+            RNLGeetestSensebot.start(parseConfig(option))
+        })
+    }
+
+    // 清理行为认证资源占用
+    export function stop () {
+        if (eventListener && typeof eventListener.remove === 'function') {
+            eventListener.remove()
+        }
+        RNLGeetestSensebot.stop()
+    }
+}
+
+export default GeetestSensebot

ios/Helper/GSColorHelper.h

@@ -1,25 +0,0 @@
-//
-//  GSColorHelper.h
-//  RNGeetestSensebot
-//
-//  Created by dayu dong on 2018/5/24.
-//
-
-#ifndef GSColorHelper_h
-#define GSColorHelper_h
-
-#import <UIKit/UIKit.h>
-
-#if __has_include(<React/RCTConvert.h>)
-#import <React/RCTConvert.h>
-#else
-#import "RCTConvert.h"
-#endif
-
-@interface GSColorHelper : NSObject
-
-+ (UIColor *)parseColor:(NSNumber *)aColorNumber;
-
-@end
-
-#endif /* GSColorHelper_h */

ios/Helper/GSColorHelper.m

@@ -1,17 +0,0 @@
-//
-//  GSColorHelper.m
-//  RNGeetestSensebot
-//
-//  Created by dayu dong on 2018/5/24.
-//
-
-#import "GSColorHelper.h"
-
-@implementation GSColorHelper
-
-+ (UIColor *)parseColor:(NSNumber *)aColorNumber
-{
-    return [RCTConvert UIColor:aColorNumber];
-}
-
-@end

ios/RCTGeetestSensebot.m

@@ -1,155 +0,0 @@
-#import "RCTGeetestSensebot.h"
-#import "GSColorHelper.h"
-
-#define GSResolveEvent(event) [NSNumber numberWithInteger:event]
-#define GSResolveBool(bool) [NSNumber numberWithBool:bool]
-
-static NSString* RCTGSEventName = @"RNGeetestSensebotEvent";
-
-typedef NS_ENUM(NSInteger, RCTGSEventType) {
-    GS_CAPTCHA = 1,
-    GS_ERROR = -1
-};
-
-@implementation RCTGeetestSensebot {
-    GT3CaptchaManager *_captchaManager;
-}
-
-+ (BOOL)requiresMainQueueSetup
-{
-    return YES;
-}
-
-- (dispatch_queue_t)methodQueue
-{
-    return dispatch_get_main_queue();
-}
-
-RCT_EXPORT_MODULE()
-
-
-#pragma export methods
-
-RCT_REMAP_METHOD(initCaptchaMgr,
-               maskColorNum:(nonnull NSNumber *)aMaskColorNum
-                    isDebug:(BOOL)isDebug
-                   resolver:(RCTPromiseResolveBlock)resolve
-                   rejecter:(RCTPromiseRejectBlock)reject)
-{
-    // 初始化 captcha manager
-    _captchaManager = [[GT3CaptchaManager alloc] initWithAPI1:nil API2:nil timeout:5.0];
-    _captchaManager.delegate = self;
-
-    UIColor *aMaskColor = [GSColorHelper parseColor:aMaskColorNum];
-    _captchaManager.maskColor = aMaskColor;
-    [_captchaManager enableDebugMode:isDebug];
-
-    resolve(GSResolveBool(YES));
-}
-
-RCT_REMAP_METHOD(captcha,
-     captchaWithSuccess:(nonnull NSNumber *)success
-                     gt:(NSString *)gt
-              challenge:(NSString *)challenge
-                   api2:(NSString *)api2
-               resolver:(RCTPromiseResolveBlock)resolve
-               rejecter:(RCTPromiseRejectBlock)reject)
-{
-    if (!_captchaManager) {
-        resolve(GSResolveBool(NO));
-        return;
-    }
-    // 行为验证
-    [_captchaManager configureGTest:gt challenge:challenge success:success withAPI2:api2];
-    [_captchaManager startGTCaptchaWithAnimated:YES];
-
-    resolve(GSResolveBool(YES));
-}
-
-RCT_REMAP_METHOD(stopCaptcha,
-         stopCaptchaResolver:(RCTPromiseResolveBlock)resolve
-                    rejecter:(RCTPromiseRejectBlock)reject)
-{
-    [self stopCaptchaAndClean];
-
-    resolve(GSResolveBool(YES));
-}
-
-
-#pragma other methods
-
-- (void)stopCaptchaAndClean
-{
-    if (_captchaManager) {
-        [_captchaManager stopGTCaptcha];
-        [_captchaManager closeGTViewIfIsOpen];
-        _captchaManager = nil;
-    }
-}
-
-
-#pragma gt3 delegate
-
-// disable sdk request api1
-- (BOOL)shouldUseDefaultRegisterAPI:(GT3CaptchaManager *)manager
-{
-    return NO;
-}
-
-// get captcha result
-- (void)gtCaptcha:(GT3CaptchaManager *)manager didReceiveCaptchaCode:(NSString *)code result:(NSDictionary *)result message:(NSString *)message
-{
-    [self sendEvent:@{
-                      @"type": GSResolveEvent(GS_CAPTCHA),
-                      @"payload": @{
-                              @"code": code,
-                              @"message": message,
-                              @"result": result
-                              }
-                      }];
-}
-
-// send user close view event to js
-- (void)gtCaptchaUserDidCloseGTView:(GT3CaptchaManager *)manager
-{
-    [self sendEvent:@{
-                      @"type": GSResolveEvent(GS_CAPTCHA),
-                      @"errCode": @"close view",
-                      @"errMsg": @"user close captcha view."
-                      }];
-}
-
-// disable sdk request api2
-- (BOOL)shouldUseDefaultSecondaryValidate:(GT3CaptchaManager *)manager
-{
-    return NO;
-}
-
-- (void)gtCaptcha:(GT3CaptchaManager *)manager didReceiveSecondaryCaptchaData:(NSData *)data response:(NSURLResponse *)response error:(GT3Error *)error decisionHandler:(void (^)(GT3SecondaryCaptchaPolicy))decisionHandler
-{
-    // no use
-}
-
-// manager error
-- (void)gtCaptcha:(GT3CaptchaManager *)manager errorHandler:(GT3Error *)error
-{
-    [self sendEvent:@{
-                      @"type": GSResolveEvent(GS_ERROR),
-                      @"errCode": error.error_code,
-                      @"errMsg": error.gtDescription
-                      }];
-}
-
-
-#pragma event
-
-- (NSArray<NSString *> *)supportedEvents
-{
-    return @[RCTGSEventName];
-}
-
-- (void)sendEvent:(id)body {
-    [self sendEventWithName:RCTGSEventName body:body];
-}
-
-@end

ios/RCTGeetestSensebot.h → ios/RNLGeetestSensebot.h

@@ -9,12 +9,5 @@
 #import "RCTEventEmitter.h"
 #endif
 
-#if __has_include(<GT3Captcha/GT3Captcha.h>)
-#import <GT3Captcha/GT3Captcha.h>
-#else
-#import "GT3Captcha.h"
-#endif
-
-@interface RCTGeetestSensebot : RCTEventEmitter <RCTBridgeModule, GT3CaptchaManagerDelegate, GT3CaptchaManagerViewDelegate>
-
+@interface RNLGeetestSensebot : RCTEventEmitter <RCTBridgeModule>
 @end

ios/RNLGeetestSensebot.m

@@ -0,0 +1,211 @@
+#if __has_include(<React/RCTConvert.h>)
+#import <React/RCTConvert.h>
+#else
+#import "RCTConvert.h"
+#endif
+#if __has_include(<React/RCTUtils.h>)
+#import <React/RCTUtils.h>
+#else
+#import "RCTUtils.h"
+#endif
+#import <GT3Captcha/GT3Captcha.h>
+
+#import "RNLGeetestSensebot.h"
+
+static NSString* EventName = @"RNLGeetestSensebotEvent";
+
+typedef NS_ENUM(NSUInteger, RNLGSEvent) {
+    RNLGSResultEvent = 1,
+    RNLGSClosedEvent = 2,
+    RNLGSFailedEvent = 3,
+    RNLGSErrorEvent = 0,
+};
+
+static NSNumber* RNLGSGetEventCode(RNLGSEvent event) {
+    return [NSNumber numberWithUnsignedInteger:event];
+}
+
+typedef NS_ENUM(NSInteger, RNLGSError) {
+    RNLGSParameterParseError = -1,
+};
+
+static NSNumber* RNLGSGetErrorCode(RNLGSError event) {
+    return [NSNumber numberWithInteger:event];
+}
+
+@interface RNLGeetestSensebot () <GT3CaptchaManagerDelegate, GT3CaptchaManagerViewDelegate>
+@end
+
+@implementation RNLGeetestSensebot {
+    GT3CaptchaManager *_manager;
+}
+
+RCT_EXPORT_METHOD(start:(NSDictionary *)option)
+{
+    @try {
+        // view load timeout
+        NSTimeInterval timeout = [RCTConvert double:option[@"loadTimeout"]] / 1000.0;
+        // init manager
+        _manager = [[GT3CaptchaManager alloc] initWithAPI1:nil API2:nil timeout:timeout];
+        _manager.delegate = self;
+        _manager.viewDelegate = self;
+        // debug
+        BOOL enableDebugMode = [RCTConvert BOOL:option[@"debug"]];
+        [_manager enableDebugMode: enableDebugMode];
+        // request timeout
+        NSTimeInterval gtViewTimeout = [RCTConvert double:option[@"reqTimeout"]] / 1000.0;
+        [_manager useGTViewWithTimeout:gtViewTimeout];
+        // lang
+        GT3LanguageType lang = [RNLGeetestSensebot parseLanguag:
+                                [RCTConvert NSString:option[@"lang"]]];
+        [_manager useLanguage:lang];
+        // enable background cancel
+        BOOL disableBackgroundUserInteraction = ![RCTConvert BOOL:option[@"enableBackgroundCancel"]];
+        [_manager disableBackgroundUserInteraction:disableBackgroundUserInteraction];
+        // background color
+        UIColor *maskColor = [RCTConvert UIColor:option[@"backgroundColorIOS"]];
+        if (maskColor != nil) {
+            _manager.maskColor = maskColor;
+        }
+        // background blur effect
+        NSInteger blurEffectStyle = [RCTConvert NSInteger:option[@"backgroundBlurEffectIOS"]];
+        if (blurEffectStyle >= UIBlurEffectStyleExtraLight && blurEffectStyle <= UIBlurEffectStyleProminent) {
+            // enum bound
+            [_manager useVisualViewWithEffect:
+             [UIBlurEffect effectWithStyle:(UIBlurEffectStyle)blurEffectStyle]];
+        }
+        // api1 json result
+        NSDictionary *api1JSON = RCTJSONParse([RCTConvert NSString:option[@"api1Result"]], nil);
+        [_manager configureGTest:[api1JSON objectForKey:@"gt"]
+                       challenge:[api1JSON objectForKey:@"challenge"]
+                         success:[api1JSON objectForKey:@"success"]
+                        withAPI2:nil];
+        // registe and start validate
+        [_manager registerCaptcha:nil];
+        [_manager startGTCaptchaWithAnimated:YES];
+    } @catch (NSException *e) {
+        NSMutableString *errorMessage = [NSMutableString new];
+        [errorMessage appendString:[e name]];
+        if ([e reason] != nil) {
+            [errorMessage appendFormat:@", %@", [e reason]];
+        }
+        if ([e userInfo] != nil) {
+            [errorMessage appendFormat:@", %@", [e userInfo]];
+        }
+        [self sendEvent:@[
+                          RNLGSGetEventCode(RNLGSErrorEvent),
+                          RNLGSGetErrorCode(RNLGSParameterParseError),
+                          errorMessage]];
+    }
+}
+
+RCT_EXPORT_METHOD(stop)
+{
+    if (_manager != nil) {
+        [_manager stopGTCaptcha];
+        _manager = nil;
+    }
+}
+
++(GT3LanguageType)parseLanguag:(NSString *)lang
+{
+    if ([lang isEqualToString:@"system"]) {
+        return GT3LANGTYPE_AUTO;
+    } else if ([lang isEqualToString:@"zh"]) {
+        return GT3LANGTYPE_ZH_CN;
+    } else if ([lang isEqualToString:@"zh-tw"]) {
+        return GT3LANGTYPE_ZH_TW;
+    } else if ([lang isEqualToString:@"zh-hk"]) {
+        return GT3LANGTYPE_ZH_HK;
+    } else if ([lang isEqualToString:@"en"]) {
+        return GT3LANGTYPE_EN;
+    } else if ([lang isEqualToString:@"id"]) {
+        return GT3LANGTYPE_ID;
+    } else if ([lang isEqualToString:@"ja"]) {
+        return GT3LANGTYPE_JA_JP;
+    } else if ([lang isEqualToString:@"ko"]) {
+        return GT3LANGTYPE_KO_KR;
+    } else if ([lang isEqualToString:@"ru"]) {
+        return GT3LANGTYPE_RU;
+    } else if ([lang isEqualToString:@"ar"]) {
+        return GT3LANGTYPE_AR;
+    } else if ([lang isEqualToString:@"es"]) {
+        return GT3LANGTYPE_ES;
+    } else if ([lang isEqualToString:@"pt-pt"]) {
+        return GT3LANGTYPE_PT_PT;
+    } else if ([lang isEqualToString:@"fr"]) {
+        return GT3LANGTYPE_FR;
+    } else if ([lang isEqualToString:@"de"]) {
+        return GT3LANGTYPE_DE;
+    }
+    return GT3LANGTYPE_AUTO;
+}
+
+#pragma GT3 Delegate
+
+- (void)gtCaptcha:(GT3CaptchaManager *)manager errorHandler:(GT3Error *)error
+{
+    NSMutableString *errorMessage = [NSMutableString new];
+    [errorMessage appendString:[error error_code]];
+    [errorMessage appendFormat:@", %@", [error gtDescription]];
+
+    [self sendEvent:@[RNLGSGetEventCode(RNLGSFailedEvent),
+                      errorMessage]];
+}
+
+- (void)gtCaptcha:(GT3CaptchaManager *)manager didReceiveCaptchaCode:(NSString *)code result:(NSDictionary *)result message:(NSString *)message
+{
+    if ([code isEqualToString:@"0"]) {
+        [self sendEvent:@[RNLGSGetEventCode(RNLGSFailedEvent),
+                          RCTJSONStringify(result, nil)]];
+    } else if ([code isEqualToString:@"1"]) {
+        [self sendEvent:@[RNLGSGetEventCode(RNLGSResultEvent),
+                          RCTJSONStringify(result, nil)]];
+    }
+}
+
+- (void)gtCaptcha:(GT3CaptchaManager *)manager didReceiveSecondaryCaptchaData:(NSData *)data response:(NSURLResponse *)response error:(GT3Error *)error decisionHandler:(void (^)(GT3SecondaryCaptchaPolicy))decisionHandler
+{
+
+}
+
+- (void)gtCaptchaUserDidCloseGTView:(GT3CaptchaManager *)manager
+{
+    [self sendEvent:@[RNLGSGetEventCode(RNLGSClosedEvent)]];
+}
+
+- (BOOL)shouldUseDefaultRegisterAPI:(GT3CaptchaManager *)manager
+{
+    return NO;
+}
+
+- (BOOL)shouldUseDefaultSecondaryValidate:(GT3CaptchaManager *)manager
+{
+    return NO;
+}
+
+#pragma react native bridge
+
+- (NSArray<NSString *> *)supportedEvents
+{
+    return @[EventName];
+}
+
+- (void)sendEvent:(id)body
+{
+    [self sendEventWithName:EventName body:body];
+}
+
+RCT_EXPORT_MODULE()
+
++ (BOOL)requiresMainQueueSetup
+{
+    return YES;
+}
+
+- (dispatch_queue_t)methodQueue
+{
+    return dispatch_get_main_queue();
+}
+
+@end

ios/RCTGeetestSensebot.xcodeproj/project.pbxproj → ios/RNLGeetestSensebot.xcodeproj/project.pbxproj

@@ -7,107 +7,63 @@
 	objects = {
 
 /* Begin PBXBuildFile section */
-		3643C27A20B64B8E00A0B890 /* GSColorHelper.m in Sources */ = {isa = PBXBuildFile; fileRef = 3643C27920B64B8E00A0B890 /* GSColorHelper.m */; };
-		36AF50B120D2408400F82592 /* GT3Captcha.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 36AF50B020D2408400F82592 /* GT3Captcha.bundle */; };
-		B3E7B58A1CC2AC0600A0062D /* RCTGeetestSensebot.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RCTGeetestSensebot.m */; };
+		363F8FBF226ED46600C89882 /* GT3Captcha.bundle in Resources */ = {isa = PBXBuildFile; fileRef = 363F8FBD226ED42100C89882 /* GT3Captcha.bundle */; };
+		B3E7B58A1CC2AC0600A0062D /* RNLGeetestSensebot.m in Sources */ = {isa = PBXBuildFile; fileRef = B3E7B5891CC2AC0600A0062D /* RNLGeetestSensebot.m */; };
 /* End PBXBuildFile section */
 
-/* Begin PBXCopyFilesBuildPhase section */
-		58B511D91A9E6C8500147676 /* Copy Files */ = {
-			isa = PBXCopyFilesBuildPhase;
-			buildActionMask = 2147483647;
-			dstPath = "include/$(PRODUCT_NAME)";
-			dstSubfolderSpec = 16;
-			files = (
-			);
-			name = "Copy Files";
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXCopyFilesBuildPhase section */
-
 /* Begin PBXFileReference section */
-		134814201AA4EA6300B7C361 /* libRCTGeetestSensebot.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRCTGeetestSensebot.a; sourceTree = BUILT_PRODUCTS_DIR; };
-		3643C27820B64B2F00A0B890 /* GSColorHelper.h */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.h; path = GSColorHelper.h; sourceTree = "<group>"; };
-		3643C27920B64B8E00A0B890 /* GSColorHelper.m */ = {isa = PBXFileReference; lastKnownFileType = sourcecode.c.objc; path = GSColorHelper.m; sourceTree = "<group>"; };
-		36AF50B020D2408400F82592 /* GT3Captcha.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; name = GT3Captcha.bundle; path = SDK/GT3Captcha.bundle; sourceTree = "<group>"; };
-		B3E7B5881CC2AC0600A0062D /* RCTGeetestSensebot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RCTGeetestSensebot.h; sourceTree = "<group>"; };
-		B3E7B5891CC2AC0600A0062D /* RCTGeetestSensebot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RCTGeetestSensebot.m; sourceTree = "<group>"; };
+		134814201AA4EA6300B7C361 /* libRNLGeetestSensebot.a */ = {isa = PBXFileReference; explicitFileType = archive.ar; includeInIndex = 0; path = libRNLGeetestSensebot.a; sourceTree = BUILT_PRODUCTS_DIR; };
+		363F8FBD226ED42100C89882 /* GT3Captcha.bundle */ = {isa = PBXFileReference; lastKnownFileType = "wrapper.plug-in"; path = GT3Captcha.bundle; sourceTree = "<group>"; };
+		363F8FBE226ED45600C89882 /* GT3Captcha.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GT3Captcha.framework; path = SDK/GT3Captcha.framework; sourceTree = "<group>"; };
+		B3E7B5881CC2AC0600A0062D /* RNLGeetestSensebot.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = RNLGeetestSensebot.h; sourceTree = "<group>"; };
+		B3E7B5891CC2AC0600A0062D /* RNLGeetestSensebot.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = RNLGeetestSensebot.m; sourceTree = "<group>"; };
 /* End PBXFileReference section */
 
-/* Begin PBXFrameworksBuildPhase section */
-		58B511D81A9E6C8500147676 /* Frameworks */ = {
-			isa = PBXFrameworksBuildPhase;
-			buildActionMask = 2147483647;
-			files = (
-			);
-			runOnlyForDeploymentPostprocessing = 0;
-		};
-/* End PBXFrameworksBuildPhase section */
-
 /* Begin PBXGroup section */
 		134814211AA4EA7D00B7C361 /* Products */ = {
 			isa = PBXGroup;
 			children = (
-				134814201AA4EA6300B7C361 /* libRCTGeetestSensebot.a */,
+				134814201AA4EA6300B7C361 /* libRNLGeetestSensebot.a */,
 			);
 			name = Products;
 			sourceTree = "<group>";
 		};
-		3643C27620B64ADF00A0B890 /* Helper */ = {
-			isa = PBXGroup;
-			children = (
-				3643C27820B64B2F00A0B890 /* GSColorHelper.h */,
-				3643C27920B64B8E00A0B890 /* GSColorHelper.m */,
-			);
-			path = Helper;
-			sourceTree = "<group>";
-		};
-		36AF50AF20D2407800F82592 /* Resources */ = {
+		363F8FBC226ED41C00C89882 /* SDK */ = {
 			isa = PBXGroup;
 			children = (
-				36AF50B020D2408400F82592 /* GT3Captcha.bundle */,
+				363F8FBE226ED45600C89882 /* GT3Captcha.framework */,
+				363F8FBD226ED42100C89882 /* GT3Captcha.bundle */,
 			);
-			name = Resources;
-			sourceTree = "<group>";
-		};
-		36CD983820B80C0500647AC8 /* Frameworks */ = {
-			isa = PBXGroup;
-			children = (
-			);
-			name = Frameworks;
+			name = SDK;
 			sourceTree = "<group>";
 		};
 		58B511D21A9E6C8500147676 = {
 			isa = PBXGroup;
 			children = (
-				B3E7B5881CC2AC0600A0062D /* RCTGeetestSensebot.h */,
-				B3E7B5891CC2AC0600A0062D /* RCTGeetestSensebot.m */,
-				3643C27620B64ADF00A0B890 /* Helper */,
-				36AF50AF20D2407800F82592 /* Resources */,
+				B3E7B5881CC2AC0600A0062D /* RNLGeetestSensebot.h */,
+				B3E7B5891CC2AC0600A0062D /* RNLGeetestSensebot.m */,
+				363F8FBC226ED41C00C89882 /* SDK */,
 				134814211AA4EA7D00B7C361 /* Products */,
-				36CD983820B80C0500647AC8 /* Frameworks */,
 			);
 			sourceTree = "<group>";
 		};
 /* End PBXGroup section */
 
 /* Begin PBXNativeTarget section */
-		58B511DA1A9E6C8500147676 /* RCTGeetestSensebot */ = {
+		58B511DA1A9E6C8500147676 /* RNLGeetestSensebot */ = {
 			isa = PBXNativeTarget;
-			buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTGeetestSensebot" */;
+			buildConfigurationList = 58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RNLGeetestSensebot" */;
 			buildPhases = (
 				58B511D71A9E6C8500147676 /* Sources */,
-				58B511D81A9E6C8500147676 /* Frameworks */,
-				58B511D91A9E6C8500147676 /* Copy Files */,
-				36AF50AD20D2404900F82592 /* Resources */,
+				363F8F8C226ED25100C89882 /* Resources */,
 			);
 			buildRules = (
 			);
 			dependencies = (
 			);
-			name = RCTGeetestSensebot;
+			name = RNLGeetestSensebot;
 			productName = RCTDataManager;
-			productReference = 134814201AA4EA6300B7C361 /* libRCTGeetestSensebot.a */;
+			productReference = 134814201AA4EA6300B7C361 /* libRNLGeetestSensebot.a */;
 			productType = "com.apple.product-type.library.static";
 		};
 /* End PBXNativeTarget section */
@@ -124,11 +80,12 @@
 					};
 				};
 			};
-			buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RCTGeetestSensebot" */;
+			buildConfigurationList = 58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RNLGeetestSensebot" */;
 			compatibilityVersion = "Xcode 3.2";
 			developmentRegion = English;
 			hasScannedForEncodings = 0;
 			knownRegions = (
+				English,
 				en,
 			);
 			mainGroup = 58B511D21A9E6C8500147676;
@@ -136,17 +93,17 @@
 			projectDirPath = "";
 			projectRoot = "";
 			targets = (
-				58B511DA1A9E6C8500147676 /* RCTGeetestSensebot */,
+				58B511DA1A9E6C8500147676 /* RNLGeetestSensebot */,
 			);
 		};
 /* End PBXProject section */
 
 /* Begin PBXResourcesBuildPhase section */
-		36AF50AD20D2404900F82592 /* Resources */ = {
+		363F8F8C226ED25100C89882 /* Resources */ = {
 			isa = PBXResourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				36AF50B120D2408400F82592 /* GT3Captcha.bundle in Resources */,
+				363F8FBF226ED46600C89882 /* GT3Captcha.bundle in Resources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -157,8 +114,7 @@
 			isa = PBXSourcesBuildPhase;
 			buildActionMask = 2147483647;
 			files = (
-				B3E7B58A1CC2AC0600A0062D /* RCTGeetestSensebot.m in Sources */,
-				3643C27A20B64B8E00A0B890 /* GSColorHelper.m in Sources */,
+				B3E7B58A1CC2AC0600A0062D /* RNLGeetestSensebot.m in Sources */,
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 		};
@@ -249,14 +205,9 @@
 		58B511F01A9E6C8500147676 /* Debug */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/SDK",
-				);
-				HEADER_SEARCH_PATHS = "$(inherited)";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/SDK";
 				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = RCTGeetestSensebot;
+				PRODUCT_NAME = RNLGeetestSensebot;
 				SKIP_INSTALL = YES;
 			};
 			name = Debug;
@@ -264,14 +215,9 @@
 		58B511F11A9E6C8500147676 /* Release */ = {
 			isa = XCBuildConfiguration;
 			buildSettings = {
-				FRAMEWORK_SEARCH_PATHS = (
-					"$(inherited)",
-					"$(PROJECT_DIR)/SDK",
-				);
-				HEADER_SEARCH_PATHS = "$(inherited)";
-				LIBRARY_SEARCH_PATHS = "$(inherited)";
+				FRAMEWORK_SEARCH_PATHS = "$(PROJECT_DIR)/SDK";
 				OTHER_LDFLAGS = "-ObjC";
-				PRODUCT_NAME = RCTGeetestSensebot;
+				PRODUCT_NAME = RNLGeetestSensebot;
 				SKIP_INSTALL = YES;
 			};
 			name = Release;
@@ -279,7 +225,7 @@
 /* End XCBuildConfiguration section */
 
 /* Begin XCConfigurationList section */
-		58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RCTGeetestSensebot" */ = {
+		58B511D61A9E6C8500147676 /* Build configuration list for PBXProject "RNLGeetestSensebot" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				58B511ED1A9E6C8500147676 /* Debug */,
@@ -288,7 +234,7 @@
 			defaultConfigurationIsVisible = 0;
 			defaultConfigurationName = Release;
 		};
-		58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RCTGeetestSensebot" */ = {
+		58B511EF1A9E6C8500147676 /* Build configuration list for PBXNativeTarget "RNLGeetestSensebot" */ = {
 			isa = XCConfigurationList;
 			buildConfigurations = (
 				58B511F01A9E6C8500147676 /* Debug */,

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

@@ -53,7 +53,7 @@
  *  Captcha Button `layer.borderColor`. Defaults 
  *  to 0xcccccc. Animatable.
  */
-@property (nonatomic, assign) CGColorRef borderColor;
+@property (nonatomic, strong) UIColor *borderColor;
 
 /**
  *  Captcha Button `layer.borderWidth` Defaults to

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

@@ -10,7 +10,7 @@
 #import "GT3Utils.h"
 #import "GT3Error.h"
 
-@protocol GT3CaptchaManagerDelegate, GT3CaptchaManagerViewDelegate, GT3CaptchaManagerStatisticDelegate;
+@protocol GT3CaptchaManagerDelegate, GT3CaptchaNetworkDelegate, GT3CaptchaManagerViewDelegate, GT3CaptchaManagerStatisticDelegate;
 
 @interface GT3CaptchaManager : NSObject
 
@@ -19,6 +19,8 @@
 
 /** 验证管理代理 */
 @property (nonatomic, weak) id<GT3CaptchaManagerDelegate> delegate;
+/** 验证网络代理 */
+@property (nonatomic, weak) id<GT3CaptchaNetworkDelegate> networkDelegate;
 /** 验证视图代理 */
 @property (nonatomic, weak) id<GT3CaptchaManagerViewDelegate> viewDelegate;
 /** 验证统计代理 */
@@ -190,9 +192,9 @@
  *  @discussion
  *  默认中文
  *
- *  @param Type 语言类型
+ *  @param type 语言类型
  */
-- (void)useLanguage:(GT3LanguageType)Type;
+- (void)useLanguage:(GT3LanguageType)type;
 
 /**
  *  @abstract 完全使用HTTPS协议请求验证
@@ -356,6 +358,13 @@
 
 @end
 
+@protocol GT3CaptchaNetworkDelegate <NSObject>
+
+- (void)gtCaptcha:(GT3CaptchaManager *)manager didReceiveChallenge:(NSURLAuthenticationChallenge *)challenge
+ completionHandler:(void (^)(NSURLSessionAuthChallengeDisposition disposition, NSURLCredential * credential))completionHandler;
+
+@end
+
 @protocol GT3CaptchaManagerViewDelegate <NSObject>
 
 @optional

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

@@ -65,22 +65,34 @@ typedef NS_ENUM(NSInteger, GT3SecondaryCaptchaPolicy) {
  *  图形验证的语言选项
  */
 typedef NS_ENUM(NSInteger, GT3LanguageType) {
-    /** Simplified Chinese */
+    /** Simplified Chinese 简体中文 */
     GT3LANGTYPE_ZH_CN = 0,
-    /** Traditional Chinese */
+    /** Traditional Chinese 繁体中文 */
     GT3LANGTYPE_ZH_TW,
-    /** Traditional Chinese */
+    /** Traditional Chinese 繁体中文 */
     GT3LANGTYPE_ZH_HK,
-    /** Korean */
-    GT3LANGTYPE_KO_KR,// 暂不支持
-    /** Japenese */
+    /** Korean 韩语 */
+    GT3LANGTYPE_KO_KR,
+    /** Japenese 日语 */
     GT3LANGTYPE_JA_JP,
-    /** English */
-    GT3LANGTYPE_EN_US,
-    /** Indonesian */
+    /** English 英语 */
+    GT3LANGTYPE_EN,
+    /** Indonesian 印度尼西亚语 */
     GT3LANGTYPE_ID,
-    /** System language*/
-    GT3LANGTYPE_AUTO
+    /** Arabic 阿拉伯语 */
+    GT3LANGTYPE_AR,
+    /** German 德语 */
+    GT3LANGTYPE_DE,
+    /** Spanish 西班牙语 */
+    GT3LANGTYPE_ES,
+    /** French 法语 */
+    GT3LANGTYPE_FR,
+    /** Portuguese 葡萄牙语 */
+    GT3LANGTYPE_PT_PT,
+    /** Russian 俄语 */
+    GT3LANGTYPE_RU,
+    /** System language 跟随系统语言*/
+    GT3LANGTYPE_AUTO = 999
 };
 
 /**

package-lock.json

@@ -0,0 +1,47 @@
+{
+  "name": "@yyyyu/react-native-geetest-sensebot",
+  "version": "2.0.0",
+  "lockfileVersion": 1,
+  "requires": true,
+  "dependencies": {
+    "@types/invariant": {
+      "version": "2.2.29",
+      "resolved": "https://registry.npmjs.org/@types/invariant/-/invariant-2.2.29.tgz",
+      "integrity": "sha512-lRVw09gOvgviOfeUrKc/pmTiRZ7g7oDOU6OAutyuSHpm1/o2RaBQvRhgK8QEdu+FFuw/wnWb29A/iuxv9i8OpQ=="
+    },
+    "@types/prop-types": {
+      "version": "15.7.1",
+      "resolved": "https://registry.npmjs.org/@types/prop-types/-/prop-types-15.7.1.tgz",
+      "integrity": "sha512-CFzn9idOEpHrgdw8JsoTkaDDyRWk1jrzIV8djzcgpq0y9tG4B4lFT+Nxh52DVpDXV+n4+NPNv7M1Dj5uMp6XFg=="
+    },
+    "@types/react": {
+      "version": "16.8.13",
+      "resolved": "https://registry.npmjs.org/@types/react/-/react-16.8.13.tgz",
+      "integrity": "sha512-otJ4ntMuHGrvm67CdDJMAls4WqotmAmW0g3HmWi9LCjSWXrxoXY/nHXrtmMfvPEEmGFNm6NdgMsJmnfH820Qaw==",
+      "requires": {
+        "@types/prop-types": "*",
+        "csstype": "^2.2.0"
+      }
+    },
+    "@types/react-native": {
+      "version": "0.57.45",
+      "resolved": "https://registry.npmjs.org/@types/react-native/-/react-native-0.57.45.tgz",
+      "integrity": "sha512-XHo3buFjgCs5WmycCBoc71QAa+mayQgDf+igRKgt3rle8rxW/fKtQny6quSabR+YcT55PsOE2qBQ4S5ra9ds2g==",
+      "requires": {
+        "@types/prop-types": "*",
+        "@types/react": "*"
+      }
+    },
+    "csstype": {
+      "version": "2.6.4",
+      "resolved": "https://registry.npmjs.org/csstype/-/csstype-2.6.4.tgz",
+      "integrity": "sha512-lAJUJP3M6HxFXbqtGRc0iZrdyeN+WzOWeY0q/VnFzI+kqVrYIzC7bWlKqCW7oCIdzoPkvfp82EVvrTlQ8zsWQg=="
+    },
+    "typescript": {
+      "version": "3.4.3",
+      "resolved": "https://registry.npmjs.org/typescript/-/typescript-3.4.3.tgz",
+      "integrity": "sha512-FFgHdPt4T/duxx6Ndf7hwgMZZjZpB+U0nMNGVCYPq0rEzWKjEDobm4J6yb3CS7naZ0yURFqdw9Gwc7UOh/P9oQ==",
+      "dev": true
+    }
+  }
+}

package.json

@@ -1,42 +1,31 @@
 {
   "name": "@yyyyu/react-native-geetest-sensebot",
   "author": "yyyyu <g592842897@gmail.com>",
-  "version": "1.0.4",
+  "version": "2.0.0",
   "keywords": [
     "react-native",
-    "geetest"
+    "geetest sensebot"
   ],
-  "description": "react native for geetest sensebot.",
+  "description": "geetest sensebot for react native.",
   "license": "MIT",
   "homepage": "https://github.com/yyyyu/react-native-geetest-sensebot",
   "repository": {
     "type": "git",
     "url": "git@github.com:yyyyu/react-native-geetest-sensebot.git"
   },
-  "main": "index.js",
+  "main": "dist/index.js",
+  "types": "dist/index.d.js",
   "scripts": {
-    "postinstall": "node scripts/postinstall"
-  },
-  "rnpm": {
-    "commands": {
-      "postlink": "node node_modules/@yyyyu/react-native-geetest-sensebot/scripts/postlink"
-    }
-  },
-  "dependencies": {
-    "invariant": "^2.2.4"
+    "build": "tsc"
   },
   "peerDependencies": {
-    "react-native": ">0.50.0"
+    "react-native": "^0.59.5"
   },
   "devDependencies": {
-    "babel-eslint": "^8.2.3",
-    "standard": "^11.0.1"
+    "typescript": "^3.4.3"
   },
-  "standard": {
-    "parser": "babel-eslint",
-    "globals": [
-      "fetch",
-      "Request"
-    ]
+  "dependencies": {
+    "@types/invariant": "^2.2.29",
+    "@types/react-native": "^0.57.45"
   }
 }

scripts/file.js

@@ -1,40 +0,0 @@
-const fs = require('fs')
-
-function fileInsert (path, insStr, insSign, avoidDupSign) {
-  fileReadAndWrite(path, function (data) {
-    if (avoidDupSign && data.indexOf(avoidDupSign) !== -1) return
-    const position = data.indexOf(insSign)
-    return data.slice(0, position) + insStr + data.slice(position)
-  })
-}
-
-function fileReplace (path, search, replace) {
-  fileReadAndWrite(path, function (data) {
-    return data.replace(new RegExp(search, 'g'), replace)
-  })
-}
-
-function fileReadAndWrite (path, callback) {
-  if (!fs.existsSync(path)) return
-  const encoding = 'utf8'
-  let data = null
-
-  try {
-    data = fs.readFileSync(path, encoding)
-  } catch (e) {
-    return console.error(e)
-  }
-
-  const result = callback(data)
-
-  try {
-    fs.writeFileSync(path, result, encoding)
-  } catch (e) {
-    console.error(e)
-  }
-}
-
-module.exports = {
-  fileInsert,
-  fileReplace
-}

scripts/postinstall.js

@@ -1,22 +0,0 @@
-const path = require('path')
-const file = require('./file')
-
-const postinstall = () => {
-  const nodeModuleDir = path.dirname(__filename) + '/../../..'
-
-  const modifies = {
-    get reactSpec () {
-      const avoidDupSign = '# Dependency'
-      return [
-        nodeModuleDir + '/react-native/React.podspec',
-        avoidDupSign + '\n  s.subspec "Dependency" do |ss|\n    ss.source_files         = "React/**/*.h"\n  end\n\n  ',
-        's.subspec "Core" do |ss|',
-        avoidDupSign
-      ]
-    }
-  }
-
-  file.fileInsert(...modifies.reactSpec)
-}
-
-postinstall()

scripts/postlink.js

@@ -1,21 +0,0 @@
-const path = require('path')
-const file = require('./file')
-
-const postlink = () => {
-  const projectDir = path.dirname(__filename) + '/../../../..'
-
-  file.fileReplace(
-    projectDir + '/android/settings.gradle',
-    ':@yyyyu/react-native-geetest-sensebot',
-    ':react-native-geetest-sensebot'
-  )
-  file.fileReplace(
-    projectDir + '/android/app/build.gradle',
-    ':@yyyyu/react-native-geetest-sensebot',
-    ':react-native-geetest-sensebot'
-  )
-
-  console.log('\nLink finished, hit <Enter> to continue')
-}
-
-postlink()

src/api.js

@@ -1,258 +0,0 @@
-import { NativeEventEmitter, NativeModules, Platform } from 'react-native'
-import processColor from './lib/processColor'
-import validUrl from './lib/validUrl'
-import validCaptchaParams from './lib/validCaptchaParams'
-import invariant from 'invariant'
-import { EVENT_TYPE, ERROR_TYPE } from './constant'
-
-const { GeetestSensebot } = NativeModules
-
-const GSConfig = {
-  api1: null,
-  api2: null,
-  maskColor: processColor('transparent'),
-  isDebug: false
-}
-
-/**
- * configApi 配置 api 地址
- * @param  {String} api1
- * @param  {String} api2
- * @return {void}
- */
-export const configApi = (api1, api2) => {
-  validUrl(api1)
-  GSConfig.api1 = api1
-  validUrl(api2)
-  GSConfig.api2 = api2
-}
-
-/**
- * setMaskColor 配置行为验证背景遮罩颜色 iosOnly
- * @param  {String} color
- * @return {void}
- */
-export const setMaskColor = color => {
-  if (Platform.OS !== 'ios') return // 避免不必要的计算
-  GSConfig.maskColor = processColor(color)
-}
-
-/**
- * enableDebug 开启调试 iosOnly
- * @param  {Boolean} isDebug
- * @return {void}
- */
-export const enableDebug = isDebug => {
-  GSConfig.isDebug = !!isDebug
-}
-
-/**
- * captcha 行为验证
- */
-export const captcha = async argument => {
-  invariant(
-    GSConfig.api1 !== null && GSConfig.api2 !== null,
-    'api address must be set, please run configApi function first.'
-  )
-
-  const {
-    api1ReqReplacer, api1RespHandler,
-    api2ReqReplacer, api2RespHandler
-  } = argument || {}
-
-  let payload = null
-  let errCode = null
-  let errMsg = null
-
-  // initial captcha manager
-  await GeetestSensebot.initCaptchaMgr(GSConfig.maskColor, GSConfig.isDebug)
-
-  // api1 request
-  let api1Resp = null
-  let captchaParams = null
-  try {
-    let api1Req = new Request(GSConfig.api1, {
-      method: 'GET',
-      headers: { 'Content-Type': 'application/json' },
-      credentials: 'include'
-    })
-    if (typeof api1ReqReplacer === 'function') {
-      api1Req = await api1ReqReplacer(api1Req)
-      if (!(api1Req instanceof Request)) {
-        throw Error('api1ReqReplacer return value not a valid request object')
-      }
-    }
-    api1Resp = await fetch(api1Req)
-  } catch (e) {
-    throw new GSError({
-      errCode: ERROR_TYPE.API1,
-      errMsg: `api1 request failed, ${e.message}`
-    })
-  }
-  // api1 resp handle
-  if (typeof api1RespHandler === 'function') {
-    captchaParams = await api1RespHandler(api1Resp)
-  } else {
-    captchaParams = await defaultApi1RespHandler(api1Resp)
-  }
-
-  // captcha
-  try {
-    validCaptchaParams(captchaParams)
-  } catch (e) {
-    throw new GSError({
-      errCode: ERROR_TYPE.CAPTCHA,
-      errMsg: `captcha params error, ${e.message}`
-    })
-  }
-  const capcataStartRes = await GeetestSensebot.captcha(
-    captchaParams.success,
-    captchaParams.gt,
-    captchaParams.challenge,
-    GSConfig.api2
-  )
-  if (!capcataStartRes) {
-    throw new GSError({
-      errCode: ERROR_TYPE.CAPTCHA,
-      errMsg: 'captcha start failed, can\'t find captcha manager.'
-    })
-  }
-  const captchaRes = await rnGSEventListener(EVENT_TYPE.CAPTCHA)
-  payload = captchaRes.payload
-  errCode = captchaRes.errCode
-  errMsg = captchaRes.errMsg
-  if (errCode) {
-    throw new GSError({ errCode: ERROR_TYPE.CAPTCHA, errMsg })
-  }
-  // from sdk @param code 验证交互结果, 0失败/1成功
-  if (payload.code !== '1') {
-    throw new GSError({
-      errCode: ERROR_TYPE.CAPTCHA,
-      errMsg: `captcha valid failed, ${payload.message}`
-    })
-  }
-
-  // api2 request
-  // @param { geetest_challenge: "", geetest_seccode: "", geetest_validate: "" }
-  const api2ReqParams = payload.result
-  let api2Resp = null
-  try {
-    let api2Req = new Request(GSConfig.api2, {
-      method: 'POST',
-      headers: { 'Content-Type': 'application/json' },
-      credentials: 'include',
-      body: JSON.stringify(api2ReqParams)
-    })
-    if (typeof api2ReqReplacer === 'function') {
-      api2Req = await api2ReqReplacer(api2Req)
-      if (!(api2Req instanceof Request)) {
-        throw Error('second params not a valid request object')
-      }
-    }
-    api2Resp = await fetch(api2Req)
-  } catch (e) {
-    throw new GSError({
-      errCode: EVENT_TYPE.API2,
-      errMsg: `api2 request failed, ${e.message}`
-    })
-  }
-  // clean
-  stopCaptcha()
-
-  // api2 resp handle
-  if (typeof api2RespHandler === 'function') {
-    return api2RespHandler(api2Resp)
-  } else {
-    return defaultApi2RespHandler(api2Resp)
-  }
-}
-
-/**
- * stopCaptcha 停止行为验证
- */
-const stopCaptcha = () => {
-  return GeetestSensebot.stopCaptcha()
-}
-
-/* event handle */
-const GSEmitter = new NativeEventEmitter(GeetestSensebot)
-
-const rnGSEventListener = listenEventType => {
-  return new Promise(resolve => {
-    let subscription = null
-    const handleGSEvent = ({ type, ...otherParams }) => {
-      if (type === EVENT_TYPE.ERROR) {
-        resolve(otherParams)
-        return
-      }
-      if (listenEventType !== type) return
-      clearSubscribe()
-      resolve(otherParams)
-    }
-    const clearSubscribe = () => {
-      subscription.remove()
-    }
-
-    subscription = GSEmitter.addListener('RNGeetestSensebotEvent', handleGSEvent)
-  })
-}
-/* event handle end */
-
-/* default captcha funcs */
-const defaultApi1RespHandler = async api1Resp => {
-  /**
-   * api1 官方示例接口
-   * http://www.geetest.com/demo/gt/register-test
-   */
-  if (api1Resp.status !== 200) {
-    throw new GSError({
-      errCode: ERROR_TYPE.API1,
-      errMsg: `api1 request error, ${await api1Resp.text()}`
-    })
-  }
-  try {
-    return api1Resp.json()
-  } catch (e) {
-    throw new GSError({
-      errCode: ERROR_TYPE.API1,
-      errMsg: `api1 request error, response result need json format, but get ${await api1Resp.text()}`
-    })
-  }
-}
-
-const defaultApi2RespHandler = async api2Resp => {
-  /**
-   * api2 官方示例接口
-   * http://www.geetest.com/demo/gt/validate-test
-   */
-  if (api2Resp.status !== 200) {
-    throw new GSError({
-      errCode: ERROR_TYPE.API2,
-      errMsg: `api2 request error, ${await api2Resp.text()}`
-    })
-  }
-  try {
-    return api2Resp.json()
-  } catch (e) {
-    return api2Resp.text()
-  }
-}
-/* default captcha funcs end */
-
-export class GSError extends Error {
-  constructor ({ errCode, errMsg }) {
-    super(errMsg)
-
-    this.name = 'GSError'
-    this.errCode = errCode
-    this.errMsg = errMsg
-
-    if (typeof Object.setPrototypeOf === 'function') {
-      Object.setPrototypeOf(this, GSError.prototype)
-    } else {
-      this.__proto__ = GSError.prototype
-    }
-
-    stopCaptcha()
-  }
-}

src/constant.js

@@ -1,10 +0,0 @@
-export const EVENT_TYPE = {
-  CAPTCHA: 1,
-  ERROR: -1
-}
-
-export const ERROR_TYPE = {
-  API1: 1,
-  API2: 2,
-  CAPTCHA: 3
-}

src/lib/processColor.js

@@ -1,3 +0,0 @@
-import processColor from 'react-native/Libraries/StyleSheet/processColor'
-
-export default processColor

src/lib/validCaptchaParams.js

@@ -1,13 +0,0 @@
-import invariant from 'invariant'
-
-export default params => {
-  invariant(
-    typeof params === 'object' &&
-    typeof params.success === 'number' &&
-    typeof params.gt === 'string' &&
-    typeof params.challenge === 'string',
-    'captcha params must be an object have \
-      success(Number) gt(String) challenge(String), but get %s',
-    JSON.stringify(params)
-  )
-}

src/lib/validUrl.js

@@ -1,12 +0,0 @@
-import invariant from 'invariant'
-
-export default arg => {
-  invariant(
-    typeof arg === 'string',
-    'expect url is string type, but get %s', typeof arg
-  )
-  invariant(
-    /^https?:\/\//.test(arg),
-    'expect url is valid http address, but get %s', arg
-  )
-}

tsconfig.json

@@ -0,0 +1,63 @@
+{
+  "compilerOptions": {
+    /* Basic Options */
+    "target": "ES2016",                          /* Specify ECMAScript target version: 'ES3' (default), 'ES5', 'ES2015', 'ES2016', 'ES2017', 'ES2018', 'ES2019' or 'ESNEXT'. */
+    "module": "es2015",                     /* Specify module code generation: 'none', 'commonjs', 'amd', 'system', 'umd', 'es2015', or 'ESNext'. */
+    // "lib": [],                             /* Specify library files to be included in the compilation. */
+    // "allowJs": true,                       /* Allow javascript files to be compiled. */
+    // "checkJs": true,                       /* Report errors in .js files. */
+    // "jsx": "preserve",                     /* Specify JSX code generation: 'preserve', 'react-native', or 'react'. */
+    "declaration": true,                   /* Generates corresponding '.d.ts' file. */
+    // "declarationMap": true,                /* Generates a sourcemap for each corresponding '.d.ts' file. */
+    // "sourceMap": true,                     /* Generates corresponding '.map' file. */
+    // "outFile": "./",                       /* Concatenate and emit output to single file. */
+    "outDir": "./dist",                        /* Redirect output structure to the directory. */
+    // "rootDir": "./",                       /* Specify the root directory of input files. Use to control the output directory structure with --outDir. */
+    // "composite": true,                     /* Enable project compilation */
+    // "incremental": true,                   /* Enable incremental compilation */
+    // "tsBuildInfoFile": "./",               /* Specify file to store incremental compilation information */
+    "removeComments": false,                /* Do not emit comments to output. */
+    // "noEmit": true,                        /* Do not emit outputs. */
+    // "importHelpers": true,                 /* Import emit helpers from 'tslib'. */
+    // "downlevelIteration": true,            /* Provide full support for iterables in 'for-of', spread, and destructuring when targeting 'ES5' or 'ES3'. */
+    // "isolatedModules": true,               /* Transpile each file as a separate module (similar to 'ts.transpileModule'). */
+
+    /* Strict Type-Checking Options */
+    "strict": true,                           /* Enable all strict type-checking options. */
+    "skipLibCheck": true,
+    // "noImplicitAny": true,                 /* Raise error on expressions and declarations with an implied 'any' type. */
+    // "strictNullChecks": true,              /* Enable strict null checks. */
+    // "strictFunctionTypes": true,           /* Enable strict checking of function types. */
+    // "strictBindCallApply": true,           /* Enable strict 'bind', 'call', and 'apply' methods on functions. */
+    // "strictPropertyInitialization": true,  /* Enable strict checking of property initialization in classes. */
+    // "noImplicitThis": true,                /* Raise error on 'this' expressions with an implied 'any' type. */
+    // "alwaysStrict": true,                  /* Parse in strict mode and emit "use strict" for each source file. */
+
+    /* Additional Checks */
+    // "noUnusedLocals": true,                /* Report errors on unused locals. */
+    // "noUnusedParameters": true,            /* Report errors on unused parameters. */
+    // "noImplicitReturns": true,             /* Report error when not all code paths in function return a value. */
+    // "noFallthroughCasesInSwitch": true,    /* Report errors for fallthrough cases in switch statement. */
+
+    /* Module Resolution Options */
+    // "moduleResolution": "node",            /* Specify module resolution strategy: 'node' (Node.js) or 'classic' (TypeScript pre-1.6). */
+    // "baseUrl": "./",                       /* Base directory to resolve non-absolute module names. */
+    // "paths": {},                           /* A series of entries which re-map imports to lookup locations relative to the 'baseUrl'. */
+    // "rootDirs": [],                        /* List of root folders whose combined content represents the structure of the project at runtime. */
+    // "typeRoots": [],                       /* List of folders to include type definitions from. */
+    // "types": [],                           /* Type declaration files to be included in compilation. */
+    // "allowSyntheticDefaultImports": true,  /* Allow default imports from modules with no default export. This does not affect code emit, just typechecking. */
+    "esModuleInterop": true                   /* Enables emit interoperability between CommonJS and ES Modules via creation of namespace objects for all imports. Implies 'allowSyntheticDefaultImports'. */
+    // "preserveSymlinks": true,              /* Do not resolve the real path of symlinks. */
+
+    /* Source Map Options */
+    // "sourceRoot": "",                      /* Specify the location where debugger should locate TypeScript files instead of source locations. */
+    // "mapRoot": "",                         /* Specify the location where debugger should locate map files instead of generated locations. */
+    // "inlineSourceMap": true,               /* Emit a single file with source maps instead of having a separate file. */
+    // "inlineSources": true,                 /* Emit the source alongside the sourcemaps within a single file; requires '--inlineSourceMap' or '--sourceMap' to be set. */
+
+    /* Experimental Options */
+    // "experimentalDecorators": true,        /* Enables experimental support for ES7 decorators. */
+    // "emitDecoratorMetadata": true,         /* Enables experimental support for emitting type metadata for decorators. */
+  }
+}