Team2890/PhotonVision
4
0
Fork 0
mirror of https://github.com/PhotonVision/photonvision synced 2026-06-19 00:41:41 +00:00
Code Issues Packages Projects Releases Wiki Activity

chore: Bump Javalin (#2126)

Browse Source
This commit is contained in:
Henry Martin
2025-10-13 20:58:14 -05:00
committed by GitHub
parent 797936865f
commit 85f155c77b
3 changed files with 11 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
build.gradle
View File

@@ -36,7 +36,7 @@ ext {
wpimathVersion = wpilibVersion
openCVYear = "2025"
openCVversion = "4.10.0-3"
javalinVersion = "5.6.2"
javalinVersion = "6.7.0"
libcameraDriverVersion = "v2025.0.4"
rknnVersion = "dev-v2025.0.0-5-g666c0c6"
rubikVersion = "dev-v2025.1.0-8-g067a316"

2
photon-server/src/main/java/org/photonvision/server/DataSocketHandler.java
View File

@@ -87,7 +87,7 @@ public class DataSocketHandler {
var reason = context.reason() != null ? context.reason() : "Connection closed by client";
logger.info("Closing websocket connection from " + host + " for reason: " + reason);
} else {
logger.info("Closing websockets for user " + context.getSessionId());
logger.info("Closing websockets for user " + context.sessionId());
}
}

14
photon-server/src/main/java/org/photonvision/server/Server.java
View File

@@ -18,7 +18,7 @@
package org.photonvision.server;
import io.javalin.Javalin;
import io.javalin.plugin.bundled.CorsPluginConfig;
import io.javalin.plugin.bundled.CorsPlugin;
import java.net.InetSocketAddress;
import java.util.List;
import java.util.StringJoiner;
@@ -60,10 +60,14 @@ public class Server {
javalinConfig -> {
javalinConfig.showJavalinBanner = false;
javalinConfig.staticFiles.add("web");
javalinConfig.plugins.enableCors(
corsContainer -> {
corsContainer.add(CorsPluginConfig::anyHost);
});
javalinConfig.registerPlugin(
new CorsPlugin(
cors -> {
cors.addRule(
it -> {
it.anyHost();
});
}));
javalinConfig.requestLogger.http(
(ctx, ms) -> {