Merge pull request Lojii#6 from ethanjin/iOS13

适配iOS13

.gitignore

@@ -0,0 +1,59 @@
+# Xcode
+build/
+xcuserdata
+DerivedData
+dwarf*.txt
+
+## Other
+*.moved-aside
+*.xccheckout
+*.xcscmblueprint
+*.DS_Store
+
+## Obj-C/Swift specific
+*.hmap
+*.ipa
+*.dSYM.zip
+*.dSYM
+
+# CocoaPods
+#
+# We recommend against adding the Pods directory to your .gitignore. However
+# you should judge for yourself, the pros and cons are mentioned at:
+# https://guides.cocoapods.org/using/using-cocoapods.html#should-i-check-the-pods-directory-into-source-control
+#
+Pods/
+Pods/Target Support Files/*
+Pods/Local Podspecs/*
+Pods/Headers
+Pods/Pods.xcodeproj
+
+#
+# Add this line if you want to avoid checking in source code from the Xcode workspace
+*.xcworkspace
+
+# Carthage
+#
+# Add this line if you want to avoid checking in source code from Carthage dependencies.
+# Carthage/Checkouts
+
+Carthage/Build
+
+# fastlane
+#
+# It is recommended to not store the screenshots in the git repo. Instead, use fastlane to re-generate the
+# screenshots whenever they are needed.
+# For more information about the recommended setup visit:
+# https://docs.fastlane.tools/best-practices/source-control/#source-control
+
+fastlane/report.xml
+fastlane/Preview.html
+fastlane/screenshots/**/*.png
+fastlane/test_output
+
+# Code Injection
+#
+# After new code Injection tools there's a generated folder /iOSInjectionProject
+# https://github.com/johnno1962/injectionforxcode
+
+iOSInjectionProject/

NIO1901.xcodeproj/project.pbxproj

@@ -2915,35 +2915,16 @@
 			buildActionMask = 2147483647;
 			files = (
 			);
-			inputPaths = (
-				"${SRCROOT}/Pods/Target Support Files/Pods-NIO1901/Pods-NIO1901-frameworks.sh",
-				"${BUILT_PRODUCTS_DIR}/CocoaAsyncSocket/CocoaAsyncSocket.framework",
-				"${BUILT_PRODUCTS_DIR}/FileBrowser/FileBrowser.framework",
-				"${BUILT_PRODUCTS_DIR}/Highlightr/Highlightr.framework",
-				"${BUILT_PRODUCTS_DIR}/ReachabilitySwift/Reachability.framework",
-				"${BUILT_PRODUCTS_DIR}/SQLite.swift/SQLite.framework",
-				"${BUILT_PRODUCTS_DIR}/TangramKit/TangramKit.framework",
-				"${BUILT_PRODUCTS_DIR}/YYCache/YYCache.framework",
-				"${BUILT_PRODUCTS_DIR}/YYCategories/YYCategories.framework",
-				"${BUILT_PRODUCTS_DIR}/YYImage/YYImage.framework",
-				"${BUILT_PRODUCTS_DIR}/YYWebImage/YYWebImage.framework",
+			inputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-NIO1901/Pods-NIO1901-frameworks-${CONFIGURATION}-input-files.xcfilelist",
 			);
 			name = "[CP] Embed Pods Frameworks";
-			outputPaths = (
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/CocoaAsyncSocket.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/FileBrowser.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Highlightr.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/Reachability.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/SQLite.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/TangramKit.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCache.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYCategories.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYImage.framework",
-				"${TARGET_BUILD_DIR}/${FRAMEWORKS_FOLDER_PATH}/YYWebImage.framework",
+			outputFileListPaths = (
+				"${PODS_ROOT}/Target Support Files/Pods-NIO1901/Pods-NIO1901-frameworks-${CONFIGURATION}-output-files.xcfilelist",
 			);
 			runOnlyForDeploymentPostprocessing = 0;
 			shellPath = /bin/sh;
-			shellScript = "\"${SRCROOT}/Pods/Target Support Files/Pods-NIO1901/Pods-NIO1901-frameworks.sh\"\n";
+			shellScript = "\"${PODS_ROOT}/Target Support Files/Pods-NIO1901/Pods-NIO1901-frameworks.sh\"\n";
 			showEnvVarsInLog = 0;
 		};
 		B0C8B630042532A4968F514E /* [CP] Check Pods Manifest.lock */ = {
@@ -3650,6 +3631,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = Lojii.NIO1901;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "";
+				SWIFT_ENABLE_BATCH_MODE = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "NIO1901/NIO1901-Bridging-Header.h";
 				SWIFT_OPTIMIZATION_LEVEL = "-Onone";
 				SWIFT_VERSION = 5.0;
@@ -3682,6 +3664,7 @@
 				PRODUCT_BUNDLE_IDENTIFIER = Lojii.NIO1901;
 				PRODUCT_NAME = "$(TARGET_NAME)";
 				PROVISIONING_PROFILE_SPECIFIER = "NIO2019发布描述文件";
+				SWIFT_ENABLE_BATCH_MODE = NO;
 				SWIFT_OBJC_BRIDGING_HEADER = "NIO1901/NIO1901-Bridging-Header.h";
 				SWIFT_VERSION = 5.0;
 				TARGETED_DEVICE_FAMILY = 1;

NIO1901/Common/Nan.swift

@@ -10,51 +10,112 @@ import Foundation
 
 let cc1 = """
 -----BEGIN CERTIFICATE-----
-MIIBvzCCASgCCQDrVu5izcY3rTANBgkqhkiG9w0BAQsFADAkMQswCQYDVQQGEwJVUzEVMBMGA1UEAwwMS25vdCBDQSAyMDE5MB4XDTE5MDYyODA2MzQ0MloXDTI5MDYyNTA2MzQ0MlowJDELMAkGA1UEBhMCVVMxFTATBgNVBAMMDEtub3QgQ0EgMjAxOTCB
+MIIDXTCCAkWgAwIBAgIJAOOICvVn0xS7MA0GCSqGSIb3DQEBCwUAMGUxCzAJBgNV
+BAYTAkNOMRAwDgYDVQQIDAdCZWlKaW5nMRAwDgYDVQQHDAdCZWlKaW5nMQ0wCwYD
+VQQKDARURVNUMQwwCgYDVQQLDAN3ZWIxFTATBgNVBAMMDEtub3RfQ0FfMjAyMDAe
+Fw0yMDAzMjcwODAzMjBaFw0yMjA2MzAwODAzMjBaMGUxCzAJBgNVBAYTAkNOMRAw
+DgYDVQQIDAdCZWlKaW5nMRAwDgYDVQQHDAdCZWlKaW5nMQ0wCwYDVQQKDARURVNU
+MQwwCgYDVQQLDAN3ZWIxFTATBgNVBAMMDEtub3RfQ0FfMjAyMDCCASIwDQYJKoZI
+hvcNAQEBBQADggEPADCCAQoCggEBAL493BFzQPiKOwuU8EptwI3CvgmAM/woLbyL
+chzlhU1jbdi9pFQT2YZindfBKPlRlt8cY28dELXaBbPM0pqe7UsVuNmP4/Yp3GRY
+AU3VMLatTleikb17bwvOuGrfe+6QDjnelSZw7nYGOwIGfRENfMy/kOYkQdpKEcJu
+d7G9K7x2m+o4wYxnnxE3MU+6kMlxohsglbKthAEWPVv5aNROK8DJvlcvVU/Rk370
+1yrgdi9+XrvSj+ztgR4T4wHpDPElV+CCsh3SzZ7fRDnr+ihpWnviNvTF8S/KYLxQ
+JOtpb4ZH7tElW6KS1x4Ng/hwdLBL0qwPamjPL3W/C26vxYuJAocCAwEAAaMQMA4w
+DAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAVJYM6CDny7bx6sWSUOD3
+8s9krLckPlg/ZnzbJPzcTBAPdyNaEXb5UU/Ax0DYJRnHIXK8vxYBu3NKemHYJKhL
+wXuI9vLfQXV2AWCsyVWBqw2b91ZeZDVXxGQvXKws/0OkdWbvdSMnQCb6pZ8iKo8U
+9Ost96CICDyGi8Et11aJDeJFV6YyHlg2m28yAr+9dE7YQ9VBZ7+GB0nIkBFTeOlz
+ZWJQ6gbBlOl+UkezJJhJnFl3QBSVvFclipJJrHV2ECIWwcVAGMwTcSagT42vRrZs
+UAXymVt1xKmg/hh94tQKBPgmrXHfq6OMwckj6iWo1+JywvVu8RG/cqOY0dE2Y+Qt
+dA==
+-----END CERTIFICATE-----
 """
 
 
 let cc2 = """
-nzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArwBI+IO3DBxdWlNmMAQDYLyZpkvXT6/cByqkgWHybo6gwfC8ug6LzxBod7ajC/rgvl73TSzvhkSELDUTnQql/O36RcNsEQXVaE5Vwadda1s4zbRZ5DfvKmHJoQzdZZrripgbW0WFVg4tdZpubR+QiXeH5CCS
 """
 
 let cc3 = """
-k979FXvGtFyYVNMCAwEAATANBgkqhkiG9w0BAQsFAAOBgQA4lv9izvthNMHI2FUELISkQzuv48zUn4kOMppwivFz9jA9K0+jq20jn+eP015Hp1D6tZy28IwkbQUrrcAlWWZI4PLhWOUTygdxawicWLdh/HNfaU1igx/qC9iIkxykytVWOEDDRP4KhaostRiI8v1x3mJj8Sfx7cLraxv1LP6JyA==
------END CERTIFICATE-----
 """
 
-let ccDerBase64 = "MIIBvzCCASgCCQDrVu5izcY3rTANBgkqhkiG9w0BAQsFADAkMQswCQYDVQQGEwJVUzEVMBMGA1UEAwwMS25vdCBDQSAyMDE5MB4XDTE5MDYyODA2MzQ0MloXDTI5MDYyNTA2MzQ0MlowJDELMAkGA1UEBhMCVVMxFTATBgNVBAMMDEtub3QgQ0EgMjAxOTCBnzANBgkqhkiG9w0BAQEFAAOBjQAwgYkCgYEArwBI+IO3DBxdWlNmMAQDYLyZpkvXT6/cByqkgWHybo6gwfC8ug6LzxBod7ajC/rgvl73TSzvhkSELDUTnQql/O36RcNsEQXVaE5Vwadda1s4zbRZ5DfvKmHJoQzdZZrripgbW0WFVg4tdZpubR+QiXeH5CCSk979FXvGtFyYVNMCAwEAATANBgkqhkiG9w0BAQsFAAOBgQA4lv9izvthNMHI2FUELISkQzuv48zUn4kOMppwivFz9jA9K0+jq20jn+eP015Hp1D6tZy28IwkbQUrrcAlWWZI4PLhWOUTygdxawicWLdh/HNfaU1igx/qC9iIkxykytVWOEDDRP4KhaostRiI8v1x3mJj8Sfx7cLraxv1LP6JyA=="
+let ccDerBase64 = "MIIDXTCCAkWgAwIBAgIJAOOICvVn0xS7MA0GCSqGSIb3DQEBCwUAMGUxCzAJBgNVBAYTAkNOMRAwDgYDVQQIDAdCZWlKaW5nMRAwDgYDVQQHDAdCZWlKaW5nMQ0wCwYDVQQKDARURVNUMQwwCgYDVQQLDAN3ZWIxFTATBgNVBAMMDEtub3RfQ0FfMjAyMDAeFw0yMDAzMjcwODAzMjBaFw0yMjA2MzAwODAzMjBaMGUxCzAJBgNVBAYTAkNOMRAwDgYDVQQIDAdCZWlKaW5nMRAwDgYDVQQHDAdCZWlKaW5nMQ0wCwYDVQQKDARURVNUMQwwCgYDVQQLDAN3ZWIxFTATBgNVBAMMDEtub3RfQ0FfMjAyMDCCASIwDQYJKoZIhvcNAQEBBQADggEPADCCAQoCggEBAL493BFzQPiKOwuU8EptwI3CvgmAM/woLbyLchzlhU1jbdi9pFQT2YZindfBKPlRlt8cY28dELXaBbPM0pqe7UsVuNmP4/Yp3GRYAU3VMLatTleikb17bwvOuGrfe+6QDjnelSZw7nYGOwIGfRENfMy/kOYkQdpKEcJud7G9K7x2m+o4wYxnnxE3MU+6kMlxohsglbKthAEWPVv5aNROK8DJvlcvVU/Rk3701yrgdi9+XrvSj+ztgR4T4wHpDPElV+CCsh3SzZ7fRDnr+ihpWnviNvTF8S/KYLxQJOtpb4ZH7tElW6KS1x4Ng/hwdLBL0qwPamjPL3W/C26vxYuJAocCAwEAAaMQMA4wDAYDVR0TBAUwAwEB/zANBgkqhkiG9w0BAQsFAAOCAQEAVJYM6CDny7bx6sWSUOD38s9krLckPlg/ZnzbJPzcTBAPdyNaEXb5UU/Ax0DYJRnHIXK8vxYBu3NKemHYJKhLwXuI9vLfQXV2AWCsyVWBqw2b91ZeZDVXxGQvXKws/0OkdWbvdSMnQCb6pZ8iKo8U9Ost96CICDyGi8Et11aJDeJFV6YyHlg2m28yAr+9dE7YQ9VBZ7+GB0nIkBFTeOlzZWJQ6gbBlOl+UkezJJhJnFl3QBSVvFclipJJrHV2ECIWwcVAGMwTcSagT42vRrZsUAXymVt1xKmg/hh94tQKBPgmrXHfq6OMwckj6iWo1+JywvVu8RG/cqOY0dE2Y+QtdA=="
 
 let ck1 = """
 -----BEGIN RSA PRIVATE KEY-----
-MIICXAIBAAKBgQCvAEj4g7cMHF1aU2YwBANgvJmmS9dPr9wHKqSBYfJujqDB8Ly6DovPEGh3tqML+uC+XvdNLO+GRIQsNROdCqX87fpFw2wRBdVoTlXBp11rWzjNtFnkN+8qYcmhDN1lmuuKmBtbRYVWDi11mm5tH5CJd4fkIJKT3v0Ve8a0XJhU0wIDAQABAoGAYzazKAlspnYSStpLbd9olth197y5ldjq0jlPyHZiPmGoLCuyo30JsFvqDizC
+MIIEowIBAAKCAQEAvj3cEXNA+Io7C5TwSm3AjcK+CYAz/CgtvItyHOWFTWNt2L2k
+VBPZhmKd18Eo+VGW3xxjbx0QtdoFs8zSmp7tSxW42Y/j9incZFgBTdUwtq1OV6KR
+vXtvC864at977pAOOd6VJnDudgY7AgZ9EQ18zL+Q5iRB2koRwm53sb0rvHab6jjB
+jGefETcxT7qQyXGiGyCVsq2EARY9W/lo1E4rwMm+Vy9VT9GTfvTXKuB2L35eu9KP
+7O2BHhPjAekM8SVX4IKyHdLNnt9EOev6KGlae+I29MXxL8pgvFAk62lvhkfu0SVb
+opLXHg2D+HB0sEvSrA9qaM8vdb8Lbq/Fi4kChwIDAQABAoIBACC7a/3koq0gu4AG
+pEFqGNNLSn8/+7HLB/OE2qF2LDVgginklz2QHMEufpH8vhwHmbnRnJolmhZv6MNC
+3omUBqgAmMl2JHbaRP1O1wqZP8RulSgm5ISBlF2nt7tLsHsfdhMm5Oq0S5MrB0QV
+8bbZZzujSj8OxfXVALE/aIDAV6IZSfvy6evMUu5rlyO9kHrk2PlbPchvWswE7HYp
+Q85OeN+Te6kJYHicpIdhlRi0H5XosUt0t4LhBugsuoL8ix8RG0dhOvBBVexbVo7k
+kbXpQQIOhTJvkzRVOSif6XwFWg5jIEzkSufCDrrxZ9xhS0J6L40NXQsxAvzfdjpJ
+Mf74pQECgYEA8ltfGIqkSj+/BoNR3uIE+MbXmaM0AcHp+NHvr0N2nFa23RW622bz
+yCeSm/CQ9ROPw3dtywG/5wNvrhBrmi9mv6ST2f87xPL6ndQoZwGrc5+uf1Gccrnb
+05o0q+loFjaxzEBn0mmDzYA9/VoGyIoRAAzj2/dnwiyK929BtESbqaECgYEAyPNz
+LnCAy3Kao/UTsIgKlkym53QRowtTTl4i7RDtMTII0SuLsJ/T9e6J0I/rPa4iNLyV
+YJSH63HUXf85YcikHXHdLIqPQ+75j7wONXet2kC9817DSvjfn8xybEuuNVrpQhOt
+pgJeK2A8nl7/4l6XZ8C//K0z4wba1HrypakgSycCgYAqk0Skcg6kgIhVY5JpXjlT
+XtMXSWVkfaVVscOyfV6D3nPnaN7XlkFzQwhtXpiIhTQ3OW7PP/JvadofsQDGKFeb
+iRT0MfNVCP5f5ZpnZhKxkDa+ZR7fxKjKhoeEP8+qP1eCsznJ7AFcg4/gRwV0C1Ur
+Nhh9VvwiT2LmTuQy/+58oQKBgQCmY3ZW2I68ZpuG8PGptStXAgcdFK1Z3JHRDP9M
+XjyYBH7qe20CBYUjWK1CRTiabOoj0pa5TqMwn6MhZagkwFarjtF9BQnVTTXU/vig
+6wTH992Qe0GnfWTk0wtXgl6wDSOhM9wP3lwM/HWVCMJFtN8W6LHPTbbt34oob9kk
+tGJp9wKBgEKSy0jy+PTLhWroGzTz/4g8fyOsSBmqf7ladN+UlZS/3I25JBkOedHN
+88xqMkBjV8UsBz7TOVi/ObxoK0qi3k//f/BT4Sh4AVFSMMI1Wf6LlLW9AYlvhllS
+JPGpchyqa8aMI4GNl9ljkkOge/f88VtS867MYCdWpWSuCaSwkp+a
+-----END RSA PRIVATE KEY-----
+
 """
 
 let ck2 = """
-JVGXRvaKF/vo0+NWV8XDl93omhvDscopSJj7MKJIcnu62xYnvfexVWT81J3vwyxcZxcDKJwNLWkAOx+FpngNTkNbzmGQd5l8qsIIDFwzkhxrbBECQQDVXrsHaUgwc3sjX3OHNwEN+fsJS1esC3xraLbXW8rMBqF4KkUNnIq8qXl6XsaVjGSeEc+fai9xas+f
 """
 
 
 let ck3 = """
-pQ8ZeD75AkEA0fcX2cL6NLGx/GKCGlpqbr04WwNTEwP9XzVJSnnCvzl3zznpV5zriburnC/hSv4MTDIL63n0gEsBoD5Y7WcJKwJAUf+f3M9HIOegcQ2jtlkbHKXvJblAriuT2ytY6RarrxD1SNrlwr9gSfTPbImzw5E6scyif98s8Gdd9zpVvTIK8QJBAKrv2rgLt72sqTXLURZ5Y8sSO85E7548kkuvyyJZ7MXX2IWaJTGR7GRuqHD4vhdaqtJhsDieSgMkjYdTGvzz9I8CQC5YEjOUQoBo1F964fIu8xv61FO+T0Fzz4WlxrgnfZoglhx+wy/R6HgaqDW1spt3p4PmDWJztseqXKWxuwo1BwA=
------END RSA PRIVATE KEY-----
 """
 
 
 let rk1 = """
 -----BEGIN RSA PRIVATE KEY-----
-MIIEowIBAAKCAQEAwXJfTSFcZtw95At1abUK+DpeYqVyGuAFexY75kfvAhXBoUX80nkm22sBwyXeUq7q9ArO9QHufscPxVqtrc+dp9TBqmY+lX6KIno0FRLcEbGOZQBROyWiHlzhJ+KFMr9onmtb6jeJRuMlQ4Bn0UjHHvwHC0zPAH17VkqsIBT7xFuysifvzpBTvzleKM5mf1bdu60rlsWEy1hnUJ+3REstCluAvsZ5uzBiQjZu1f1BnFA6r/nn1XAb4PLc8B4DwRzGIK7Fqz3ytlDUqBCu9VBMA2JiqboW3UAP3Zbv1EPOlFpeTPwm
+MIIEpQIBAAKCAQEA1FW4Nxw2fiIcy5wvh77wTFOrW7Q7GvwZUct/WwjugCWii6rj
+izd5I9pK2ojHbnmVCQOjn4+wcHqBwR9vAzNf1GscwREZrdBT1KLlT2cwKhw53/L6
+xsV9MtLF/bwOKKYdNEKhjQt+d2gBOh7zN2bzoevbMkOJU/4XGxGZiWwRPbnUvnG7
+Zm40RfTSby/wfKQw5XCk8bofqdrgg8ZHdWADpgwwMJKHY6DolpbD99xjJVeSWyRl
+ZtsGd5dTUoj+V8D1h92m10PFk4fY1OlviBX1pTtk8YiSbo+tM+W3rc10Gk+/TiwO
+RHTXhtqQeUwKjMH0Dj65Xop3UT/vJfctDR/XyQIDAQABAoIBAQCvAE8prKkE4ByX
+e4x49teaMMNke3DTVr+PeIbogr3/BAWp0xhi3z+KWxmib2TfGnnIyiULFyQ2L+HN
+R5j5LFho/DbgsLVXWgIdmHwiK0u5CTZx6xLgzFfZkXn5HAsXWYFsVxZK5xQ+WYvZ
+WTTfjoxyAa/RB3ShsyNb/e9rIZQ8J/JEBWuuTu12LwBmXzghLkJ9hbdCX3wYTHYB
+sftMjApNuZSuzMHPNzzL39tlvl28AnBh1/PmWq29c3hqu6ThkCF5itrdkZHfROkV
+gFsLEQH/NSe9J9kCOglD3KiUS03W1xaJG8zmw++egk1cDuonVdxF7rUeq2h9N6I+
+YPbsMNjZAoGBAO/06znypuKk7ewIl0PI+8SApgD/NJt8/l3ZTDbsYPI0r4rXbQG3
+o1CMMkCyVBXiuX8x9K6pB5yV2o7W+1YcfRI9VaNmPuvOMJRmiX2D6h3DLXTHa8aA
+fgHMmHRl1clrvr/agh3QicbwneGv+V+YeII6chYs3/Yq4DMTGjb1IAw/AoGBAOKI
+Bt89L54elXsQMmcuRGlrGBlrpBfqlNaLiY7eezhphfaIxZdvh0bUGmjCu4T55MIR
+BdPGOLS8rZoI21vJdInsqLH3nnhq1Nps3sqFGs3wQg8OH3WdFbNWg8smIL0bwqbl
+2LfcP/dyRiS5BIf8JRqaMz4wQEvHr/om2UIhBjn3AoGBANQ0/wniRCBPx3FkL5Hs
+3mrrcuOSzo1rvvB0SWiRJzNL0Kqy1V4dbzq+oXqBuscYGQAZx8/nACpEhGKqUN/Y
+letZfrDgrWiQknnLLHBqBtOHVl3eNrv3yngA3hqiLKzSsoCs10FSuWXMSXPb0mfu
+STSyR07BJNdpF5lTnW1Y3py1AoGAC/r5shDAVfJ0IWAH6mEOCS06xw1kTkd/u6EB
+k2a8yYz7IsC1An9Jfjt1chjqZev5ZzITRtHy6cwYuk7BmycaXLkBavgXj3LG8w5S
+8g78Dewo8jbi/wthvGxU6AeKL7YqIz2AqqihUWrfvs1yKebx52hEUYOnwto6ulYX
+o2GvvJ0CgYEA63GJej71K62USN3W3g2+iRPXif8PnKVEr9jk36dxtCdnIdKSjqZf
+dWAYD2k7KmK4jcKJAjBzQdLlzlvgEINtiZAjK90wwizBvjN2YDseJSMmbrNGEoWh
+C76IJQ5gymr79PYmKhHzS0oEtb2w1chhDDFNnws+YZ+FzBkNs1qIBcY=
+-----END RSA PRIVATE KEY-----
 """
 
 
 let rk2 = """
-wUU9Pwzos8bDgziDTrbCUIre708n9mMDD415+wIDAQABAoIBAFLnqG5O6OHwa9nrC0PlYjEmGsNeMnvQHKk2yy8TDxyupFBwxTySzZNl1diDxzdaXbl/VFjunf7ZYynqhdqiyuddqC5WKWY6WAsUonORpJ00olko/KdDpqoqlhhY3Ur1e2nBix/i80NdH+BBDL1F2oit7HrsTR7hqFVAJWqOc6QgBcBZguY7e2DXHjJtYcQXkv4/vIjTU8FQVOp6r2zPmoRKTD+ws/10PxbIA67XuUDLyX5BGojXHCL93lNsdhxPRuHDBCUcuDvMgdh5PK36yeLTaseldrUee2zVl1QcPyxdGCgV8gn4tEhm+357FUujcMCa10mTfkLbeJPzm/UYNlkCgYEA4RXyMpZCi4DGNi/jq5A+03AkZT16kF50r0MXuK9G6EOfIfd73D3qfi0c1Md3I3wWZgnbD9BFsASz8QIhZAxZ94guipVzjgmco38V6pq0yzlrIoxJYpScf0yqdn32yDGPBfGyjnBYxEXHB0UHINwPXddgIbKfTQkEigXIX6W3tLcCgYEA3AP+
 """
 
 
 let rk3 = """
-qGCYgbjKLBr5AHblvH63AXXnkt3as9yk/RncXLrz0XLWK7hjQxw+r0IpxLB2jI/I0Eqj08GKRxcvu7ns5W1hhle59OOjua2DZtGOlskri0zcaFFgxwzH8QEsyxlye5d88fVVhj5XK/w8xVhuiCFwBYB7dBeDLYRuV671SN0CgYAjn1mJcAZwFZ1JDiM2D8ohpGneK/Ct0IUfB7tFW1gZgjo5IfXUUWg/N9yMQFU2pHjXBVBKHGgrB1ODHRczwlCqwD69aBG1tQe5SG+rhXh/gULXYORsWaC69OM1hZH89PrxseLUcCtcRL7PA7mxFaLI80EflClqA7dYMLoZiRyd2QKBgQC31tquBPDJzAearPsNCUxToan3HXbfgGNjUOXH2xkHnutmQsd0hsDibbJvLSDLigu0zdwlN4kGwrxxRI2NFgE9f5Uy9RCb8K540uRuQIIduoCZCCNPQ1hTWnmjBrFQD7ZaUS2E29OXtXWPelepKohJVW9OGZqOWasxmGu+9qFcPQKBgBVwFujZlPYADKdtHg1wvoeNFWSBb/CptXEkUCAOIYatwdBu1e1BOIyQelgng/r38x/tN0eOOIxfUPxe3hmVA43oI6lnMeKJIUIvFx/LVg9o+3ZvWRKJ2yP4OMOT56L5k7DO1KhHEHKzjfWBtZRxv7+290XngQM0Jb+oCjFIcyND
------END RSA PRIVATE KEY-----
 """
 
 let fwtkUrl = "http://kingtup.cn/fwtkcn"

NIO1901/Modules/Home/Controller/MainViewController.swift

@@ -23,7 +23,7 @@ let NetWorkChangedNoti: NSNotification.Name = NSNotification.Name(rawValue: "Net
 
 class MainViewController: BaseViewController {
 
-    let reachability = Reachability()!
+    let reachability = try! Reachability()
     var currentIsWifi = false
     var netStr = ""
     var _vpnStatus: NEVPNStatus = .disconnected
@@ -206,6 +206,7 @@ class MainViewController: BaseViewController {
         case .none:
             netStr = "none"
             currentIsWifi = false
+        default: break;
         }
         NotificationCenter.default.post(name: NetWorkChangedNoti, object: netStr)
         updateData()

PacketTunnel/PacketTunnelProvider.swift

@@ -18,7 +18,7 @@ class PacketTunnelProvider: NEPacketTunnelProvider {
 
     open var connection: NWTCPConnection!
     var mitmServer: MitmService!
-    var reachability = Reachability()!
+    var reachability = try! Reachability()
 
     /// The completion handler to call when the tunnel is fully established.
     var pendingStartCompletion: ((Error?) -> Void)!

Podfile

@@ -1,6 +1,7 @@
 # Uncomment the next line to define a global platform for your project
 platform :ios, '9.0'
 use_frameworks!
+source 'https://github.com/CocoaPods/Specs.git'
 
 target 'NIO1901' do
     pod 'SQLite.swift'

Podfile.lock

@@ -1,13 +1,13 @@
 PODS:
-  - Bugly (2.5.0)
-  - CocoaAsyncSocket (7.6.3)
+  - Bugly (2.5.2)
+  - CocoaAsyncSocket (7.6.4)
   - FileBrowser (1.0.0)
-  - Highlightr (2.0.1)
-  - ReachabilitySwift (4.1.0)
-  - SQLite.swift (0.11.5):
-    - SQLite.swift/standard (= 0.11.5)
-  - SQLite.swift/standard (0.11.5)
-  - TangramKit (1.2.0)
+  - Highlightr (2.1.0)
+  - ReachabilitySwift (5.0.0)
+  - SQLite.swift (0.12.2):
+    - SQLite.swift/standard (= 0.12.2)
+  - SQLite.swift/standard (0.12.2)
+  - TangramKit (1.4.2)
   - YYCache (1.0.4)
   - YYCategories (1.0.4):
     - YYCategories/no-arc (= 1.0.4)
@@ -35,7 +35,7 @@ DEPENDENCIES:
   - YYWebImage
 
 SPEC REPOS:
-  https://github.com/cocoapods/specs.git:
+  https://github.com/CocoaPods/Specs.git:
     - Bugly
     - CocoaAsyncSocket
     - FileBrowser
@@ -49,18 +49,18 @@ SPEC REPOS:
     - YYWebImage
 
 SPEC CHECKSUMS:
-  Bugly: 3ca9f255c01025582df26f9222893b383c7e4b4e
-  CocoaAsyncSocket: eafaa68a7e0ec99ead0a7b35015e0bf25d2c8987
+  Bugly: dbac48b55ad469a97cc4321045cd50df8f63d44f
+  CocoaAsyncSocket: 694058e7c0ed05a9e217d1b3c7ded962f4180845
   FileBrowser: 2ca91ff61c9ea09665eb3b8f9e64a7a77e66a0bf
-  Highlightr: 65655134dd0d5e1320afdd8a9d880c9e9dc0b437
-  ReachabilitySwift: 6849231cd4e06559f3b9ef4a97a0a0f96d41e09f
-  SQLite.swift: 6e5356850bb1791459f8c16d6ee9195b28714a2e
-  TangramKit: 43d01f9d5d820037c241de6570d30a968e291abf
+  Highlightr: 595f3e100737c8de41113385da8bd0b5b65212c6
+  ReachabilitySwift: 985039c6f7b23a1da463388634119492ff86c825
+  SQLite.swift: d2b4642190917051ce6bd1d49aab565fe794eea3
+  TangramKit: aad3ab8f9617418c9da96d59cddd71134ae8af83
   YYCache: 8105b6638f5e849296c71f331ff83891a4942952
   YYCategories: 6bcd4314c6661a561410dce4a793379ebd306abd
   YYImage: 1e1b62a9997399593e4b9c4ecfbbabbf1d3f3b54
   YYWebImage: 5f7f36aee2ae293f016d418c7d6ba05c4863e928
 
-PODFILE CHECKSUM: 5511d30a042c6f5b68329761ffd615ae588ac935
+PODFILE CHECKSUM: 3f4a8fc10b7b4e794d8f59101e83344b217ec53e
 
-COCOAPODS: 1.5.3
+COCOAPODS: 1.9.0

TunnelServices/HttpService/HTTPServer.swift

@@ -16,7 +16,7 @@ public let LocalHTTPServerChanged: NSNotification.Name = NSNotification.Name(raw
 
 public class LocalHTTPServer {
 
-    let reachability = Reachability()!
+    let reachability = try! Reachability()
 
     public static let httpRootPath = FileManager.default.containerURL(forSecurityApplicationGroupIdentifier: GROUPNAME)?.appendingPathComponent("Root")
 
@@ -42,6 +42,8 @@ public class LocalHTTPServer {
             runWifiAgain()
         case .cellular,.none:
             closeWifi()
+        default:
+            break;
         }
     }
 

TunnelServices/NIO/NIO/NIO/EventLoop.swift

@@ -1029,11 +1029,11 @@ extension EventLoopGroup {
 
     public func syncShutdownGracefully() throws {
         if let eventLoop = MultiThreadedEventLoopGroup.currentEventLoop {
-            preconditionFailure("""
-            BUG DETECTED: syncShutdownGracefully() must not be called when on an EventLoop.
-            Calling syncShutdownGracefully() on any EventLoop can lead to deadlocks.
-            Current eventLoop: \(eventLoop)
-            """)
+//            preconditionFailure("""
+//            BUG DETECTED: syncShutdownGracefully() must not be called when on an EventLoop.
+//            Calling syncShutdownGracefully() on any EventLoop can lead to deadlocks.
+//            Current eventLoop: \(eventLoop)
+//            """)
         }
         let errorStorageLock = Lock()
         var errorStorage: Error? = nil