项目优化

README.md

@@ -38,9 +38,7 @@ pod 'yoga', :path => '../node_modules/react-native/ReactCommon/yoga'
 
 #### 额外配置
 
-**手动配置和非 Pods 管理依赖情况下**需要
-- 将 **node_modules/@yyyyu/react-native-geetest-sensebot/ios/SDK** 目录中 **GT3Captcha.framework** **GT3Captcha.bundle** 两个文件添加到主项目中
-- 将 **GT3Captcha.framework** 文件所在路径添加到 Build Settings 的 Framework Search Paths 中
+**手动配置和非 Pods 管理依赖情况下**需要将 **node_modules/@yyyyu/react-native-geetest-sensebot/ios/SDK/GT3Captcha.framework** 添加到 framework 依赖中
 
 ### android
 
@@ -96,7 +94,7 @@ react-native link @yyyyu/react-native-geetest-sensebot
     }
     ```
 
-2. android/app/build.gradle 配置构建工具版本需要 (buildToolsVersion >= 25)
+2. android/app/build.gradle 中修改构建工具版本大于 25 (buildToolsVersion >= 25)
 
 3. AndroidManifest.xml
     ```xml

RNGeetestSensebot.podspec

@@ -1,22 +1,21 @@
-require "json"
+require 'json'
 
 package = JSON.parse(File.read(File.join(__dir__, 'package.json')))
 
 Pod::Spec.new do |s|
-  s.name                = "RNGeetestSensebot"
-  s.version             = package["version"]
-  s.summary             = "react native for geetest sensebot."
-  s.description         = package["description"]
-  s.license             = package["license"]
-  s.author              = { package["author"] => "g592842897@gmail.com" }
-  s.homepage            = package["homepage"]
-  s.source              = { :git => package["repository"]["url"], :tag => package["version"] }
+  s.name                = 'RNGeetestSensebot'
+  s.version             = package['version']
+  s.summary             = package['description']
+  s.description         = package['description']
+  s.license             = package['license']
+  s.author              = { package['author'] => 'g592842897@gmail.com' }
+  s.homepage            = package['homepage']
+  s.source              = { :git => package['repository']['url'], :tag => package['version'] }
 
   s.requires_arc        = true
-  s.platform            = :ios, "8.0"
-  s.source_files        = "ios/RCTGeetestSensebot.{h,m}", "ios/Helper/*.{h,m}"
-  s.vendored_frameworks = "ios/SDK/GT3Captcha.framework"
-  s.resource            = "ios/SDK/GT3Captcha.bundle"
-  s.framework           = "JavaScriptCore", "WebKit"
-
+  s.platform            = :ios, '8.0'
+  s.source_files        = 'ios/RCTGeetestSensebot.{h,m}', 'ios/Helper/*.{h,m}'
+  s.vendored_frameworks = 'ios/SDK/GT3Captcha.framework'
+  s.resource            = 'ios/SDK/GT3Captcha.bundle'
+  s.framework           = 'JavaScriptCore', 'WebKit'
 end

ios/RCTGeetestSensebot.xcodeproj/project.pbxproj

@@ -8,6 +8,7 @@
 
 /* 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 */; };
 /* End PBXBuildFile section */
 
@@ -28,6 +29,7 @@
 		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>"; };
 /* End PBXFileReference section */
@@ -60,6 +62,14 @@
 			path = Helper;
 			sourceTree = "<group>";
 		};
+		36AF50AF20D2407800F82592 /* Resources */ = {
+			isa = PBXGroup;
+			children = (
+				36AF50B020D2408400F82592 /* GT3Captcha.bundle */,
+			);
+			name = Resources;
+			sourceTree = "<group>";
+		};
 		36CD983820B80C0500647AC8 /* Frameworks */ = {
 			isa = PBXGroup;
 			children = (
@@ -73,6 +83,7 @@
 				B3E7B5881CC2AC0600A0062D /* RCTGeetestSensebot.h */,
 				B3E7B5891CC2AC0600A0062D /* RCTGeetestSensebot.m */,
 				3643C27620B64ADF00A0B890 /* Helper */,
+				36AF50AF20D2407800F82592 /* Resources */,
 				134814211AA4EA7D00B7C361 /* Products */,
 				36CD983820B80C0500647AC8 /* Frameworks */,
 			);
@@ -88,6 +99,7 @@
 				58B511D71A9E6C8500147676 /* Sources */,
 				58B511D81A9E6C8500147676 /* Frameworks */,
 				58B511D91A9E6C8500147676 /* Copy Files */,
+				36AF50AD20D2404900F82592 /* Resources */,
 			);
 			buildRules = (
 			);
@@ -129,6 +141,17 @@
 		};
 /* End PBXProject section */
 
+/* Begin PBXResourcesBuildPhase section */
+		36AF50AD20D2404900F82592 /* Resources */ = {
+			isa = PBXResourcesBuildPhase;
+			buildActionMask = 2147483647;
+			files = (
+				36AF50B120D2408400F82592 /* GT3Captcha.bundle in Resources */,
+			);
+			runOnlyForDeploymentPostprocessing = 0;
+		};
+/* End PBXResourcesBuildPhase section */
+
 /* Begin PBXSourcesBuildPhase section */
 		58B511D71A9E6C8500147676 /* Sources */ = {
 			isa = PBXSourcesBuildPhase;
@@ -230,12 +253,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/SDK",
 				);
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../../React/**",
-					"$(SRCROOT)/../../react-native/React/**",
-				);
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = RCTGeetestSensebot;
@@ -250,12 +268,7 @@
 					"$(inherited)",
 					"$(PROJECT_DIR)/SDK",
 				);
-				HEADER_SEARCH_PATHS = (
-					"$(inherited)",
-					/Applications/Xcode.app/Contents/Developer/Toolchains/XcodeDefault.xctoolchain/usr/include,
-					"$(SRCROOT)/../../../React/**",
-					"$(SRCROOT)/../../react-native/React/**",
-				);
+				HEADER_SEARCH_PATHS = "$(inherited)";
 				LIBRARY_SEARCH_PATHS = "$(inherited)";
 				OTHER_LDFLAGS = "-ObjC";
 				PRODUCT_NAME = RCTGeetestSensebot;

package.json

@@ -15,7 +15,6 @@
   },
   "main": "index.js",
   "scripts": {
-    "test": "echo \"Error: no test specified\" && exit 1",
     "postinstall": "node scripts/postinstall"
   },
   "rnpm": {
@@ -35,6 +34,9 @@
   },
   "standard": {
     "parser": "babel-eslint",
-    "globals": ["fetch", "Request"]
+    "globals": [
+      "fetch",
+      "Request"
+    ]
   }
 }

scripts/postinstall.js

@@ -1,18 +1,22 @@
 const path = require('path')
 const file = require('./file')
 
-const nodeModuleDir = path.dirname(__filename) + '/../../..'
+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
-    ]
+  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)
 }
 
-file.fileInsert(...modifies.reactSpec)
+postinstall()

scripts/postlink.js

@@ -1,7 +1,21 @@
 const path = require('path')
 const file = require('./file')
 
-const projectDir = path.dirname(__filename) + '/../../../..'
+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')
+  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

@@ -174,7 +174,6 @@ const stopCaptcha = () => {
   return GeetestSensebot.stopCaptcha()
 }
 
-
 /* event handle */
 const GSEmitter = new NativeEventEmitter(GeetestSensebot)
 
@@ -199,7 +198,6 @@ const rnGSEventListener = listenEventType => {
 }
 /* event handle end */
 
-
 /* default captcha funcs */
 const defaultApi1RespHandler = async api1Resp => {
   /**
@@ -241,7 +239,6 @@ const defaultApi2RespHandler = async api2Resp => {
 }
 /* default captcha funcs end */
 
-
 export class GSError extends Error {
   constructor ({ errCode, errMsg }) {
     super(errMsg)

src/lib/validCaptchaParams.js

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

yarn.lock

@@ -89,8 +89,8 @@ acorn@^3.0.4:
   resolved "https://registry.npmjs.org/acorn/-/acorn-3.3.0.tgz#45e37fb39e8da3f25baee3ff5369e2bb5f22017a"
 
 acorn@^5.5.0:
-  version "5.5.3"
-  resolved "https://registry.npmjs.org/acorn/-/acorn-5.5.3.tgz#f473dd47e0277a08e28e9bec5aeeb04751f0b8c9"
+  version "5.6.2"
+  resolved "https://registry.npmjs.org/acorn/-/acorn-5.6.2.tgz#b1da1d7be2ac1b4a327fb9eab851702c5045b4e7"
 
 ajv-keywords@^2.1.0:
   version "2.1.1"
@@ -193,8 +193,8 @@ brace-expansion@^1.1.7:
     concat-map "0.0.1"
 
 buffer-from@^1.0.0:
-  version "1.0.0"
-  resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.0.0.tgz#4cb8832d23612589b0406e9e2956c17f06fdf531"
+  version "1.1.0"
+  resolved "https://registry.npmjs.org/buffer-from/-/buffer-from-1.1.0.tgz#87fcaa3a298358e0ade6e442cfce840740d1ad04"
 
 builtin-modules@^1.0.0, builtin-modules@^1.1.1:
   version "1.1.1"
@@ -251,14 +251,14 @@ co@^4.6.0:
   resolved "https://registry.npmjs.org/co/-/co-4.6.0.tgz#6ea6bdf3d853ae54ccb8e47bfa0bf3f9031fb184"
 
 color-convert@^1.9.0:
-  version "1.9.1"
-  resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.1.tgz#c1261107aeb2f294ebffec9ed9ecad529a6097ed"
+  version "1.9.2"
+  resolved "https://registry.npmjs.org/color-convert/-/color-convert-1.9.2.tgz#49881b8fba67df12a96bdf3f56c0aab9e7913147"
   dependencies:
-    color-name "^1.1.1"
+    color-name "1.1.1"
 
-color-name@^1.1.1:
-  version "1.1.3"
-  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.3.tgz#a7d0558bd89c42f795dd42328f740831ca53bc25"
+color-name@1.1.1:
+  version "1.1.1"
+  resolved "https://registry.npmjs.org/color-name/-/color-name-1.1.1.tgz#4b1415304cf50028ea81643643bd82ea05803689"
 
 concat-map@0.0.1:
   version "0.0.1"
@@ -321,8 +321,8 @@ define-properties@^1.1.2:
     object-keys "^1.0.8"
 
 deglob@^2.1.0:
-  version "2.1.0"
-  resolved "https://registry.npmjs.org/deglob/-/deglob-2.1.0.tgz#4d44abe16ef32c779b4972bd141a80325029a14a"
+  version "2.1.1"
+  resolved "https://registry.npmjs.org/deglob/-/deglob-2.1.1.tgz#d268e168727799862e8eac07042e165957c1f3be"
   dependencies:
     find-root "^1.0.0"
     glob "^7.0.5"
@@ -369,8 +369,8 @@ error-ex@^1.2.0, error-ex@^1.3.1:
     is-arrayish "^0.2.1"
 
 es-abstract@^1.7.0:
-  version "1.11.0"
-  resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.11.0.tgz#cce87d518f0496893b1a30cd8461835535480681"
+  version "1.12.0"
+  resolved "https://registry.npmjs.org/es-abstract/-/es-abstract-1.12.0.tgz#9dbbdd27c6856f0001421ca18782d786bf8a6165"
   dependencies:
     es-to-primitive "^1.1.1"
     function-bind "^1.1.1"
@@ -558,8 +558,8 @@ fast-levenshtein@~2.0.4:
   resolved "https://registry.npmjs.org/fast-levenshtein/-/fast-levenshtein-2.0.6.tgz#3d8a5c66883a16a30ca8643e851f19baa7797917"
 
 fbjs@^0.8.16:
-  version "0.8.16"
-  resolved "https://registry.npmjs.org/fbjs/-/fbjs-0.8.16.tgz#5e67432f550dc41b572bf55847b8aca64e5337db"
+  version "0.8.17"
+  resolved "https://registry.npmjs.org/fbjs/-/fbjs-0.8.17.tgz#c4d598ead6949112653d6588b01a5cdcd9f90fdd"
   dependencies:
     core-js "^1.0.0"
     isomorphic-fetch "^2.1.1"
@@ -567,7 +567,7 @@ fbjs@^0.8.16:
     object-assign "^4.1.0"
     promise "^7.1.1"
     setimmediate "^1.0.5"
-    ua-parser-js "^0.7.9"
+    ua-parser-js "^0.7.18"
 
 figures@^2.0.0:
   version "2.0.0"
@@ -616,7 +616,7 @@ fs.realpath@^1.0.0:
   version "1.0.0"
   resolved "https://registry.npmjs.org/fs.realpath/-/fs.realpath-1.0.0.tgz#1504ad2523158caa40db4a2787cb01411994ea4f"
 
-function-bind@^1.0.2, function-bind@^1.1.1:
+function-bind@^1.1.1:
   version "1.1.1"
   resolved "https://registry.npmjs.org/function-bind/-/function-bind-1.1.1.tgz#a56899d3ea3c9bab874bb9773b7c5ede92f4895d"
 
@@ -669,18 +669,18 @@ has-flag@^3.0.0:
   resolved "https://registry.npmjs.org/has-flag/-/has-flag-3.0.0.tgz#b5d454dc2199ae225699f3467e5a07f3b955bafd"
 
 has@^1.0.1:
-  version "1.0.1"
-  resolved "https://registry.npmjs.org/has/-/has-1.0.1.tgz#8461733f538b0837c9361e39a9ab9e9704dc2f28"
+  version "1.0.3"
+  resolved "https://registry.npmjs.org/has/-/has-1.0.3.tgz#722d7cbfc1f6aa8241f16dd814e011e1f41e8796"
   dependencies:
-    function-bind "^1.0.2"
+    function-bind "^1.1.1"
 
 hosted-git-info@^2.1.4:
   version "2.6.0"
   resolved "https://registry.npmjs.org/hosted-git-info/-/hosted-git-info-2.6.0.tgz#23235b29ab230c576aab0d4f13fc046b0b038222"
 
 iconv-lite@^0.4.17, iconv-lite@~0.4.13:
-  version "0.4.22"
-  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.22.tgz#c6b16b9d05bc6c307dc9303a820412995d2eea95"
+  version "0.4.23"
+  resolved "https://registry.npmjs.org/iconv-lite/-/iconv-lite-0.4.23.tgz#297871f63be507adcfbfca715d0cd0eed84e9a63"
   dependencies:
     safer-buffer ">= 2.1.2 < 3"
 
@@ -808,8 +808,8 @@ js-tokens@^3.0.0, js-tokens@^3.0.2:
   resolved "https://registry.npmjs.org/js-tokens/-/js-tokens-3.0.2.tgz#9866df395102130e38f7f996bceb65443209c25b"
 
 js-yaml@^3.9.1:
-  version "3.11.0"
-  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.11.0.tgz#597c1a8bd57152f26d622ce4117851a51f5ebaef"
+  version "3.12.0"
+  resolved "https://registry.npmjs.org/js-yaml/-/js-yaml-3.12.0.tgz#eaed656ec8344f10f527c6bfa1b6e2244de167d1"
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -879,8 +879,8 @@ loose-envify@^1.0.0, loose-envify@^1.3.1:
     js-tokens "^3.0.0"
 
 lru-cache@^4.0.1:
-  version "4.1.2"
-  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.2.tgz#45234b2e6e2f2b33da125624c4664929a0224c3f"
+  version "4.1.3"
+  resolved "https://registry.npmjs.org/lru-cache/-/lru-cache-4.1.3.tgz#a1175cf3496dfc8436c156c334b4955992bce69c"
   dependencies:
     pseudomap "^1.0.2"
     yallist "^2.1.2"
@@ -973,8 +973,8 @@ os-tmpdir@~1.0.2:
   resolved "https://registry.npmjs.org/os-tmpdir/-/os-tmpdir-1.0.2.tgz#bbe67406c79aa85c5cfec766fe5734555dfa1274"
 
 p-limit@^1.1.0:
-  version "1.2.0"
-  resolved "https://registry.npmjs.org/p-limit/-/p-limit-1.2.0.tgz#0e92b6bedcb59f022c13d0f1949dc82d15909f1c"
+  version "1.3.0"
+  resolved "https://registry.npmjs.org/p-limit/-/p-limit-1.3.0.tgz#b86bd5f0c25690911c7590fcbfc2010d54b3ccb8"
   dependencies:
     p-try "^1.0.0"
 
@@ -1354,7 +1354,7 @@ typedarray@^0.0.6:
   version "0.0.6"
   resolved "https://registry.npmjs.org/typedarray/-/typedarray-0.0.6.tgz#867ac74e3864187b1d3d47d996a78ec5c8830777"
 
-ua-parser-js@^0.7.9:
+ua-parser-js@^0.7.18:
   version "0.7.18"
   resolved "https://registry.npmjs.org/ua-parser-js/-/ua-parser-js-0.7.18.tgz#a7bfd92f56edfb117083b69e31d2aa8882d4b1ed"
 
@@ -1378,8 +1378,8 @@ whatwg-fetch@>=0.10.0:
   resolved "https://registry.npmjs.org/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
 
 which@^1.2.9:
-  version "1.3.0"
-  resolved "https://registry.npmjs.org/which/-/which-1.3.0.tgz#ff04bdfc010ee547d780bec38e1ac1c2777d253a"
+  version "1.3.1"
+  resolved "https://registry.npmjs.org/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"
   dependencies:
     isexe "^2.0.0"