shkong/OpenShamrock
1
0
Fork 0
mirror of https://github.com/whitechi73/OpenShamrock.git synced 2024-08-14 13:12:17 +08:00
Code Issues Packages Projects Releases Wiki Activity

Shamrock: Allow modification of active WebSocket listening address

Browse Source 
Signed-off-by: WhiteChi <whitechi73@outlook.com>
This commit is contained in:
WhiteChi 2023-11-02 08:05:16 +08:00
parent c67b49790f
commit b76ef7efb3
4 changed files with 17 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/WebSocketService.kt
View File

@ -21,7 +21,7 @@ import org.java_websocket.WebSocket
import org.java_websocket.handshake.ClientHandshake import org.java_websocket.handshake.ClientHandshake
import java.net.URI import java.net.URI
internal class WebSocketService(port: Int): WebSocketTransmitServlet(port) { internal class WebSocketService(host: String, port: Int): WebSocketTransmitServlet(host, port) {
private val eventJobList = mutableSetOf<Job>() private val eventJobList = mutableSetOf<Job>()
override fun submitFlowJob(job: Job) { override fun submitFlowJob(job: Job) {

3
xposed/src/main/java/moe/fuqiuluo/shamrock/remote/service/api/WebSocketTransmitServlet.kt
View File

@ -32,8 +32,9 @@ import java.util.Collections
import kotlin.concurrent.timer import kotlin.concurrent.timer
internal abstract class WebSocketTransmitServlet( internal abstract class WebSocketTransmitServlet(
host:String,
port: Int port: Int
) : BaseTransmitServlet, WebSocketServer(InetSocketAddress(port)) { ) : BaseTransmitServlet, WebSocketServer(InetSocketAddress(host, port)) {
protected val eventReceivers: MutableList<WebSocket> = Collections.synchronizedList(mutableListOf<WebSocket>()) protected val eventReceivers: MutableList<WebSocket> = Collections.synchronizedList(mutableListOf<WebSocket>())
override val address: String override val address: String

6
xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/XposedEntry.kt
View File

@ -118,9 +118,9 @@ internal class XposedEntry: IXposedHookLoadPackage {
log("Process Name = " + MobileQQ.getMobileQQ().qqProcessName.apply { log("Process Name = " + MobileQQ.getMobileQQ().qqProcessName.apply {
// if (!contains("msf", ignoreCase = true)) return // 非MSF进程 退出 // if (!contains("msf", ignoreCase = true)) return // 非MSF进程 退出
if (contains("peak")) { //if (contains("peak")) {
PlatformUtils.killProcess(ctx, this) // PlatformUtils.killProcess(ctx, this)
} //}
}) })
PlatformUtils.isTim() PlatformUtils.isTim()

12
xposed/src/main/java/moe/fuqiuluo/shamrock/xposed/actions/InitRemoteService.kt
View File

@ -70,7 +70,17 @@ internal class InitRemoteService : IAction {
private fun startWebSocketServer() { private fun startWebSocketServer() {
GlobalScope.launch { GlobalScope.launch {
try { try {
val server = WebSocketService(ShamrockConfig.getActiveWebSocketConfig()?.port ?: 5700) val config = ShamrockConfig.getActiveWebSocketConfig() ?: return@launch
config.address ?: kotlin.run {
LogCenter.log("WebSocketServer地址不合法", Level.ERROR)
return@launch
}
config.port ?: kotlin.run {
LogCenter.log("WebSocketServer端口不合法", Level.ERROR)
return@launch
}
require(config.port in 0 .. 65536) { "WebSocketServer端口不合法" }
val server = WebSocketService(config.address, config.port!!)
server.start() server.start()
} catch (e: Throwable) { } catch (e: Throwable) {
LogCenter.log(e.stackTraceToString(), Level.ERROR) LogCenter.log(e.stackTraceToString(), Level.ERROR)