Merge pull request #53 from greatfire/envoy-urls

support envoy and ss urls
greatfire · Mar 13, 2023 · 653943a · 653943a
2 parents bcc7b8f + 94d404e
commit 653943a
Show file tree

Hide file tree

Showing 3 changed files with 16 additions and 6 deletions.
diff --git a/android/demo/build.gradle b/android/demo/build.gradle
@@ -44,7 +44,7 @@ dependencies {
     implementation 'com.android.volley:volley:1.2.1'
 
     implementation project(path: ':envoy')
-    implementation 'org.greatfire.envoy:cronet:102.0.5005.195-1'
+    implementation 'org.greatfire.envoy:cronet:102.0.5005.195-3'
     implementation 'androidx.viewpager2:viewpager2:1.0.0'
     implementation 'com.google.android.material:material:1.1.0'
     implementation 'androidx.constraintlayout:constraintlayout:1.1.3'

diff --git a/android/envoy/build.gradle b/android/envoy/build.gradle
@@ -59,7 +59,7 @@ dependencies {
     implementation 'androidx.core:core-ktx:1.3.2'
     implementation 'androidx.preference:preference-ktx:1.1.1'
     implementation 'androidx.localbroadcastmanager:localbroadcastmanager:1.0.0'
-    implementation 'org.greatfire.envoy:cronet:102.0.5005.195-1'
+    implementation 'org.greatfire.envoy:cronet:102.0.5005.195-3'
     implementation 'org.greatfire:IEnvoyProxy:1.2.1'
 
     // debugApi(name: 'cronet-debug', ext: 'aar')

diff --git a/android/envoy/src/main/kotlin/org/greatfire/envoy/NetworkIntentService.kt b/android/envoy/src/main/kotlin/org/greatfire/envoy/NetworkIntentService.kt
@@ -124,6 +124,9 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
     private val cacheMap = Collections.synchronizedMap(mutableMapOf<String, String>())
     private val cronetMap = Collections.synchronizedMap(mutableMapOf<String, CronetEngine>())
 
+    private val httpPrefixes = Collections.synchronizedList(mutableListOf<String>("https", "http", "envoy"))
+    private val supportedPrefixes = Collections.synchronizedList(mutableListOf<String>("v2ws", "v2srtp", "v2wechat", "hysteria", "ss"))
+
     inner class NetworkBinder : Binder() {
         // Return this instance of LocalService so clients can call public methods
         fun getService(): NetworkIntentService = this@NetworkIntentService
@@ -223,12 +226,16 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
             }
         } else {
             urlsToSubmit.forEach() { url ->
+                val parts = url.split(":")
+                val prefix = parts[0]
                 if (url.contains("test")) {
                     // no-op
-                } else if (url.startsWith("http")) {
+                } else if (httpPrefixes.contains(prefix)) {
                     shuffledHttps.add(url)
-                } else {
+                } else if (supportedPrefixes.contains(prefix)) {
                     shuffledUrls.add(url)
+                } else {
+                    Log.w(TAG, "found url with unsupported prefix: " + prefix)
                 }
             }
             Log.d(TAG, "shuffle " + (shuffledHttps.size + shuffledUrls.size) + " submitted urls")
@@ -331,9 +338,12 @@ class NetworkIntentService : IntentService("NetworkIntentService") {
             } else if (envoyUrl.startsWith("ss://")) {
                 Log.d(TAG, "found ss url: " + envoyUrl)
                 handleShadowsocksSubmit(envoyUrl, captive_portal_url, hysteriaCert, dnsttConfig, dnsttUrls)
-            } else {
-                Log.d(TAG, "found (https?) url: " + envoyUrl)
+            } else if (envoyUrl.startsWith("http") || envoyUrl.startsWith("envoy")) {
+                Log.d(TAG, "found http/envoy url: " + envoyUrl)
                 handleHttpsSubmit(envoyUrl, captive_portal_url, hysteriaCert, dnsttConfig, dnsttUrls)
+            } else {
+                // prefix check should handle this but if not, batch count may not add up
+                Log.w(TAG, "found unsupported url: " + envoyUrl)
             }
         }