Update both server and client for websocket support

This commit is contained in:
Maxwell Jeffress
2024-10-24 12:33:58 +11:00
parent ebe5e6b922
commit 5b813c2335
3 changed files with 206 additions and 76 deletions

View File

@@ -1,23 +1,75 @@
package xyz.maxwellj.chookpen
import io.javalin.Javalin
import com.sun.net.httpserver.HttpExchange
import com.sun.net.httpserver.HttpHandler
import com.sun.net.httpserver.HttpServer
import java.net.InetSocketAddress
import io.javalin.websocket.WsContext
import java.util.concurrent.ConcurrentHashMap
import java.util.UUID
import java.io.File
import java.io.BufferedReader
/*
object WsSessionManager {
val sessions = ConcurrentHashMap<String, WsContext>()
fun addSession(sessionID: String, ctx: WsContext) {
sessions[sessionID] = ctx
}
fun removeSession(sessionID: String) {
sessions.remove(sessionID)
}
fun broadcast(message: String) {
sessions.values.forEach { ctx ->
ctx.send(message)
}
}
}
*/
object WsSessionManager {
private val sessions = ConcurrentHashMap<String, WsContext>()
fun main(args: Array<String>) {
val app = Javalin.create()
.get("/") { ctx -> ctx.result("dingus") }
.get("/api/send/{content}") { ctx -> ctx.result(handleSentMessage(ctx.pathParam("content")))}
.get("/api/createaccount/{content}") { ctx -> ctx.result(createAccount(ctx.pathParam("content")))}
.get("/api/syncmessages/{content}") { ctx -> ctx.result(syncMessages(ctx.pathParam("content")))}
.get("/api/authkey/{content}") { ctx -> ctx.result(authKey(ctx.pathParam("content")))}
.start(7070)
fun addSession(ctx: WsContext) {
// Generate our own UUID for the session since we can't access Javalin's private sessionId
val sessionId = UUID.randomUUID().toString()
sessions[sessionId] = ctx
}
fun removeSession(ctx: WsContext) {
// Find and remove the session by context
sessions.entries.removeIf { it.value === ctx }
}
fun broadcast(message: String) {
sessions.values.forEach { ctx ->
ctx.send(message)
}
}
}
fun extractMessageContent(inputData: String): String {
var username = ""
var message = ""
var dataType = ""
var isParsingData = 0
for (char in inputData) {
if (char == ':') {
isParsingData = 1
} else if (isParsingData == 1) {
if (char == '}') {
isParsingData = 0
dataType = ""
} else if (char != '{') {
if (dataType == "username") {
username += char
} else if (dataType == "message") {
message += char
}
}
} else {
dataType += char
}
}
return("$username: $message")
}
fun handleSentMessage(inputData: String): String {
@@ -306,3 +358,78 @@ fun authKey(inputData: String): String {
return("Success")
}
fun main(args: Array<String>) {
val app = Javalin.create()
.get("/") { ctx -> ctx.result("dingus") }
.get("/api/send/{content}") { ctx ->
val result = handleSentMessage(ctx.pathParam("content"))
if (result == "Success") {
val messageContent = extractMessageContent(ctx.pathParam("content"))
WsSessionManager.broadcast(messageContent)
}
ctx.result(result)
}
.get("/api/createaccount/{content}") { ctx -> ctx.result(createAccount(ctx.pathParam("content")))}
.get("/api/syncmessages/{content}") { ctx -> ctx.result(syncMessages(ctx.pathParam("content")))}
.get("/api/authkey/{content}") { ctx -> ctx.result(authKey(ctx.pathParam("content")))}
.ws("/api/websocket") { ws ->
ws.onConnect { ctx ->
WsSessionManager.addSession(ctx)
ctx.send("Websocket success")
}
ws.onClose { ctx ->
WsSessionManager.removeSession(ctx)
}
ws.onMessage { ctx ->
println(ctx.message())
val successState = handleSentMessage(ctx.message())
if (successState != "Success") {
ctx.send(successState)
} else {
// Broadcast the message to all clients if successful
val messageContent = extractMessageContent(ctx.message())
WsSessionManager.broadcast(messageContent)
ctx.send("Message sent successfully")
}
}
}
.start(7070)
}
/*
fun main(args: Array<String>) {
val app = Javalin.create()
.get("/") { ctx -> ctx.result("dingus") }
.get("/api/send/{content}") { ctx ->
val result = handleSentMessage(ctx.pathParam("content"))
if (result == "Success") {
val messageContent = extractMessageContent(ctx.pathParam("content")
WsSessionManager.broadcast(messageContent)
ctx.result(result)
}
}
.get("/api/createaccount/{content}") { ctx -> ctx.result(createAccount(ctx.pathParam("content")))}
.get("/api/syncmessages/{content}") { ctx -> ctx.result(syncMessages(ctx.pathParam("content")))}
.get("/api/authkey/{content}") { ctx -> ctx.result(authKey(ctx.pathParam("content")))}
.ws("/api/websocket") { ws ->
ws.onConnect { ctx ->
WsSessionManager.addSession(ctx.sessionId, ctx)
ctx.send("Websocket success")
}
ws.onClose { ctx ->
WsSessionManager.removeSession(ctx.sessionId)
}
ws.onMessage { ctx ->
println(ctx.message())
val successState = handleSentMessage(ctx.message())
if (successState != "Success") {
ctx.send(successState)
} else {
ctx.send("Message sent successfully")
}
}
}
.start(7070)
}*/