commit 26/08/2025
This commit is contained in:
@@ -2,6 +2,7 @@ package web
|
||||
|
||||
import codes.Somecodes
|
||||
import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
|
||||
import database.MariaDB
|
||||
import io.javalin.Javalin
|
||||
import io.javalin.apibuilder.ApiBuilder.before
|
||||
import io.javalin.apibuilder.ApiBuilder.get
|
||||
@@ -9,13 +10,13 @@ import io.javalin.apibuilder.ApiBuilder.path
|
||||
import io.javalin.apibuilder.ApiBuilder.post
|
||||
import io.javalin.apibuilder.ApiBuilder.ws
|
||||
import io.javalin.http.Context
|
||||
import java.time.LocalDateTime
|
||||
|
||||
@Suppress("unused")
|
||||
class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
|
||||
class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>, val db: MariaDB) {
|
||||
|
||||
var app : Javalin? = null
|
||||
private val objectmapper = jacksonObjectMapper()
|
||||
|
||||
val objectmapper = jacksonObjectMapper()
|
||||
fun Start() {
|
||||
app = Javalin.create {
|
||||
config ->
|
||||
@@ -55,35 +56,58 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
|
||||
|
||||
path("home.html") {
|
||||
before { CheckUsers(it) }
|
||||
ws("/ws") { it ->
|
||||
ws("/ws") { ws ->
|
||||
// WebSocket endpoint for home
|
||||
it.onClose {
|
||||
ws.onClose { wsCloseContext ->
|
||||
// TODO Handle WebSocket close event
|
||||
println("WebSocket closed: ${it.session.remoteAddress}")
|
||||
println("WebSocket closed: ${wsCloseContext.session.remoteAddress}")
|
||||
}
|
||||
it.onMessage {
|
||||
ws.onMessage { wsMessageContext ->
|
||||
try{
|
||||
val cmd = objectmapper.readValue(it.message(), WebsocketCommand::class.java)
|
||||
val cmd = objectmapper.readValue(wsMessageContext.message(), WebsocketCommand::class.java)
|
||||
when (cmd.command) {
|
||||
"getSystemTime" ->{
|
||||
wsMessageContext.send(objectmapper.writeValueAsString(WebsocketReply(cmd.command, LocalDateTime.now().format(Somecodes.datetimeformat1))))
|
||||
}
|
||||
"getCPUStatus" ->{
|
||||
//TODO Get CPU status
|
||||
|
||||
it.send(objectmapper.writeValueAsString(WebsocketReply(cmd.command,"OK")))
|
||||
Somecodes.getCPUUsage { vv ->
|
||||
wsMessageContext.send(objectmapper.writeValueAsString(WebsocketReply(cmd.command, vv)))
|
||||
}
|
||||
}
|
||||
"getMemoryStatus" ->{
|
||||
// TODO Get Memory status
|
||||
it.send(objectmapper.writeValueAsString(WebsocketReply(cmd.command, Somecodes.getMemoryUsage())))
|
||||
wsMessageContext.send(objectmapper.writeValueAsString(WebsocketReply(cmd.command, Somecodes.getMemoryUsage())))
|
||||
}
|
||||
"getDiskStatus" ->{
|
||||
// TODO Get Disk status
|
||||
it.send(objectmapper.writeValueAsString(WebsocketReply(cmd.command,"OK")))
|
||||
wsMessageContext.send(objectmapper.writeValueAsString(WebsocketReply(cmd.command, Somecodes.getDiskUsage())))
|
||||
}
|
||||
"getNetworkStatus" ->{
|
||||
// TODO Get Network status
|
||||
it.send(objectmapper.writeValueAsString(WebsocketReply(cmd.command,"OK")))
|
||||
wsMessageContext.send(objectmapper.writeValueAsString(WebsocketReply(cmd.command,"OK")))
|
||||
}
|
||||
"getSoundBankList" ->{
|
||||
println("getSoundBankList command received")
|
||||
wsMessageContext.send(objectmapper.writeValueAsString(WebsocketReply(cmd.command, MariaDB.ArrayListtoString(db.SoundbankList))))
|
||||
}
|
||||
"getMessageBankList"->{
|
||||
println("getMessageBankList command received")
|
||||
wsMessageContext.send(objectmapper.writeValueAsString(WebsocketReply(cmd.command, MariaDB.ArrayListtoString(db.MessagebankList))) )
|
||||
}
|
||||
"getLanguageList"->{
|
||||
println("getLanguageList command received")
|
||||
wsMessageContext.send(objectmapper.writeValueAsString(WebsocketReply(cmd.command, MariaDB.ArrayListtoString(db.LanguageLinkList))))
|
||||
}
|
||||
"getTimerList"->{
|
||||
println("getTimerList command received")
|
||||
wsMessageContext.send(objectmapper.writeValueAsString(WebsocketReply(cmd.command, MariaDB.ArrayListtoString(db.SchedulebankList))))
|
||||
}
|
||||
"getLog" ->{
|
||||
println("getLog command received")
|
||||
}
|
||||
"getSetting" ->{
|
||||
println("getSetting command received")
|
||||
}
|
||||
else -> {
|
||||
it.send(objectmapper.writeValueAsString(WebsocketReply("error", "Unknown command: ${cmd.command}")))
|
||||
wsMessageContext.send(objectmapper.writeValueAsString(WebsocketReply("error", "Unknown command: ${cmd.command}")))
|
||||
}
|
||||
}
|
||||
} catch (e: Exception){
|
||||
@@ -91,30 +115,37 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
|
||||
}
|
||||
|
||||
}
|
||||
it.onConnect {
|
||||
ws.onConnect { wsConnectContext ->
|
||||
// TODO Handle WebSocket connect event
|
||||
println("WebSocket connected: ${it.session.remoteAddress}")
|
||||
println("WebSocket connected: ${wsConnectContext.session.remoteAddress}")
|
||||
}
|
||||
|
||||
}
|
||||
}
|
||||
path("soundbank.html") {
|
||||
before {CheckUsers(it)}
|
||||
|
||||
|
||||
}
|
||||
path("messagebank.html") {
|
||||
before { CheckUsers(it) }
|
||||
|
||||
}
|
||||
path("language.html") {
|
||||
before { CheckUsers(it) }
|
||||
|
||||
}
|
||||
path("log.html") {
|
||||
before { CheckUsers(it) }
|
||||
|
||||
}
|
||||
path("setting.html") {
|
||||
before { CheckUsers(it) }
|
||||
|
||||
}
|
||||
path("timer.html") {
|
||||
before { CheckUsers(it) }
|
||||
|
||||
}
|
||||
}
|
||||
}.start(listenPort)
|
||||
@@ -122,19 +153,13 @@ class WebApp(val listenPort: Int, val userlist: List<Pair<String, String>>) {
|
||||
}
|
||||
|
||||
fun CheckUsers(ctx: Context){
|
||||
println("Checking user session at ${ctx.req().requestURI}")
|
||||
val user = ctx.sessionAttribute<String?>("user")
|
||||
if (user == null) {
|
||||
println("User not logged in, redirecting to login page")
|
||||
ctx.redirect("login.html")
|
||||
}
|
||||
println("User is logged in: $user")
|
||||
val foundUser = userlist.find { it.first == user }
|
||||
if (foundUser==null) {
|
||||
println("User not found in user list, redirecting to login page")
|
||||
ctx.redirect("login.html")
|
||||
} else {
|
||||
println("User found: $user")
|
||||
}
|
||||
}
|
||||
|
||||
|
||||
Reference in New Issue
Block a user