commit b917ae613c4c764043bbead4ccb11309df3a9633 Author: 2wenty1ne Date: Sat Nov 29 22:02:55 2025 +0100 Initial commit diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..480bdf5 --- /dev/null +++ b/.gitignore @@ -0,0 +1,39 @@ +target/ +!.mvn/wrapper/maven-wrapper.jar +!**/src/main/**/target/ +!**/src/test/**/target/ +.kotlin + +### IntelliJ IDEA ### +.idea/modules.xml +.idea/jarRepositories.xml +.idea/compiler.xml +.idea/libraries/ +*.iws +*.iml +*.ipr + +### Eclipse ### +.apt_generated +.classpath +.factorypath +.project +.settings +.springBeans +.sts4-cache + +### NetBeans ### +/nbproject/private/ +/nbbuild/ +/dist/ +/nbdist/ +/.nb-gradle/ +build/ +!**/src/main/**/build/ +!**/src/test/**/build/ + +### VS Code ### +.vscode/ + +### Mac OS ### +.DS_Store \ No newline at end of file diff --git a/.idea/.gitignore b/.idea/.gitignore new file mode 100644 index 0000000..13566b8 --- /dev/null +++ b/.idea/.gitignore @@ -0,0 +1,8 @@ +# Default ignored files +/shelf/ +/workspace.xml +# Editor-based HTTP Client requests +/httpRequests/ +# Datasource local storage ignored files +/dataSources/ +/dataSources.local.xml diff --git a/.idea/encodings.xml b/.idea/encodings.xml new file mode 100644 index 0000000..aa00ffa --- /dev/null +++ b/.idea/encodings.xml @@ -0,0 +1,7 @@ + + + + + + + \ No newline at end of file diff --git a/.idea/misc.xml b/.idea/misc.xml new file mode 100644 index 0000000..d0530a3 --- /dev/null +++ b/.idea/misc.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + \ No newline at end of file diff --git a/.mvn/wrapper/maven-wrapper.jar b/.mvn/wrapper/maven-wrapper.jar new file mode 100644 index 0000000..c1dd12f Binary files /dev/null and b/.mvn/wrapper/maven-wrapper.jar differ diff --git a/.mvn/wrapper/maven-wrapper.properties b/.mvn/wrapper/maven-wrapper.properties new file mode 100644 index 0000000..41d2d76 --- /dev/null +++ b/.mvn/wrapper/maven-wrapper.properties @@ -0,0 +1,2 @@ +distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.6/apache-maven-3.9.6-bin.zip +wrapperUrl=https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.3.0/maven-wrapper-3.3.0.jar \ No newline at end of file diff --git a/mvnw b/mvnw new file mode 100644 index 0000000..8a8fb22 --- /dev/null +++ b/mvnw @@ -0,0 +1,316 @@ +#!/bin/sh +# ---------------------------------------------------------------------------- +# Licensed to the Apache Software Foundation (ASF) under one +# or more contributor license agreements. See the NOTICE file +# distributed with this work for additional information +# regarding copyright ownership. The ASF licenses this file +# to you under the Apache License, Version 2.0 (the +# "License"); you may not use this file except in compliance +# with the License. You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, +# software distributed under the License is distributed on an +# "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +# KIND, either express or implied. See the License for the +# specific language governing permissions and limitations +# under the License. +# ---------------------------------------------------------------------------- + +# ---------------------------------------------------------------------------- +# Maven Start Up Batch script +# +# Required ENV vars: +# ------------------ +# JAVA_HOME - location of a JDK home dir +# +# Optional ENV vars +# ----------------- +# M2_HOME - location of maven2's installed home dir +# MAVEN_OPTS - parameters passed to the Java VM when running Maven +# e.g. to debug Maven itself, use +# set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +# MAVEN_SKIP_RC - flag to disable loading of mavenrc files +# ---------------------------------------------------------------------------- + +if [ -z "$MAVEN_SKIP_RC" ] ; then + + if [ -f /usr/local/etc/mavenrc ] ; then + . /usr/local/etc/mavenrc + fi + + if [ -f /etc/mavenrc ] ; then + . /etc/mavenrc + fi + + if [ -f "$HOME/.mavenrc" ] ; then + . "$HOME/.mavenrc" + fi + +fi + +# OS specific support. $var _must_ be set to either true or false. +cygwin=false; +darwin=false; +mingw=false +case "`uname`" in + CYGWIN*) cygwin=true ;; + MINGW*) mingw=true;; + Darwin*) darwin=true + # Use /usr/libexec/java_home if available, otherwise fall back to /Library/Java/Home + # See https://developer.apple.com/library/mac/qa/qa1170/_index.html + if [ -z "$JAVA_HOME" ]; then + if [ -x "/usr/libexec/java_home" ]; then + export JAVA_HOME="`/usr/libexec/java_home`" + else + export JAVA_HOME="/Library/Java/Home" + fi + fi + ;; +esac + +if [ -z "$JAVA_HOME" ] ; then + if [ -r /etc/gentoo-release ] ; then + JAVA_HOME=`java-config --jre-home` + fi +fi + +if [ -z "$M2_HOME" ] ; then + ## resolve links - $0 may be a link to maven's home + PRG="$0" + + # need this for relative symlinks + while [ -h "$PRG" ] ; do + ls=`ls -ld "$PRG"` + link=`expr "$ls" : '.*-> \(.*\)$'` + if expr "$link" : '/.*' > /dev/null; then + PRG="$link" + else + PRG="`dirname "$PRG"`/$link" + fi + done + + saveddir=`pwd` + + M2_HOME=`dirname "$PRG"`/.. + + # make it fully qualified + M2_HOME=`cd "$M2_HOME" && pwd` + + cd "$saveddir" + # echo Using m2 at $M2_HOME +fi + +# For Cygwin, ensure paths are in UNIX format before anything is touched +if $cygwin ; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --unix "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --unix "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --unix "$CLASSPATH"` +fi + +# For Mingw, ensure paths are in UNIX format before anything is touched +if $mingw ; then + [ -n "$M2_HOME" ] && + M2_HOME="`(cd "$M2_HOME"; pwd)`" + [ -n "$JAVA_HOME" ] && + JAVA_HOME="`(cd "$JAVA_HOME"; pwd)`" +fi + +if [ -z "$JAVA_HOME" ]; then + javaExecutable="`which javac`" + if [ -n "$javaExecutable" ] && ! [ "`expr \"$javaExecutable\" : '\([^ ]*\)'`" = "no" ]; then + # readlink(1) is not available as standard on Solaris 10. + readLink=`which readlink` + if [ ! `expr "$readLink" : '\([^ ]*\)'` = "no" ]; then + if $darwin ; then + javaHome="`dirname \"$javaExecutable\"`" + javaExecutable="`cd \"$javaHome\" && pwd -P`/javac" + else + javaExecutable="`readlink -f \"$javaExecutable\"`" + fi + javaHome="`dirname \"$javaExecutable\"`" + javaHome=`expr "$javaHome" : '\(.*\)/bin'` + JAVA_HOME="$javaHome" + export JAVA_HOME + fi + fi +fi + +if [ -z "$JAVACMD" ] ; then + if [ -n "$JAVA_HOME" ] ; then + if [ -x "$JAVA_HOME/jre/sh/java" ] ; then + # IBM's JDK on AIX uses strange locations for the executables + JAVACMD="$JAVA_HOME/jre/sh/java" + else + JAVACMD="$JAVA_HOME/bin/java" + fi + else + JAVACMD="`\\unset -f command; \\command -v java`" + fi +fi + +if [ ! -x "$JAVACMD" ] ; then + echo "Error: JAVA_HOME is not defined correctly." >&2 + echo " We cannot execute $JAVACMD" >&2 + exit 1 +fi + +if [ -z "$JAVA_HOME" ] ; then + echo "Warning: JAVA_HOME environment variable is not set." +fi + +CLASSWORLDS_LAUNCHER=org.codehaus.plexus.classworlds.launcher.Launcher + +# traverses directory structure from process work directory to filesystem root +# first directory with .mvn subdirectory is considered project base directory +find_maven_basedir() { + + if [ -z "$1" ] + then + echo "Path not specified to find_maven_basedir" + return 1 + fi + + basedir="$1" + wdir="$1" + while [ "$wdir" != '/' ] ; do + if [ -d "$wdir"/.mvn ] ; then + basedir=$wdir + break + fi + # workaround for JBEAP-8937 (on Solaris 10/Sparc) + if [ -d "${wdir}" ]; then + wdir=`cd "$wdir/.."; pwd` + fi + # end of workaround + done + echo "${basedir}" +} + +# concatenates all lines of a file +concat_lines() { + if [ -f "$1" ]; then + echo "$(tr -s '\n' ' ' < "$1")" + fi +} + +BASE_DIR=`find_maven_basedir "$(pwd)"` +if [ -z "$BASE_DIR" ]; then + exit 1; +fi + +########################################################################################## +# Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +# This allows using the maven wrapper in projects that prohibit checking in binary data. +########################################################################################## +if [ -r "$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found .mvn/wrapper/maven-wrapper.jar" + fi +else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Couldn't find .mvn/wrapper/maven-wrapper.jar, downloading it ..." + fi + if [ -n "$MVNW_REPOURL" ]; then + jarUrl="$MVNW_REPOURL/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + else + jarUrl="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + fi + while IFS="=" read key value; do + case "$key" in (wrapperUrl) jarUrl="$value"; break ;; + esac + done < "$BASE_DIR/.mvn/wrapper/maven-wrapper.properties" + if [ "$MVNW_VERBOSE" = true ]; then + echo "Downloading from: $jarUrl" + fi + wrapperJarPath="$BASE_DIR/.mvn/wrapper/maven-wrapper.jar" + if $cygwin; then + wrapperJarPath=`cygpath --path --windows "$wrapperJarPath"` + fi + + if command -v wget > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found wget ... using wget" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + wget "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + else + wget --http-user=$MVNW_USERNAME --http-password=$MVNW_PASSWORD "$jarUrl" -O "$wrapperJarPath" || rm -f "$wrapperJarPath" + fi + elif command -v curl > /dev/null; then + if [ "$MVNW_VERBOSE" = true ]; then + echo "Found curl ... using curl" + fi + if [ -z "$MVNW_USERNAME" ] || [ -z "$MVNW_PASSWORD" ]; then + curl -o "$wrapperJarPath" "$jarUrl" -f + else + curl --user $MVNW_USERNAME:$MVNW_PASSWORD -o "$wrapperJarPath" "$jarUrl" -f + fi + + else + if [ "$MVNW_VERBOSE" = true ]; then + echo "Falling back to using Java to download" + fi + javaClass="$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.java" + # For Cygwin, switch paths to Windows format before running javac + if $cygwin; then + javaClass=`cygpath --path --windows "$javaClass"` + fi + if [ -e "$javaClass" ]; then + if [ ! -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Compiling MavenWrapperDownloader.java ..." + fi + # Compiling the Java class + ("$JAVA_HOME/bin/javac" "$javaClass") + fi + if [ -e "$BASE_DIR/.mvn/wrapper/MavenWrapperDownloader.class" ]; then + # Running the downloader + if [ "$MVNW_VERBOSE" = true ]; then + echo " - Running MavenWrapperDownloader.java ..." + fi + ("$JAVA_HOME/bin/java" -cp .mvn/wrapper MavenWrapperDownloader "$MAVEN_PROJECTBASEDIR") + fi + fi + fi +fi +########################################################################################## +# End of extension +########################################################################################## + +export MAVEN_PROJECTBASEDIR=${MAVEN_BASEDIR:-"$BASE_DIR"} +if [ "$MVNW_VERBOSE" = true ]; then + echo $MAVEN_PROJECTBASEDIR +fi +MAVEN_OPTS="$(concat_lines "$MAVEN_PROJECTBASEDIR/.mvn/jvm.config") $MAVEN_OPTS" + +# For Cygwin, switch paths to Windows format before running java +if $cygwin; then + [ -n "$M2_HOME" ] && + M2_HOME=`cygpath --path --windows "$M2_HOME"` + [ -n "$JAVA_HOME" ] && + JAVA_HOME=`cygpath --path --windows "$JAVA_HOME"` + [ -n "$CLASSPATH" ] && + CLASSPATH=`cygpath --path --windows "$CLASSPATH"` + [ -n "$MAVEN_PROJECTBASEDIR" ] && + MAVEN_PROJECTBASEDIR=`cygpath --path --windows "$MAVEN_PROJECTBASEDIR"` +fi + +# Provide a "standardized" way to retrieve the CLI args that will +# work with both Windows and non-Windows executions. +MAVEN_CMD_LINE_ARGS="$MAVEN_CONFIG $@" +export MAVEN_CMD_LINE_ARGS + +WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +exec "$JAVACMD" \ + $MAVEN_OPTS \ + $MAVEN_DEBUG_OPTS \ + -classpath "$MAVEN_PROJECTBASEDIR/.mvn/wrapper/maven-wrapper.jar" \ + "-Dmaven.home=${M2_HOME}" \ + "-Dmaven.multiModuleProjectDirectory=${MAVEN_PROJECTBASEDIR}" \ + ${WRAPPER_LAUNCHER} $MAVEN_CONFIG "$@" diff --git a/mvnw.cmd b/mvnw.cmd new file mode 100644 index 0000000..1d8ab01 --- /dev/null +++ b/mvnw.cmd @@ -0,0 +1,188 @@ +@REM ---------------------------------------------------------------------------- +@REM Licensed to the Apache Software Foundation (ASF) under one +@REM or more contributor license agreements. See the NOTICE file +@REM distributed with this work for additional information +@REM regarding copyright ownership. The ASF licenses this file +@REM to you under the Apache License, Version 2.0 (the +@REM "License"); you may not use this file except in compliance +@REM with the License. You may obtain a copy of the License at +@REM +@REM https://www.apache.org/licenses/LICENSE-2.0 +@REM +@REM Unless required by applicable law or agreed to in writing, +@REM software distributed under the License is distributed on an +@REM "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY +@REM KIND, either express or implied. See the License for the +@REM specific language governing permissions and limitations +@REM under the License. +@REM ---------------------------------------------------------------------------- + +@REM ---------------------------------------------------------------------------- +@REM Maven Start Up Batch script +@REM +@REM Required ENV vars: +@REM JAVA_HOME - location of a JDK home dir +@REM +@REM Optional ENV vars +@REM M2_HOME - location of maven2's installed home dir +@REM MAVEN_BATCH_ECHO - set to 'on' to enable the echoing of the batch commands +@REM MAVEN_BATCH_PAUSE - set to 'on' to wait for a keystroke before ending +@REM MAVEN_OPTS - parameters passed to the Java VM when running Maven +@REM e.g. to debug Maven itself, use +@REM set MAVEN_OPTS=-Xdebug -Xrunjdwp:transport=dt_socket,server=y,suspend=y,address=8000 +@REM MAVEN_SKIP_RC - flag to disable loading of mavenrc files +@REM ---------------------------------------------------------------------------- + +@REM Begin all REM lines with '@' in case MAVEN_BATCH_ECHO is 'on' +@echo off +@REM set title of command window +title %0 +@REM enable echoing by setting MAVEN_BATCH_ECHO to 'on' +@if "%MAVEN_BATCH_ECHO%" == "on" echo %MAVEN_BATCH_ECHO% + +@REM set %HOME% to equivalent of $HOME +if "%HOME%" == "" (set "HOME=%HOMEDRIVE%%HOMEPATH%") + +@REM Execute a user defined script before this one +if not "%MAVEN_SKIP_RC%" == "" goto skipRcPre +@REM check for pre script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_pre.bat" call "%USERPROFILE%\mavenrc_pre.bat" %* +if exist "%USERPROFILE%\mavenrc_pre.cmd" call "%USERPROFILE%\mavenrc_pre.cmd" %* +:skipRcPre + +@setlocal + +set ERROR_CODE=0 + +@REM To isolate internal variables from possible post scripts, we use another setlocal +@setlocal + +@REM ==== START VALIDATION ==== +if not "%JAVA_HOME%" == "" goto OkJHome + +echo. +echo Error: JAVA_HOME not found in your environment. >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +:OkJHome +if exist "%JAVA_HOME%\bin\java.exe" goto init + +echo. +echo Error: JAVA_HOME is set to an invalid directory. >&2 +echo JAVA_HOME = "%JAVA_HOME%" >&2 +echo Please set the JAVA_HOME variable in your environment to match the >&2 +echo location of your Java installation. >&2 +echo. +goto error + +@REM ==== END VALIDATION ==== + +:init + +@REM Find the project base dir, i.e. the directory that contains the folder ".mvn". +@REM Fallback to current working directory if not found. + +set MAVEN_PROJECTBASEDIR=%MAVEN_BASEDIR% +IF NOT "%MAVEN_PROJECTBASEDIR%"=="" goto endDetectBaseDir + +set EXEC_DIR=%CD% +set WDIR=%EXEC_DIR% +:findBaseDir +IF EXIST "%WDIR%"\.mvn goto baseDirFound +cd .. +IF "%WDIR%"=="%CD%" goto baseDirNotFound +set WDIR=%CD% +goto findBaseDir + +:baseDirFound +set MAVEN_PROJECTBASEDIR=%WDIR% +cd "%EXEC_DIR%" +goto endDetectBaseDir + +:baseDirNotFound +set MAVEN_PROJECTBASEDIR=%EXEC_DIR% +cd "%EXEC_DIR%" + +:endDetectBaseDir + +IF NOT EXIST "%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config" goto endReadAdditionalConfig + +@setlocal EnableExtensions EnableDelayedExpansion +for /F "usebackq delims=" %%a in ("%MAVEN_PROJECTBASEDIR%\.mvn\jvm.config") do set JVM_CONFIG_MAVEN_PROPS=!JVM_CONFIG_MAVEN_PROPS! %%a +@endlocal & set JVM_CONFIG_MAVEN_PROPS=%JVM_CONFIG_MAVEN_PROPS% + +:endReadAdditionalConfig + +SET MAVEN_JAVA_EXE="%JAVA_HOME%\bin\java.exe" +set WRAPPER_JAR="%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.jar" +set WRAPPER_LAUNCHER=org.apache.maven.wrapper.MavenWrapperMain + +set DOWNLOAD_URL="https://repo.maven.apache.org/maven2/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + +FOR /F "usebackq tokens=1,2 delims==" %%A IN ("%MAVEN_PROJECTBASEDIR%\.mvn\wrapper\maven-wrapper.properties") DO ( + IF "%%A"=="wrapperUrl" SET DOWNLOAD_URL=%%B +) + +@REM Extension to allow automatically downloading the maven-wrapper.jar from Maven-central +@REM This allows using the maven wrapper in projects that prohibit checking in binary data. +if exist %WRAPPER_JAR% ( + if "%MVNW_VERBOSE%" == "true" ( + echo Found %WRAPPER_JAR% + ) +) else ( + if not "%MVNW_REPOURL%" == "" ( + SET DOWNLOAD_URL="%MVNW_REPOURL%/org/apache/maven/wrapper/maven-wrapper/3.1.0/maven-wrapper-3.1.0.jar" + ) + if "%MVNW_VERBOSE%" == "true" ( + echo Couldn't find %WRAPPER_JAR%, downloading it ... + echo Downloading from: %DOWNLOAD_URL% + ) + + powershell -Command "&{"^ + "$webclient = new-object System.Net.WebClient;"^ + "if (-not ([string]::IsNullOrEmpty('%MVNW_USERNAME%') -and [string]::IsNullOrEmpty('%MVNW_PASSWORD%'))) {"^ + "$webclient.Credentials = new-object System.Net.NetworkCredential('%MVNW_USERNAME%', '%MVNW_PASSWORD%');"^ + "}"^ + "[Net.ServicePointManager]::SecurityProtocol = [Net.SecurityProtocolType]::Tls12; $webclient.DownloadFile('%DOWNLOAD_URL%', '%WRAPPER_JAR%')"^ + "}" + if "%MVNW_VERBOSE%" == "true" ( + echo Finished downloading %WRAPPER_JAR% + ) +) +@REM End of extension + +@REM Provide a "standardized" way to retrieve the CLI args that will +@REM work with both Windows and non-Windows executions. +set MAVEN_CMD_LINE_ARGS=%* + +%MAVEN_JAVA_EXE% ^ + %JVM_CONFIG_MAVEN_PROPS% ^ + %MAVEN_OPTS% ^ + %MAVEN_DEBUG_OPTS% ^ + -classpath %WRAPPER_JAR% ^ + "-Dmaven.multiModuleProjectDirectory=%MAVEN_PROJECTBASEDIR%" ^ + %WRAPPER_LAUNCHER% %MAVEN_CONFIG% %* +if ERRORLEVEL 1 goto error +goto end + +:error +set ERROR_CODE=1 + +:end +@endlocal & set ERROR_CODE=%ERROR_CODE% + +if not "%MAVEN_SKIP_RC%"=="" goto skipRcPost +@REM check for post script, once with legacy .bat ending and once with .cmd ending +if exist "%USERPROFILE%\mavenrc_post.bat" call "%USERPROFILE%\mavenrc_post.bat" +if exist "%USERPROFILE%\mavenrc_post.cmd" call "%USERPROFILE%\mavenrc_post.cmd" +:skipRcPost + +@REM pause the script if MAVEN_BATCH_PAUSE is set to 'on' +if "%MAVEN_BATCH_PAUSE%"=="on" pause + +if "%MAVEN_TERMINATE_CMD%"=="on" exit %ERROR_CODE% + +cmd /C exit /B %ERROR_CODE% diff --git a/paho7844434371800-tcplocalhost1883/.lck b/paho7844434371800-tcplocalhost1883/.lck new file mode 100644 index 0000000..e69de29 diff --git a/pom.xml b/pom.xml new file mode 100644 index 0000000..1273f62 --- /dev/null +++ b/pom.xml @@ -0,0 +1,72 @@ + + + 4.0.0 + + vs + MessagingMonitor + 1.0-SNAPSHOT + Messaging Monitor + war + + + UTF-8 + 25 + 25 + 5.13.2 + + + + + com.fasterxml.jackson.core + jackson-databind + 2.15.2 + + + org.eclipse.paho + org.eclipse.paho.client.mqttv3 + 1.2.5 + + + jakarta.websocket + jakarta.websocket-api + 2.2.0 + provided + + + org.apache.tomcat + tomcat-websocket + 10.1.0 + provided + + + jakarta.servlet + jakarta.servlet-api + 6.1.0 + provided + + + org.junit.jupiter + junit-jupiter-api + ${junit.version} + test + + + org.junit.jupiter + junit-jupiter-engine + ${junit.version} + test + + + + + + + org.apache.maven.plugins + maven-war-plugin + 3.4.0 + + + + \ No newline at end of file diff --git a/src/main/java/vs/messagingmonitor/AsciiChars.java b/src/main/java/vs/messagingmonitor/AsciiChars.java new file mode 100644 index 0000000..31aee9a --- /dev/null +++ b/src/main/java/vs/messagingmonitor/AsciiChars.java @@ -0,0 +1,78 @@ +package vs.messagingmonitor; + +/** + * helper class for RFC 5424 (https://datatracker.ietf.org/doc/html/rfc5424) + * compliant log messages as immutable Java objects - representation of a subset + * of printable strings of specific length + * + * @author Sandro Leuchter + * + */ +public abstract class AsciiChars { + private final String value; + + public String value() { + return this.value; + } + + protected AsciiChars(int length, String value) { + if (value != null) { + if (value.length() > length) { + throw new IllegalArgumentException( + "Stringlänge = " + value.length() + " > " + length); + } + for (int c : value.getBytes()) { + if (c < 33 || c > 126) { + throw new IllegalArgumentException( + "Stringinhalt nicht printable US-ASCII ohne Space"); + } + } + } + this.value = value; + } + + @Override + public String toString() { + if (value() == null || value().length() == 0) { + return "-"; + } else { + return value(); + } + } + + static public final class L004 extends AsciiChars { + public L004(String value) { + super(4, value); + } + } + + static public final class L012 extends AsciiChars { + public L012(String value) { + super(12, value); + } + } + + static public final class L032 extends AsciiChars { + public L032(String value) { + super(32, value); + } + } + + static public final class L048 extends AsciiChars { + public L048(String value) { + super(48, value); + } + } + + static public final class L128 extends AsciiChars { + public L128(String value) { + super(128, value); + } + } + + static public final class L255 extends AsciiChars { + public L255(String value) { + super(255, value); + } + } +} diff --git a/src/main/java/vs/messagingmonitor/Conf.java b/src/main/java/vs/messagingmonitor/Conf.java new file mode 100644 index 0000000..e554b27 --- /dev/null +++ b/src/main/java/vs/messagingmonitor/Conf.java @@ -0,0 +1,5 @@ +package vs.messagingmonitor; + +public class Conf { + public static final String ROOTTOPIC = "messagingMonitor1337"; +} diff --git a/src/main/java/vs/messagingmonitor/MqttReceiver.java b/src/main/java/vs/messagingmonitor/MqttReceiver.java new file mode 100644 index 0000000..2ada60e --- /dev/null +++ b/src/main/java/vs/messagingmonitor/MqttReceiver.java @@ -0,0 +1,93 @@ +package vs.messagingmonitor; + +import org.eclipse.paho.client.mqttv3.*; + +import java.io.ByteArrayInputStream; +import java.io.IOException; +import java.io.ObjectInputStream; + +public class MqttReceiver { + private final String channel; + private final String topic; + private final String broker; + private MqttClient mqttClient; + + public MqttReceiver(String channel, String topic, String broker) { + this.channel = channel; + this.topic = topic; + this.broker = broker; + + createClient(); + } + + private void createClient() { + try { + String clientId = MqttClient.generateClientId(); + mqttClient = new MqttClient(broker, clientId); + + MqttConnectOptions options = new MqttConnectOptions(); + options.setAutomaticReconnect(true); + options.setKeepAliveInterval(60); + + mqttClient.setCallback(mqttCallback); + + WebappWebsocket.sendMessage("Channel " + channel + ": Connected!"); + + mqttClient.connect(options); + mqttClient.subscribe(topic); + } + + catch (MqttException | IOException e) { + System.err.println("Error creating client on channel " + channel + ":\n" + e.getMessage()); + } + } + + private final MqttCallback mqttCallback = new MqttCallback() { + @Override + public void connectionLost(Throwable throwable) {} + @Override + public void deliveryComplete(IMqttDeliveryToken iMqttDeliveryToken) {} + + @Override + public void messageArrived(String topic, MqttMessage mqttMessage) { + System.out.println("Test"); + System.out.println("Received: " + mqttMessage.toString()); + + byte[] messageData = mqttMessage.getPayload(); + SyslogMessage syslogMsg; + + System.out.println("After getting payload"); + + try { + ObjectInputStream ois = new ObjectInputStream(new ByteArrayInputStream(messageData)); + System.out.println("After converting to stream"); + Object receivedObject = ois.readObject(); + + + if (!(receivedObject instanceof SyslogMessage)) { + System.out.println("Not a syslog message!"); + return; + } + syslogMsg = (SyslogMessage) receivedObject; + + if (!(syslogMsg.sev().ordinal() <= SyslogMessage.Severity.WARNING.ordinal())) { + WebappWebsocket.sendMessage("Channel " + channel + ": " + syslogMsg.toString()); + } + } + catch (ClassNotFoundException | IOException e) { + System.err.println("Error while message arrival: " + e); + } + } + }; + + public void disconnect() { + try { + if (mqttClient != null && mqttClient.isConnected()) { + System.out.println("Diconnecting client"); + mqttClient.disconnect(); + } + } catch (MqttException e) { + System.err.println("Error during disconnect: " + e.getMessage()); + } + } +} diff --git a/src/main/java/vs/messagingmonitor/Publisher.java b/src/main/java/vs/messagingmonitor/Publisher.java new file mode 100644 index 0000000..bb51ee7 --- /dev/null +++ b/src/main/java/vs/messagingmonitor/Publisher.java @@ -0,0 +1,59 @@ +package vs.messagingmonitor; + +import java.io.ByteArrayOutputStream; +import java.io.IOException; +import java.io.ObjectOutputStream; +import java.util.ArrayList; +import java.util.Date; +import vs.messagingmonitor.AsciiChars.L032; +import vs.messagingmonitor.AsciiChars.L048; +import vs.messagingmonitor.AsciiChars.L128; +import vs.messagingmonitor.AsciiChars.L255; +import org.eclipse.paho.client.mqttv3.MqttClient; +import org.eclipse.paho.client.mqttv3.MqttException; +import org.eclipse.paho.client.mqttv3.MqttMessage; + +class Publisher { + public static void main(String[] args) { + String broker = args[0]; + System.out.println("Broker: " + broker); + String topic = args[1]; + + System.out.println("Topic: " + topic); + + MqttClient client; + String clientId = MqttClient.generateClientId(); + try { + client = new MqttClient(broker, clientId); + client.connect(); + + SyslogMessage.TextMessage textMessage = new SyslogMessage.TextMessage("message"); + SyslogMessage syslogMessage = new SyslogMessage( + SyslogMessage.Facility.USER, + SyslogMessage.Severity.INFORMATIONAL, + new L255("192.168.2.100"), + new L048("java"), + new L128("1"), + new L032("1"), + new StructuredData(new ArrayList<>()), + textMessage + ); + + MqttMessage message = new MqttMessage(); + ByteArrayOutputStream baos = new ByteArrayOutputStream(); + ObjectOutputStream oos = new ObjectOutputStream(baos); + oos.writeObject(syslogMessage); + oos.flush(); + + message.setPayload(baos.toByteArray()); + + client.publish(topic, message); + + oos.close(); + client.disconnect(); + System.out.println("DONE!"); + } catch (MqttException | IOException e) { + System.err.println(e.getMessage()); + } + } +} diff --git a/src/main/java/vs/messagingmonitor/StructuredData.java b/src/main/java/vs/messagingmonitor/StructuredData.java new file mode 100644 index 0000000..9113c1a --- /dev/null +++ b/src/main/java/vs/messagingmonitor/StructuredData.java @@ -0,0 +1,147 @@ +package vs.messagingmonitor; + +import java.util.ArrayList; +import java.util.List; + + +/** + * helper class for RFC 5424 (https://datatracker.ietf.org/doc/html/rfc5424) + * compliant log messages as immutable Java objects - structured data (set of + * key/value-pairs) with some predefined sets according to the standard + * + * @author Sandro Leuchter + * + */ +public class StructuredData { + static public class Element { + private final String name; + private List parameters; + + public static Element newTimeQuality(boolean tzKnown, + boolean isSynced) { + return newTimeQuality(tzKnown, isSynced, null); + } + + public static Element newTimeQuality(boolean tzKnown, boolean isSynced, + Integer syncAccuracy) { + var e = new Element("timeQuality"); + e.add(new Param("tzKnown", (tzKnown) ? "1" : "0")); + e.add(new Param("isSynced", (isSynced) ? "1" : "0")); + if (syncAccuracy != null && !isSynced) { + e.add(new Param("syncAccuracy", String.valueOf(syncAccuracy))); + } + return e; + } + + public static Element newOrigin(String enterpriseId, String software, + String swVersion) { + return newOrigin(new String[] {}, enterpriseId, software, + swVersion); + } + + public static Element newOrigin(String ip, String enterpriseId, + String software, String swVersion) { + return newOrigin(new String[] { ip }, enterpriseId, software, + swVersion); + } + + public static Element newOrigin(String[] ip, String enterpriseId, + String software, String swVersion) { + var e = new Element("origin"); + for (var p : ip) { + e = e.add(new Param("ip", p)); + } + if (enterpriseId != null && !enterpriseId.equals("")) { + e = e.add(new Param("enterpriseId", enterpriseId)); + } + if (software != null && !software.equals("")) { + e = e.add(new Param("software", software)); + } + if (swVersion != null && !swVersion.equals("")) { + e = e.add(new Param("swVersion", swVersion)); + } + return e; + } + + public static Element newMeta(Integer sequenceId, Integer sysUpTime, + String language) { + var e = new Element("meta"); + if (sequenceId != null && sequenceId > 0) { + e = e.add(new Param("sequenceId", + String.valueOf(sequenceId % 2147483647))); + } + if (sysUpTime != null && sysUpTime >= 0) { + e = e.add(new Param("sysUpTime", String.valueOf(sysUpTime))); + } + if (language != null && !language.equals("")) { + e = e.add(new Param("language", language)); + } + return e; + } + + public Element(String name) { + this.name = name; + this.parameters = new ArrayList<>(); + } + + public Element add(Param parameter) { + var e = new Element(this.name); + e.parameters = this.parameters; + e.parameters.add(parameter); + return e; + } + + @Override + public String toString() { + var str = "[" + this.name; + for (var p : this.parameters) { + str = str + " " + p.toString(); + } + return str + "]"; + } + } + + static public class Param { + private final String name; + // name: printable US-ASCII string ^[@=\]\"\s]+ + // "@" + private enterpise number "@\d+(\.\d+)*" + private final String value; + + public Param(String name, String value) { + this.name = name; // 7-Bit ASCII + this.value = value; // UTF-8 + } + + @Override + public String toString() { + return this.name + "=\"" + this.value + "\""; + } + } + + private List params; + + public StructuredData() { + this.params = new ArrayList<>(); + } + + public StructuredData(List params) { + this.params = params; + } + + public String toString() { + if (this.params.size() == 0) { + return "-"; + } + var str = ""; + for (var p : this.params) { + str = str + p.toString(); + } + return str; + } + + public StructuredData add(Element e) { + var p = this.params; + p.add(e); + return new StructuredData(p); + } +} diff --git a/src/main/java/vs/messagingmonitor/SyslogMessage.java b/src/main/java/vs/messagingmonitor/SyslogMessage.java new file mode 100644 index 0000000..d326a57 --- /dev/null +++ b/src/main/java/vs/messagingmonitor/SyslogMessage.java @@ -0,0 +1,159 @@ +package vs.messagingmonitor; + +import java.io.Serializable; +import java.text.SimpleDateFormat; +import java.util.Date; + +/** + * RFC 5424 (https://datatracker.ietf.org/doc/html/rfc5424) compliant log + * messages as immutable Java objects + * + * @author Sandro Leuchter + * + */ +public class SyslogMessage implements Serializable { + private static final long serialVersionUID = -5895573029109990861L; + private final Facility fac; + private final Severity sev; + private final AsciiChars.L255 host; + private final AsciiChars.L048 appName; + private final AsciiChars.L128 procId; + private final AsciiChars.L032 msgId; + private final StructuredData data; + private final Message message; + + public SyslogMessage(Facility fac, Severity sev, AsciiChars.L255 host, + AsciiChars.L048 appName, AsciiChars.L128 procId, + AsciiChars.L032 msgId, StructuredData data, Message message) { + this.fac = fac; + this.sev = sev; + this.host = host; + this.appName = appName; + this.procId = procId; + this.msgId = msgId; + this.data = data; + this.message = message; + } + + public Facility fac() { + return this.fac; + } + + + public Severity sev() { + return sev; + } + + public AsciiChars.L255 host() { + return host; + } + + public AsciiChars.L048 appName() { + return appName; + } + + public AsciiChars.L128 procId() { + return procId; + } + + public AsciiChars.L032 msgId() { + return msgId; + } + + public StructuredData data() { + return data; + } + + public Message message() { + return message; + } + + public static int version() { + return VERSION; + } + + + public static enum Facility { + KERNEL, USER, MAIL_SYSTEM, SYS_DAEMON, SECURITY1, INTERNAL, PRINTER, + NEWS, UUCP, CLOCK1, SECURITY2, FTP, NTP, AUDIT, ALERT, CLOCK2, LOCAL0, + LOCAL1, LOCAL2, LOCAL3, LOCAL4, LOCAL5, LOCAL6, LOCAL7; + } + + public static enum Severity { + EMERGENCY, ALERT, CRITICAL, ERROR, WARNING, NOTICE, INFORMATIONAL, + DEBUG; + } + + public static interface Message { + public Object message(); + + public int length(); + } + + public static class BinaryMessage implements Message { + private Byte[] message; + + public BinaryMessage(Byte[] message) { + this.message = message; + } + + @Override + public String toString() { + return message.toString(); + } + + @Override + public Object message() { + return this.message; + } + + @Override + public int length() { + return this.message.length; + } + } + + public static class TextMessage implements Message { + private String message; // UTF8 + + public TextMessage(String message) { + this.message = message; + } + + @Override + public String toString() { + return "\u00EF\u00BB\u00BF" + message.toString(); + } + + @Override + public Object message() { + return this.message; + } + + @Override + public int length() { + return this.message.length(); + } + } + + static final int VERSION = 1; // RFC 5424, Mar 2009 + + @Override + public String toString() { + var prival = String.valueOf(fac().ordinal() * 8 + sev().ordinal()); + var d = ""; + if (data() != null) { + d = " " + data(); + } + var m = ""; + if (message() != null && message().message() != null + && message().length() > 0) { + m = " " + message(); + } + var timestamp = new SimpleDateFormat("yyyy-MM-dd'T'HH:mm:ssXXX") + .format(new Date()); + return "<" + prival + ">" + VERSION + " " + timestamp + " " + + host().toString() + " " + appName().toString() + " " + + procId().toString() + " " + msgId().toString() + d + m; + } +} diff --git a/src/main/java/vs/messagingmonitor/WebappServlet.java b/src/main/java/vs/messagingmonitor/WebappServlet.java new file mode 100644 index 0000000..d31a7a8 --- /dev/null +++ b/src/main/java/vs/messagingmonitor/WebappServlet.java @@ -0,0 +1,41 @@ +package vs.messagingmonitor; + +import java.io.*; +import java.util.stream.Collectors; + +import com.fasterxml.jackson.databind.JsonNode; +import com.fasterxml.jackson.databind.ObjectMapper; +import jakarta.servlet.ServletException; +import jakarta.servlet.http.*; +import jakarta.servlet.annotation.*; + +@WebServlet("/webapp") +public class WebappServlet extends HttpServlet { + private ObjectMapper objectMapper = new ObjectMapper(); + + @Override + public void doPost(HttpServletRequest request, HttpServletResponse response) throws IOException, ServletException { + String jsonString = request.getReader().lines().collect(Collectors.joining()); + JsonNode jsonData = objectMapper.readTree(jsonString); + + String topic = ""; + String address = ""; + String channel = ""; + + if (jsonData.has(("topic"))) { + topic = jsonData.get("topic").asText(); + } + + if (jsonData.has("address")) { + address = jsonData.get("address").asText(); + } + + if (jsonData.has("channel")) { + channel = jsonData.get("channel").asText(); + } + + WebappWebsocket.addReceiver(topic, address, channel); + + response.getWriter().append("Success"); + } +} \ No newline at end of file diff --git a/src/main/java/vs/messagingmonitor/WebappWebsocket.java b/src/main/java/vs/messagingmonitor/WebappWebsocket.java new file mode 100644 index 0000000..37de542 --- /dev/null +++ b/src/main/java/vs/messagingmonitor/WebappWebsocket.java @@ -0,0 +1,75 @@ +package vs.messagingmonitor; + +import jakarta.websocket.*; +import jakarta.websocket.server.ServerEndpoint; +import org.eclipse.paho.client.mqttv3.*; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + + +@ServerEndpoint("/syslog") +public class WebappWebsocket { + private static List clients = new ArrayList<>(); + private static MqttReceiver receiverOne = null; + private static MqttReceiver receiverTwo = null; + + public static void sendMessage(String message) throws IOException { + synchronized (WebappWebsocket.clients) { + for (Session client: WebappWebsocket.clients) { + if (client.isOpen()) { + client.getBasicRemote().sendText(message); + } + } + } + } + + public static synchronized void addReceiver(String topic, String broker, String channel) { + topic = Conf.ROOTTOPIC + "/" + topic; + removeReceiver(channel); + if ("one".equals(channel)) { + receiverOne = new MqttReceiver("one", topic, broker); + } + if ("two".equals(channel)) { + receiverTwo = new MqttReceiver("two", topic, broker); + } + } + + public static synchronized void removeReceiver(String channel) { + if ("one".equals(channel)) { + if (receiverOne != null) { + receiverOne.disconnect(); + receiverOne = null; + } + } + if ("two".equals(channel)) { + if (receiverTwo != null) { + receiverTwo.disconnect(); + receiverTwo = null; + } + } + } + + + @OnOpen + public void onOpen(Session session) { + synchronized (WebappWebsocket.clients) { + System.out.println("New client!"); + //TODO send current open topics + WebappWebsocket.clients.add(session); + } + try { + session.getBasicRemote().sendText("Websocket connection established\n"); + } catch (IOException e) { + e.printStackTrace(System.err); + } + } + + @OnClose + public void close(Session session) { + synchronized (WebappWebsocket.clients) { + WebappWebsocket.clients.remove(session); + } + } +} diff --git a/src/main/webapp/WEB-INF/web.xml b/src/main/webapp/WEB-INF/web.xml new file mode 100644 index 0000000..7eac129 --- /dev/null +++ b/src/main/webapp/WEB-INF/web.xml @@ -0,0 +1,15 @@ + + + + + + + + + + + + \ No newline at end of file diff --git a/src/main/webapp/css/styles.css b/src/main/webapp/css/styles.css new file mode 100644 index 0000000..6776ee1 --- /dev/null +++ b/src/main/webapp/css/styles.css @@ -0,0 +1,89 @@ +:root { + --text-color: #FFFFFF; +} + +body { + display: flex; + flex-direction: column; + font-family: 'Segoe UI', Tahoma, Geneva, Verdana, sans-serif; + line-height: 1.6; + height: 100vh; + background: linear-gradient(90deg, #1A1625, #2D1B69); + color: var(--text-color); + overflow: hidden; + margin: 0; + margin-left: 5%; +} + +.content-area { + display: flex; + flex-direction: row; + justify-content: space-between; + height: 100%; + margin-right: 5%; + margin-bottom: 5%; + /*border: 2px solid red;*/ + overflow: hidden; +} + +.input-field-wrapper { + display: flex; + flex-direction: column; + justify-content: flex-start; + gap: 3%; +} + +.input-field { + //display: block; + width: fit-content; + padding: 20px; + border: 2px solid rgb(97, 10, 173); + border-radius: 5px; +} + +.channel-header { + color: #a8b3e2; + font-weight: 600; + font-size: 1.25rem; +} + +.input-button-wrapper { + display: flex; + flex-direction: row; + justify-content: space-between; +} + +.input-button { + color: var(--text-color); + border: none; + padding: 5px 10px; + border-radius: 6px; + font-weight: 500; + transition: background 0.3s; +} + +.connect-button { + background: #667eea; + +} +.connect-btn:hover { background: #5a6fd8; } + +.delete-button { + background: #e53e3e; +} +.delete-btn:hover { background: #c53030; } + +.message-box { + width: 100%; + height: 100%; + margin-left: 20%; + background: #1a202c; + border: 1px solid #4a5568; + border-radius: 8px; + padding: 15px; + overflow-y: auto; + color: white; + font-family: monospace; + white-space: pre-wrap; + box-sizing: border-box; +} diff --git a/src/main/webapp/index.html b/src/main/webapp/index.html new file mode 100644 index 0000000..5789100 --- /dev/null +++ b/src/main/webapp/index.html @@ -0,0 +1,52 @@ + + + + + Message Monitor + + + +

Message Monitor

+

MQTT Kanäle

+
+
+
+
Kanal 1
+
+
+ +
+

+ +
+ + +
+
+ +
+
Kanal 2
+
+
+ +
+

+ +
+ + +
+
+
+
+ +
+
+ + + + diff --git a/src/main/webapp/index.jsp b/src/main/webapp/index.jsp new file mode 100644 index 0000000..dd88878 --- /dev/null +++ b/src/main/webapp/index.jsp @@ -0,0 +1,13 @@ +<%@ page contentType="text/html; charset=UTF-8" pageEncoding="UTF-8" %> + + + + JSP - Hello World + + +

<%= "Hello World!" %> +

+
+Hello Servlet + + \ No newline at end of file diff --git a/src/main/webapp/js/app.js b/src/main/webapp/js/app.js new file mode 100644 index 0000000..df5e5c8 --- /dev/null +++ b/src/main/webapp/js/app.js @@ -0,0 +1,79 @@ +let websocket = null; +const messageBox = document.getElementById('messageBox'); + +window.addEventListener('load', function() { + connectWebSocket(); +}); + +function connectWebSocket() { + const wsUrl = 'syslog'; + console.log("Creating connection to: " + wsUrl) + websocket = new WebSocket(wsUrl); + + websocket.onopen = function(event) { + console.log('WebSocket connected successfully'); + }; + + websocket.onmessage = function(event) { + console.log('Message from server:', event.data); + messageBox.textContent += event.data + '\n'; + messageBox.scrollTop = messageBox.scrollHeight; + }; +} + +const Channel = { + ONE: "one", + TWO: "two" +} + +async function connectChannelOne() { + await connect(Channel.ONE); +} + +async function connectChannelTwo() { + await connect(Channel.TWO); +} + +async function connect(channel) { + var data = {}; + + if (channel === Channel.ONE) { + data = { + topic: document.getElementById('topic1').value, + address: document.getElementById('address1').value, + channel: Channel.ONE + } + } + + if (channel === Channel.TWO) { + data = { + topic: document.getElementById('topic2').value, + address: document.getElementById('address2').value, + channel: Channel.TWO + } + } + await sendData(data, channel) +} + +async function sendData(data, channel) { + const response = await fetch("webapp", { + method: "POST", + headers: {'Content-Type': 'application/json'}, + body: JSON.stringify(data) + }) + + console.log(response) + const text = await response.text() + console.log(text) + + if (response.status !== 200) { + displayError(channel) + return + } + + //TODO websocket connection aufbauen +} + +function displayError(channel) { + +} \ No newline at end of file