Skip to content

Commit 582e8e3

Browse files
chen08209chen08209
committed
Fix some issues
1 parent 2ab70f1 commit 582e8e3

17 files changed

Lines changed: 152 additions & 61 deletions

File tree

‎android/app/src/main/kotlin/com/follow/clash/Service.kt‎

Lines changed: 20 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,7 @@ package com.follow.clash
33
import com.follow.clash.common.ServiceDelegate
44
import com.follow.clash.common.formatString
55
import com.follow.clash.common.intent
6+
import com.follow.clash.service.IAckInterface
67
import com.follow.clash.service.ICallbackInterface
78
import com.follow.clash.service.IEventInterface
89
import com.follow.clash.service.IRemoteInterface
@@ -44,8 +45,11 @@ object Service {
4445
return delegate.useService {
4546
it.invokeAction(
4647
data, object : ICallbackInterface.Stub() {
47-
override fun onResult(result: ByteArray?, isSuccess: Boolean) {
48+
override fun onResult(
49+
result: ByteArray?, isSuccess: Boolean, ack: IAckInterface?
50+
) {
4851
res.add(result ?: byteArrayOf())
52+
ack?.onAck()
4953
if (isSuccess) {
5054
cb(res.formatString())
5155
}
@@ -61,24 +65,24 @@ object Service {
6165
return delegate.useService {
6266
it.setEventListener(
6367
when (cb != null) {
64-
true -> object : IEventInterface.Stub() {
65-
override fun onEvent(
66-
id: String, data: ByteArray?, isSuccess: Boolean
67-
) {
68-
if (results[id] == null) {
69-
results[id] = mutableListOf()
70-
}
71-
results[id]?.add(data ?: byteArrayOf())
72-
if (isSuccess) {
73-
cb(results[id]?.formatString())
74-
results.remove(id)
75-
}
68+
true -> object : IEventInterface.Stub() {
69+
override fun onEvent(
70+
id: String, data: ByteArray?, isSuccess: Boolean, ack: IAckInterface?
71+
) {
72+
if (results[id] == null) {
73+
results[id] = mutableListOf()
74+
}
75+
results[id]?.add(data ?: byteArrayOf())
76+
ack?.onAck()
77+
if (isSuccess) {
78+
cb(results[id]?.formatString())
79+
results.remove(id)
7680
}
7781
}
78-
79-
false -> null
8082
}
81-
)
83+
84+
false -> null
85+
})
8286
}
8387
}
8488

‎android/app/src/main/kotlin/com/follow/clash/TileService.kt‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,9 @@ import android.annotation.SuppressLint
44
import android.os.Build
55
import android.service.quicksettings.Tile
66
import android.service.quicksettings.TileService
7-
import com.follow.clash.common.QuickAction
8-
import com.follow.clash.common.quickIntent
7+
import com.follow.clash.common.Components
8+
import com.follow.clash.common.GlobalState
9+
import com.follow.clash.common.intent
910
import com.follow.clash.common.toPendingIntent
1011
import kotlinx.coroutines.CoroutineScope
1112
import kotlinx.coroutines.Dispatchers
@@ -39,20 +40,22 @@ class TileService : TileService() {
3940
}
4041

4142
@SuppressLint("StartActivityAndCollapseDeprecated")
42-
private fun handleToggle() {
43-
val intent = QuickAction.TOGGLE.quickIntent
43+
private fun activityTransfer() {
44+
val intent = Components.TEMP_ACTIVITY.intent
4445
val pendingIntent = intent.toPendingIntent
4546
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.UPSIDE_DOWN_CAKE) {
4647
startActivityAndCollapse(pendingIntent)
4748
} else {
48-
@Suppress("DEPRECATION")
49-
startActivityAndCollapse(intent)
49+
@Suppress("DEPRECATION") startActivityAndCollapse(intent)
5050
}
5151
}
5252

5353
override fun onClick() {
5454
super.onClick()
55-
handleToggle()
55+
activityTransfer()
56+
GlobalState.launch {
57+
State.handleToggleAction()
58+
}
5659
}
5760

5861
override fun onStopListening() {

‎android/common/src/main/java/com/follow/clash/common/Ext.kt‎

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -220,7 +220,6 @@ val Long.formatBytes: String
220220
fun String.chunkedForAidl(charset: Charset = Charsets.UTF_8): List<ByteArray> {
221221
val allBytes = toByteArray(charset)
222222
val total = allBytes.size
223-
224223
val maxBytes = when {
225224
total <= 100 * 1024 -> total
226225
total <= 1024 * 1024 -> 64 * 1024

‎android/common/src/main/java/com/follow/clash/common/Service.kt‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,7 @@ import kotlinx.coroutines.flow.StateFlow
1111
import kotlinx.coroutines.flow.filterNotNull
1212
import kotlinx.coroutines.flow.first
1313
import kotlinx.coroutines.launch
14+
import kotlinx.coroutines.withContext
1415
import kotlinx.coroutines.withTimeout
1516
import java.util.concurrent.atomic.AtomicBoolean
1617

@@ -59,7 +60,9 @@ class ServiceDelegate<T>(
5960
withTimeout(timeoutMillis) {
6061
val state = serviceState.filterNotNull().first()
6162
state.first?.let {
62-
block(it)
63+
withContext(Dispatchers.Default) {
64+
block(it)
65+
}
6366
} ?: throw Exception(state.second)
6467
}
6568
}

‎android/service/src/main/aidl/com/follow/clash/service/IAckInterface.aidl‎

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
// IAckInterface.aidl
2+
package com.follow.clash.service;
3+
4+
import com.follow.clash.service.IAckInterface;
5+
6+
interface IAckInterface {
7+
oneway void onAck();
8+
}

‎android/service/src/main/aidl/com/follow/clash/service/ICallbackInterface.aidl‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// ICallbackInterface.aidl
22
package com.follow.clash.service;
33

4+
import com.follow.clash.service.IAckInterface;
5+
46
interface ICallbackInterface {
5-
oneway void onResult(in byte[] data,in boolean isSuccess);
7+
oneway void onResult(in byte[] data,in boolean isSuccess, in IAckInterface ack);
68
}

‎android/service/src/main/aidl/com/follow/clash/service/IEventInterface.aidl‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,8 @@
11
// IEventInterface.aidl
22
package com.follow.clash.service;
33

4+
import com.follow.clash.service.IAckInterface;
5+
46
interface IEventInterface {
5-
oneway void onEvent(in String id, in byte[] data,in boolean isSuccess);
7+
oneway void onEvent(in String id, in byte[] data,in boolean isSuccess, in IAckInterface ack);
68
}

‎android/service/src/main/java/com/follow/clash/service/RemoteService.kt‎

Lines changed: 37 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,10 @@ import kotlinx.coroutines.CoroutineScope
1717
import kotlinx.coroutines.Dispatchers
1818
import kotlinx.coroutines.SupervisorJob
1919
import kotlinx.coroutines.launch
20+
import kotlinx.coroutines.suspendCancellableCoroutine
2021
import kotlinx.coroutines.sync.withLock
2122
import java.util.UUID
23+
import kotlin.coroutines.resume
2224

2325
class RemoteService : Service(),
2426
CoroutineScope by CoroutineScope(SupervisorJob() + Dispatchers.Default) {
@@ -75,11 +77,22 @@ class RemoteService : Service(),
7577
private val binder = object : IRemoteInterface.Stub() {
7678
override fun invokeAction(data: String, callback: ICallbackInterface) {
7779
Core.invokeAction(data) {
78-
runCatching {
79-
val chunks = it?.chunkedForAidl() ?: listOf()
80-
val totalSize = chunks.size
81-
chunks.forEachIndexed { index, chunk ->
82-
callback.onResult(chunk, totalSize - 1 == index)
80+
launch {
81+
runCatching {
82+
val chunks = it?.chunkedForAidl() ?: listOf()
83+
for ((index, chunk) in chunks.withIndex()) {
84+
suspendCancellableCoroutine { cont ->
85+
callback.onResult(
86+
chunk,
87+
index == chunks.lastIndex,
88+
object : IAckInterface.Stub() {
89+
override fun onAck() {
90+
cont.resume(Unit)
91+
}
92+
},
93+
)
94+
}
95+
}
8396
}
8497
}
8598
}
@@ -89,6 +102,7 @@ class RemoteService : Service(),
89102
State.notificationParamsFlow.tryEmit(params)
90103
}
91104

105+
92106
override fun startService(
93107
options: VpnOptions,
94108
runtime: Long,
@@ -106,12 +120,24 @@ class RemoteService : Service(),
106120
GlobalState.log("RemoveEventListener ${eventListener == null}")
107121
when (eventListener != null) {
108122
true -> Core.callSetEventListener {
109-
runCatching {
110-
val id = UUID.randomUUID().toString()
111-
val chunks = it?.chunkedForAidl() ?: listOf()
112-
val totalSize = chunks.size
113-
chunks.forEachIndexed { index, chunk ->
114-
eventListener.onEvent(id, chunk, totalSize - 1 == index)
123+
launch {
124+
runCatching {
125+
val id = UUID.randomUUID().toString()
126+
val chunks = it?.chunkedForAidl() ?: listOf()
127+
for ((index, chunk) in chunks.withIndex()) {
128+
suspendCancellableCoroutine { cont ->
129+
eventListener.onEvent(
130+
id,
131+
chunk,
132+
index == chunks.lastIndex,
133+
object : IAckInterface.Stub() {
134+
override fun onAck() {
135+
cont.resume(Unit)
136+
}
137+
},
138+
)
139+
}
140+
}
115141
}
116142
}
117143
}

‎android/service/src/main/java/com/follow/clash/service/VpnService.kt‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -213,6 +213,7 @@ class VpnService : SystemVpnService(), IBaseService,
213213
allowBypass()
214214
}
215215
if (Build.VERSION.SDK_INT >= Build.VERSION_CODES.Q && options.systemProxy) {
216+
GlobalState.log("Open http proxy")
216217
setHttpProxy(
217218
ProxyInfo.buildDirectProxy(
218219
"127.0.0.1", options.port, options.bypassDomain

‎core/action.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,8 +53,8 @@ func handleAction(action *Action, result ActionResult) {
5353
result.success(handleShutdown())
5454
return
5555
case validateConfigMethod:
56-
data := []byte(action.Data.(string))
57-
result.success(handleValidateConfig(data))
56+
path := action.Data.(string)
57+
result.success(handleValidateConfig(path))
5858
return
5959
case updateConfigMethod:
6060
data := []byte(action.Data.(string))

0 commit comments

Comments
 (0)