Maa HTTP Server

This commit is contained in:
guigui
2022-05-25 22:45:05 +08:00
parent 0b08ecbcbb
commit 11d51447ad
5 changed files with 14 additions and 7 deletions

View File

@@ -21,6 +21,8 @@ data class AppendTaskRequest(
val host: String,
@SerialName("type")
val type: String,
@SerialName("taskId")
val taskId: Int,
@SerialName("params")
val params: Task
)

View File

@@ -41,14 +41,14 @@ data class GetVersion(
@Serializable
data class ConnectResponse(
@SerialName("version")
@SerialName("id")
val id: String
) : BaseData()
@Serializable
data class ListInstance(
@SerialName("version")
@SerialName("list")
val list: List<MaaInstanceInfo>
) : BaseData()
@@ -64,6 +64,11 @@ data class MaaInstanceInfo(
val status: Int,
) : BaseData()
@Serializable
data class AppendTask(
@SerialName("id")
val id: Int
) : BaseData()
object EmptyBaseData : BaseData()

View File

@@ -32,7 +32,7 @@ fun Application.httpRouting() {
}
post("/setTaskParams") {
val appendTask = call.receive<AppendTaskRequest>()
MaaService.setTaskParams(appendTask.host, appendTask.type, appendTask.params.toJsonString())
MaaService.setTaskParams(appendTask.host, appendTask.type,appendTask.taskId, appendTask.params.toJsonString())
call.respond(HttpResponse())
}
post("/start") {

View File

@@ -33,7 +33,7 @@ class MaaInstance(private val instance: MeoAssistant, val id: String, val adbPat
fun appendTask(type: String, params: String) = instance.AsstAppendTask(pointer, type, params)
fun setTaskParams(type: String, params: String) = instance.AsstSetTaskParams(pointer, 1, params)
fun setTaskParams(type: String,taskId:Int, params: String) = instance.AsstSetTaskParams(pointer, taskId, params)
fun start() = instance.AsstStart(pointer)

View File

@@ -40,9 +40,9 @@ object MaaService {
}
fun setTaskParams(host: String, type: String, detailJson: String): Int {
val appendTask = instancePool[host]?.setTaskParams(type, detailJson)
return appendTask ?: 0
fun setTaskParams(host: String, type: String, taskId: Int, detailJson: String): Boolean {
val appendTask = instancePool[host]?.setTaskParams(type, taskId, detailJson)
return appendTask ?: false
}
fun start(host: String) = instancePool[host]?.start()