From 28e091fe8c7495289581fe89f677452a1f1e525f Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Thu, 23 Dec 2021 10:09:16 +0300 Subject: [PATCH 01/49] [TH2-2806] Initial commit --- build.gradle | 55 ++++ gradle.properties | 1 + gradle/wrapper/gradle-wrapper.jar | Bin 0 -> 59536 bytes gradle/wrapper/gradle-wrapper.properties | 5 + gradlew | 185 ++++++++++++ gradlew.bat | 89 ++++++ settings.gradle | 2 + .../ditry/pillar/handler/PillarHandler.kt | 271 +++++++++++++++++ .../pillar/handler/PillarHandlerSettings.kt | 33 +++ .../pillar/handler/PillarMessageDecoder.kt | 213 +++++++++++++ .../pillar/handler/PillarMessageEncoder.kt | 136 +++++++++ .../ditry/pillar/handler/util/PillarUtils.kt | 122 ++++++++ src/test/java/TestHandler.kt | 280 ++++++++++++++++++ 13 files changed, 1392 insertions(+) create mode 100644 build.gradle create mode 100644 gradle.properties create mode 100644 gradle/wrapper/gradle-wrapper.jar create mode 100644 gradle/wrapper/gradle-wrapper.properties create mode 100644 gradlew create mode 100644 gradlew.bat create mode 100644 settings.gradle create mode 100644 src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt create mode 100644 src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerSettings.kt create mode 100644 src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt create mode 100644 src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageEncoder.kt create mode 100644 src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/util/PillarUtils.kt create mode 100644 src/test/java/TestHandler.kt diff --git a/build.gradle b/build.gradle new file mode 100644 index 0000000..0699596 --- /dev/null +++ b/build.gradle @@ -0,0 +1,55 @@ +/* + * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) + * + * Licensed 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 + * + * http://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. + */ + +plugins { + id 'java' + id 'org.jetbrains.kotlin.jvm' version '1.6.0' +} + +group 'org.exactpro.th2' +version = release_version + +repositories { + mavenCentral() + maven { + name 'Sonatype_snapshots' + url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' + } +} + +dependencies { + implementation 'com.exactpro.th2:sailfish-utils:3.12.2' + implementation 'com.exactpro.th2:conn-dirty-tcp-core:0.0.1-th2-2785-1601754947-SNAPSHOT' + + testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' + testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' + testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0' +} + +test { + useJUnitPlatform() +} +compileKotlin { + kotlinOptions { + jvmTarget = "1.8" + } +} +compileTestKotlin { + kotlinOptions { + jvmTarget = "1.8" + } +} \ No newline at end of file diff --git a/gradle.properties b/gradle.properties new file mode 100644 index 0000000..a0049e4 --- /dev/null +++ b/gradle.properties @@ -0,0 +1 @@ +release_version=0.0.0 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar new file mode 100644 index 0000000000000000000000000000000000000000..7454180f2ae8848c63b8b4dea2cb829da983f2fa GIT binary patch literal 59536 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 QuEJmfE|#`Dqx|px0L@K;Y5)KL literal 0 HcmV?d00001 diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties new file mode 100644 index 0000000..69a9715 --- /dev/null +++ b/gradle/wrapper/gradle-wrapper.properties @@ -0,0 +1,5 @@ +distributionBase=GRADLE_USER_HOME +distributionPath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1-bin.zip +zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew new file mode 100644 index 0000000..744e882 --- /dev/null +++ b/gradlew @@ -0,0 +1,185 @@ +#!/usr/bin/env sh + +# +# Copyright 2015 the original author or authors. +# +# Licensed 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. +# + +############################################################################## +## +## Gradle start up script for UN*X +## +############################################################################## + +# Attempt to set APP_HOME +# Resolve links: $0 may be a link +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 +SAVED="`pwd`" +cd "`dirname \"$PRG\"`/" >/dev/null +APP_HOME="`pwd -P`" +cd "$SAVED" >/dev/null + +APP_NAME="Gradle" +APP_BASE_NAME=`basename "$0"` + +# Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' + +# Use the maximum available, or set MAX_FD != -1 to use that value. +MAX_FD="maximum" + +warn () { + echo "$*" +} + +die () { + echo + echo "$*" + echo + exit 1 +} + +# OS specific support (must be 'true' or 'false'). +cygwin=false +msys=false +darwin=false +nonstop=false +case "`uname`" in + CYGWIN* ) + cygwin=true + ;; + Darwin* ) + darwin=true + ;; + MSYS* | MINGW* ) + msys=true + ;; + NONSTOP* ) + nonstop=true + ;; +esac + +CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + + +# Determine the Java command to use to start the JVM. +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 + if [ ! -x "$JAVACMD" ] ; then + die "ERROR: JAVA_HOME is set to an invalid directory: $JAVA_HOME + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." + fi +else + JAVACMD="java" + which java >/dev/null 2>&1 || die "ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. + +Please set the JAVA_HOME variable in your environment to match the +location of your Java installation." +fi + +# Increase the maximum file descriptors if we can. +if [ "$cygwin" = "false" -a "$darwin" = "false" -a "$nonstop" = "false" ] ; then + MAX_FD_LIMIT=`ulimit -H -n` + if [ $? -eq 0 ] ; then + if [ "$MAX_FD" = "maximum" -o "$MAX_FD" = "max" ] ; then + MAX_FD="$MAX_FD_LIMIT" + fi + ulimit -n $MAX_FD + if [ $? -ne 0 ] ; then + warn "Could not set maximum file descriptor limit: $MAX_FD" + fi + else + warn "Could not query maximum file descriptor limit: $MAX_FD_LIMIT" + fi +fi + +# For Darwin, add options to specify how the application appears in the dock +if $darwin; then + GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" +fi + +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then + APP_HOME=`cygpath --path --mixed "$APP_HOME"` + CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + + JAVACMD=`cygpath --unix "$JAVACMD"` + + # We build the pattern for arguments to be converted via cygpath + ROOTDIRSRAW=`find -L / -maxdepth 1 -mindepth 1 -type d 2>/dev/null` + SEP="" + for dir in $ROOTDIRSRAW ; do + ROOTDIRS="$ROOTDIRS$SEP$dir" + SEP="|" + done + OURCYGPATTERN="(^($ROOTDIRS))" + # Add a user-defined pattern to the cygpath arguments + if [ "$GRADLE_CYGPATTERN" != "" ] ; then + OURCYGPATTERN="$OURCYGPATTERN|($GRADLE_CYGPATTERN)" + fi + # Now convert the arguments - kludge to limit ourselves to /bin/sh + i=0 + for arg in "$@" ; do + CHECK=`echo "$arg"|egrep -c "$OURCYGPATTERN" -` + CHECK2=`echo "$arg"|egrep -c "^-"` ### Determine if an option + + if [ $CHECK -ne 0 ] && [ $CHECK2 -eq 0 ] ; then ### Added a condition + eval `echo args$i`=`cygpath --path --ignore --mixed "$arg"` + else + eval `echo args$i`="\"$arg\"" + fi + i=`expr $i + 1` + done + case $i in + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + esac +fi + +# Escape application args +save () { + for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done + echo " " +} +APP_ARGS=`save "$@"` + +# Collect all arguments for the java command, following the shell quoting and substitution rules +eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" + +exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat new file mode 100644 index 0000000..107acd3 --- /dev/null +++ b/gradlew.bat @@ -0,0 +1,89 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem 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, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + +@if "%DEBUG%" == "" @echo off +@rem ########################################################################## +@rem +@rem Gradle startup script for Windows +@rem +@rem ########################################################################## + +@rem Set local scope for the variables with windows NT shell +if "%OS%"=="Windows_NT" setlocal + +set DIRNAME=%~dp0 +if "%DIRNAME%" == "" set DIRNAME=. +set APP_BASE_NAME=%~n0 +set APP_HOME=%DIRNAME% + +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + +@rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" + +@rem Find java.exe +if defined JAVA_HOME goto findJavaFromJavaHome + +set JAVA_EXE=java.exe +%JAVA_EXE% -version >NUL 2>&1 +if "%ERRORLEVEL%" == "0" goto execute + +echo. +echo ERROR: JAVA_HOME is not set and no 'java' command could be found in your PATH. +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:findJavaFromJavaHome +set JAVA_HOME=%JAVA_HOME:"=% +set JAVA_EXE=%JAVA_HOME%/bin/java.exe + +if exist "%JAVA_EXE%" goto execute + +echo. +echo ERROR: JAVA_HOME is set to an invalid directory: %JAVA_HOME% +echo. +echo Please set the JAVA_HOME variable in your environment to match the +echo location of your Java installation. + +goto fail + +:execute +@rem Setup the command line + +set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + + +@rem Execute Gradle +"%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %* + +:end +@rem End local scope for the variables with windows NT shell +if "%ERRORLEVEL%"=="0" goto mainEnd + +:fail +rem Set variable GRADLE_EXIT_CONSOLE if you need the _script_ return code instead of +rem the _cmd.exe /c_ return code! +if not "" == "%GRADLE_EXIT_CONSOLE%" exit 1 +exit /b 1 + +:mainEnd +if "%OS%"=="Windows_NT" endlocal + +:omega diff --git a/settings.gradle b/settings.gradle new file mode 100644 index 0000000..a3e9af4 --- /dev/null +++ b/settings.gradle @@ -0,0 +1,2 @@ +rootProject.name = 'th2-conn-ditry-pillar' + diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt new file mode 100644 index 0000000..45f675c --- /dev/null +++ b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt @@ -0,0 +1,271 @@ +/* + * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) + * + * Licensed 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 + * + * http://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. + */ + +package com.exactpro.th2.conn.ditry.pillar.handler + +import com.exactpro.th2.conn.dirty.tcp.core.api.IChannel +import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandler +import com.exactpro.th2.conn.dirty.tcp.core.api.impl.Channel +import com.exactpro.th2.conn.ditry.pillar.handler.util.* +import io.netty.buffer.ByteBuf +import io.netty.buffer.Unpooled +import mu.KotlinLogging +import java.util.concurrent.Executors +import java.util.concurrent.Future +import java.util.concurrent.TimeUnit + +class PillarHandler(private val channel: Channel): IProtocolHandler { + private val logger = KotlinLogging.logger {} + + private var state = State.SESSION_CLOSE + + val settings = PillarHandlerSettings() + + private val executor = Executors.newSingleThreadScheduledExecutor() + + private var clientFuture: Future<*>? = null + + private lateinit var sentHeartbeatCommand: Runnable + + private var serverFuture: Future<*>? = null + + private lateinit var receivedHeartbeatCommand: Runnable + + private lateinit var streamId: StreamIdEncode + + fun initCommand(){ + if(settings.heartbeatInterval <= 0L) { + throw Exception("Heartbeat sending interval must be greater than zero") + } + + sentHeartbeatCommand = Runnable { + startSendHeartBeats() + } + + if(settings.streamAvailInterval <= 0L) { + throw Exception("StreamAvail sending interval must be greater than zero") + } + + receivedHeartbeatCommand = Runnable { + receivedHeartBeats() + } + } + + override fun onOpen() { + when (state){ + State.SESSION_CLOSE -> { + state = State.SESSION_CREATED + logger.info { "Setting a new state -> $state" } + + channel.open() + + val login = Login(settings) + channel.send(login.login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE) + + initCommand() + startSendHeartBeats() + logger.info { "Connected handler" } + } + else -> logger.info { "Handler is already connected" } + } + } + + override fun onReceive(buffer: ByteBuf): ByteBuf? { + + val bufferLength = buffer.readableBytes() + if (bufferLength == 0) { + logger.warn { "Cannot parse empty buffer" } + return null + } + + buffer.markReaderIndex() + val messageType = buffer.readShort().toInt() + val messageLength = buffer.readShort().toInt() + buffer.resetReaderIndex() + + if (!MessageType.contains(messageType)){ + buffer.resetReaderIndex() + throw Exception ("Message type is not supported: $messageType") + } + + if(bufferLength < messageLength) { + logger.warn { "Buffer length is less than the declared one: $bufferLength -> $messageLength" } + return null + } + + if(bufferLength > messageLength) { + logger.warn { "Buffer length is longer than the declared one: $bufferLength -> $messageLength" } + val buf: ByteBuf = Unpooled.buffer(messageLength) + buffer.resetReaderIndex() + buf.writeBytes(buffer, 0, messageLength) + buffer.readerIndex(messageLength) + return buf + } + + return buffer + } + + override fun onIncoming(message: ByteBuf): Map { + val msgHeader = MsgHeader(message) + + when (val msgType = msgHeader.type) { + MessageType.LOGIN_RESPONSE.type -> { + logger.info { "Type message - LoginResponse" } + val mapLoginResponse = LoginResponse(message).loginResponse() + + when (val status = Status.getStatus(mapLoginResponse[STATUS_FIELD_NAME]!!.toShort())) { + Status.OK -> { + logger.info("Login successful. Start sending heartbeats.") + state = State.LOGGED_IN + logger.info { "Setting a new state -> $state" } + } + Status.NOT_LOGGED_IN -> { + if(state == State.SESSION_CREATED) { + stopSendHeartBeats() + state = State.SESSION_CLOSE + } + logger.info("Received `not logged in` status. Fall in to error state.") + close() + } + else -> { + throw Exception("Received $status status.") + } + } + return messageMetadata(MessageType.LOGIN_RESPONSE) + } + + MessageType.STREAM_AVAIL.type -> { + logger.info { "Type message - StreamAvail" } + val mapStreamAvail = StreamAvail(message).streamAvail() + streamId = StreamIdEncode(StreamId(message)) + val open = Open( + streamId.streamId(), + mapStreamAvail[NEXT_SEQ_FIELD_NAME]!!.toInt(), + mapStreamAvail[STREAM_TYPE_FIELD_NAME]!!.toInt() + ) + + channel.send( + open.open(), + messageMetadata(MessageType.OPEN), IChannel.SendMode.MANGLE + ) + + serverFuture = + executor.schedule(receivedHeartbeatCommand, settings.streamAvailInterval, TimeUnit.MILLISECONDS) + + return messageMetadata(MessageType.STREAM_AVAIL) + } + + MessageType.OPEN_RESPONSE.type -> { + logger.info { "Type message - OpenResponse" } + val mapOpenResponse = OpenResponse(message).openResponse() + + when (Status.getStatus(mapOpenResponse[STATUS_FIELD_NAME]!!.toShort())) { + Status.OK -> { + logger.info("Open successful.") + } + Status.NO_STREAM_PERMISSION -> { + logger.warn { "No stream permission" } + } + else -> { + throw Exception("This is not an OpenResponse status") + } + } + return messageMetadata(MessageType.OPEN_RESPONSE) + } + + MessageType.CLOSE_RESPONSE.type -> { + logger.info { "Type message - CloseResponse" } + val mapCloseResponse = CloseResponse(message).closeResponse() + when (Status.getStatus(mapCloseResponse[STATUS_FIELD_NAME]!!.toShort())) { + Status.OK -> { + logger.info("Open successful.") + } + Status.STREAM_NOT_OPEN -> { + logger.warn { "Stream not open" } + } + else -> { + throw Exception("This is not an CloseResponse status") + } + } + return messageMetadata(MessageType.CLOSE_RESPONSE) + } + + MessageType.SEQMSG.type -> { + logger.info { "Type message - SeqMsg" } + return messageMetadata(MessageType.SEQMSG) + } + + else -> { + throw Exception("Message type is not supported: $msgType") + } + } + } + + override fun onOutgoing(message: ByteBuf, metadata: Map): Map { + val buffer: ByteBuf = Unpooled.buffer(message.readableBytes() + 4) + buffer.writeShort(metadata[TYPE_FIELD_NAME]!!.toInt()) + buffer.writeShort(message.readableBytes() + 4) + buffer.writeBytes(message) + return metadata + } + + override fun onClose() { + when (state != State.SESSION_CLOSE) { + true -> { + state = State.SESSION_CLOSE + logger.info { "Setting a new state -> $state" } + + channel.close() + logger.info { "Disconnected handler" } + } + else -> logger.info { "Handler is already disconnected" } + } + } + + override fun close() { + executor.shutdownNow() + state = State.LOGGED_OUT + logger.info { "Setting a new state -> $state" } + val close = Close(streamId.streamId()) + channel.send(close.close(), messageMetadata(MessageType.CLOSE), IChannel.SendMode.MANGLE) + } + + private fun startSendHeartBeats(){ + val heartbeat = Heartbeat() + channel.send(heartbeat.heartbeat(), messageMetadata(MessageType.HEARTBEAT), IChannel.SendMode.MANGLE) + clientFuture = executor.schedule(sentHeartbeatCommand, settings.heartbeatInterval, TimeUnit.MILLISECONDS) + } + + private fun stopSendHeartBeats(){ + if (clientFuture != null) { + clientFuture!!.cancel(false) + } + } + + private fun receivedHeartBeats(){ + logger.error { "Server stopped sending heartbeat" } + state = State.NOT_HEARTBEAT + logger.info { "Setting a new state -> $state" } + close() + } + + private fun messageMetadata(messageType: MessageType): Map{ + val metadata = mutableMapOf() + metadata[TYPE_FIELD_NAME] = messageType.type.toString() + metadata[LENGTH_FIELD_NAME] = messageType.length.toString() + return metadata + } +} diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerSettings.kt b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerSettings.kt new file mode 100644 index 0000000..b88944d --- /dev/null +++ b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerSettings.kt @@ -0,0 +1,33 @@ +/* + * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) + * + * Licensed 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 + * + * http://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. + */ + +package com.exactpro.th2.conn.ditry.pillar.handler + +import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandlerSettings + +class PillarHandlerSettings: IProtocolHandlerSettings { + var username: String = "username" + + var password: String = "password" + + var mic: String = "mic" + + var version: String = "1.1" + + var heartbeatInterval: Long = 1000L + + var streamAvailInterval: Long = 5000L +} \ No newline at end of file diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt new file mode 100644 index 0000000..ddb6893 --- /dev/null +++ b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt @@ -0,0 +1,213 @@ +/* + * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) + * + * Licensed 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 + * + * http://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. + */ + +package com.exactpro.th2.conn.ditry.pillar.handler + +import com.exactpro.sf.util.DateTimeUtility +import com.exactpro.th2.conn.ditry.pillar.handler.util.* +import io.netty.buffer.ByteBuf +import java.math.BigDecimal +import java.math.BigInteger +import java.nio.charset.StandardCharsets +import java.time.LocalDateTime + +class MsgHeader(byteBuf: ByteBuf) { + val type: Int + private val length: Int + + init { + type = byteBuf.readShort().toInt() + length = byteBuf.readShort().toInt() + } + + fun msgHeader(): Map { + val header = mutableMapOf() + header[TYPE_FIELD_NAME] = type.toString() + header[LENGTH_FIELD_NAME] = length.toString() + return header + } +} + +class StreamId(byteBuf: ByteBuf){ + val envId: Short + val sessNum: Int + val streamType: Byte + val userId: UShort + val subId: Int + + init { + byteBuf.readerIndex(4) + envId = byteBuf.readUnsignedByte() + sessNum = byteBuf.readMedium() + streamType = byteBuf.readByte() + userId = byteBuf.readShort().toUShort() + subId = byteBuf.readByte().toInt() + } + + fun streamId(): Map { + val stream = mutableMapOf() + stream[ENV_ID_FIELD_NAME] = envId.toString() + stream[SESS_NUM_FIELD_NAME] = sessNum.toString() + stream[STREAM_TYPE_FIELD_NAME] = streamType.toString() + stream[USER_ID_FIELD_NAME] = userId.toString() + stream[SUB_ID_FIELD_NAME] = subId.toString() + return stream + } +} + +class LoginResponse(byteBuf: ByteBuf) { + private val charset = StandardCharsets.US_ASCII + private val header: MsgHeader + private val username: String + private val status: Byte + + init { + byteBuf.markReaderIndex() + byteBuf.readerIndex(0) + header = MsgHeader(byteBuf) + byteBuf.readerIndex(4) + username = byteBuf.readCharSequence(16, charset).toString().trimEnd(0.toChar()) + byteBuf.readerIndex(20) + status = byteBuf.readUnsignedByte().toByte() + } + + fun loginResponse(): Map { + val lResponse = mutableMapOf() + lResponse.putAll(header.msgHeader()) + lResponse[USERNAME_FIELD_NAME] = username + lResponse[STATUS_FIELD_NAME] = status.toString() + return lResponse + } +} + +class StreamAvail(byteBuf: ByteBuf) { + private val header: MsgHeader + private val streamId: StreamId + private val nextSeq: BigDecimal + private val access: Int + + init { + byteBuf.markReaderIndex() + byteBuf.readerIndex(0) + header = MsgHeader(byteBuf) + byteBuf.readerIndex(4) + streamId = StreamId(byteBuf) + byteBuf.readerIndex(12) + val bytes = ByteArray(8) + byteBuf.readBytes(bytes) + bytes.reverse() + nextSeq = BigInteger(1, bytes).toBigDecimal() + byteBuf.readerIndex(20) + access = byteBuf.readUnsignedByte().toInt() + } + + fun streamAvail(): Map { + val strAvail = mutableMapOf() + strAvail.putAll(header.msgHeader()) + strAvail.putAll(streamId.streamId()) + strAvail[NEXT_SEQ_FIELD_NAME] = nextSeq.toString() + strAvail[ACCESS_FIELD_NAME] = access.toString() + return strAvail + } +} + +class OpenResponse(byteBuf: ByteBuf) { + private val header: MsgHeader + private val streamId: StreamId + private val status: Int + private val access: Int + + init { + byteBuf.markReaderIndex() + byteBuf.readerIndex(0) + header = MsgHeader(byteBuf) + byteBuf.readerIndex(4) + streamId = StreamId(byteBuf) + byteBuf.readerIndex(12) + status = byteBuf.readUnsignedByte().toInt() + byteBuf.readerIndex(13) + access = byteBuf.readUnsignedByte().toInt() + } + + fun openResponse(): Map { + val oResponse = mutableMapOf() + oResponse.putAll(header.msgHeader()) + oResponse.putAll(streamId.streamId()) + oResponse[STATUS_FIELD_NAME] = status.toString() + oResponse[ACCESS_FIELD_NAME] = access.toString() + return oResponse + } +} + +class CloseResponse(byteBuf: ByteBuf){ + private val header: MsgHeader + private val streamId: StreamId + private val status: Int + + init { + byteBuf.markReaderIndex() + byteBuf.readerIndex(0) + header = MsgHeader(byteBuf) + byteBuf.readerIndex(4) + streamId = StreamId(byteBuf) + byteBuf.readerIndex(12) + status = byteBuf.readUnsignedByte().toInt() + } + + fun closeResponse(): Map { + val oResponse = mutableMapOf() + oResponse.putAll(header.msgHeader()) + oResponse.putAll(streamId.streamId()) + oResponse[STATUS_FIELD_NAME] = status.toString() + return oResponse + } +} + +class SeqMsg(byteBuf: ByteBuf) { + private val header: MsgHeader + private val streamId: StreamId + private val seqmsg: Int + private val reserved1: Int + private val timestamp: LocalDateTime + + init { + byteBuf.markReaderIndex() + byteBuf.readerIndex(0) + header = MsgHeader(byteBuf) + byteBuf.readerIndex(4) + streamId = StreamId(byteBuf) + seqmsg = byteBuf.readByte().toInt() + byteBuf.readerIndex(20) + reserved1 = byteBuf.readMedium() + byteBuf.readerIndex(24) + val time = byteBuf.readLongLE().toULong() + val milliseconds = time / 1_000_000UL + val nanoseconds = time % 1_000_000_000UL + timestamp = DateTimeUtility.toLocalDateTime(milliseconds.toLong(), nanoseconds.toInt()) + } + + fun seqMsg(): Map { + val sMsg = mutableMapOf() + sMsg.putAll(header.msgHeader()) + sMsg.putAll(streamId.streamId()) + sMsg[SEQMSG_ID_FIELD_NAME] = seqmsg.toString() + sMsg[RESERVED1_FIELD_NAME] = reserved1.toString() + sMsg[TIMESTAMP_FIELD_NAME] = timestamp.toString() + return sMsg + } +} + + diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageEncoder.kt b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageEncoder.kt new file mode 100644 index 0000000..fa33125 --- /dev/null +++ b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageEncoder.kt @@ -0,0 +1,136 @@ +/* + * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) + * + * Licensed 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 + * + * http://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. + */ + +package com.exactpro.th2.conn.ditry.pillar.handler + +import com.exactpro.th2.conn.ditry.pillar.handler.util.Access +import com.exactpro.th2.conn.ditry.pillar.handler.util.MODE_LOSSY +import com.exactpro.th2.conn.ditry.pillar.handler.util.MessageType +import com.exactpro.th2.conn.ditry.pillar.handler.util.StreamType +import io.netty.buffer.ByteBuf +import io.netty.buffer.Unpooled + +class Heartbeat{ + private val type: Int = MessageType.HEARTBEAT.type + private val length: Int = MessageType.HEARTBEAT.length + + fun heartbeat (): ByteBuf { + val beat: ByteBuf = Unpooled.buffer(length) + beat.writeShort(type) + beat.writeShort(length) + return beat + } +} + +class StreamIdEncode(var streamId: StreamId){ + private val streamIdBuf: ByteBuf = Unpooled.buffer(8) + + fun streamId(): ByteBuf{ + streamIdBuf.writeByte(streamId.envId.toInt()) + streamIdBuf.writeMedium(streamId.sessNum) + streamIdBuf.writeByte(streamId.streamType.toInt()) + streamIdBuf.writeShort(streamId.userId.toInt()) + streamIdBuf.writeByte(streamId.subId) + return streamIdBuf + } +} + +class Login(settings: PillarHandlerSettings) { + private val type: Int = MessageType.LOGIN.type + private val length: Int = MessageType.LOGIN.length + private val username: ByteArray + private val password: ByteArray + private val mic: ByteArray + private val version: ByteArray + + init { + username = settings.username.encodeToByteArray() + password = settings.password.encodeToByteArray() + mic = settings.mic.encodeToByteArray() + version = settings.version.encodeToByteArray() + } + + fun login (): ByteBuf{ + val loginMessage: ByteBuf = Unpooled.buffer(length) + loginMessage.markWriterIndex() + + loginMessage.writeShort(type) + loginMessage.writeShort(length) + + loginMessage.writeBytes(username) + + loginMessage.writerIndex(20) + loginMessage.writeBytes(password) + + loginMessage.writerIndex(52) + loginMessage.writeBytes(mic) + + loginMessage.writerIndex(56) + loginMessage.writeBytes(version) + return loginMessage + } +} + +class Open(private val streamId: ByteBuf, + private val startSeq: Int, + private val streamType: Int){ + private val type: Int = MessageType.OPEN.type + private val length: Int = MessageType.OPEN.length + + fun open(): ByteBuf{ + val openMessage: ByteBuf = Unpooled.buffer(length) + openMessage.markWriterIndex() + + openMessage.writeShort(type) + openMessage.writeShort(length) + + openMessage.writeBytes(streamId) + + openMessage.writerIndex(12) + openMessage.writeLongLE(startSeq.toLong()) + + openMessage.writerIndex(20) + openMessage.writeLongLE(startSeq.toLong()+1) + + openMessage.writerIndex(28) + if (streamType == StreamType.REF.value || streamType == StreamType.GT.value) + openMessage.writeByte(Access.READ.value.toInt()) + else if (streamType == StreamType.TG.value) + openMessage.writeByte(Access.WRITE.value.toInt()) + + openMessage.writerIndex(29) + openMessage.writeByte(MODE_LOSSY) + + return openMessage + } +} + +class Close(private val streamId: ByteBuf) { + private val type: Int = MessageType.CLOSE.type + private val length: Int = MessageType.CLOSE.length + + fun close(): ByteBuf { + val closeMessage: ByteBuf = Unpooled.buffer(length) + closeMessage.markWriterIndex() + + closeMessage.writeShort(type) + closeMessage.writeShort(length) + + closeMessage.writeBytes(streamId) + + return closeMessage + } +} diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/util/PillarUtils.kt b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/util/PillarUtils.kt new file mode 100644 index 0000000..bec05f9 --- /dev/null +++ b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/util/PillarUtils.kt @@ -0,0 +1,122 @@ +/* + * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) + * + * Licensed 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 + * + * http://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. + */ + +package com.exactpro.th2.conn.ditry.pillar.handler.util + +import kotlin.experimental.and +import kotlin.experimental.or + +const val TYPE_FIELD_NAME = "type" +const val LENGTH_FIELD_NAME = "length" + +const val ENV_ID_FIELD_NAME = "env_id" +const val SESS_NUM_FIELD_NAME = "sess_num" +const val STREAM_TYPE_FIELD_NAME = "stream_type" +const val USER_ID_FIELD_NAME = "user_id" +const val SUB_ID_FIELD_NAME = "sub_id" + +const val USERNAME_FIELD_NAME = "username" +const val PASSWORD_FIELD_NAME = "password" +const val MIC_FIELD_NAME = "mic" +const val VERSION_FIELD_NAME = "version" +const val STATUS_FIELD_NAME = "status" + +const val START_SEQ_FIELD_NAME = "start_seq" +const val END_SEQ_FIELD_NAME = "end_seq" +const val NEXT_SEQ_FIELD_NAME = "next_seq" +const val ACCESS_FIELD_NAME = "access" +const val MODE_FIELD_NAME = "mode" +const val MODE_LOSSY = 0 + +const val SEQMSG_ID_FIELD_NAME = "seqmsg" +const val RESERVED1_FIELD_NAME = "reserved1" +const val TIMESTAMP_FIELD_NAME = "timestamp" + +enum class State(val value: Int){ + SESSION_CREATED(0), + SESSION_CLOSE(1), + LOGGED_IN(2), + LOGGED_OUT(3), + NOT_HEARTBEAT(4); +} + +enum class Status(val value: Short) { + OK(0), + NOT_LOGGED_IN(18), + INVALID_LOGIN_DETAILS(24), + ALREADY_LOGGED_IN(27), + HEARTBEAT_TIMEOUT(28), + LOGIN_TIMEOUT(29), + INVALID_MESSAGE(33), + NO_STREAM_PERMISSION(54), + STREAM_NOT_OPEN(85); + + companion object { + fun getStatus(value: Short?): Status { + return values().find { it.value == value }!! + } + } +} + +enum class Access(val value: Short) { + READ(1), + WRITE(2), + THROTTLE_REJECT(4); + + companion object { + fun getPermission(permission: Short): Short { + var result: Short = 0 + values().forEach { access -> + result = result or (access.value and permission) + } + return result + } + } +} + +enum class StreamType (val value: Int){ + TG(15), + GT(13), + REF(33), + XDP(27); + companion object { + fun getStream(value: Int?): StreamType? { + return values().find { it.value == value } + } + } +} + +enum class MessageType(val type: Int, val length: Int) { + LOGIN(513, 76), + LOGIN_RESPONSE(514, 21), + STREAM_AVAIL(515, 21), + HEARTBEAT(516, 4), + OPEN(517, 30), + OPEN_RESPONSE(518, 14), + CLOSE(519, 12), + CLOSE_RESPONSE(520, 13), + SEQMSG(2309, 32); + + companion object { + fun getEnum(type: Int?): MessageType? { + return values().find { it.type == type } + } + + fun contains(type: Int): Boolean { + return values().find { it.type == type } != null + } + } +} diff --git a/src/test/java/TestHandler.kt b/src/test/java/TestHandler.kt new file mode 100644 index 0000000..49e5921 --- /dev/null +++ b/src/test/java/TestHandler.kt @@ -0,0 +1,280 @@ +import com.exactpro.th2.common.event.Event +import com.exactpro.th2.common.grpc.EventID +import com.exactpro.th2.common.grpc.RawMessage +import com.exactpro.th2.conn.dirty.tcp.core.ActionStreamExecutor +import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandler +import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolMangler +import com.exactpro.th2.conn.dirty.tcp.core.api.impl.Channel +import com.exactpro.th2.conn.ditry.pillar.handler.* +import com.exactpro.th2.conn.ditry.pillar.handler.util.* +import io.netty.buffer.ByteBuf +import io.netty.buffer.Unpooled +import io.netty.channel.EventLoopGroup +import io.netty.channel.nio.NioEventLoopGroup +import org.junit.jupiter.api.Assertions.assertEquals +import org.junit.jupiter.api.Nested +import org.junit.jupiter.api.Test +import org.junit.jupiter.api.assertThrows +import org.mockito.Mockito.mock +import com.nhaarman.mockitokotlin2.mock +import java.net.InetSocketAddress +import java.util.concurrent.Executor + + +class TestHandler { + private val address: InetSocketAddress = mock (InetSocketAddress::class.java) + val secure = true + private val sessionAlias: String = "sessionAlias" + private val reconnectDelay: Long = 1000L + private val handler: IProtocolHandler = mock (IProtocolHandler::class.java) + private val mangler: IProtocolMangler = mock (IProtocolMangler::class.java) + private val onEvent: (event: Event, parentEventId: EventID) -> Unit = mock{} + private val onMessage: (RawMessage) -> Unit = mock { } + val eventLoopGroup: EventLoopGroup = NioEventLoopGroup() + private val executor: Executor = mock (Executor::class.java) + private val onError: (stream: String, error: Throwable) -> Unit = mock{} + private val actionExecutor = ActionStreamExecutor(executor, onError) + val parentEventId = EventID.newBuilder().setId("root").build()!! + + private var channel = Channel(address, secure, sessionAlias, reconnectDelay, handler, mangler, onEvent, onMessage, eventLoopGroup, actionExecutor, parentEventId) + + @Nested + inner class Positive { + @Test + fun `sending LoginResponse with extra bytes`() { + val raw = byteArrayOf( + 2, 2, //type, + 0, 21, //length + 117, 115, 101, 114, 110, 97, 109, 101, 0, 0, 0, 0, 0, 0, 0, 0, //username + 0, //status + 117, 115, 101 + ) + + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel) + val data = pillarHandler.onReceive(buffer) + val returnMetadata = pillarHandler.onIncoming(data!!) + + assertEquals(514.toString(), returnMetadata[TYPE_FIELD_NAME]) + assertEquals(21.toString(), returnMetadata[LENGTH_FIELD_NAME]) + } + + @Test + fun `sending StreamAvail`() { + val raw = byteArrayOf( + 2, 3, //type, + 0, 21, //length + 5, 65, 0, 5, 4, -99, 95, 15, //stream_id: env_id(1), sess_num(3), stream_type, user_id(2), sub_id(1) + 23, 0, 0, 0, 0, 0, 0, 0, //next_seq + 6 //access + ) + + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel) + val data = pillarHandler.onReceive(buffer) + val returnMetadata = StreamAvail(data!!).streamAvail() + + assertEquals(515.toString(), returnMetadata[TYPE_FIELD_NAME]) + assertEquals(21.toString(), returnMetadata[LENGTH_FIELD_NAME]) + } + + @Test + fun `sending OpenResponse`() { + val raw = byteArrayOf( + 2, 6, //type, + 0, 14, //length + 5, 65, 0, 5, 4, -99, 95, 15, //stream_id: env_id(1), ses_num(3), stream_type(1) user_id(2), sub_id(1), + 0, //status + 2 //access + ) + + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel) + val data = pillarHandler.onReceive(buffer) + val returnMetadata = pillarHandler.onIncoming(data!!) + + assertEquals(518.toString(), returnMetadata[TYPE_FIELD_NAME]) + assertEquals(14.toString(), returnMetadata[LENGTH_FIELD_NAME]) + } + + @Test + fun `sending CloseResponse`() { + val raw = byteArrayOf( + 2, 8, //type, + 0, 13, //length + 5, 65, 0, 5, 4, -99, 95, 15, //stream_id: env_id(1), ses_num(4), user_id(2), stream_type(1) + 0 + ) + + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel) + val data = pillarHandler.onReceive(buffer) + val returnMetadata = pillarHandler.onIncoming(data!!) + + assertEquals(520.toString(), returnMetadata[TYPE_FIELD_NAME]) + assertEquals(13.toString(), returnMetadata[LENGTH_FIELD_NAME]) + } + + @Test + fun `sending SeqMsg`() { + val raw = byteArrayOf( + 9, 5, //type + 0, 32, //length + 5, 65, 0, 5, 4, -99, 95, 15, //stream_id: env_id(1), ses_num(4), user_id(2), stream_type(1) + 23, 0, 0, 0, 0, 0, 0, 0, //seq + 0, 0, 0, 0, //reserved1 + 1, 88, -67, -81, 0, 0, 0, 0, //timestamp + ) + + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel) + val data = pillarHandler.onReceive(buffer) + val returnMetadata = pillarHandler.onIncoming(data!!) + + assertEquals(2309.toString(), returnMetadata[TYPE_FIELD_NAME]) + assertEquals(32.toString(), returnMetadata[LENGTH_FIELD_NAME]) + } + + @Test + fun `assembling Login`() { + val settings = PillarHandlerSettings() + val login = Login(settings).login().array() + val raw = byteArrayOf( + 2, 1, //type:513, + 0, 76, //length:76 + 117, 115, 101, 114, 110, 97, 109, 101, 0, 0, 0, 0, 0, 0, 0, 0, //username + 112, 97, 115, 115, 119, 111, 114, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //password + 109, 105, 99, 0, //mic + 49, 46, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,// version + ) + + for (i in login.indices) + assertEquals(raw[i], login[i]) + } + + @Test + fun `assembling Open`() { + val stream = byteArrayOf( + 0, 0, 0, 0, 5, 65, 0, 5, 4, -99, 95, 15 + ) + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(stream) + val streamId = StreamIdEncode(StreamId(buffer)) + val open = Open(streamId.streamId(), 23, 15).open().array() + + val raw = byteArrayOf( + 2, 5, //type:517, + 0, 30, //length:30 + 5, 65, 0, 5, 4, -99, 95, 15, //stream_id: ses_num(3), env_id(1), user_id(2), sub_id(1), stream_type(1) + 23, 0, 0, 0, 0, 0, 0, 0, //start_seq + 24, 0, 0, 0, 0, 0, 0, 0, //end_seq + 2, //access + 0, //mode + ) + + for (i in open.indices) + assertEquals(raw[i], open[i]) + } + + @Test + fun `assembling Close`() { + + val stream = byteArrayOf( + 0, 0, 0, 0, 5, 65, 0, 5, 4, -99, 95, 15 + ) + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(stream) + val streamId = StreamIdEncode(StreamId(buffer)) + val close = Close(streamId.streamId()).close().array() + + val raw = byteArrayOf( + 2, 7, + 0, 12, + 5, 65, 0, 5, 4, -99, 95, 15 + ) + + for (i in close.indices) + assertEquals(raw[i], close[i]) + } + + @Test + fun `invalid size message`() { + val raw = byteArrayOf( + 9, 5, //type + 0, 32, //length + ) + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel) + assertEquals(null, pillarHandler.onReceive(buffer)) + } + + @Test + fun `empty message`() { + val buffer: ByteBuf = Unpooled.buffer() + val pillarHandler = PillarHandler(channel) + assertEquals(null, pillarHandler.onReceive(buffer)) + } + + @Test + fun `send onOutgoing`() { + val raw = byteArrayOf( + 5, 65, 0, 5, 4, -99, 95, 15 + ) + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel) + val metadata = mutableMapOf() + metadata[TYPE_FIELD_NAME] = 12.toString() + metadata[LENGTH_FIELD_NAME] = 12.toString() + + assertEquals(12.toString(), pillarHandler.onOutgoing(buffer, metadata)[TYPE_FIELD_NAME]) + } + } + + @Nested + inner class Negative { + + @Test + fun `invalid type message`() { + val raw = byteArrayOf( + 9, 9, //type + 0, 32, //length + ) + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel) + val exception = assertThrows { pillarHandler.onReceive(buffer) } + assertEquals("Message type is not supported: 2313", exception.message) + } + + @Test + fun `invalid heartbeat interval`() { + val pillarHandler = PillarHandler(channel) + pillarHandler.settings.heartbeatInterval = 0L + val exception = assertThrows { pillarHandler.initCommand() } + assertEquals("Heartbeat sending interval must be greater than zero", exception.message) + } + + @Test + fun `invalid LoginResponse`() { + val raw = byteArrayOf( + 2, 2, //type, + 0, 21, //length + 117, 115, 101, 114, 110, 97, 109, 101, 0, 0, 0, 0, 0, 0, 0, 0, //username + 85, //status + ) + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel) + val data = pillarHandler.onReceive(buffer) + val exception = assertThrows { pillarHandler.onIncoming(data!!) } + assertEquals("Received STREAM_NOT_OPEN status.", exception.message) + } + } +} \ No newline at end of file From f7a5c78b4b954baff71559abd383dbee6377b847 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Thu, 23 Dec 2021 16:47:46 +0300 Subject: [PATCH 02/49] [TH2-2806] Creating a special assembly --- .github/workflows/ci-unwelcome-words.yml | 23 ++++++++++++ .github/workflows/dev-docker-publish.yml | 47 ++++++++++++++++++++++++ .github/workflows/docker-publish.yml | 37 +++++++++++++++++++ Dockerfile | 9 +++++ build.gradle | 43 ++++++++++++++++++++-- 5 files changed, 156 insertions(+), 3 deletions(-) create mode 100644 .github/workflows/ci-unwelcome-words.yml create mode 100644 .github/workflows/dev-docker-publish.yml create mode 100644 .github/workflows/docker-publish.yml create mode 100644 Dockerfile diff --git a/.github/workflows/ci-unwelcome-words.yml b/.github/workflows/ci-unwelcome-words.yml new file mode 100644 index 0000000..a369f6e --- /dev/null +++ b/.github/workflows/ci-unwelcome-words.yml @@ -0,0 +1,23 @@ +name: CI + +on: + pull_request: + +jobs: + test: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + with: + ref: ${{ github.sha }} + - name: Checkout tool + uses: actions/checkout@v2 + with: + repository: exactpro-th2/ci-github-action + ref: master + token: ${{ secrets.PAT_CI_ACTION }} + path: ci-github-action + - name: Run CI action + uses: ./ci-github-action + with: + ref: ${{ github.sha }} \ No newline at end of file diff --git a/.github/workflows/dev-docker-publish.yml b/.github/workflows/dev-docker-publish.yml new file mode 100644 index 0000000..03c796d --- /dev/null +++ b/.github/workflows/dev-docker-publish.yml @@ -0,0 +1,47 @@ +name: Dev build and publish Docker distributions to Github Container Registry ghcr.io + +on: + push: + branches-ignore: + - master + - version-* + paths-ignore: + - README.md + +jobs: + build: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + # Prepare custom build version + - name: Get branch name + id: branch + run: echo ::set-output name=branch_name::${GITHUB_REF#refs/*/} + - name: Get release_version + id: ver + uses: christian-draeger/read-properties@1.0.1 + with: + path: gradle.properties + property: release_version + - name: Build custom release version + id: release_ver + run: echo ::set-output name=value::"${{ steps.ver.outputs.value }}-${{ steps.branch.outputs.branch_name }}-${{ github.run_id }}" + - name: Show custom release version + run: echo ${{ steps.release_ver.outputs.value }} + # Build and publish image + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.CR_PAT }} + - run: echo "::set-output name=REPOSITORY_NAME::$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" + id: meta + - name: Build and push + id: docker_build + uses: docker/build-push-action@v2 + with: + push: true + tags: ghcr.io/${{ github.repository }}:${{ steps.release_ver.outputs.value }} + labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.ver.outputs.value }} \ No newline at end of file diff --git a/.github/workflows/docker-publish.yml b/.github/workflows/docker-publish.yml new file mode 100644 index 0000000..9f51020 --- /dev/null +++ b/.github/workflows/docker-publish.yml @@ -0,0 +1,37 @@ +name: Build and publish Docker distributions to Github Container Registry ghcr.io + +on: + push: + branches: + - master + - version-* + paths: + - gradle.properties + +jobs: + build: + runs-on: ubuntu-20.04 + steps: + - uses: actions/checkout@v2 + - name: Set up Docker Buildx + uses: docker/setup-buildx-action@v1 + - uses: docker/login-action@v1 + with: + registry: ghcr.io + username: ${{ github.repository_owner }} + password: ${{ secrets.CR_PAT }} + - run: echo "::set-output name=REPOSITORY_NAME::$(echo '${{ github.repository }}' | awk -F '/' '{print $2}')" + id: meta + - name: Read version from gradle.properties + id: read_property + uses: christian-draeger/read-properties@1.0.1 + with: + path: ./gradle.properties + property: release_version + - name: Build and push + id: docker_build + uses: docker/build-push-action@v2 + with: + push: true + tags: ghcr.io/${{ github.repository }}:${{ steps.read_property.outputs.value }} + labels: com.exactpro.th2.${{ steps.meta.outputs.REPOSITORY_NAME }}=${{ steps.read_property.outputs.value }} \ No newline at end of file diff --git a/Dockerfile b/Dockerfile new file mode 100644 index 0000000..a7388e9 --- /dev/null +++ b/Dockerfile @@ -0,0 +1,9 @@ +FROM gradle:6.6-jdk11 AS build +ARG release_version +COPY ./ . +RUN gradle --no-daemon clean build dockerPrepare -Prelease_version=${release_version} + +FROM adoptopenjdk/openjdk11:alpine +WORKDIR /home +COPY --from=build /home/gradle/build/docker . +ENTRYPOINT ["/home/service/bin/service"] \ No newline at end of file diff --git a/build.gradle b/build.gradle index 0699596..43b1902 100644 --- a/build.gradle +++ b/build.gradle @@ -15,19 +15,47 @@ */ plugins { - id 'java' + id 'com.palantir.docker' version '0.25.0' + id 'com.github.harbby.gradle.serviceloader' version '1.1.8' id 'org.jetbrains.kotlin.jvm' version '1.6.0' + id 'application' } -group 'org.exactpro.th2' -version = release_version +ext { + sharedDir = file("${project.rootDir}/shared") + sailfishVersion = '3.2.1594' +} + +group 'org.example' +version '1.0-SNAPSHOT' repositories { + maven { + name 'MavenLocal' + url sharedDir + } + mavenCentral() maven { name 'Sonatype_snapshots' url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' } + + maven { + name 'Sonatype_releases' + url 'https://s01.oss.sonatype.org/content/repositories/releases/' + } + + mavenLocal() + + configurations.all { + resolutionStrategy.cacheChangingModulesFor 0, 'seconds' + resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds' + } + + maven { + url "https://plugins.gradle.org/m2/" + } } dependencies { @@ -40,9 +68,14 @@ dependencies { implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0' } +application { + mainClassName 'com.exactpro.th2.conn.dirty.tcp.core.MainKt' +} + test { useJUnitPlatform() } + compileKotlin { kotlinOptions { jvmTarget = "1.8" @@ -52,4 +85,8 @@ compileTestKotlin { kotlinOptions { jvmTarget = "1.8" } +} + +serviceLoader { + serviceInterface 'com.exactpro.th2.conn.dirty.tcp.core.api.IFactory' } \ No newline at end of file From 014a3991c88511a9f531353930eb0e511ba6c28d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Fri, 24 Dec 2021 09:38:42 +0300 Subject: [PATCH 03/49] [TH2-2806] Creating a special assembly --- .gitlab-ci.yml | 7 +++++++ 1 file changed, 7 insertions(+) create mode 100644 .gitlab-ci.yml diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml new file mode 100644 index 0000000..7bedeca --- /dev/null +++ b/.gitlab-ci.yml @@ -0,0 +1,7 @@ +variables: + APP_NAME: th2-codec-json + +include: + - project: vivarium/th2/pipelines + ref: v2 + file: /.gitlab-ci-java.yml \ No newline at end of file From 2d9c752091bd679114ea6d8c379e8bdf63845752 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Fri, 24 Dec 2021 09:56:27 +0300 Subject: [PATCH 04/49] [TH2-2806] Creating a special assembly --- build.gradle | 16 +++++++++++++++- 1 file changed, 15 insertions(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 43b1902..f33e51d 100644 --- a/build.gradle +++ b/build.gradle @@ -72,6 +72,20 @@ application { mainClassName 'com.exactpro.th2.conn.dirty.tcp.core.MainKt' } +applicationName = 'service' + +distTar { + archiveName "${applicationName}.tar" +} + +dockerPrepare { + dependsOn distTar +} + +docker { + copySpec.from(tarTree("$buildDir/distributions/${applicationName}.tar")) +} + test { useJUnitPlatform() } @@ -89,4 +103,4 @@ compileTestKotlin { serviceLoader { serviceInterface 'com.exactpro.th2.conn.dirty.tcp.core.api.IFactory' -} \ No newline at end of file +} From 94b9dbdeb7d3550d52adfcadd1d3c0a7868107de Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Fri, 24 Dec 2021 15:18:18 +0300 Subject: [PATCH 05/49] [TH2-2806] Update build.gradle, Dockerfile, gradle.properties, fixes PillarHandler, PillarMessageDecoder, TestHandler, add PillarHandlerFactory --- Dockerfile | 2 +- build.gradle | 38 ++++------ gradle.properties | 2 +- .../ditry/pillar/handler/PillarHandler.kt | 73 +++++++++---------- .../pillar/handler/PillarHandlerFactory.kt | 35 +++++++++ .../pillar/handler/PillarMessageDecoder.kt | 4 +- src/test/java/TestHandler.kt | 32 ++++---- 7 files changed, 104 insertions(+), 82 deletions(-) create mode 100644 src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerFactory.kt diff --git a/Dockerfile b/Dockerfile index a7388e9..9b5e925 100644 --- a/Dockerfile +++ b/Dockerfile @@ -1,4 +1,4 @@ -FROM gradle:6.6-jdk11 AS build +FROM gradle:7.1.0-jdk11 AS build ARG release_version COPY ./ . RUN gradle --no-daemon clean build dockerPrepare -Prelease_version=${release_version} diff --git a/build.gradle b/build.gradle index f33e51d..004e164 100644 --- a/build.gradle +++ b/build.gradle @@ -15,26 +15,16 @@ */ plugins { - id 'com.palantir.docker' version '0.25.0' + id 'com.palantir.docker' version '0.31.0' id 'com.github.harbby.gradle.serviceloader' version '1.1.8' id 'org.jetbrains.kotlin.jvm' version '1.6.0' id 'application' } -ext { - sharedDir = file("${project.rootDir}/shared") - sailfishVersion = '3.2.1594' -} - -group 'org.example' -version '1.0-SNAPSHOT' +group 'com.exactpro.th2' +version release_version repositories { - maven { - name 'MavenLocal' - url sharedDir - } - mavenCentral() maven { name 'Sonatype_snapshots' @@ -52,20 +42,24 @@ repositories { resolutionStrategy.cacheChangingModulesFor 0, 'seconds' resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds' } - - maven { - url "https://plugins.gradle.org/m2/" - } } dependencies { - implementation 'com.exactpro.th2:sailfish-utils:3.12.2' - implementation 'com.exactpro.th2:conn-dirty-tcp-core:0.0.1-th2-2785-1601754947-SNAPSHOT' + api platform('com.exactpro.th2:bom:3.0.0') + + implementation 'com.exactpro.th2:common:3.31.4' + implementation 'com.exactpro.th2:conn-dirty-tcp-core:0.0.1-th2-2785-1615274464-SNAPSHOT' + + implementation 'io.netty:netty-all:4.1.72.Final' + + implementation 'io.github.microutils:kotlin-logging:2.1.16' + + implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0' + + testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' - testImplementation "com.nhaarman.mockitokotlin2:mockito-kotlin:2.2.0" - implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0' } application { @@ -102,5 +96,5 @@ compileTestKotlin { } serviceLoader { - serviceInterface 'com.exactpro.th2.conn.dirty.tcp.core.api.IFactory' + serviceInterface 'com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandlerFactory' } diff --git a/gradle.properties b/gradle.properties index a0049e4..e7564ef 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1 +1 @@ -release_version=0.0.0 \ No newline at end of file +release_version=0.0.1 \ No newline at end of file diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt index 45f675c..1d73129 100644 --- a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt @@ -26,48 +26,38 @@ import mu.KotlinLogging import java.util.concurrent.Executors import java.util.concurrent.Future import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicReference -class PillarHandler(private val channel: Channel): IProtocolHandler { - private val logger = KotlinLogging.logger {} - - private var state = State.SESSION_CLOSE +class PillarHandler(private val channel: Channel, + private val settings: PillarHandlerSettings): IProtocolHandler { + companion object { + private val logger = KotlinLogging.logger { } + } - val settings = PillarHandlerSettings() + private var state = AtomicReference(State.SESSION_CLOSE) private val executor = Executors.newSingleThreadScheduledExecutor() private var clientFuture: Future<*>? = null - private lateinit var sentHeartbeatCommand: Runnable - private var serverFuture: Future<*>? = null - private lateinit var receivedHeartbeatCommand: Runnable - private lateinit var streamId: StreamIdEncode - fun initCommand(){ + init{ if(settings.heartbeatInterval <= 0L) { - throw Exception("Heartbeat sending interval must be greater than zero") - } - - sentHeartbeatCommand = Runnable { - startSendHeartBeats() + error("Heartbeat sending interval must be greater than zero") } if(settings.streamAvailInterval <= 0L) { - throw Exception("StreamAvail sending interval must be greater than zero") - } - - receivedHeartbeatCommand = Runnable { - receivedHeartBeats() + error("StreamAvail sending interval must be greater than zero") } } override fun onOpen() { - when (state){ + when (state.get()){ State.SESSION_CLOSE -> { - state = State.SESSION_CREATED + state.getAndSet(State.SESSION_CREATED) logger.info { "Setting a new state -> $state" } channel.open() @@ -75,7 +65,6 @@ class PillarHandler(private val channel: Channel): IProtocolHandler { val login = Login(settings) channel.send(login.login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE) - initCommand() startSendHeartBeats() logger.info { "Connected handler" } } @@ -98,7 +87,7 @@ class PillarHandler(private val channel: Channel): IProtocolHandler { if (!MessageType.contains(messageType)){ buffer.resetReaderIndex() - throw Exception ("Message type is not supported: $messageType") + error ("Message type is not supported: $messageType") } if(bufferLength < messageLength) { @@ -129,19 +118,19 @@ class PillarHandler(private val channel: Channel): IProtocolHandler { when (val status = Status.getStatus(mapLoginResponse[STATUS_FIELD_NAME]!!.toShort())) { Status.OK -> { logger.info("Login successful. Start sending heartbeats.") - state = State.LOGGED_IN + state.getAndSet(State.LOGGED_IN) logger.info { "Setting a new state -> $state" } } Status.NOT_LOGGED_IN -> { - if(state == State.SESSION_CREATED) { + if(state.get() == State.SESSION_CREATED) { stopSendHeartBeats() - state = State.SESSION_CLOSE + state.getAndSet(State.SESSION_CLOSE) } logger.info("Received `not logged in` status. Fall in to error state.") - close() + sendClose() } else -> { - throw Exception("Received $status status.") + error("Received $status status.") } } return messageMetadata(MessageType.LOGIN_RESPONSE) @@ -163,7 +152,7 @@ class PillarHandler(private val channel: Channel): IProtocolHandler { ) serverFuture = - executor.schedule(receivedHeartbeatCommand, settings.streamAvailInterval, TimeUnit.MILLISECONDS) + executor.schedule(this::startSendHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) return messageMetadata(MessageType.STREAM_AVAIL) } @@ -180,7 +169,7 @@ class PillarHandler(private val channel: Channel): IProtocolHandler { logger.warn { "No stream permission" } } else -> { - throw Exception("This is not an OpenResponse status") + error("This is not an OpenResponse status") } } return messageMetadata(MessageType.OPEN_RESPONSE) @@ -197,7 +186,7 @@ class PillarHandler(private val channel: Channel): IProtocolHandler { logger.warn { "Stream not open" } } else -> { - throw Exception("This is not an CloseResponse status") + error("This is not an CloseResponse status") } } return messageMetadata(MessageType.CLOSE_RESPONSE) @@ -209,7 +198,7 @@ class PillarHandler(private val channel: Channel): IProtocolHandler { } else -> { - throw Exception("Message type is not supported: $msgType") + error("Message type is not supported: $msgType") } } } @@ -223,9 +212,9 @@ class PillarHandler(private val channel: Channel): IProtocolHandler { } override fun onClose() { - when (state != State.SESSION_CLOSE) { + when (state.get() != State.SESSION_CLOSE) { true -> { - state = State.SESSION_CLOSE + state.getAndSet(State.SESSION_CLOSE) logger.info { "Setting a new state -> $state" } channel.close() @@ -236,8 +225,12 @@ class PillarHandler(private val channel: Channel): IProtocolHandler { } override fun close() { - executor.shutdownNow() - state = State.LOGGED_OUT + executor.shutdown(); + if (!executor.awaitTermination(5000, TimeUnit.MILLISECONDS)) executor.shutdownNow() + } + + private fun sendClose(){ + state.getAndSet(State.LOGGED_OUT) logger.info { "Setting a new state -> $state" } val close = Close(streamId.streamId()) channel.send(close.close(), messageMetadata(MessageType.CLOSE), IChannel.SendMode.MANGLE) @@ -246,7 +239,7 @@ class PillarHandler(private val channel: Channel): IProtocolHandler { private fun startSendHeartBeats(){ val heartbeat = Heartbeat() channel.send(heartbeat.heartbeat(), messageMetadata(MessageType.HEARTBEAT), IChannel.SendMode.MANGLE) - clientFuture = executor.schedule(sentHeartbeatCommand, settings.heartbeatInterval, TimeUnit.MILLISECONDS) + clientFuture = executor.schedule(this::receivedHeartBeats, settings.heartbeatInterval, TimeUnit.MILLISECONDS) } private fun stopSendHeartBeats(){ @@ -257,9 +250,9 @@ class PillarHandler(private val channel: Channel): IProtocolHandler { private fun receivedHeartBeats(){ logger.error { "Server stopped sending heartbeat" } - state = State.NOT_HEARTBEAT + state.getAndSet(State.NOT_HEARTBEAT) logger.info { "Setting a new state -> $state" } - close() + sendClose() } private fun messageMetadata(messageType: MessageType): Map{ diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerFactory.kt b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerFactory.kt new file mode 100644 index 0000000..ce0b09b --- /dev/null +++ b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerFactory.kt @@ -0,0 +1,35 @@ +/* + * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) + * + * Licensed 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 + * + * http://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. + */ + +package com.exactpro.th2.conn.ditry.pillar.handler + +import com.exactpro.th2.conn.dirty.tcp.core.api.IContext +import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandler +import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandlerFactory +import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandlerSettings +import com.exactpro.th2.conn.dirty.tcp.core.api.impl.Channel + +class PillarHandlerFactory: IProtocolHandlerFactory { + override val name: String + get() = PillarHandlerSettings::class.java.name + + override val settings: Class + get() = PillarHandlerSettings::class.java + + override fun create(context: IContext): IProtocolHandler { + return PillarHandler(context.channel as Channel, context.settings as PillarHandlerSettings) + } +} \ No newline at end of file diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt index ddb6893..b51b648 100644 --- a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt +++ b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt @@ -16,13 +16,13 @@ package com.exactpro.th2.conn.ditry.pillar.handler -import com.exactpro.sf.util.DateTimeUtility import com.exactpro.th2.conn.ditry.pillar.handler.util.* import io.netty.buffer.ByteBuf import java.math.BigDecimal import java.math.BigInteger import java.nio.charset.StandardCharsets import java.time.LocalDateTime +import java.time.ZoneOffset class MsgHeader(byteBuf: ByteBuf) { val type: Int @@ -196,7 +196,7 @@ class SeqMsg(byteBuf: ByteBuf) { val time = byteBuf.readLongLE().toULong() val milliseconds = time / 1_000_000UL val nanoseconds = time % 1_000_000_000UL - timestamp = DateTimeUtility.toLocalDateTime(milliseconds.toLong(), nanoseconds.toInt()) + timestamp = LocalDateTime.ofEpochSecond(milliseconds.toLong(), nanoseconds.toInt(), ZoneOffset.UTC) } fun seqMsg(): Map { diff --git a/src/test/java/TestHandler.kt b/src/test/java/TestHandler.kt index 49e5921..bb44c2a 100644 --- a/src/test/java/TestHandler.kt +++ b/src/test/java/TestHandler.kt @@ -33,10 +33,11 @@ class TestHandler { val eventLoopGroup: EventLoopGroup = NioEventLoopGroup() private val executor: Executor = mock (Executor::class.java) private val onError: (stream: String, error: Throwable) -> Unit = mock{} - private val actionExecutor = ActionStreamExecutor(executor, onError) + private val actionExecutor = ActionStreamExecutor(executor, 1000, onError) val parentEventId = EventID.newBuilder().setId("root").build()!! private var channel = Channel(address, secure, sessionAlias, reconnectDelay, handler, mangler, onEvent, onMessage, eventLoopGroup, actionExecutor, parentEventId) + private var settings = PillarHandlerSettings() @Nested inner class Positive { @@ -52,7 +53,7 @@ class TestHandler { val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel) + val pillarHandler = PillarHandler(channel, settings) val data = pillarHandler.onReceive(buffer) val returnMetadata = pillarHandler.onIncoming(data!!) @@ -72,7 +73,7 @@ class TestHandler { val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel) + val pillarHandler = PillarHandler(channel, settings) val data = pillarHandler.onReceive(buffer) val returnMetadata = StreamAvail(data!!).streamAvail() @@ -92,7 +93,7 @@ class TestHandler { val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel) + val pillarHandler = PillarHandler(channel, settings) val data = pillarHandler.onReceive(buffer) val returnMetadata = pillarHandler.onIncoming(data!!) @@ -111,7 +112,7 @@ class TestHandler { val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel) + val pillarHandler = PillarHandler(channel, settings) val data = pillarHandler.onReceive(buffer) val returnMetadata = pillarHandler.onIncoming(data!!) @@ -132,7 +133,7 @@ class TestHandler { val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel) + val pillarHandler = PillarHandler(channel, settings) val data = pillarHandler.onReceive(buffer) val returnMetadata = pillarHandler.onIncoming(data!!) @@ -210,14 +211,14 @@ class TestHandler { ) val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel) + val pillarHandler = PillarHandler(channel, settings) assertEquals(null, pillarHandler.onReceive(buffer)) } @Test fun `empty message`() { val buffer: ByteBuf = Unpooled.buffer() - val pillarHandler = PillarHandler(channel) + val pillarHandler = PillarHandler(channel, settings) assertEquals(null, pillarHandler.onReceive(buffer)) } @@ -228,7 +229,7 @@ class TestHandler { ) val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel) + val pillarHandler = PillarHandler(channel, settings) val metadata = mutableMapOf() metadata[TYPE_FIELD_NAME] = 12.toString() metadata[LENGTH_FIELD_NAME] = 12.toString() @@ -248,16 +249,15 @@ class TestHandler { ) val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel) - val exception = assertThrows { pillarHandler.onReceive(buffer) } + val pillarHandler = PillarHandler(channel, settings) + val exception = assertThrows { pillarHandler.onReceive(buffer) } assertEquals("Message type is not supported: 2313", exception.message) } @Test fun `invalid heartbeat interval`() { - val pillarHandler = PillarHandler(channel) - pillarHandler.settings.heartbeatInterval = 0L - val exception = assertThrows { pillarHandler.initCommand() } + settings.heartbeatInterval = 0L + val exception = assertThrows { PillarHandler(channel, settings) } assertEquals("Heartbeat sending interval must be greater than zero", exception.message) } @@ -271,9 +271,9 @@ class TestHandler { ) val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel) + val pillarHandler = PillarHandler(channel, settings) val data = pillarHandler.onReceive(buffer) - val exception = assertThrows { pillarHandler.onIncoming(data!!) } + val exception = assertThrows { pillarHandler.onIncoming(data!!) } assertEquals("Received STREAM_NOT_OPEN status.", exception.message) } } From 9a46dd9baf3028e26856e7829f7b0479fae66efc Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Mon, 27 Dec 2021 16:42:21 +0300 Subject: [PATCH 06/49] [TH2-2806] Fixes build.gradle, PillarHandler, PillarHandlerFactory, PillarMessageDecoder, PillarMessageEncoder, PillarUtils, TestHandler --- build.gradle | 8 +- .../ditry/pillar/handler/PillarHandler.kt | 215 +++--- .../pillar/handler/PillarHandlerFactory.kt | 8 +- .../pillar/handler/PillarMessageDecoder.kt | 133 ++-- .../pillar/handler/PillarMessageEncoder.kt | 85 ++- .../ditry/pillar/handler/util/PillarUtils.kt | 32 +- src/test/java/TestHandler.kt | 625 +++++++++++------- 7 files changed, 584 insertions(+), 522 deletions(-) diff --git a/build.gradle b/build.gradle index 004e164..046abc1 100644 --- a/build.gradle +++ b/build.gradle @@ -21,6 +21,9 @@ plugins { id 'application' } +apply plugin: 'application' +apply plugin: 'com.palantir.docker' + group 'com.exactpro.th2' version release_version @@ -37,11 +40,6 @@ repositories { } mavenLocal() - - configurations.all { - resolutionStrategy.cacheChangingModulesFor 0, 'seconds' - resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds' - } } dependencies { diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt index 1d73129..c62633f 100644 --- a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt @@ -18,65 +18,50 @@ package com.exactpro.th2.conn.ditry.pillar.handler import com.exactpro.th2.conn.dirty.tcp.core.api.IChannel import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandler -import com.exactpro.th2.conn.dirty.tcp.core.api.impl.Channel import com.exactpro.th2.conn.ditry.pillar.handler.util.* import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled import mu.KotlinLogging +import java.util.concurrent.CompletableFuture import java.util.concurrent.Executors import java.util.concurrent.Future import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicReference -class PillarHandler(private val channel: Channel, +class PillarHandler(private val channel: IChannel, private val settings: PillarHandlerSettings): IProtocolHandler { - companion object { - private val logger = KotlinLogging.logger { } - } private var state = AtomicReference(State.SESSION_CLOSE) - private val executor = Executors.newSingleThreadScheduledExecutor() - - private var clientFuture: Future<*>? = null - - private var serverFuture: Future<*>? = null - + private var clientFuture: Future<*>? = CompletableFuture.completedFuture(null) + private var serverFuture: Future<*>? = CompletableFuture.completedFuture(null) private lateinit var streamId: StreamIdEncode init{ - if(settings.heartbeatInterval <= 0L) { - error("Heartbeat sending interval must be greater than zero") - } - - if(settings.streamAvailInterval <= 0L) { - error("StreamAvail sending interval must be greater than zero") - } + require(settings.heartbeatInterval > 0) { "Heartbeat sending interval must be greater than zero." } + require(settings.streamAvailInterval > 0) { "StreamAvail sending interval must be greater than zero." } } override fun onOpen() { - when (state.get()){ - State.SESSION_CLOSE -> { - state.getAndSet(State.SESSION_CREATED) - logger.info { "Setting a new state -> $state" } + if (state.compareAndSet(State.SESSION_CLOSE, State.SESSION_CREATED)) { + LOGGER.info { "Setting a new state -> $state." } - channel.open() + channel.send(Login(settings).login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE) - val login = Login(settings) - channel.send(login.login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE) - - startSendHeartBeats() - logger.info { "Connected handler" } - } - else -> logger.info { "Handler is already connected" } - } + startSendHeartBeats() + LOGGER.info { "Handler is connected." } + } else LOGGER.info { "Failed to set a new state. $state -> ${State.SESSION_CREATED}." } } override fun onReceive(buffer: ByteBuf): ByteBuf? { - val bufferLength = buffer.readableBytes() if (bufferLength == 0) { - logger.warn { "Cannot parse empty buffer" } + LOGGER.warn { "Cannot parse empty buffer." } + return null + } + + if (bufferLength < 4){ + LOGGER.warn { "Not enough bytes to read header." } return null } @@ -87,21 +72,18 @@ class PillarHandler(private val channel: Channel, if (!MessageType.contains(messageType)){ buffer.resetReaderIndex() - error ("Message type is not supported: $messageType") + LOGGER.error { "Message type is not supported: $messageType." } + return null } if(bufferLength < messageLength) { - logger.warn { "Buffer length is less than the declared one: $bufferLength -> $messageLength" } + LOGGER.warn { "Buffer length is less than the declared one: $bufferLength -> $messageLength." } return null } if(bufferLength > messageLength) { - logger.warn { "Buffer length is longer than the declared one: $bufferLength -> $messageLength" } - val buf: ByteBuf = Unpooled.buffer(messageLength) - buffer.resetReaderIndex() - buf.writeBytes(buffer, 0, messageLength) - buffer.readerIndex(messageLength) - return buf + LOGGER.info { "Buffer length is longer than the declared one: $bufferLength -> $messageLength." } + return buffer.copy(0, messageLength) } return buffer @@ -112,38 +94,37 @@ class PillarHandler(private val channel: Channel, when (val msgType = msgHeader.type) { MessageType.LOGIN_RESPONSE.type -> { - logger.info { "Type message - LoginResponse" } - val mapLoginResponse = LoginResponse(message).loginResponse() + LOGGER.info { "Type message - LoginResponse." } + val loginResponse = LoginResponse(message) - when (val status = Status.getStatus(mapLoginResponse[STATUS_FIELD_NAME]!!.toShort())) { + when (val status = Status.getStatus(loginResponse.status)) { Status.OK -> { - logger.info("Login successful. Start sending heartbeats.") - state.getAndSet(State.LOGGED_IN) - logger.info { "Setting a new state -> $state" } + LOGGER.info("Login successful. Start sending heartbeats.") + if (state.compareAndSet( + State.SESSION_CREATED, + State.LOGGED_IN + ) + ) LOGGER.info { "Setting a new state -> $state." } + else LOGGER.info { "Failed to set a new state. $state -> ${State.LOGGED_IN}." } } Status.NOT_LOGGED_IN -> { - if(state.get() == State.SESSION_CREATED) { - stopSendHeartBeats() - state.getAndSet(State.SESSION_CLOSE) - } - logger.info("Received `not logged in` status. Fall in to error state.") + if (state.compareAndSet(State.SESSION_CREATED, State.SESSION_CLOSE)) stopSendHeartBeats() + else LOGGER.info { "Failed to set a new state. $state -> ${State.SESSION_CLOSE}." } + LOGGER.info("Received `not logged in` status. Fall in to error state.") sendClose() } - else -> { - error("Received $status status.") - } + else -> error("Received $status status.") } return messageMetadata(MessageType.LOGIN_RESPONSE) } MessageType.STREAM_AVAIL.type -> { - logger.info { "Type message - StreamAvail" } - val mapStreamAvail = StreamAvail(message).streamAvail() + LOGGER.info { "Type message - StreamAvail." } + val streamAvail = StreamAvail(message) streamId = StreamIdEncode(StreamId(message)) val open = Open( - streamId.streamId(), - mapStreamAvail[NEXT_SEQ_FIELD_NAME]!!.toInt(), - mapStreamAvail[STREAM_TYPE_FIELD_NAME]!!.toInt() + streamId.streamId, + streamAvail.nextSeq ) channel.send( @@ -158,48 +139,39 @@ class PillarHandler(private val channel: Channel, } MessageType.OPEN_RESPONSE.type -> { - logger.info { "Type message - OpenResponse" } - val mapOpenResponse = OpenResponse(message).openResponse() + LOGGER.info { "Type message - OpenResponse." } + val openResponse = OpenResponse(message) - when (Status.getStatus(mapOpenResponse[STATUS_FIELD_NAME]!!.toShort())) { - Status.OK -> { - logger.info("Open successful.") - } - Status.NO_STREAM_PERMISSION -> { - logger.warn { "No stream permission" } - } - else -> { - error("This is not an OpenResponse status") - } + when (Status.getStatus(openResponse.status)) { + Status.OK -> LOGGER.info("Open successful.") + Status.NO_STREAM_PERMISSION -> LOGGER.warn { "No stream permission." } + else -> error("This is not an OpenResponse status.") } return messageMetadata(MessageType.OPEN_RESPONSE) } - MessageType.CLOSE_RESPONSE.type -> { - logger.info { "Type message - CloseResponse" } - val mapCloseResponse = CloseResponse(message).closeResponse() - when (Status.getStatus(mapCloseResponse[STATUS_FIELD_NAME]!!.toShort())) { - Status.OK -> { - logger.info("Open successful.") - } - Status.STREAM_NOT_OPEN -> { - logger.warn { "Stream not open" } - } - else -> { - error("This is not an CloseResponse status") - } - } - return messageMetadata(MessageType.CLOSE_RESPONSE) - } - MessageType.SEQMSG.type -> { - logger.info { "Type message - SeqMsg" } + LOGGER.info { "Type message - SeqMsg." } + channel.send( + SeqMsgToSend(SeqMsg(message)).seqMsg(), + messageMetadata(MessageType.SEQMSG), + IChannel.SendMode.MANGLE + ) return messageMetadata(MessageType.SEQMSG) } - else -> { - error("Message type is not supported: $msgType") + MessageType.CLOSE_RESPONSE.type -> { + LOGGER.info { "Type message - CloseResponse." } + val closeResponse = CloseResponse(message) + when (Status.getStatus(closeResponse.status)) { + Status.OK -> LOGGER.info("Open successful.") + Status.STREAM_NOT_OPEN -> LOGGER.warn { "Stream not open." } + else -> error("This is not an CloseResponse status.") + } + return messageMetadata(MessageType.CLOSE_RESPONSE) } + + else -> error("Message type is not supported: $msgType.") } } @@ -212,47 +184,46 @@ class PillarHandler(private val channel: Channel, } override fun onClose() { - when (state.get() != State.SESSION_CLOSE) { - true -> { - state.getAndSet(State.SESSION_CLOSE) - logger.info { "Setting a new state -> $state" } - - channel.close() - logger.info { "Disconnected handler" } - } - else -> logger.info { "Handler is already disconnected" } - } + if (!state.compareAndSet(State.SESSION_CLOSE, State.SESSION_CLOSE)) { + state.getAndSet(State.SESSION_CLOSE) + LOGGER.info { "Setting a new state -> $state." } + LOGGER.info { "Handler is disconnected." } + } else LOGGER.info { "Failed to set a new state. $state -> ${State.SESSION_CLOSE}." } } override fun close() { - executor.shutdown(); + executor.shutdown() if (!executor.awaitTermination(5000, TimeUnit.MILLISECONDS)) executor.shutdownNow() } - private fun sendClose(){ - state.getAndSet(State.LOGGED_OUT) - logger.info { "Setting a new state -> $state" } - val close = Close(streamId.streamId()) - channel.send(close.close(), messageMetadata(MessageType.CLOSE), IChannel.SendMode.MANGLE) + private fun sendClose() { + if (!state.compareAndSet(State.LOGGED_OUT, State.LOGGED_OUT)) { + state.getAndSet(State.LOGGED_OUT) + LOGGER.info { "Setting a new state -> $state." } + channel.send( + Close(streamId.streamIdBuf).close(), + messageMetadata(MessageType.CLOSE), + IChannel.SendMode.MANGLE + ) + } else LOGGER.info { "Failed to set a new state. $state -> ${State.LOGGED_OUT}." } } - private fun startSendHeartBeats(){ - val heartbeat = Heartbeat() - channel.send(heartbeat.heartbeat(), messageMetadata(MessageType.HEARTBEAT), IChannel.SendMode.MANGLE) + private fun startSendHeartBeats() { + channel.send(Heartbeat().heartbeat, messageMetadata(MessageType.HEARTBEAT), IChannel.SendMode.MANGLE) clientFuture = executor.schedule(this::receivedHeartBeats, settings.heartbeatInterval, TimeUnit.MILLISECONDS) } - private fun stopSendHeartBeats(){ - if (clientFuture != null) { - clientFuture!!.cancel(false) - } + private fun stopSendHeartBeats() { + clientFuture?.cancel(false) } - private fun receivedHeartBeats(){ - logger.error { "Server stopped sending heartbeat" } - state.getAndSet(State.NOT_HEARTBEAT) - logger.info { "Setting a new state -> $state" } - sendClose() + private fun receivedHeartBeats() { + if (!state.compareAndSet(State.NOT_HEARTBEAT, State.NOT_HEARTBEAT)) { + LOGGER.error { "Server stopped sending heartbeat." } + state.getAndSet(State.NOT_HEARTBEAT) + LOGGER.info { "Setting a new state -> $state." } + sendClose() + } else LOGGER.info { "Failed to set a new state. $state -> ${State.NOT_HEARTBEAT}." } } private fun messageMetadata(messageType: MessageType): Map{ @@ -261,4 +232,8 @@ class PillarHandler(private val channel: Channel, metadata[LENGTH_FIELD_NAME] = messageType.length.toString() return metadata } + + companion object { + private val LOGGER = KotlinLogging.logger {} + } } diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerFactory.kt b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerFactory.kt index ce0b09b..375fede 100644 --- a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerFactory.kt +++ b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerFactory.kt @@ -23,13 +23,11 @@ import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandlerSettings import com.exactpro.th2.conn.dirty.tcp.core.api.impl.Channel class PillarHandlerFactory: IProtocolHandlerFactory { - override val name: String - get() = PillarHandlerSettings::class.java.name + override val name: String = PillarHandlerSettings::class.java.name - override val settings: Class - get() = PillarHandlerSettings::class.java + override val settings: Class = PillarHandlerSettings::class.java override fun create(context: IContext): IProtocolHandler { - return PillarHandler(context.channel as Channel, context.settings as PillarHandlerSettings) + return PillarHandler(context.channel, context.settings as PillarHandlerSettings) } } \ No newline at end of file diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt index b51b648..a18059f 100644 --- a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt +++ b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt @@ -16,88 +16,63 @@ package com.exactpro.th2.conn.ditry.pillar.handler -import com.exactpro.th2.conn.ditry.pillar.handler.util.* import io.netty.buffer.ByteBuf import java.math.BigDecimal import java.math.BigInteger import java.nio.charset.StandardCharsets +import java.time.Instant import java.time.LocalDateTime import java.time.ZoneOffset class MsgHeader(byteBuf: ByteBuf) { val type: Int - private val length: Int + val length: Int init { type = byteBuf.readShort().toInt() length = byteBuf.readShort().toInt() } - - fun msgHeader(): Map { - val header = mutableMapOf() - header[TYPE_FIELD_NAME] = type.toString() - header[LENGTH_FIELD_NAME] = length.toString() - return header - } } class StreamId(byteBuf: ByteBuf){ val envId: Short val sessNum: Int - val streamType: Byte + var streamType: Byte val userId: UShort val subId: Int init { - byteBuf.readerIndex(4) - envId = byteBuf.readUnsignedByte() - sessNum = byteBuf.readMedium() - streamType = byteBuf.readByte() - userId = byteBuf.readShort().toUShort() - subId = byteBuf.readByte().toInt() - } - - fun streamId(): Map { - val stream = mutableMapOf() - stream[ENV_ID_FIELD_NAME] = envId.toString() - stream[SESS_NUM_FIELD_NAME] = sessNum.toString() - stream[STREAM_TYPE_FIELD_NAME] = streamType.toString() - stream[USER_ID_FIELD_NAME] = userId.toString() - stream[SUB_ID_FIELD_NAME] = subId.toString() - return stream + envId = byteBuf.readUnsignedByte() + sessNum = byteBuf.readMedium() + streamType = byteBuf.readByte() + userId = byteBuf.readShort().toUShort() + subId = byteBuf.readByte().toInt() } } class LoginResponse(byteBuf: ByteBuf) { - private val charset = StandardCharsets.US_ASCII - private val header: MsgHeader - private val username: String - private val status: Byte + val header: MsgHeader + val username: String + val status: Byte init { byteBuf.markReaderIndex() byteBuf.readerIndex(0) header = MsgHeader(byteBuf) byteBuf.readerIndex(4) - username = byteBuf.readCharSequence(16, charset).toString().trimEnd(0.toChar()) + username = byteBuf.readCharSequence(16, StandardCharsets.US_ASCII).toString().trimEnd(0.toChar()) byteBuf.readerIndex(20) - status = byteBuf.readUnsignedByte().toByte() - } + status = byteBuf.readByte() - fun loginResponse(): Map { - val lResponse = mutableMapOf() - lResponse.putAll(header.msgHeader()) - lResponse[USERNAME_FIELD_NAME] = username - lResponse[STATUS_FIELD_NAME] = status.toString() - return lResponse + require(byteBuf.readerIndex() == header.length){ "There are bytes left in buffer to read" } } } class StreamAvail(byteBuf: ByteBuf) { - private val header: MsgHeader - private val streamId: StreamId - private val nextSeq: BigDecimal - private val access: Int + val header: MsgHeader + val streamId: StreamId + val nextSeq: BigDecimal + val access: Byte init { byteBuf.markReaderIndex() @@ -111,24 +86,17 @@ class StreamAvail(byteBuf: ByteBuf) { bytes.reverse() nextSeq = BigInteger(1, bytes).toBigDecimal() byteBuf.readerIndex(20) - access = byteBuf.readUnsignedByte().toInt() - } + access = byteBuf.readByte() - fun streamAvail(): Map { - val strAvail = mutableMapOf() - strAvail.putAll(header.msgHeader()) - strAvail.putAll(streamId.streamId()) - strAvail[NEXT_SEQ_FIELD_NAME] = nextSeq.toString() - strAvail[ACCESS_FIELD_NAME] = access.toString() - return strAvail + require(byteBuf.readerIndex() == header.length){ "There are bytes left in buffer to read" } } } class OpenResponse(byteBuf: ByteBuf) { - private val header: MsgHeader - private val streamId: StreamId - private val status: Int - private val access: Int + val header: MsgHeader + val streamId: StreamId + val status: Byte + val access: Byte init { byteBuf.markReaderIndex() @@ -137,25 +105,18 @@ class OpenResponse(byteBuf: ByteBuf) { byteBuf.readerIndex(4) streamId = StreamId(byteBuf) byteBuf.readerIndex(12) - status = byteBuf.readUnsignedByte().toInt() + status = byteBuf.readByte() byteBuf.readerIndex(13) - access = byteBuf.readUnsignedByte().toInt() - } + access = byteBuf.readByte() - fun openResponse(): Map { - val oResponse = mutableMapOf() - oResponse.putAll(header.msgHeader()) - oResponse.putAll(streamId.streamId()) - oResponse[STATUS_FIELD_NAME] = status.toString() - oResponse[ACCESS_FIELD_NAME] = access.toString() - return oResponse + require(byteBuf.readerIndex() == header.length){ "There are bytes left in buffer to read" } } } class CloseResponse(byteBuf: ByteBuf){ - private val header: MsgHeader - private val streamId: StreamId - private val status: Int + val header: MsgHeader + val streamId: StreamId + val status: Byte init { byteBuf.markReaderIndex() @@ -164,24 +125,18 @@ class CloseResponse(byteBuf: ByteBuf){ byteBuf.readerIndex(4) streamId = StreamId(byteBuf) byteBuf.readerIndex(12) - status = byteBuf.readUnsignedByte().toInt() - } + status = byteBuf.readByte() - fun closeResponse(): Map { - val oResponse = mutableMapOf() - oResponse.putAll(header.msgHeader()) - oResponse.putAll(streamId.streamId()) - oResponse[STATUS_FIELD_NAME] = status.toString() - return oResponse + require(byteBuf.readerIndex() == header.length){ "There are bytes left in buffer to read" } } } class SeqMsg(byteBuf: ByteBuf) { - private val header: MsgHeader - private val streamId: StreamId - private val seqmsg: Int - private val reserved1: Int - private val timestamp: LocalDateTime + val header: MsgHeader + val streamId: StreamId + val seqmsg: Int + val reserved1: Int + val timestamp: LocalDateTime init { byteBuf.markReaderIndex() @@ -196,17 +151,11 @@ class SeqMsg(byteBuf: ByteBuf) { val time = byteBuf.readLongLE().toULong() val milliseconds = time / 1_000_000UL val nanoseconds = time % 1_000_000_000UL - timestamp = LocalDateTime.ofEpochSecond(milliseconds.toLong(), nanoseconds.toInt(), ZoneOffset.UTC) - } + timestamp = LocalDateTime.ofInstant(Instant.ofEpochMilli(milliseconds.toLong()), ZoneOffset.UTC).withNano( + nanoseconds.toInt() + ) - fun seqMsg(): Map { - val sMsg = mutableMapOf() - sMsg.putAll(header.msgHeader()) - sMsg.putAll(streamId.streamId()) - sMsg[SEQMSG_ID_FIELD_NAME] = seqmsg.toString() - sMsg[RESERVED1_FIELD_NAME] = reserved1.toString() - sMsg[TIMESTAMP_FIELD_NAME] = timestamp.toString() - return sMsg + require(byteBuf.readerIndex() == header.length){ "There are bytes left in buffer to read" } } } diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageEncoder.kt b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageEncoder.kt index fa33125..d486818 100644 --- a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageEncoder.kt +++ b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageEncoder.kt @@ -22,29 +22,28 @@ import com.exactpro.th2.conn.ditry.pillar.handler.util.MessageType import com.exactpro.th2.conn.ditry.pillar.handler.util.StreamType import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled +import java.math.BigDecimal +import java.time.LocalDateTime +import java.time.ZoneOffset class Heartbeat{ - private val type: Int = MessageType.HEARTBEAT.type - private val length: Int = MessageType.HEARTBEAT.length - - fun heartbeat (): ByteBuf { - val beat: ByteBuf = Unpooled.buffer(length) - beat.writeShort(type) - beat.writeShort(length) - return beat + val heartbeat: ByteBuf = Unpooled.buffer(MessageType.HEARTBEAT.length) + + init { + heartbeat.writeShort(MessageType.HEARTBEAT.type) + heartbeat.writeShort(MessageType.HEARTBEAT.length) } } -class StreamIdEncode(var streamId: StreamId){ - private val streamIdBuf: ByteBuf = Unpooled.buffer(8) +class StreamIdEncode(var streamId: StreamId) { + val streamIdBuf: ByteBuf = Unpooled.buffer(8) - fun streamId(): ByteBuf{ + init { streamIdBuf.writeByte(streamId.envId.toInt()) streamIdBuf.writeMedium(streamId.sessNum) streamIdBuf.writeByte(streamId.streamType.toInt()) streamIdBuf.writeShort(streamId.userId.toInt()) streamIdBuf.writeByte(streamId.subId) - return streamIdBuf } } @@ -58,18 +57,23 @@ class Login(settings: PillarHandlerSettings) { init { username = settings.username.encodeToByteArray() + require(username.size < 16 && username.isNotEmpty()) { "Size of username exceeds allowed size or equal to zero." } password = settings.password.encodeToByteArray() + require(password.size <= 32 && password.isNotEmpty()) { "Size of password exceeds allowed size or equal to zero." } mic = settings.mic.encodeToByteArray() + require(mic.size <= 4 && mic.isNotEmpty()) { "Size of mic exceeds allowed size or equal to zero." } version = settings.version.encodeToByteArray() + require(version.size <= 20 && version.isNotEmpty()) { "Size of version exceeds allowed size or equal to zero." } } fun login (): ByteBuf{ val loginMessage: ByteBuf = Unpooled.buffer(length) - loginMessage.markWriterIndex() + loginMessage.markWriterIndex() loginMessage.writeShort(type) loginMessage.writeShort(length) + loginMessage.writerIndex(4) loginMessage.writeBytes(username) loginMessage.writerIndex(20) @@ -80,57 +84,90 @@ class Login(settings: PillarHandlerSettings) { loginMessage.writerIndex(56) loginMessage.writeBytes(version) + + require (length >= loginMessage.readableBytes()){ "Message size exceeded." } + return loginMessage } } -class Open(private val streamId: ByteBuf, - private val startSeq: Int, - private val streamType: Int){ +class Open(private val streamId: StreamId, + private val startSeq: BigDecimal){ private val type: Int = MessageType.OPEN.type private val length: Int = MessageType.OPEN.length fun open(): ByteBuf{ val openMessage: ByteBuf = Unpooled.buffer(length) - openMessage.markWriterIndex() + openMessage.markWriterIndex() openMessage.writeShort(type) openMessage.writeShort(length) - openMessage.writeBytes(streamId) + openMessage.writerIndex(4) + openMessage.writeBytes(StreamIdEncode(streamId).streamIdBuf) openMessage.writerIndex(12) openMessage.writeLongLE(startSeq.toLong()) - openMessage.writerIndex(20) openMessage.writeLongLE(startSeq.toLong()+1) openMessage.writerIndex(28) - if (streamType == StreamType.REF.value || streamType == StreamType.GT.value) + if (streamId.streamType == StreamType.REF.value || streamId.streamType == StreamType.GT.value) openMessage.writeByte(Access.READ.value.toInt()) - else if (streamType == StreamType.TG.value) + else if (streamId.streamType == StreamType.TG.value) openMessage.writeByte(Access.WRITE.value.toInt()) - openMessage.writerIndex(29) openMessage.writeByte(MODE_LOSSY) + require (length >= openMessage.writerIndex()){ "Message size exceeded." } + return openMessage } } +class SeqMsgToSend(private val seqmsg: SeqMsg){ + private val type: Int = MessageType.SEQMSG.type + private val length: Int = MessageType.SEQMSG.length + + fun seqMsg(): ByteBuf { + val seqMsgMessage: ByteBuf = Unpooled.buffer(length) + + seqMsgMessage.markWriterIndex() + seqMsgMessage.writeShort(type) + seqMsgMessage.writeShort(length) + + seqMsgMessage.writerIndex(4) + seqmsg.streamId.streamType = StreamType.TG.value + seqMsgMessage.writeBytes(StreamIdEncode(seqmsg.streamId).streamIdBuf) + seqMsgMessage.writerIndex(12) + seqMsgMessage.writeByte(seqmsg.seqmsg) + seqMsgMessage.writerIndex(20) + seqMsgMessage.writeInt(seqmsg.reserved1) + + seqMsgMessage.writerIndex(24) + val time = LocalDateTime.now() + val seconds = time.toEpochSecond(ZoneOffset.UTC).toULong() + val nanoseconds = time.nano.toULong() + seqMsgMessage.writeLongLE((seconds * 1_000_000_000UL + nanoseconds).toLong()) + + require (length == seqMsgMessage.writerIndex()){ "Message size exceeded." } + + return seqMsgMessage + } +} + class Close(private val streamId: ByteBuf) { private val type: Int = MessageType.CLOSE.type private val length: Int = MessageType.CLOSE.length fun close(): ByteBuf { val closeMessage: ByteBuf = Unpooled.buffer(length) - closeMessage.markWriterIndex() closeMessage.writeShort(type) closeMessage.writeShort(length) - closeMessage.writeBytes(streamId) + require (length == closeMessage.writerIndex()){ "Message size exceeded." } return closeMessage } } diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/util/PillarUtils.kt b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/util/PillarUtils.kt index bec05f9..3124d28 100644 --- a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/util/PillarUtils.kt +++ b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/util/PillarUtils.kt @@ -21,30 +21,8 @@ import kotlin.experimental.or const val TYPE_FIELD_NAME = "type" const val LENGTH_FIELD_NAME = "length" - -const val ENV_ID_FIELD_NAME = "env_id" -const val SESS_NUM_FIELD_NAME = "sess_num" -const val STREAM_TYPE_FIELD_NAME = "stream_type" -const val USER_ID_FIELD_NAME = "user_id" -const val SUB_ID_FIELD_NAME = "sub_id" - -const val USERNAME_FIELD_NAME = "username" -const val PASSWORD_FIELD_NAME = "password" -const val MIC_FIELD_NAME = "mic" -const val VERSION_FIELD_NAME = "version" -const val STATUS_FIELD_NAME = "status" - -const val START_SEQ_FIELD_NAME = "start_seq" -const val END_SEQ_FIELD_NAME = "end_seq" -const val NEXT_SEQ_FIELD_NAME = "next_seq" -const val ACCESS_FIELD_NAME = "access" -const val MODE_FIELD_NAME = "mode" const val MODE_LOSSY = 0 -const val SEQMSG_ID_FIELD_NAME = "seqmsg" -const val RESERVED1_FIELD_NAME = "reserved1" -const val TIMESTAMP_FIELD_NAME = "timestamp" - enum class State(val value: Int){ SESSION_CREATED(0), SESSION_CLOSE(1), @@ -53,7 +31,7 @@ enum class State(val value: Int){ NOT_HEARTBEAT(4); } -enum class Status(val value: Short) { +enum class Status(val value: Byte) { OK(0), NOT_LOGGED_IN(18), INVALID_LOGIN_DETAILS(24), @@ -65,7 +43,7 @@ enum class Status(val value: Short) { STREAM_NOT_OPEN(85); companion object { - fun getStatus(value: Short?): Status { + fun getStatus(value: Byte?): Status { return values().find { it.value == value }!! } } @@ -87,13 +65,13 @@ enum class Access(val value: Short) { } } -enum class StreamType (val value: Int){ +enum class StreamType (val value: Byte){ TG(15), GT(13), REF(33), XDP(27); companion object { - fun getStream(value: Int?): StreamType? { + fun getStream(value: Byte?): StreamType? { return values().find { it.value == value } } } @@ -119,4 +97,4 @@ enum class MessageType(val type: Int, val length: Int) { return values().find { it.type == type } != null } } -} +} \ No newline at end of file diff --git a/src/test/java/TestHandler.kt b/src/test/java/TestHandler.kt index bb44c2a..a00c8ec 100644 --- a/src/test/java/TestHandler.kt +++ b/src/test/java/TestHandler.kt @@ -1,3 +1,19 @@ +/* + * Copyright 2021-2021 Exactpro (Exactpro Systems Limited) + * + * Licensed 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 + * + * http://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. + */ + import com.exactpro.th2.common.event.Event import com.exactpro.th2.common.grpc.EventID import com.exactpro.th2.common.grpc.RawMessage @@ -17,264 +33,375 @@ import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import org.mockito.Mockito.mock import com.nhaarman.mockitokotlin2.mock +import org.junit.jupiter.api.Assertions.assertNull +import java.math.BigDecimal import java.net.InetSocketAddress import java.util.concurrent.Executor - class TestHandler { - private val address: InetSocketAddress = mock (InetSocketAddress::class.java) - val secure = true + private val address: InetSocketAddress = mock(InetSocketAddress::class.java) + private val secure = true private val sessionAlias: String = "sessionAlias" private val reconnectDelay: Long = 1000L - private val handler: IProtocolHandler = mock (IProtocolHandler::class.java) - private val mangler: IProtocolMangler = mock (IProtocolMangler::class.java) - private val onEvent: (event: Event, parentEventId: EventID) -> Unit = mock{} - private val onMessage: (RawMessage) -> Unit = mock { } - val eventLoopGroup: EventLoopGroup = NioEventLoopGroup() - private val executor: Executor = mock (Executor::class.java) - private val onError: (stream: String, error: Throwable) -> Unit = mock{} - private val actionExecutor = ActionStreamExecutor(executor, 1000, onError) - val parentEventId = EventID.newBuilder().setId("root").build()!! - - private var channel = Channel(address, secure, sessionAlias, reconnectDelay, handler, mangler, onEvent, onMessage, eventLoopGroup, actionExecutor, parentEventId) + private val handler: IProtocolHandler = mock(IProtocolHandler::class.java) + private val mangler: IProtocolMangler = mock(IProtocolMangler::class.java) + private val onEvent: (event: Event, parentEventId: EventID) -> Unit = mock {} + private val onMessage: (RawMessage) -> Unit = mock { } + private val eventLoopGroup: EventLoopGroup = NioEventLoopGroup() + private val executor: Executor = mock(Executor::class.java) + private val onError: (stream: String, error: Throwable) -> Unit = mock {} + private val actionExecutor = ActionStreamExecutor(executor, 1000, onError) + private val parentEventId = EventID.newBuilder().setId("root").build()!! + + private var channel = Channel( + address, + secure, + sessionAlias, + reconnectDelay, + handler, + mangler, + onEvent, + onMessage, + eventLoopGroup, + actionExecutor, + parentEventId + ) private var settings = PillarHandlerSettings() - @Nested - inner class Positive { - @Test - fun `sending LoginResponse with extra bytes`() { - val raw = byteArrayOf( - 2, 2, //type, - 0, 21, //length - 117, 115, 101, 114, 110, 97, 109, 101, 0, 0, 0, 0, 0, 0, 0, 0, //username - 0, //status - 117, 115, 101 - ) - - val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) - val data = pillarHandler.onReceive(buffer) - val returnMetadata = pillarHandler.onIncoming(data!!) - - assertEquals(514.toString(), returnMetadata[TYPE_FIELD_NAME]) - assertEquals(21.toString(), returnMetadata[LENGTH_FIELD_NAME]) - } - - @Test - fun `sending StreamAvail`() { - val raw = byteArrayOf( - 2, 3, //type, - 0, 21, //length - 5, 65, 0, 5, 4, -99, 95, 15, //stream_id: env_id(1), sess_num(3), stream_type, user_id(2), sub_id(1) - 23, 0, 0, 0, 0, 0, 0, 0, //next_seq - 6 //access - ) - - val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) - val data = pillarHandler.onReceive(buffer) - val returnMetadata = StreamAvail(data!!).streamAvail() - - assertEquals(515.toString(), returnMetadata[TYPE_FIELD_NAME]) - assertEquals(21.toString(), returnMetadata[LENGTH_FIELD_NAME]) - } - - @Test - fun `sending OpenResponse`() { - val raw = byteArrayOf( - 2, 6, //type, - 0, 14, //length - 5, 65, 0, 5, 4, -99, 95, 15, //stream_id: env_id(1), ses_num(3), stream_type(1) user_id(2), sub_id(1), - 0, //status - 2 //access - ) - - val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) - val data = pillarHandler.onReceive(buffer) - val returnMetadata = pillarHandler.onIncoming(data!!) - - assertEquals(518.toString(), returnMetadata[TYPE_FIELD_NAME]) - assertEquals(14.toString(), returnMetadata[LENGTH_FIELD_NAME]) - } - - @Test - fun `sending CloseResponse`() { - val raw = byteArrayOf( - 2, 8, //type, - 0, 13, //length - 5, 65, 0, 5, 4, -99, 95, 15, //stream_id: env_id(1), ses_num(4), user_id(2), stream_type(1) - 0 - ) - - val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) - val data = pillarHandler.onReceive(buffer) - val returnMetadata = pillarHandler.onIncoming(data!!) - - assertEquals(520.toString(), returnMetadata[TYPE_FIELD_NAME]) - assertEquals(13.toString(), returnMetadata[LENGTH_FIELD_NAME]) - } - - @Test - fun `sending SeqMsg`() { - val raw = byteArrayOf( - 9, 5, //type - 0, 32, //length - 5, 65, 0, 5, 4, -99, 95, 15, //stream_id: env_id(1), ses_num(4), user_id(2), stream_type(1) - 23, 0, 0, 0, 0, 0, 0, 0, //seq - 0, 0, 0, 0, //reserved1 - 1, 88, -67, -81, 0, 0, 0, 0, //timestamp - ) - - val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) - val data = pillarHandler.onReceive(buffer) - val returnMetadata = pillarHandler.onIncoming(data!!) - - assertEquals(2309.toString(), returnMetadata[TYPE_FIELD_NAME]) - assertEquals(32.toString(), returnMetadata[LENGTH_FIELD_NAME]) - } - - @Test - fun `assembling Login`() { - val settings = PillarHandlerSettings() - val login = Login(settings).login().array() - val raw = byteArrayOf( - 2, 1, //type:513, - 0, 76, //length:76 - 117, 115, 101, 114, 110, 97, 109, 101, 0, 0, 0, 0, 0, 0, 0, 0, //username - 112, 97, 115, 115, 119, 111, 114, 100, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //password - 109, 105, 99, 0, //mic - 49, 46, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,// version - ) - - for (i in login.indices) - assertEquals(raw[i], login[i]) - } - - @Test - fun `assembling Open`() { - val stream = byteArrayOf( - 0, 0, 0, 0, 5, 65, 0, 5, 4, -99, 95, 15 - ) - val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(stream) - val streamId = StreamIdEncode(StreamId(buffer)) - val open = Open(streamId.streamId(), 23, 15).open().array() - - val raw = byteArrayOf( - 2, 5, //type:517, - 0, 30, //length:30 - 5, 65, 0, 5, 4, -99, 95, 15, //stream_id: ses_num(3), env_id(1), user_id(2), sub_id(1), stream_type(1) - 23, 0, 0, 0, 0, 0, 0, 0, //start_seq - 24, 0, 0, 0, 0, 0, 0, 0, //end_seq - 2, //access - 0, //mode - ) - - for (i in open.indices) - assertEquals(raw[i], open[i]) - } - - @Test - fun `assembling Close`() { - - val stream = byteArrayOf( - 0, 0, 0, 0, 5, 65, 0, 5, 4, -99, 95, 15 - ) - val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(stream) - val streamId = StreamIdEncode(StreamId(buffer)) - val close = Close(streamId.streamId()).close().array() - - val raw = byteArrayOf( - 2, 7, - 0, 12, - 5, 65, 0, 5, 4, -99, 95, 15 - ) - - for (i in close.indices) - assertEquals(raw[i], close[i]) - } - - @Test - fun `invalid size message`() { - val raw = byteArrayOf( - 9, 5, //type - 0, 32, //length - ) - val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) - assertEquals(null, pillarHandler.onReceive(buffer)) - } - - @Test - fun `empty message`() { - val buffer: ByteBuf = Unpooled.buffer() - val pillarHandler = PillarHandler(channel, settings) - assertEquals(null, pillarHandler.onReceive(buffer)) - } - - @Test - fun `send onOutgoing`() { - val raw = byteArrayOf( - 5, 65, 0, 5, 4, -99, 95, 15 - ) - val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) - val metadata = mutableMapOf() - metadata[TYPE_FIELD_NAME] = 12.toString() - metadata[LENGTH_FIELD_NAME] = 12.toString() - - assertEquals(12.toString(), pillarHandler.onOutgoing(buffer, metadata)[TYPE_FIELD_NAME]) - } + @Test + fun `sending LoginResponse with extra bytes`() { + val raw = byteArrayOf( + 2, 2, //type, + 0, 21, //length + 117, 115, 101, 114, 110, 97, 109, 101, 0, 0, 0, 0, 0, 0, 0, 0, //username + 0, //status + 117, 115, 101 //extra bytes + ) + + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel, settings) + val message = pillarHandler.onReceive(buffer) + val metadata = pillarHandler.onIncoming(message!!) + val loginResponseMsg = LoginResponse(message) + + assertEquals(514.toString(), metadata[TYPE_FIELD_NAME]) + assertEquals(21.toString(), metadata[LENGTH_FIELD_NAME]) + + assertEquals("username", loginResponseMsg.username) + assertEquals(0, loginResponseMsg.status) + } + + @Test + fun `sending StreamAvail`() { + val raw = byteArrayOf( + 2, 3, //type, + 0, 21, //length + 5, 65, 0, 5, 15, -99, 95, 4, //stream_id: env_id(1), sess_num(3), stream_type, user_id(2), sub_id(1) + 23, 0, 0, 0, 0, 0, 0, 0, //next_seq + 6 //access + ) + + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel, settings) + val message = pillarHandler.onReceive(buffer) + val streamAvail = StreamAvail(message!!) + + assertEquals(515, streamAvail.header.type) + assertEquals(21, streamAvail.header.length) + assertEquals(5, streamAvail.streamId.envId) + assertEquals(4259845, streamAvail.streamId.sessNum) + assertEquals(15, streamAvail.streamId.streamType) + assertEquals(40287.toUShort(), streamAvail.streamId.userId) + assertEquals(4, streamAvail.streamId.subId) + } + + @Test + fun `sending OpenResponse`() { + val raw = byteArrayOf( + 2, 6, //type, + 0, 14, //length + 5, 65, 0, 5, 15, -99, 95, 4, //stream_id: env_id(1), sess_num(3), stream_type, user_id(2), sub_id(1) + 0, //status + 2 //access + ) + + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel, settings) + val message = pillarHandler.onReceive(buffer) + val metadata = pillarHandler.onIncoming(message!!) + val openResponseMsg = OpenResponse(message) + + assertEquals(518.toString(), metadata[TYPE_FIELD_NAME]) + assertEquals(14.toString(), metadata[LENGTH_FIELD_NAME]) + + assertEquals(5, openResponseMsg.streamId.envId) + assertEquals(4259845, openResponseMsg.streamId.sessNum) + assertEquals(15, openResponseMsg.streamId.streamType) + assertEquals(40287.toUShort(), openResponseMsg.streamId.userId) + assertEquals(4, openResponseMsg.streamId.subId) + assertEquals(0, openResponseMsg.status) + assertEquals(2, openResponseMsg.access) + } + + @Test + fun `sending CloseResponse`() { + val raw = byteArrayOf( + 2, 8, //type, + 0, 13, //length + 5, 65, 0, 5, 15, -99, 95, 4, //stream_id: env_id(1), sess_num(3), stream_type, user_id(2), sub_id(1) + 0 + ) + + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel, settings) + val message = pillarHandler.onReceive(buffer) + val metadata = pillarHandler.onIncoming(message!!) + val closeResponseMsg = CloseResponse(message) + + assertEquals(520.toString(), metadata[TYPE_FIELD_NAME]) + assertEquals(13.toString(), metadata[LENGTH_FIELD_NAME]) + + assertEquals(5, closeResponseMsg.streamId.envId) + assertEquals(4259845, closeResponseMsg.streamId.sessNum) + assertEquals(15, closeResponseMsg.streamId.streamType) + assertEquals(40287.toUShort(), closeResponseMsg.streamId.userId) + assertEquals(4, closeResponseMsg.streamId.subId) + assertEquals(0, closeResponseMsg.status) + } + + @Test + fun `sending SeqMsg`() { + val raw = byteArrayOf( + 9, 5, //type + 0, 32, //length + 5, 65, 0, 5, 13, -99, 95, 4, //stream_id: env_id(1), sess_num(3), stream_type, user_id(2), sub_id(1) + 23, 0, 0, 0, 0, 0, 0, 0, //seq + 0, 0, 0, 0, //reserved1 + 64, -59, -122, 125, 62, -96, -60, 22 //timestamp + ) + + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel, settings) + val message = pillarHandler.onReceive(buffer) + val seqMsg = SeqMsg(message!!) + + assertEquals(2309, seqMsg.header.type) + assertEquals(32, seqMsg.header.length) + assertEquals(5, seqMsg.streamId.envId) + assertEquals(4259845, seqMsg.streamId.sessNum) + assertEquals(13, seqMsg.streamId.streamType) + assertEquals(40287.toUShort(), seqMsg.streamId.userId) + assertEquals(4, seqMsg.streamId.subId) + assertEquals(23, seqMsg.seqmsg) + assertEquals(0, seqMsg.reserved1) + assertEquals("2021-12-27T13:39:14.524104", seqMsg.timestamp.toString()) + } + + @Test + fun `assembling Login`() { + val settings = PillarHandlerSettings() + val login = Login(settings).login().array() + val raw = byteArrayOf( + 2, 1, //type:513 + 0, 76, //length:76 + 117, 115, 101, 114, 110, 97, 109, 101, 0, 0, 0, 0, 0, 0, 0, 0, //username + 112, 97, 115, 115, 119, 111, 114, 100, 0, 0, 0, 0, + 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //password + 109, 105, 99, 0, //mic + 49, 46, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 // version + ) + + for (i in raw.indices) + assertEquals(raw[i], login[i]) + } + + @Test + fun `assembling Open`() { + val stream = byteArrayOf( + 5, 65, 0, 5, 15, -99, 95, 4 + ) + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(stream) + val open = Open(StreamId(buffer), BigDecimal.valueOf(23)).open().array() + + val raw = byteArrayOf( + 2, 5, //type:517, + 0, 30, //length:30 + 5, 65, 0, 5, 15, -99, 95, 4, //stream_id: env_id(1), sess_num(3), stream_type, user_id(2), sub_id(1) + 23, 0, 0, 0, 0, 0, 0, 0, //start_seq + 24, 0, 0, 0, 0, 0, 0, 0, //end_seq + 2, //access + 0, //mode + ) + + for (i in open.indices) + assertEquals(raw[i], open[i]) + } + + @Test + fun `assembling SeqMsg`() { + val rawSend = byteArrayOf( + 9, 5, //type + 0, 32, //length + 5, 65, 0, 5, 13, -99, 95, 4, //stream_id: env_id(1), sess_num(3), stream_type, user_id(2), sub_id(1) + 23, 0, 0, 0, 0, 0, 0, 0, //seq + 0, 0, 0, 0, //reserved1 + 64, -59, -122, 125, 62, -96, -60, 22 //timestamp + ) + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(rawSend) + val seqMsg = SeqMsg(buffer) + + val seqMsgToSend = SeqMsgToSend(seqMsg).seqMsg().array() + + val raw = byteArrayOf( + 9, 5, //type + 0, 32, //length + 5, 65, 0, 5, 15, -99, 95, 4, //stream_id: env_id(1), sess_num(3), stream_type, user_id(2), sub_id(1) + 23, 0, 0, 0, 0, 0, 0, 0, //seq + 0, 0, 0, 0 //reserved1 + ) + + for (i in raw.indices) + assertEquals(raw[i], seqMsgToSend[i]) + } + + @Test + fun `assembling Close`() { + + val stream = byteArrayOf( + 5, 65, 0, 5, 15, -99, 95, 4 + ) + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(stream) + val streamId = StreamIdEncode(StreamId(buffer)) + val close = Close(streamId.streamIdBuf).close().array() + + val raw = byteArrayOf( + 2, 7, + 0, 12, + 5, 65, 0, 5, 15, -99, 95, 4, + ) + + for (i in close.indices) + assertEquals(raw[i], close[i]) + } + + @Test + fun `invalid size message`() { + val raw = byteArrayOf( + 9, 5, //type + 0, 32, //length + ) + val buffer: ByteBuf = Unpooled.buffer(4) + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel, settings) + assertNull(pillarHandler.onReceive(buffer)) + } + + @Test + fun `empty message`() { + val buffer: ByteBuf = Unpooled.buffer() + val pillarHandler = PillarHandler(channel, settings) + assertNull(pillarHandler.onReceive(buffer)) + } + + @Test + fun `message size is less than 4`() { + val raw = byteArrayOf( + 9, 5, 0 + ) + val buffer: ByteBuf = Unpooled.buffer(3) + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel, settings) + assertNull(pillarHandler.onReceive(buffer)) + } + + @Test + fun `send onOutgoing`() { + val raw = byteArrayOf( + 2, 2, 0, 21, 5, 65, 0, 5, 15, -99, 95, 4 + ) + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel, settings) + val metadata = mutableMapOf() + metadata[TYPE_FIELD_NAME] = 517.toString() + metadata[LENGTH_FIELD_NAME] = 21.toString() + + val onOutgoing = pillarHandler.onOutgoing(buffer, metadata) + + assertEquals(517.toString(), onOutgoing[TYPE_FIELD_NAME]) + assertEquals(21.toString(), onOutgoing[LENGTH_FIELD_NAME]) + } + + + @Test + fun `invalid type message`() { + val raw = byteArrayOf( + 9, 9, //type + 0, 32, //length + ) + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel, settings) + assertNull(pillarHandler.onReceive(buffer)) + } + + @Test + fun `invalid heartbeat interval`() { + settings.heartbeatInterval = 0 + val exception = assertThrows { PillarHandler(channel, settings) } + assertEquals("Heartbeat sending interval must be greater than zero.", exception.message) + } + + @Test + fun `invalid status in LoginResponse`() { + val raw = byteArrayOf( + 2, 2, //type, + 0, 21, //length + 117, 115, 101, 114, 110, 97, 109, 101, 0, 0, 0, 0, 0, 0, 0, 0, //username + 85, //status + ) + val buffer: ByteBuf = Unpooled.buffer() + buffer.writeBytes(raw) + val pillarHandler = PillarHandler(channel, settings) + val message = pillarHandler.onReceive(buffer) + val exception = assertThrows { pillarHandler.onIncoming(message!!) } + assertEquals("Received STREAM_NOT_OPEN status.", exception.message) + } + + @Test + fun `invalid username Login`() { + settings.username = "username_username" + settings.password = String() + val exception = assertThrows { Login(settings) } + assertEquals("Size of username exceeds allowed size or equal to zero.", exception.message) + } + + @Test + fun `invalid password Login`() { + settings.password = String() + val exception = assertThrows { Login(settings) } + assertEquals("Size of password exceeds allowed size or equal to zero.", exception.message) + } + + @Test + fun `invalid mic Login`() { + settings.mic = "mic_mic" + val exception = assertThrows { Login(settings) } + assertEquals("Size of mic exceeds allowed size or equal to zero.", exception.message) } - @Nested - inner class Negative { - - @Test - fun `invalid type message`() { - val raw = byteArrayOf( - 9, 9, //type - 0, 32, //length - ) - val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) - val exception = assertThrows { pillarHandler.onReceive(buffer) } - assertEquals("Message type is not supported: 2313", exception.message) - } - - @Test - fun `invalid heartbeat interval`() { - settings.heartbeatInterval = 0L - val exception = assertThrows { PillarHandler(channel, settings) } - assertEquals("Heartbeat sending interval must be greater than zero", exception.message) - } - - @Test - fun `invalid LoginResponse`() { - val raw = byteArrayOf( - 2, 2, //type, - 0, 21, //length - 117, 115, 101, 114, 110, 97, 109, 101, 0, 0, 0, 0, 0, 0, 0, 0, //username - 85, //status - ) - val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) - val data = pillarHandler.onReceive(buffer) - val exception = assertThrows { pillarHandler.onIncoming(data!!) } - assertEquals("Received STREAM_NOT_OPEN status.", exception.message) - } + @Test + fun `invalid version Login`() { + settings.version = String() + val exception = assertThrows { Login(settings) } + assertEquals("Size of version exceeds allowed size or equal to zero.", exception.message) } } \ No newline at end of file From b1b0defe04bb434560256f1a5c321b8afe9ea603 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Tue, 28 Dec 2021 11:51:52 +0300 Subject: [PATCH 07/49] [TH2-2806] Fixes PillarHandler, PillarMessageDecoder, PillarMessageEncoder, PillarUtils, TestHandler --- .../ditry/pillar/handler/PillarHandler.kt | 29 ++++++------ .../pillar/handler/PillarMessageDecoder.kt | 46 ++++++++++--------- .../pillar/handler/PillarMessageEncoder.kt | 19 ++++---- .../ditry/pillar/handler/util/PillarUtils.kt | 8 ++-- src/test/java/TestHandler.kt | 39 +++++++++------- 5 files changed, 76 insertions(+), 65 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt index c62633f..d2d2d58 100644 --- a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt @@ -44,13 +44,13 @@ class PillarHandler(private val channel: IChannel, override fun onOpen() { if (state.compareAndSet(State.SESSION_CLOSE, State.SESSION_CREATED)) { - LOGGER.info { "Setting a new state -> $state." } + LOGGER.info { "Setting a new state -> ${state.get()}." } channel.send(Login(settings).login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE) startSendHeartBeats() LOGGER.info { "Handler is connected." } - } else LOGGER.info { "Failed to set a new state. $state -> ${State.SESSION_CREATED}." } + } else LOGGER.info { "Failed to set a new state. ${State.SESSION_CLOSE} -> ${state.get()}." } } override fun onReceive(buffer: ByteBuf): ByteBuf? { @@ -104,12 +104,13 @@ class PillarHandler(private val channel: IChannel, State.SESSION_CREATED, State.LOGGED_IN ) - ) LOGGER.info { "Setting a new state -> $state." } - else LOGGER.info { "Failed to set a new state. $state -> ${State.LOGGED_IN}." } + ) LOGGER.info { "Setting a new state -> ${state.get()}." } + else LOGGER.info { "Failed to set a new state. ${State.LOGGED_IN} -> ${state.get()}." } } Status.NOT_LOGGED_IN -> { if (state.compareAndSet(State.SESSION_CREATED, State.SESSION_CLOSE)) stopSendHeartBeats() - else LOGGER.info { "Failed to set a new state. $state -> ${State.SESSION_CLOSE}." } + else LOGGER.info { "Failed to set a new state. ${State.SESSION_CLOSE} -> ${state.get()}." } + LOGGER.info("Received `not logged in` status. Fall in to error state.") sendClose() } @@ -184,11 +185,11 @@ class PillarHandler(private val channel: IChannel, } override fun onClose() { - if (!state.compareAndSet(State.SESSION_CLOSE, State.SESSION_CLOSE)) { + if (state.compareAndSet(state.get(), State.SESSION_CLOSE)) { state.getAndSet(State.SESSION_CLOSE) - LOGGER.info { "Setting a new state -> $state." } + LOGGER.info { "Setting a new state -> ${state.get()}." } LOGGER.info { "Handler is disconnected." } - } else LOGGER.info { "Failed to set a new state. $state -> ${State.SESSION_CLOSE}." } + } else LOGGER.info { "Failed to set a new state." } } override fun close() { @@ -197,15 +198,15 @@ class PillarHandler(private val channel: IChannel, } private fun sendClose() { - if (!state.compareAndSet(State.LOGGED_OUT, State.LOGGED_OUT)) { + if (state.compareAndSet(state.get(), State.LOGGED_OUT)) { state.getAndSet(State.LOGGED_OUT) - LOGGER.info { "Setting a new state -> $state." } + LOGGER.info { "Setting a new state -> ${state.get()}." } channel.send( Close(streamId.streamIdBuf).close(), messageMetadata(MessageType.CLOSE), IChannel.SendMode.MANGLE ) - } else LOGGER.info { "Failed to set a new state. $state -> ${State.LOGGED_OUT}." } + } else LOGGER.info { "Failed to set a new state." } } private fun startSendHeartBeats() { @@ -218,12 +219,12 @@ class PillarHandler(private val channel: IChannel, } private fun receivedHeartBeats() { - if (!state.compareAndSet(State.NOT_HEARTBEAT, State.NOT_HEARTBEAT)) { + if (state.compareAndSet(state.get(), State.NOT_HEARTBEAT)) { LOGGER.error { "Server stopped sending heartbeat." } state.getAndSet(State.NOT_HEARTBEAT) - LOGGER.info { "Setting a new state -> $state." } + LOGGER.info { "Setting a new state -> ${state.get()}." } sendClose() - } else LOGGER.info { "Failed to set a new state. $state -> ${State.NOT_HEARTBEAT}." } + } else LOGGER.info { "Failed to set a new state." } } private fun messageMetadata(messageType: MessageType): Map{ diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt index a18059f..189871c 100644 --- a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt +++ b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt @@ -29,6 +29,7 @@ class MsgHeader(byteBuf: ByteBuf) { val length: Int init { + byteBuf.readerIndex(0) type = byteBuf.readShort().toInt() length = byteBuf.readShort().toInt() } @@ -38,14 +39,14 @@ class StreamId(byteBuf: ByteBuf){ val envId: Short val sessNum: Int var streamType: Byte - val userId: UShort + val userId: Int val subId: Int init { envId = byteBuf.readUnsignedByte() sessNum = byteBuf.readMedium() streamType = byteBuf.readByte() - userId = byteBuf.readShort().toUShort() + userId = byteBuf.readUnsignedShort() subId = byteBuf.readByte().toInt() } } @@ -53,16 +54,15 @@ class StreamId(byteBuf: ByteBuf){ class LoginResponse(byteBuf: ByteBuf) { val header: MsgHeader val username: String - val status: Byte + val status: Short init { byteBuf.markReaderIndex() - byteBuf.readerIndex(0) header = MsgHeader(byteBuf) byteBuf.readerIndex(4) username = byteBuf.readCharSequence(16, StandardCharsets.US_ASCII).toString().trimEnd(0.toChar()) byteBuf.readerIndex(20) - status = byteBuf.readByte() + status = byteBuf.readUnsignedByte() require(byteBuf.readerIndex() == header.length){ "There are bytes left in buffer to read" } } @@ -72,21 +72,22 @@ class StreamAvail(byteBuf: ByteBuf) { val header: MsgHeader val streamId: StreamId val nextSeq: BigDecimal - val access: Byte + val access: Short init { byteBuf.markReaderIndex() - byteBuf.readerIndex(0) header = MsgHeader(byteBuf) byteBuf.readerIndex(4) streamId = StreamId(byteBuf) + byteBuf.readerIndex(12) val bytes = ByteArray(8) byteBuf.readBytes(bytes) bytes.reverse() nextSeq = BigInteger(1, bytes).toBigDecimal() + byteBuf.readerIndex(20) - access = byteBuf.readByte() + access = byteBuf.readUnsignedByte() require(byteBuf.readerIndex() == header.length){ "There are bytes left in buffer to read" } } @@ -95,19 +96,18 @@ class StreamAvail(byteBuf: ByteBuf) { class OpenResponse(byteBuf: ByteBuf) { val header: MsgHeader val streamId: StreamId - val status: Byte - val access: Byte + val status: Short + val access: Short init { byteBuf.markReaderIndex() - byteBuf.readerIndex(0) header = MsgHeader(byteBuf) byteBuf.readerIndex(4) streamId = StreamId(byteBuf) byteBuf.readerIndex(12) - status = byteBuf.readByte() + status = byteBuf.readUnsignedByte() byteBuf.readerIndex(13) - access = byteBuf.readByte() + access = byteBuf.readUnsignedByte() require(byteBuf.readerIndex() == header.length){ "There are bytes left in buffer to read" } } @@ -116,16 +116,15 @@ class OpenResponse(byteBuf: ByteBuf) { class CloseResponse(byteBuf: ByteBuf){ val header: MsgHeader val streamId: StreamId - val status: Byte + val status: Short init { byteBuf.markReaderIndex() - byteBuf.readerIndex(0) header = MsgHeader(byteBuf) byteBuf.readerIndex(4) streamId = StreamId(byteBuf) byteBuf.readerIndex(12) - status = byteBuf.readByte() + status = byteBuf.readUnsignedByte() require(byteBuf.readerIndex() == header.length){ "There are bytes left in buffer to read" } } @@ -134,26 +133,31 @@ class CloseResponse(byteBuf: ByteBuf){ class SeqMsg(byteBuf: ByteBuf) { val header: MsgHeader val streamId: StreamId - val seqmsg: Int + val seq: BigDecimal val reserved1: Int val timestamp: LocalDateTime init { byteBuf.markReaderIndex() - byteBuf.readerIndex(0) header = MsgHeader(byteBuf) byteBuf.readerIndex(4) streamId = StreamId(byteBuf) - seqmsg = byteBuf.readByte().toInt() + + byteBuf.readerIndex(12) + val bytes = ByteArray(8) + byteBuf.readBytes(bytes) + bytes.reverse() + seq = BigInteger(1, bytes).toBigDecimal() + byteBuf.readerIndex(20) reserved1 = byteBuf.readMedium() byteBuf.readerIndex(24) + val time = byteBuf.readLongLE().toULong() val milliseconds = time / 1_000_000UL val nanoseconds = time % 1_000_000_000UL timestamp = LocalDateTime.ofInstant(Instant.ofEpochMilli(milliseconds.toLong()), ZoneOffset.UTC).withNano( - nanoseconds.toInt() - ) + nanoseconds.toInt()) require(byteBuf.readerIndex() == header.length){ "There are bytes left in buffer to read" } } diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageEncoder.kt b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageEncoder.kt index d486818..c80c694 100644 --- a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageEncoder.kt +++ b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageEncoder.kt @@ -42,7 +42,7 @@ class StreamIdEncode(var streamId: StreamId) { streamIdBuf.writeByte(streamId.envId.toInt()) streamIdBuf.writeMedium(streamId.sessNum) streamIdBuf.writeByte(streamId.streamType.toInt()) - streamIdBuf.writeShort(streamId.userId.toInt()) + streamIdBuf.writeShort(streamId.userId) streamIdBuf.writeByte(streamId.subId) } } @@ -57,7 +57,7 @@ class Login(settings: PillarHandlerSettings) { init { username = settings.username.encodeToByteArray() - require(username.size < 16 && username.isNotEmpty()) { "Size of username exceeds allowed size or equal to zero." } + require(username.size <= 16 && username.isNotEmpty()) { "Size of username exceeds allowed size or equal to zero." } password = settings.password.encodeToByteArray() require(password.size <= 32 && password.isNotEmpty()) { "Size of password exceeds allowed size or equal to zero." } mic = settings.mic.encodeToByteArray() @@ -85,8 +85,9 @@ class Login(settings: PillarHandlerSettings) { loginMessage.writerIndex(56) loginMessage.writeBytes(version) - require (length >= loginMessage.readableBytes()){ "Message size exceeded." } + loginMessage.writerIndex(76) + require ( loginMessage.writerIndex() == length){ "Message size exceeded." } return loginMessage } } @@ -109,7 +110,7 @@ class Open(private val streamId: StreamId, openMessage.writerIndex(12) openMessage.writeLongLE(startSeq.toLong()) openMessage.writerIndex(20) - openMessage.writeLongLE(startSeq.toLong()+1) + openMessage.writeLongLE(startSeq.toLong()+1) //TODO openMessage.writerIndex(28) if (streamId.streamType == StreamType.REF.value || streamId.streamType == StreamType.GT.value) @@ -119,8 +120,7 @@ class Open(private val streamId: StreamId, openMessage.writeByte(MODE_LOSSY) - require (length >= openMessage.writerIndex()){ "Message size exceeded." } - + require (openMessage.writerIndex() == length){ "Message size exceeded." } return openMessage } } @@ -140,7 +140,7 @@ class SeqMsgToSend(private val seqmsg: SeqMsg){ seqmsg.streamId.streamType = StreamType.TG.value seqMsgMessage.writeBytes(StreamIdEncode(seqmsg.streamId).streamIdBuf) seqMsgMessage.writerIndex(12) - seqMsgMessage.writeByte(seqmsg.seqmsg) + seqMsgMessage.writeByte(seqmsg.seq.toInt()) seqMsgMessage.writerIndex(20) seqMsgMessage.writeInt(seqmsg.reserved1) @@ -150,8 +150,7 @@ class SeqMsgToSend(private val seqmsg: SeqMsg){ val nanoseconds = time.nano.toULong() seqMsgMessage.writeLongLE((seconds * 1_000_000_000UL + nanoseconds).toLong()) - require (length == seqMsgMessage.writerIndex()){ "Message size exceeded." } - + require (seqMsgMessage.writerIndex() == length){ "Message size exceeded." } return seqMsgMessage } } @@ -167,7 +166,7 @@ class Close(private val streamId: ByteBuf) { closeMessage.writeShort(length) closeMessage.writeBytes(streamId) - require (length == closeMessage.writerIndex()){ "Message size exceeded." } + require (closeMessage.writerIndex() == length){ "Message size exceeded." } return closeMessage } } diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/util/PillarUtils.kt b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/util/PillarUtils.kt index 3124d28..67eeb15 100644 --- a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/util/PillarUtils.kt +++ b/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/util/PillarUtils.kt @@ -31,7 +31,7 @@ enum class State(val value: Int){ NOT_HEARTBEAT(4); } -enum class Status(val value: Byte) { +enum class Status(val value: Short) { OK(0), NOT_LOGGED_IN(18), INVALID_LOGIN_DETAILS(24), @@ -43,7 +43,7 @@ enum class Status(val value: Byte) { STREAM_NOT_OPEN(85); companion object { - fun getStatus(value: Byte?): Status { + fun getStatus(value: Short): Status { return values().find { it.value == value }!! } } @@ -71,7 +71,7 @@ enum class StreamType (val value: Byte){ REF(33), XDP(27); companion object { - fun getStream(value: Byte?): StreamType? { + fun getStream(value: Byte): StreamType? { return values().find { it.value == value } } } @@ -89,7 +89,7 @@ enum class MessageType(val type: Int, val length: Int) { SEQMSG(2309, 32); companion object { - fun getEnum(type: Int?): MessageType? { + fun getEnum(type: Int): MessageType? { return values().find { it.type == type } } diff --git a/src/test/java/TestHandler.kt b/src/test/java/TestHandler.kt index a00c8ec..f43db78 100644 --- a/src/test/java/TestHandler.kt +++ b/src/test/java/TestHandler.kt @@ -28,7 +28,6 @@ import io.netty.buffer.Unpooled import io.netty.channel.EventLoopGroup import io.netty.channel.nio.NioEventLoopGroup import org.junit.jupiter.api.Assertions.assertEquals -import org.junit.jupiter.api.Nested import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import org.mockito.Mockito.mock @@ -113,7 +112,7 @@ class TestHandler { assertEquals(5, streamAvail.streamId.envId) assertEquals(4259845, streamAvail.streamId.sessNum) assertEquals(15, streamAvail.streamId.streamType) - assertEquals(40287.toUShort(), streamAvail.streamId.userId) + assertEquals(40287, streamAvail.streamId.userId) assertEquals(4, streamAvail.streamId.subId) } @@ -140,7 +139,7 @@ class TestHandler { assertEquals(5, openResponseMsg.streamId.envId) assertEquals(4259845, openResponseMsg.streamId.sessNum) assertEquals(15, openResponseMsg.streamId.streamType) - assertEquals(40287.toUShort(), openResponseMsg.streamId.userId) + assertEquals(40287, openResponseMsg.streamId.userId) assertEquals(4, openResponseMsg.streamId.subId) assertEquals(0, openResponseMsg.status) assertEquals(2, openResponseMsg.access) @@ -168,7 +167,7 @@ class TestHandler { assertEquals(5, closeResponseMsg.streamId.envId) assertEquals(4259845, closeResponseMsg.streamId.sessNum) assertEquals(15, closeResponseMsg.streamId.streamType) - assertEquals(40287.toUShort(), closeResponseMsg.streamId.userId) + assertEquals(40287, closeResponseMsg.streamId.userId) assertEquals(4, closeResponseMsg.streamId.subId) assertEquals(0, closeResponseMsg.status) } @@ -195,9 +194,9 @@ class TestHandler { assertEquals(5, seqMsg.streamId.envId) assertEquals(4259845, seqMsg.streamId.sessNum) assertEquals(13, seqMsg.streamId.streamType) - assertEquals(40287.toUShort(), seqMsg.streamId.userId) + assertEquals(40287, seqMsg.streamId.userId) assertEquals(4, seqMsg.streamId.subId) - assertEquals(23, seqMsg.seqmsg) + assertEquals(BigDecimal.valueOf(23), seqMsg.seq) assertEquals(0, seqMsg.reserved1) assertEquals("2021-12-27T13:39:14.524104", seqMsg.timestamp.toString()) } @@ -205,7 +204,7 @@ class TestHandler { @Test fun `assembling Login`() { val settings = PillarHandlerSettings() - val login = Login(settings).login().array() + val login = Login(settings).login() val raw = byteArrayOf( 2, 1, //type:513 0, 76, //length:76 @@ -216,8 +215,10 @@ class TestHandler { 49, 46, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 // version ) + assertEquals(76, login.writerIndex()) + for (i in raw.indices) - assertEquals(raw[i], login[i]) + assertEquals(raw[i], login.array()[i]) } @Test @@ -227,7 +228,7 @@ class TestHandler { ) val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(stream) - val open = Open(StreamId(buffer), BigDecimal.valueOf(23)).open().array() + val open = Open(StreamId(buffer), BigDecimal.valueOf(23)).open() val raw = byteArrayOf( 2, 5, //type:517, @@ -239,8 +240,10 @@ class TestHandler { 0, //mode ) - for (i in open.indices) - assertEquals(raw[i], open[i]) + assertEquals(30, open.writerIndex()) + + for (i in raw.indices) + assertEquals(raw[i], open.array()[i]) } @Test @@ -257,7 +260,7 @@ class TestHandler { buffer.writeBytes(rawSend) val seqMsg = SeqMsg(buffer) - val seqMsgToSend = SeqMsgToSend(seqMsg).seqMsg().array() + val seqMsgToSend = SeqMsgToSend(seqMsg).seqMsg() val raw = byteArrayOf( 9, 5, //type @@ -267,8 +270,10 @@ class TestHandler { 0, 0, 0, 0 //reserved1 ) + assertEquals(32, seqMsgToSend.writerIndex()) + for (i in raw.indices) - assertEquals(raw[i], seqMsgToSend[i]) + assertEquals(raw[i], seqMsgToSend.array()[i]) } @Test @@ -280,7 +285,7 @@ class TestHandler { val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(stream) val streamId = StreamIdEncode(StreamId(buffer)) - val close = Close(streamId.streamIdBuf).close().array() + val close = Close(streamId.streamIdBuf).close() val raw = byteArrayOf( 2, 7, @@ -288,8 +293,10 @@ class TestHandler { 5, 65, 0, 5, 15, -99, 95, 4, ) - for (i in close.indices) - assertEquals(raw[i], close[i]) + assertEquals(12, close.writerIndex()) + + for (i in raw.indices) + assertEquals(raw[i], close.array()[i]) } @Test From a66f17f18d086918ed57b706b74ded0baa46dab2 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Tue, 28 Dec 2021 15:59:11 +0300 Subject: [PATCH 08/49] [TH2-2806] Changing project name --- settings.gradle | 2 +- .../{ditry => dirty}/pillar/handler/PillarHandler.kt | 7 ++++--- .../pillar/handler/PillarHandlerFactory.kt | 2 +- .../pillar/handler/PillarHandlerSettings.kt | 2 +- .../pillar/handler/PillarMessageDecoder.kt | 2 +- .../pillar/handler/PillarMessageEncoder.kt | 10 +++++----- .../pillar/handler/util/PillarUtils.kt | 2 +- 7 files changed, 14 insertions(+), 13 deletions(-) rename src/main/java/com/exactpro/th2/conn/{ditry => dirty}/pillar/handler/PillarHandler.kt (98%) rename src/main/java/com/exactpro/th2/conn/{ditry => dirty}/pillar/handler/PillarHandlerFactory.kt (96%) rename src/main/java/com/exactpro/th2/conn/{ditry => dirty}/pillar/handler/PillarHandlerSettings.kt (95%) rename src/main/java/com/exactpro/th2/conn/{ditry => dirty}/pillar/handler/PillarMessageDecoder.kt (98%) rename src/main/java/com/exactpro/th2/conn/{ditry => dirty}/pillar/handler/PillarMessageEncoder.kt (95%) rename src/main/java/com/exactpro/th2/conn/{ditry => dirty}/pillar/handler/util/PillarUtils.kt (97%) diff --git a/settings.gradle b/settings.gradle index a3e9af4..c0047b4 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,2 +1,2 @@ -rootProject.name = 'th2-conn-ditry-pillar' +rootProject.name = 'th2-conn-dirty-pillar' diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt similarity index 98% rename from src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt rename to src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index d2d2d58..a8c2f5c 100644 --- a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -14,11 +14,11 @@ * limitations under the License. */ -package com.exactpro.th2.conn.ditry.pillar.handler +package com.exactpro.th2.conn.dirty.pillar.handler +import com.exactpro.th2.conn.dirty.pillar.handler.util.* import com.exactpro.th2.conn.dirty.tcp.core.api.IChannel import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandler -import com.exactpro.th2.conn.ditry.pillar.handler.util.* import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled import mu.KotlinLogging @@ -29,7 +29,8 @@ import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicReference class PillarHandler(private val channel: IChannel, - private val settings: PillarHandlerSettings): IProtocolHandler { + private val settings: PillarHandlerSettings +): IProtocolHandler { private var state = AtomicReference(State.SESSION_CLOSE) private val executor = Executors.newSingleThreadScheduledExecutor() diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerFactory.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt similarity index 96% rename from src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerFactory.kt rename to src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt index 375fede..0d7c119 100644 --- a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerFactory.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.exactpro.th2.conn.ditry.pillar.handler +package com.exactpro.th2.conn.dirty.pillar.handler import com.exactpro.th2.conn.dirty.tcp.core.api.IContext import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandler diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerSettings.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerSettings.kt similarity index 95% rename from src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerSettings.kt rename to src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerSettings.kt index b88944d..93d580b 100644 --- a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarHandlerSettings.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerSettings.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.exactpro.th2.conn.ditry.pillar.handler +package com.exactpro.th2.conn.dirty.pillar.handler import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandlerSettings diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt similarity index 98% rename from src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt rename to src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt index 189871c..bca0706 100644 --- a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageDecoder.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.exactpro.th2.conn.ditry.pillar.handler +package com.exactpro.th2.conn.dirty.pillar.handler import io.netty.buffer.ByteBuf import java.math.BigDecimal diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageEncoder.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt similarity index 95% rename from src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageEncoder.kt rename to src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt index c80c694..4916661 100644 --- a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/PillarMessageEncoder.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt @@ -14,12 +14,12 @@ * limitations under the License. */ -package com.exactpro.th2.conn.ditry.pillar.handler +package com.exactpro.th2.conn.dirty.pillar.handler -import com.exactpro.th2.conn.ditry.pillar.handler.util.Access -import com.exactpro.th2.conn.ditry.pillar.handler.util.MODE_LOSSY -import com.exactpro.th2.conn.ditry.pillar.handler.util.MessageType -import com.exactpro.th2.conn.ditry.pillar.handler.util.StreamType +import com.exactpro.th2.conn.dirty.pillar.handler.util.Access +import com.exactpro.th2.conn.dirty.pillar.handler.util.MODE_LOSSY +import com.exactpro.th2.conn.dirty.pillar.handler.util.MessageType +import com.exactpro.th2.conn.dirty.pillar.handler.util.StreamType import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled import java.math.BigDecimal diff --git a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/util/PillarUtils.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/util/PillarUtils.kt similarity index 97% rename from src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/util/PillarUtils.kt rename to src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/util/PillarUtils.kt index 67eeb15..ec82030 100644 --- a/src/main/java/com/exactpro/th2/conn/ditry/pillar/handler/util/PillarUtils.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/util/PillarUtils.kt @@ -14,7 +14,7 @@ * limitations under the License. */ -package com.exactpro.th2.conn.ditry.pillar.handler.util +package com.exactpro.th2.conn.dirty.pillar.handler.util import kotlin.experimental.and import kotlin.experimental.or From 9cf14bfd090c2e302b03f7bc4df85ff10509c13e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Tue, 28 Dec 2021 16:05:38 +0300 Subject: [PATCH 09/49] [TH2-2806] Changing project name --- src/test/java/TestHandler.kt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/test/java/TestHandler.kt b/src/test/java/TestHandler.kt index f43db78..f6a1ea0 100644 --- a/src/test/java/TestHandler.kt +++ b/src/test/java/TestHandler.kt @@ -17,12 +17,13 @@ import com.exactpro.th2.common.event.Event import com.exactpro.th2.common.grpc.EventID import com.exactpro.th2.common.grpc.RawMessage +import com.exactpro.th2.conn.dirty.pillar.handler.* +import com.exactpro.th2.conn.dirty.pillar.handler.util.LENGTH_FIELD_NAME +import com.exactpro.th2.conn.dirty.pillar.handler.util.TYPE_FIELD_NAME import com.exactpro.th2.conn.dirty.tcp.core.ActionStreamExecutor import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandler import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolMangler import com.exactpro.th2.conn.dirty.tcp.core.api.impl.Channel -import com.exactpro.th2.conn.ditry.pillar.handler.* -import com.exactpro.th2.conn.ditry.pillar.handler.util.* import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled import io.netty.channel.EventLoopGroup From 37b28fc2be3f2d002c708ba7f2cda71941989023 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= <89018421+tatianavvedenskaya@users.noreply.github.com> Date: Wed, 29 Dec 2021 14:46:15 +0300 Subject: [PATCH 10/49] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 046abc1..34c5a8f 100644 --- a/build.gradle +++ b/build.gradle @@ -61,7 +61,7 @@ dependencies { } application { - mainClassName 'com.exactpro.th2.conn.dirty.tcp.core.MainKt' + mainClassName 'com.exactpro.th2.conn.dirty.tcp.core.Main' } applicationName = 'service' From e74d6005578c82cd00152ffdd9268c6badabf582 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Thu, 30 Dec 2021 13:40:33 +0300 Subject: [PATCH 11/49] Update build.gradle --- build.gradle | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/build.gradle b/build.gradle index 34c5a8f..5a7855c 100644 --- a/build.gradle +++ b/build.gradle @@ -45,12 +45,12 @@ repositories { dependencies { api platform('com.exactpro.th2:bom:3.0.0') - implementation 'com.exactpro.th2:common:3.31.4' - implementation 'com.exactpro.th2:conn-dirty-tcp-core:0.0.1-th2-2785-1615274464-SNAPSHOT' + implementation 'com.exactpro.th2:common:3.31.5' + implementation 'com.exactpro.th2:conn-dirty-tcp-core:0.0.1-dev-1637159080-SNAPSHOT' implementation 'io.netty:netty-all:4.1.72.Final' - implementation 'io.github.microutils:kotlin-logging:2.1.16' + implementation 'io.github.microutils:kotlin-logging:2.1.21' implementation 'org.jetbrains.kotlin:kotlin-stdlib-jdk8:1.6.0' From b4b84507a979eb0deede6758e70cf80e7df94d19 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= <89018421+tatianavvedenskaya@users.noreply.github.com> Date: Mon, 10 Jan 2022 10:43:11 +0300 Subject: [PATCH 12/49] Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 5a7855c..8de7a05 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ dependencies { api platform('com.exactpro.th2:bom:3.0.0') implementation 'com.exactpro.th2:common:3.31.5' - implementation 'com.exactpro.th2:conn-dirty-tcp-core:0.0.1-dev-1637159080-SNAPSHOT' + implementation 'com.exactpro.th2:conn-dirty-tcp-core:0.0.1-dev-1676302697-SNAPSHOT' implementation 'io.netty:netty-all:4.1.72.Final' From 23c676dc611db01afa745fb2d167bd0042b2dd4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= <89018421+tatianavvedenskaya@users.noreply.github.com> Date: Mon, 10 Jan 2022 10:48:00 +0300 Subject: [PATCH 13/49] Update PillarHandlerFactory.kt --- .../th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt index 0d7c119..9885302 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt @@ -23,11 +23,11 @@ import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandlerSettings import com.exactpro.th2.conn.dirty.tcp.core.api.impl.Channel class PillarHandlerFactory: IProtocolHandlerFactory { - override val name: String = PillarHandlerSettings::class.java.name + override val name: String = IProtocolHandlerFactory::class.java.name override val settings: Class = PillarHandlerSettings::class.java override fun create(context: IContext): IProtocolHandler { return PillarHandler(context.channel, context.settings as PillarHandlerSettings) } -} \ No newline at end of file +} From 0a9437ce028793f77c4e71b79dc2c38fdeb1f30b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= <89018421+tatianavvedenskaya@users.noreply.github.com> Date: Mon, 10 Jan 2022 12:15:49 +0300 Subject: [PATCH 14/49] [TH2-2806]Update build.gradle --- build.gradle | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/build.gradle b/build.gradle index 8de7a05..3e1517f 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ dependencies { api platform('com.exactpro.th2:bom:3.0.0') implementation 'com.exactpro.th2:common:3.31.5' - implementation 'com.exactpro.th2:conn-dirty-tcp-core:0.0.1-dev-1676302697-SNAPSHOT' + implementation 'com.exactpro.th2:conn-dirty-tcp-core:0.0.1-dev-1676617005-SNAPSHOT' implementation 'io.netty:netty-all:4.1.72.Final' From ee991efc2c1bf88b942ece5efa5ea4853a60eb5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Mon, 10 Jan 2022 14:40:12 +0300 Subject: [PATCH 15/49] [TH2-2806] Update build.gradle, PillarHandler.kt, PillarHandlerFactory.kt, TestHandler.kt --- .../dirty/pillar/handler/PillarHandler.kt | 11 +++-- .../pillar/handler/PillarHandlerFactory.kt | 4 +- src/test/java/TestHandler.kt | 45 +++++++++++++------ 3 files changed, 42 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index a8c2f5c..d4822fd 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -18,7 +18,10 @@ package com.exactpro.th2.conn.dirty.pillar.handler import com.exactpro.th2.conn.dirty.pillar.handler.util.* import com.exactpro.th2.conn.dirty.tcp.core.api.IChannel +import com.exactpro.th2.conn.dirty.tcp.core.api.IContext import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandler +import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandlerSettings +import com.exactpro.th2.conn.dirty.tcp.core.api.impl.Channel import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled import mu.KotlinLogging @@ -28,17 +31,18 @@ import java.util.concurrent.Future import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicReference -class PillarHandler(private val channel: IChannel, - private val settings: PillarHandlerSettings -): IProtocolHandler { +class PillarHandler(private val context: IContext): IProtocolHandler { private var state = AtomicReference(State.SESSION_CLOSE) private val executor = Executors.newSingleThreadScheduledExecutor() private var clientFuture: Future<*>? = CompletableFuture.completedFuture(null) private var serverFuture: Future<*>? = CompletableFuture.completedFuture(null) private lateinit var streamId: StreamIdEncode + private var settings: PillarHandlerSettings + lateinit var channel: IChannel init{ + settings = context.settings as PillarHandlerSettings require(settings.heartbeatInterval > 0) { "Heartbeat sending interval must be greater than zero." } require(settings.streamAvailInterval > 0) { "StreamAvail sending interval must be greater than zero." } } @@ -47,6 +51,7 @@ class PillarHandler(private val channel: IChannel, if (state.compareAndSet(State.SESSION_CLOSE, State.SESSION_CREATED)) { LOGGER.info { "Setting a new state -> ${state.get()}." } + channel = context.channel channel.send(Login(settings).login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE) startSendHeartBeats() diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt index 9885302..30b21e5 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt @@ -28,6 +28,6 @@ class PillarHandlerFactory: IProtocolHandlerFactory { override val settings: Class = PillarHandlerSettings::class.java override fun create(context: IContext): IProtocolHandler { - return PillarHandler(context.channel, context.settings as PillarHandlerSettings) + return PillarHandler(context) } -} +} \ No newline at end of file diff --git a/src/test/java/TestHandler.kt b/src/test/java/TestHandler.kt index f6a1ea0..298127e 100644 --- a/src/test/java/TestHandler.kt +++ b/src/test/java/TestHandler.kt @@ -17,13 +17,17 @@ import com.exactpro.th2.common.event.Event import com.exactpro.th2.common.grpc.EventID import com.exactpro.th2.common.grpc.RawMessage +import com.exactpro.th2.common.schema.dictionary.DictionaryType import com.exactpro.th2.conn.dirty.pillar.handler.* import com.exactpro.th2.conn.dirty.pillar.handler.util.LENGTH_FIELD_NAME import com.exactpro.th2.conn.dirty.pillar.handler.util.TYPE_FIELD_NAME import com.exactpro.th2.conn.dirty.tcp.core.ActionStreamExecutor +import com.exactpro.th2.conn.dirty.tcp.core.api.IContext import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandler +import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandlerSettings import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolMangler import com.exactpro.th2.conn.dirty.tcp.core.api.impl.Channel +import com.exactpro.th2.conn.dirty.tcp.core.api.impl.Context import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled import io.netty.channel.EventLoopGroup @@ -34,6 +38,7 @@ import org.junit.jupiter.api.assertThrows import org.mockito.Mockito.mock import com.nhaarman.mockitokotlin2.mock import org.junit.jupiter.api.Assertions.assertNull +import java.io.InputStream import java.math.BigDecimal import java.net.InetSocketAddress import java.util.concurrent.Executor @@ -66,6 +71,10 @@ class TestHandler { actionExecutor, parentEventId ) + private val handlerSettings = PillarHandlerSettings() + private val readDictionary: (DictionaryType) -> InputStream = mock { } + val sendEvent: (Event) -> Unit = mock { } + private var context: IContext = Context(handlerSettings, readDictionary, sendEvent) private var settings = PillarHandlerSettings() @Test @@ -80,7 +89,8 @@ class TestHandler { val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) + val pillarHandler = PillarHandler(context) + pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) val metadata = pillarHandler.onIncoming(message!!) val loginResponseMsg = LoginResponse(message) @@ -104,7 +114,8 @@ class TestHandler { val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) + val pillarHandler = PillarHandler(context) + pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) val streamAvail = StreamAvail(message!!) @@ -129,7 +140,8 @@ class TestHandler { val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) + val pillarHandler = PillarHandler(context) + pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) val metadata = pillarHandler.onIncoming(message!!) val openResponseMsg = OpenResponse(message) @@ -157,7 +169,8 @@ class TestHandler { val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) + val pillarHandler = PillarHandler(context) + pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) val metadata = pillarHandler.onIncoming(message!!) val closeResponseMsg = CloseResponse(message) @@ -186,7 +199,8 @@ class TestHandler { val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) + val pillarHandler = PillarHandler(context) + pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) val seqMsg = SeqMsg(message!!) @@ -308,14 +322,16 @@ class TestHandler { ) val buffer: ByteBuf = Unpooled.buffer(4) buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) + val pillarHandler = PillarHandler(context) + pillarHandler.channel = channel assertNull(pillarHandler.onReceive(buffer)) } @Test fun `empty message`() { val buffer: ByteBuf = Unpooled.buffer() - val pillarHandler = PillarHandler(channel, settings) + val pillarHandler = PillarHandler(context) + pillarHandler.channel = channel assertNull(pillarHandler.onReceive(buffer)) } @@ -326,7 +342,8 @@ class TestHandler { ) val buffer: ByteBuf = Unpooled.buffer(3) buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) + val pillarHandler = PillarHandler(context) + pillarHandler.channel = channel assertNull(pillarHandler.onReceive(buffer)) } @@ -337,7 +354,7 @@ class TestHandler { ) val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) + val pillarHandler = PillarHandler(context) val metadata = mutableMapOf() metadata[TYPE_FIELD_NAME] = 517.toString() metadata[LENGTH_FIELD_NAME] = 21.toString() @@ -357,14 +374,15 @@ class TestHandler { ) val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) + val pillarHandler = PillarHandler(context) + pillarHandler.channel = channel assertNull(pillarHandler.onReceive(buffer)) } @Test fun `invalid heartbeat interval`() { - settings.heartbeatInterval = 0 - val exception = assertThrows { PillarHandler(channel, settings) } + handlerSettings.heartbeatInterval = 0 + val exception = assertThrows { PillarHandler(context) } assertEquals("Heartbeat sending interval must be greater than zero.", exception.message) } @@ -378,7 +396,8 @@ class TestHandler { ) val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(raw) - val pillarHandler = PillarHandler(channel, settings) + val pillarHandler = PillarHandler(context) + pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) val exception = assertThrows { pillarHandler.onIncoming(message!!) } assertEquals("Received STREAM_NOT_OPEN status.", exception.message) From 3d2d143e0f37c4a8ca0d4a83d37205617c0cba52 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Mon, 10 Jan 2022 15:21:06 +0300 Subject: [PATCH 16/49] [TH2-2806] Update PillarHandlerFactory.kt --- .../th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt index 30b21e5..5be40fc 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt @@ -23,7 +23,7 @@ import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandlerSettings import com.exactpro.th2.conn.dirty.tcp.core.api.impl.Channel class PillarHandlerFactory: IProtocolHandlerFactory { - override val name: String = IProtocolHandlerFactory::class.java.name + override val name: String = PillarHandlerFactory::class.java.name override val settings: Class = PillarHandlerSettings::class.java From 917db078ee03302df92395117f62f48e19d23080 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Thu, 13 Jan 2022 09:16:14 +0300 Subject: [PATCH 17/49] [TH2-2806] fixed build.gradle, TestHandler.kt --- build.gradle | 2 +- src/test/java/TestHandler.kt | 7 +++---- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/build.gradle b/build.gradle index 3e1517f..ba2dc75 100644 --- a/build.gradle +++ b/build.gradle @@ -46,7 +46,7 @@ dependencies { api platform('com.exactpro.th2:bom:3.0.0') implementation 'com.exactpro.th2:common:3.31.5' - implementation 'com.exactpro.th2:conn-dirty-tcp-core:0.0.1-dev-1676617005-SNAPSHOT' + implementation 'com.exactpro.th2:conn-dirty-tcp-core:0.0.1-th2-2785-1688122774-SNAPSHOT' implementation 'io.netty:netty-all:4.1.72.Final' diff --git a/src/test/java/TestHandler.kt b/src/test/java/TestHandler.kt index 298127e..5ccea6e 100644 --- a/src/test/java/TestHandler.kt +++ b/src/test/java/TestHandler.kt @@ -21,7 +21,7 @@ import com.exactpro.th2.common.schema.dictionary.DictionaryType import com.exactpro.th2.conn.dirty.pillar.handler.* import com.exactpro.th2.conn.dirty.pillar.handler.util.LENGTH_FIELD_NAME import com.exactpro.th2.conn.dirty.pillar.handler.util.TYPE_FIELD_NAME -import com.exactpro.th2.conn.dirty.tcp.core.ActionStreamExecutor +import com.exactpro.th2.conn.dirty.tcp.core.TaskSequencePool import com.exactpro.th2.conn.dirty.tcp.core.api.IContext import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandler import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandlerSettings @@ -54,8 +54,7 @@ class TestHandler { private val onMessage: (RawMessage) -> Unit = mock { } private val eventLoopGroup: EventLoopGroup = NioEventLoopGroup() private val executor: Executor = mock(Executor::class.java) - private val onError: (stream: String, error: Throwable) -> Unit = mock {} - private val actionExecutor = ActionStreamExecutor(executor, 1000, onError) + private val sequencePool = TaskSequencePool(executor) private val parentEventId = EventID.newBuilder().setId("root").build()!! private var channel = Channel( @@ -68,7 +67,7 @@ class TestHandler { onEvent, onMessage, eventLoopGroup, - actionExecutor, + sequencePool, parentEventId ) private val handlerSettings = PillarHandlerSettings() From 50538bb1ad4012567e687ad19f394dea89e7a448 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= <89018421+tatianavvedenskaya@users.noreply.github.com> Date: Thu, 13 Jan 2022 11:53:14 +0300 Subject: [PATCH 18/49] [TH2-2806] Fixed PillarHandler.kt --- .../com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index d4822fd..b006ab4 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -78,7 +78,7 @@ class PillarHandler(private val context: IContext): IP if (!MessageType.contains(messageType)){ buffer.resetReaderIndex() - LOGGER.error { "Message type is not supported: $messageType." } + LOGGER.error { "Message type is not supported. Type: $messageType, length: $messageLength" } return null } From 4800b3b65495f46547aedc5b9c41e12284c3f192 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Thu, 13 Jan 2022 13:22:35 +0300 Subject: [PATCH 19/49] [TH2-2806] Fixed PillarHandler.kt --- .../th2/conn/dirty/pillar/handler/PillarHandler.kt | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index b006ab4..0172eb2 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -21,7 +21,6 @@ import com.exactpro.th2.conn.dirty.tcp.core.api.IChannel import com.exactpro.th2.conn.dirty.tcp.core.api.IContext import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandler import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandlerSettings -import com.exactpro.th2.conn.dirty.tcp.core.api.impl.Channel import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled import mu.KotlinLogging @@ -53,7 +52,8 @@ class PillarHandler(private val context: IContext): IP channel = context.channel channel.send(Login(settings).login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE) - + LOGGER.info { "Message has been sent to server - Login" } + startSendHeartBeats() LOGGER.info { "Handler is connected." } } else LOGGER.info { "Failed to set a new state. ${State.SESSION_CLOSE} -> ${state.get()}." } @@ -138,6 +138,7 @@ class PillarHandler(private val context: IContext): IP open.open(), messageMetadata(MessageType.OPEN), IChannel.SendMode.MANGLE ) + LOGGER.info { "Message has been sent to server - Open" } serverFuture = executor.schedule(this::startSendHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) @@ -164,6 +165,7 @@ class PillarHandler(private val context: IContext): IP messageMetadata(MessageType.SEQMSG), IChannel.SendMode.MANGLE ) + LOGGER.info { "Message has been sent to server - SeqMsg" } return messageMetadata(MessageType.SEQMSG) } @@ -212,11 +214,13 @@ class PillarHandler(private val context: IContext): IP messageMetadata(MessageType.CLOSE), IChannel.SendMode.MANGLE ) + LOGGER.info { "Message has been sent to server - Close" } } else LOGGER.info { "Failed to set a new state." } } private fun startSendHeartBeats() { channel.send(Heartbeat().heartbeat, messageMetadata(MessageType.HEARTBEAT), IChannel.SendMode.MANGLE) + LOGGER.info { "Message has been sent to server - Heartbeat" } clientFuture = executor.schedule(this::receivedHeartBeats, settings.heartbeatInterval, TimeUnit.MILLISECONDS) } From b53d358b8b2e9945084dc86fdcf112cc63c45287 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Thu, 13 Jan 2022 13:51:18 +0300 Subject: [PATCH 20/49] [TH2-2806] Fixed PillarHandler.kt, TestHandler.kt --- .../th2/conn/dirty/pillar/handler/PillarHandler.kt | 5 +++-- src/test/java/TestHandler.kt | 8 +++----- 2 files changed, 6 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index 0172eb2..ab6be9d 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -53,8 +53,7 @@ class PillarHandler(private val context: IContext): IP channel = context.channel channel.send(Login(settings).login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE) LOGGER.info { "Message has been sent to server - Login" } - - startSendHeartBeats() + LOGGER.info { "Handler is connected." } } else LOGGER.info { "Failed to set a new state. ${State.SESSION_CLOSE} -> ${state.get()}." } } @@ -106,6 +105,8 @@ class PillarHandler(private val context: IContext): IP when (val status = Status.getStatus(loginResponse.status)) { Status.OK -> { LOGGER.info("Login successful. Start sending heartbeats.") + startSendHeartBeats() + if (state.compareAndSet( State.SESSION_CREATED, State.LOGGED_IN diff --git a/src/test/java/TestHandler.kt b/src/test/java/TestHandler.kt index 5ccea6e..9356787 100644 --- a/src/test/java/TestHandler.kt +++ b/src/test/java/TestHandler.kt @@ -91,12 +91,10 @@ class TestHandler { val pillarHandler = PillarHandler(context) pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) - val metadata = pillarHandler.onIncoming(message!!) - val loginResponseMsg = LoginResponse(message) - - assertEquals(514.toString(), metadata[TYPE_FIELD_NAME]) - assertEquals(21.toString(), metadata[LENGTH_FIELD_NAME]) + val loginResponseMsg = LoginResponse(message!!) + assertEquals(514, loginResponseMsg.header.type) + assertEquals(21, loginResponseMsg.header.length) assertEquals("username", loginResponseMsg.username) assertEquals(0, loginResponseMsg.status) } From b7ca8612facc7cebfae14cbd4ad8263e5e03fa8b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Fri, 14 Jan 2022 09:06:39 +0300 Subject: [PATCH 21/49] [TH2-2806] Fixed PillarHandler.kt, PillarMessageDecoder.kt, PillarMessageEncoder.kt, TestHandler.kt --- .../dirty/pillar/handler/PillarHandler.kt | 7 +- .../pillar/handler/PillarMessageDecoder.kt | 7 +- .../pillar/handler/PillarMessageEncoder.kt | 20 +- src/test/java/TestHandler.kt | 255 +++++++++--------- 4 files changed, 151 insertions(+), 138 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index ab6be9d..6a9dfd0 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -54,6 +54,8 @@ class PillarHandler(private val context: IContext): IP channel.send(Login(settings).login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE) LOGGER.info { "Message has been sent to server - Login" } + startSendHeartBeats() + LOGGER.info { "Handler is connected." } } else LOGGER.info { "Failed to set a new state. ${State.SESSION_CLOSE} -> ${state.get()}." } } @@ -71,8 +73,8 @@ class PillarHandler(private val context: IContext): IP } buffer.markReaderIndex() - val messageType = buffer.readShort().toInt() - val messageLength = buffer.readShort().toInt() + val messageType = buffer.readUnsignedShortLE() + val messageLength = buffer.readUnsignedShortLE() buffer.resetReaderIndex() if (!MessageType.contains(messageType)){ @@ -105,7 +107,6 @@ class PillarHandler(private val context: IContext): IP when (val status = Status.getStatus(loginResponse.status)) { Status.OK -> { LOGGER.info("Login successful. Start sending heartbeats.") - startSendHeartBeats() if (state.compareAndSet( State.SESSION_CREATED, diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt index bca0706..59ea692 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt @@ -30,8 +30,8 @@ class MsgHeader(byteBuf: ByteBuf) { init { byteBuf.readerIndex(0) - type = byteBuf.readShort().toInt() - length = byteBuf.readShort().toInt() + type = byteBuf.readUnsignedShortLE() + length = byteBuf.readUnsignedShortLE() } } @@ -140,6 +140,7 @@ class SeqMsg(byteBuf: ByteBuf) { init { byteBuf.markReaderIndex() header = MsgHeader(byteBuf) + byteBuf.readerIndex(4) streamId = StreamId(byteBuf) @@ -158,7 +159,7 @@ class SeqMsg(byteBuf: ByteBuf) { val nanoseconds = time % 1_000_000_000UL timestamp = LocalDateTime.ofInstant(Instant.ofEpochMilli(milliseconds.toLong()), ZoneOffset.UTC).withNano( nanoseconds.toInt()) - + println(timestamp) require(byteBuf.readerIndex() == header.length){ "There are bytes left in buffer to read" } } } diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt index 4916661..df7a239 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt @@ -30,8 +30,8 @@ class Heartbeat{ val heartbeat: ByteBuf = Unpooled.buffer(MessageType.HEARTBEAT.length) init { - heartbeat.writeShort(MessageType.HEARTBEAT.type) - heartbeat.writeShort(MessageType.HEARTBEAT.length) + heartbeat.writeShortLE(MessageType.HEARTBEAT.type) + heartbeat.writeShortLE(MessageType.HEARTBEAT.length) } } @@ -70,8 +70,8 @@ class Login(settings: PillarHandlerSettings) { val loginMessage: ByteBuf = Unpooled.buffer(length) loginMessage.markWriterIndex() - loginMessage.writeShort(type) - loginMessage.writeShort(length) + loginMessage.writeShortLE(type) + loginMessage.writeShortLE(length) loginMessage.writerIndex(4) loginMessage.writeBytes(username) @@ -101,8 +101,8 @@ class Open(private val streamId: StreamId, val openMessage: ByteBuf = Unpooled.buffer(length) openMessage.markWriterIndex() - openMessage.writeShort(type) - openMessage.writeShort(length) + openMessage.writeShortLE(type) + openMessage.writeShortLE(length) openMessage.writerIndex(4) openMessage.writeBytes(StreamIdEncode(streamId).streamIdBuf) @@ -133,8 +133,8 @@ class SeqMsgToSend(private val seqmsg: SeqMsg){ val seqMsgMessage: ByteBuf = Unpooled.buffer(length) seqMsgMessage.markWriterIndex() - seqMsgMessage.writeShort(type) - seqMsgMessage.writeShort(length) + seqMsgMessage.writeShortLE(type) + seqMsgMessage.writeShortLE(length) seqMsgMessage.writerIndex(4) seqmsg.streamId.streamType = StreamType.TG.value @@ -162,8 +162,8 @@ class Close(private val streamId: ByteBuf) { fun close(): ByteBuf { val closeMessage: ByteBuf = Unpooled.buffer(length) - closeMessage.writeShort(type) - closeMessage.writeShort(length) + closeMessage.writeShortLE(type) + closeMessage.writeShortLE(length) closeMessage.writeBytes(streamId) require (closeMessage.writerIndex() == length){ "Message size exceeded." } diff --git a/src/test/java/TestHandler.kt b/src/test/java/TestHandler.kt index 9356787..4971bd1 100644 --- a/src/test/java/TestHandler.kt +++ b/src/test/java/TestHandler.kt @@ -40,7 +40,11 @@ import com.nhaarman.mockitokotlin2.mock import org.junit.jupiter.api.Assertions.assertNull import java.io.InputStream import java.math.BigDecimal +import java.math.BigInteger import java.net.InetSocketAddress +import java.nio.charset.StandardCharsets +import java.time.LocalDateTime +import java.time.ZoneOffset import java.util.concurrent.Executor class TestHandler { @@ -72,22 +76,20 @@ class TestHandler { ) private val handlerSettings = PillarHandlerSettings() private val readDictionary: (DictionaryType) -> InputStream = mock { } - val sendEvent: (Event) -> Unit = mock { } + private val sendEvent: (Event) -> Unit = mock { } private var context: IContext = Context(handlerSettings, readDictionary, sendEvent) private var settings = PillarHandlerSettings() @Test fun `sending LoginResponse with extra bytes`() { - val raw = byteArrayOf( - 2, 2, //type, - 0, 21, //length - 117, 115, 101, 114, 110, 97, 109, 101, 0, 0, 0, 0, 0, 0, 0, 0, //username - 0, //status - 117, 115, 101 //extra bytes - ) - val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(raw) + buffer.writeShortLE(514) + .writeShortLE(21) + .writeBytes("username".encodeToByteArray()) + .writerIndex(20) + .writeByte(0) + .writeShortLE(514) + val pillarHandler = PillarHandler(context) pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) @@ -101,16 +103,18 @@ class TestHandler { @Test fun `sending StreamAvail`() { - val raw = byteArrayOf( - 2, 3, //type, - 0, 21, //length - 5, 65, 0, 5, 15, -99, 95, 4, //stream_id: env_id(1), sess_num(3), stream_type, user_id(2), sub_id(1) - 23, 0, 0, 0, 0, 0, 0, 0, //next_seq - 6 //access - ) - val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(raw) + buffer.writeShortLE(515) + .writeShortLE(21) + .writeByte(5) + .writeMedium(4259845) + .writeByte(15) + .writeShort(40287) + .writeByte(4) + .writeByte(BigDecimal.valueOf(23).toInt()) + .writerIndex(20) + .writeByte(6) + val pillarHandler = PillarHandler(context) pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) @@ -123,20 +127,23 @@ class TestHandler { assertEquals(15, streamAvail.streamId.streamType) assertEquals(40287, streamAvail.streamId.userId) assertEquals(4, streamAvail.streamId.subId) + assertEquals(BigDecimal.valueOf(23), streamAvail.nextSeq) + assertEquals(6, streamAvail.access) } @Test fun `sending OpenResponse`() { - val raw = byteArrayOf( - 2, 6, //type, - 0, 14, //length - 5, 65, 0, 5, 15, -99, 95, 4, //stream_id: env_id(1), sess_num(3), stream_type, user_id(2), sub_id(1) - 0, //status - 2 //access - ) - val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(raw) + buffer.writeShortLE(518) + .writeShortLE(14) + .writeByte(5) + .writeMedium(4259845) + .writeByte(15) + .writeShort(40287) + .writeByte(4) + .writeByte(0) + .writeByte(2) + val pillarHandler = PillarHandler(context) pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) @@ -157,15 +164,16 @@ class TestHandler { @Test fun `sending CloseResponse`() { - val raw = byteArrayOf( - 2, 8, //type, - 0, 13, //length - 5, 65, 0, 5, 15, -99, 95, 4, //stream_id: env_id(1), sess_num(3), stream_type, user_id(2), sub_id(1) - 0 - ) - val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(raw) + buffer.writeShortLE(520) + .writeShortLE(13) + .writeByte(5) + .writeMedium(4259845) + .writeByte(15) + .writeShort(40287) + .writeByte(4) + .writeByte(0) + val pillarHandler = PillarHandler(context) pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) @@ -185,17 +193,24 @@ class TestHandler { @Test fun `sending SeqMsg`() { - val raw = byteArrayOf( - 9, 5, //type - 0, 32, //length - 5, 65, 0, 5, 13, -99, 95, 4, //stream_id: env_id(1), sess_num(3), stream_type, user_id(2), sub_id(1) - 23, 0, 0, 0, 0, 0, 0, 0, //seq - 0, 0, 0, 0, //reserved1 - 64, -59, -122, 125, 62, -96, -60, 22 //timestamp - ) + val time = LocalDateTime.parse("2021-12-27T13:39:14.524104") + val seconds = time.toEpochSecond(ZoneOffset.UTC).toULong() + val nanoseconds = time.nano.toULong() val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(raw) + buffer.writeShortLE(2309) + .writeShortLE(32) + .writeByte(5) + .writeMedium(4259845) + .writeByte(13) + .writeShort(40287) + .writeByte(4) + .writeByte(BigDecimal.valueOf(23).toInt()) + .writerIndex(20) + .writeMedium(0) + .writerIndex(24) + .writeLongLE((seconds * 1_000_000_000UL + nanoseconds).toLong()) + val pillarHandler = PillarHandler(context) pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) @@ -217,20 +232,15 @@ class TestHandler { fun `assembling Login`() { val settings = PillarHandlerSettings() val login = Login(settings).login() - val raw = byteArrayOf( - 2, 1, //type:513 - 0, 76, //length:76 - 117, 115, 101, 114, 110, 97, 109, 101, 0, 0, 0, 0, 0, 0, 0, 0, //username - 112, 97, 115, 115, 119, 111, 114, 100, 0, 0, 0, 0, - 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, //password - 109, 105, 99, 0, //mic - 49, 46, 49, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 // version - ) assertEquals(76, login.writerIndex()) - for (i in raw.indices) - assertEquals(raw[i], login.array()[i]) + assertEquals(513, login.readUnsignedShortLE()) + assertEquals(76, login.readUnsignedShortLE()) + assertEquals("username", login.readCharSequence(16, StandardCharsets.US_ASCII).toString().trimEnd(0.toChar())) + assertEquals("password", login.readCharSequence(32, StandardCharsets.US_ASCII).toString().trimEnd(0.toChar())) + assertEquals("mic", login.readCharSequence(4, StandardCharsets.US_ASCII).toString().trimEnd(0.toChar())) + assertEquals("1.1", login.readCharSequence(20, StandardCharsets.US_ASCII).toString().trimEnd(0.toChar())) } @Test @@ -242,55 +252,62 @@ class TestHandler { buffer.writeBytes(stream) val open = Open(StreamId(buffer), BigDecimal.valueOf(23)).open() - val raw = byteArrayOf( - 2, 5, //type:517, - 0, 30, //length:30 - 5, 65, 0, 5, 15, -99, 95, 4, //stream_id: env_id(1), sess_num(3), stream_type, user_id(2), sub_id(1) - 23, 0, 0, 0, 0, 0, 0, 0, //start_seq - 24, 0, 0, 0, 0, 0, 0, 0, //end_seq - 2, //access - 0, //mode - ) - assertEquals(30, open.writerIndex()) - for (i in raw.indices) - assertEquals(raw[i], open.array()[i]) + assertEquals(517, open.readUnsignedShortLE()) + assertEquals(30, open.readUnsignedShortLE()) + assertEquals(5, open.readUnsignedByte()) + assertEquals(4259845, open.readMedium()) + assertEquals(15, open.readByte()) + assertEquals(40287, open.readUnsignedShort()) + assertEquals(4, open.readByte().toInt()) + open.readerIndex(12) + val bytes = ByteArray(8) + open.readBytes(bytes) + bytes.reverse() + assertEquals(BigDecimal.valueOf(23), BigInteger(1, bytes).toBigDecimal()) + open.readerIndex(28) + assertEquals(2, open.readUnsignedByte()) + open.readerIndex(29) + assertEquals(0, open.readUnsignedByte()) } @Test fun `assembling SeqMsg`() { - val rawSend = byteArrayOf( - 9, 5, //type - 0, 32, //length - 5, 65, 0, 5, 13, -99, 95, 4, //stream_id: env_id(1), sess_num(3), stream_type, user_id(2), sub_id(1) - 23, 0, 0, 0, 0, 0, 0, 0, //seq - 0, 0, 0, 0, //reserved1 - 64, -59, -122, 125, 62, -96, -60, 22 //timestamp - ) + val time = LocalDateTime.parse("2021-12-27T13:39:14.524104") + val seconds = time.toEpochSecond(ZoneOffset.UTC).toULong() + val nanoseconds = time.nano.toULong() + val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(rawSend) - val seqMsg = SeqMsg(buffer) + buffer.writeShortLE(2309) + .writeShortLE(32) + .writeByte(5) + .writeMedium(4259845) + .writeByte(15) + .writeShort(40287) + .writeByte(4) + .writeByte(BigDecimal.valueOf(23).toInt()) + .writerIndex(20) + .writeMedium(0) + .writerIndex(24) + .writeLongLE((seconds * 1_000_000_000UL + nanoseconds).toLong()) + val seqMsg = SeqMsg(buffer) val seqMsgToSend = SeqMsgToSend(seqMsg).seqMsg() - val raw = byteArrayOf( - 9, 5, //type - 0, 32, //length - 5, 65, 0, 5, 15, -99, 95, 4, //stream_id: env_id(1), sess_num(3), stream_type, user_id(2), sub_id(1) - 23, 0, 0, 0, 0, 0, 0, 0, //seq - 0, 0, 0, 0 //reserved1 - ) - assertEquals(32, seqMsgToSend.writerIndex()) - for (i in raw.indices) - assertEquals(raw[i], seqMsgToSend.array()[i]) + assertEquals(2309, seqMsgToSend.readUnsignedShortLE()) + assertEquals(32, seqMsgToSend.readUnsignedShortLE()) + assertEquals(5, seqMsgToSend.readUnsignedByte()) + assertEquals(4259845, seqMsgToSend.readMedium()) + assertEquals(15, seqMsgToSend.readByte()) + assertEquals(40287, seqMsgToSend.readUnsignedShort()) + assertEquals(4, seqMsgToSend.readByte().toInt()) } @Test fun `assembling Close`() { - val stream = byteArrayOf( 5, 65, 0, 5, 15, -99, 95, 4 ) @@ -299,26 +316,22 @@ class TestHandler { val streamId = StreamIdEncode(StreamId(buffer)) val close = Close(streamId.streamIdBuf).close() - val raw = byteArrayOf( - 2, 7, - 0, 12, - 5, 65, 0, 5, 15, -99, 95, 4, - ) - assertEquals(12, close.writerIndex()) - for (i in raw.indices) - assertEquals(raw[i], close.array()[i]) + assertEquals(519, close.readUnsignedShortLE()) + assertEquals(12, close.readUnsignedShortLE()) + assertEquals(5, close.readUnsignedByte()) + assertEquals(4259845, close.readMedium()) + assertEquals(15, close.readByte()) + assertEquals(40287, close.readUnsignedShort()) + assertEquals(4, close.readByte().toInt()) } @Test fun `invalid size message`() { - val raw = byteArrayOf( - 9, 5, //type - 0, 32, //length - ) val buffer: ByteBuf = Unpooled.buffer(4) - buffer.writeBytes(raw) + buffer.writeShortLE(2309) + .writeByte(32) val pillarHandler = PillarHandler(context) pillarHandler.channel = channel assertNull(pillarHandler.onReceive(buffer)) @@ -334,11 +347,9 @@ class TestHandler { @Test fun `message size is less than 4`() { - val raw = byteArrayOf( - 9, 5, 0 - ) val buffer: ByteBuf = Unpooled.buffer(3) - buffer.writeBytes(raw) + buffer.writeShortLE(514) + .writeByte(21) val pillarHandler = PillarHandler(context) pillarHandler.channel = channel assertNull(pillarHandler.onReceive(buffer)) @@ -346,11 +357,15 @@ class TestHandler { @Test fun `send onOutgoing`() { - val raw = byteArrayOf( - 2, 2, 0, 21, 5, 65, 0, 5, 15, -99, 95, 4 - ) val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(raw) + buffer.writeShortLE(517) + .writeShortLE(21) + .writeByte(5) + .writeMedium(4259845) + .writeByte(15) + .writeShort(40287) + .writeByte(4) + val pillarHandler = PillarHandler(context) val metadata = mutableMapOf() metadata[TYPE_FIELD_NAME] = 517.toString() @@ -365,12 +380,9 @@ class TestHandler { @Test fun `invalid type message`() { - val raw = byteArrayOf( - 9, 9, //type - 0, 32, //length - ) val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(raw) + buffer.writeShortLE(500) + .writeShortLE(32) val pillarHandler = PillarHandler(context) pillarHandler.channel = channel assertNull(pillarHandler.onReceive(buffer)) @@ -385,14 +397,13 @@ class TestHandler { @Test fun `invalid status in LoginResponse`() { - val raw = byteArrayOf( - 2, 2, //type, - 0, 21, //length - 117, 115, 101, 114, 110, 97, 109, 101, 0, 0, 0, 0, 0, 0, 0, 0, //username - 85, //status - ) val buffer: ByteBuf = Unpooled.buffer() - buffer.writeBytes(raw) + buffer.writeShortLE(514) + .writeShortLE(21) + .writeBytes("username".encodeToByteArray()) + .writerIndex(20) + .writeByte(85) + val pillarHandler = PillarHandler(context) pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) From 6d3a33afde6baea592d83f8995df1808d6c793b9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Fri, 14 Jan 2022 13:01:16 +0300 Subject: [PATCH 22/49] [TH2-2806] Add reconnect --- .../dirty/pillar/handler/PillarHandler.kt | 26 ++++++++++++++----- 1 file changed, 19 insertions(+), 7 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index 6a9dfd0..a1cb458 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -36,6 +36,7 @@ class PillarHandler(private val context: IContext): IP private val executor = Executors.newSingleThreadScheduledExecutor() private var clientFuture: Future<*>? = CompletableFuture.completedFuture(null) private var serverFuture: Future<*>? = CompletableFuture.completedFuture(null) + private var reconnectFuture: Future<*>? = CompletableFuture.completedFuture(null) private lateinit var streamId: StreamIdEncode private var settings: PillarHandlerSettings lateinit var channel: IChannel @@ -52,7 +53,7 @@ class PillarHandler(private val context: IContext): IP channel = context.channel channel.send(Login(settings).login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE) - LOGGER.info { "Message has been sent to server - Login" } + LOGGER.info { "Message has been sent to server - Login." } startSendHeartBeats() @@ -112,7 +113,8 @@ class PillarHandler(private val context: IContext): IP State.SESSION_CREATED, State.LOGGED_IN ) - ) LOGGER.info { "Setting a new state -> ${state.get()}." } + ) LOGGER.info { "Setting a new state -> ${state.get()}." + } else LOGGER.info { "Failed to set a new state. ${State.LOGGED_IN} -> ${state.get()}." } } Status.NOT_LOGGED_IN -> { @@ -140,7 +142,7 @@ class PillarHandler(private val context: IContext): IP open.open(), messageMetadata(MessageType.OPEN), IChannel.SendMode.MANGLE ) - LOGGER.info { "Message has been sent to server - Open" } + LOGGER.info { "Message has been sent to server - Open." } serverFuture = executor.schedule(this::startSendHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) @@ -167,7 +169,7 @@ class PillarHandler(private val context: IContext): IP messageMetadata(MessageType.SEQMSG), IChannel.SendMode.MANGLE ) - LOGGER.info { "Message has been sent to server - SeqMsg" } + LOGGER.info { "Message has been sent to server - SeqMsg." } return messageMetadata(MessageType.SEQMSG) } @@ -216,13 +218,15 @@ class PillarHandler(private val context: IContext): IP messageMetadata(MessageType.CLOSE), IChannel.SendMode.MANGLE ) - LOGGER.info { "Message has been sent to server - Close" } + reconnectFuture = + executor.schedule(this::reconnect, settings.streamAvailInterval, TimeUnit.MILLISECONDS) + LOGGER.info { "Message has been sent to server - Close." } } else LOGGER.info { "Failed to set a new state." } } private fun startSendHeartBeats() { channel.send(Heartbeat().heartbeat, messageMetadata(MessageType.HEARTBEAT), IChannel.SendMode.MANGLE) - LOGGER.info { "Message has been sent to server - Heartbeat" } + LOGGER.info { "Message has been sent to server - Heartbeat." } clientFuture = executor.schedule(this::receivedHeartBeats, settings.heartbeatInterval, TimeUnit.MILLISECONDS) } @@ -230,13 +234,21 @@ class PillarHandler(private val context: IContext): IP clientFuture?.cancel(false) } + private fun reconnect() { + LOGGER.info { "Reconnect." } + if (state.compareAndSet(state.get(), State.SESSION_CLOSE)) { + state.getAndSet(State.SESSION_CLOSE) + LOGGER.info { "Setting a new state -> ${state.get()}." } + } else LOGGER.info { "Failed to set a new state SESSION_CLOSE." } + } + private fun receivedHeartBeats() { if (state.compareAndSet(state.get(), State.NOT_HEARTBEAT)) { LOGGER.error { "Server stopped sending heartbeat." } state.getAndSet(State.NOT_HEARTBEAT) LOGGER.info { "Setting a new state -> ${state.get()}." } sendClose() - } else LOGGER.info { "Failed to set a new state." } + } else LOGGER.info { "Failed to set a new state NOT_HEARTBEAT." } } private fun messageMetadata(messageType: MessageType): Map{ From 04d981cf44cc092a3b032903161fe5551f1ef6ab Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Fri, 14 Jan 2022 13:07:27 +0300 Subject: [PATCH 23/49] [TH2-2806] Fixed reconnect --- .../th2/conn/dirty/pillar/handler/PillarHandler.kt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index a1cb458..bce1e71 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -236,10 +236,13 @@ class PillarHandler(private val context: IContext): IP private fun reconnect() { LOGGER.info { "Reconnect." } - if (state.compareAndSet(state.get(), State.SESSION_CLOSE)) { - state.getAndSet(State.SESSION_CLOSE) + if (state.compareAndSet(state.get(), State.SESSION_CREATED)) { + state.getAndSet(State.SESSION_CREATED) LOGGER.info { "Setting a new state -> ${state.get()}." } - } else LOGGER.info { "Failed to set a new state SESSION_CLOSE." } + + channel.send(Login(settings).login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE) + LOGGER.info { "Message has been sent to server - Login." } + } else LOGGER.info { "Failed to set a new state SESSION_CREATED." } } private fun receivedHeartBeats() { From 30229cf6d6a95a578b5562f8d659564b1ec23107 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Fri, 14 Jan 2022 13:17:32 +0300 Subject: [PATCH 24/49] [TH2-2806] Fixed heartbeat --- .../exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index bce1e71..80f6e1a 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -108,6 +108,7 @@ class PillarHandler(private val context: IContext): IP when (val status = Status.getStatus(loginResponse.status)) { Status.OK -> { LOGGER.info("Login successful. Start sending heartbeats.") + serverFuture = executor.schedule(this::receivedHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) if (state.compareAndSet( State.SESSION_CREATED, @@ -144,9 +145,6 @@ class PillarHandler(private val context: IContext): IP ) LOGGER.info { "Message has been sent to server - Open." } - serverFuture = - executor.schedule(this::startSendHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) - return messageMetadata(MessageType.STREAM_AVAIL) } @@ -227,7 +225,7 @@ class PillarHandler(private val context: IContext): IP private fun startSendHeartBeats() { channel.send(Heartbeat().heartbeat, messageMetadata(MessageType.HEARTBEAT), IChannel.SendMode.MANGLE) LOGGER.info { "Message has been sent to server - Heartbeat." } - clientFuture = executor.schedule(this::receivedHeartBeats, settings.heartbeatInterval, TimeUnit.MILLISECONDS) + clientFuture = executor.schedule(this::startSendHeartBeats, settings.heartbeatInterval, TimeUnit.MILLISECONDS) } private fun stopSendHeartBeats() { From 4b2637ee05c54cac7fb7f3cc67574ec992ce4588 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Fri, 14 Jan 2022 13:58:12 +0300 Subject: [PATCH 25/49] [TH2-2806] Fixed heartbeat, decoder --- .../th2/conn/dirty/pillar/handler/PillarHandler.kt | 8 ++++++-- .../th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt | 1 - 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index 80f6e1a..6805e0f 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -108,13 +108,14 @@ class PillarHandler(private val context: IContext): IP when (val status = Status.getStatus(loginResponse.status)) { Status.OK -> { LOGGER.info("Login successful. Start sending heartbeats.") - serverFuture = executor.schedule(this::receivedHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) if (state.compareAndSet( State.SESSION_CREATED, State.LOGGED_IN ) - ) LOGGER.info { "Setting a new state -> ${state.get()}." + ){ + LOGGER.info ("Setting a new state -> ${state.get()}.") + serverFuture = executor.schedule(this::receivedHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) } else LOGGER.info { "Failed to set a new state. ${State.LOGGED_IN} -> ${state.get()}." } } @@ -132,6 +133,9 @@ class PillarHandler(private val context: IContext): IP MessageType.STREAM_AVAIL.type -> { LOGGER.info { "Type message - StreamAvail." } + + serverFuture = executor.schedule(this::receivedHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) + val streamAvail = StreamAvail(message) streamId = StreamIdEncode(StreamId(message)) val open = Open( diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt index 59ea692..6abb24f 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt @@ -159,7 +159,6 @@ class SeqMsg(byteBuf: ByteBuf) { val nanoseconds = time % 1_000_000_000UL timestamp = LocalDateTime.ofInstant(Instant.ofEpochMilli(milliseconds.toLong()), ZoneOffset.UTC).withNano( nanoseconds.toInt()) - println(timestamp) require(byteBuf.readerIndex() == header.length){ "There are bytes left in buffer to read" } } } From c1385801dfbbe17169b13e9bb00e631425c9c175 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Sun, 16 Jan 2022 12:39:25 +0300 Subject: [PATCH 26/49] [TH2-2806] Fixed PillarHandler, TestHandler --- .../conn/dirty/pillar/handler/PillarHandler.kt | 16 +++++++++------- src/test/java/TestHandler.kt | 17 ++++++++++++++++- 2 files changed, 25 insertions(+), 8 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index 6805e0f..23440ee 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -91,9 +91,11 @@ class PillarHandler(private val context: IContext): IP if(bufferLength > messageLength) { LOGGER.info { "Buffer length is longer than the declared one: $bufferLength -> $messageLength." } - return buffer.copy(0, messageLength) + + return buffer.readSlice(messageLength) } + buffer.readerIndex(messageLength) return buffer } @@ -107,12 +109,11 @@ class PillarHandler(private val context: IContext): IP when (val status = Status.getStatus(loginResponse.status)) { Status.OK -> { - LOGGER.info("Login successful. Start sending heartbeats.") + LOGGER.info { "Login successful. Start sending heartbeats." } if (state.compareAndSet( State.SESSION_CREATED, - State.LOGGED_IN - ) + State.LOGGED_IN) ){ LOGGER.info ("Setting a new state -> ${state.get()}.") serverFuture = executor.schedule(this::receivedHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) @@ -120,9 +121,9 @@ class PillarHandler(private val context: IContext): IP else LOGGER.info { "Failed to set a new state. ${State.LOGGED_IN} -> ${state.get()}." } } Status.NOT_LOGGED_IN -> { - if (state.compareAndSet(State.SESSION_CREATED, State.SESSION_CLOSE)) stopSendHeartBeats() - else LOGGER.info { "Failed to set a new state. ${State.SESSION_CLOSE} -> ${state.get()}." } - + if (!state.compareAndSet(State.SESSION_CREATED, State.SESSION_CLOSE)) + LOGGER.info { "Failed to set a new state. ${State.SESSION_CLOSE} -> ${state.get()}." } + stopSendHeartBeats() LOGGER.info("Received `not logged in` status. Fall in to error state.") sendClose() } @@ -199,6 +200,7 @@ class PillarHandler(private val context: IContext): IP } override fun onClose() { + sendClose() if (state.compareAndSet(state.get(), State.SESSION_CLOSE)) { state.getAndSet(State.SESSION_CLOSE) LOGGER.info { "Setting a new state -> ${state.get()}." } diff --git a/src/test/java/TestHandler.kt b/src/test/java/TestHandler.kt index 4971bd1..52035ac 100644 --- a/src/test/java/TestHandler.kt +++ b/src/test/java/TestHandler.kt @@ -93,7 +93,10 @@ class TestHandler { val pillarHandler = PillarHandler(context) pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) - val loginResponseMsg = LoginResponse(message!!) + assertEquals(21, buffer.readerIndex()) + + pillarHandler.onIncoming(message!!) + val loginResponseMsg = LoginResponse(message) assertEquals(514, loginResponseMsg.header.type) assertEquals(21, loginResponseMsg.header.length) @@ -118,6 +121,8 @@ class TestHandler { val pillarHandler = PillarHandler(context) pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) + assertEquals(21, buffer.readerIndex()) + val streamAvail = StreamAvail(message!!) assertEquals(515, streamAvail.header.type) @@ -147,6 +152,8 @@ class TestHandler { val pillarHandler = PillarHandler(context) pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) + assertEquals(14, buffer.readerIndex()) + val metadata = pillarHandler.onIncoming(message!!) val openResponseMsg = OpenResponse(message) @@ -177,6 +184,8 @@ class TestHandler { val pillarHandler = PillarHandler(context) pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) + assertEquals(13, buffer.readerIndex()) + val metadata = pillarHandler.onIncoming(message!!) val closeResponseMsg = CloseResponse(message) @@ -214,6 +223,8 @@ class TestHandler { val pillarHandler = PillarHandler(context) pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) + assertEquals(32, buffer.readerIndex()) + val seqMsg = SeqMsg(message!!) assertEquals(2309, seqMsg.header.type) @@ -335,6 +346,7 @@ class TestHandler { val pillarHandler = PillarHandler(context) pillarHandler.channel = channel assertNull(pillarHandler.onReceive(buffer)) + assertEquals(0, buffer.readerIndex()) } @Test @@ -343,6 +355,7 @@ class TestHandler { val pillarHandler = PillarHandler(context) pillarHandler.channel = channel assertNull(pillarHandler.onReceive(buffer)) + assertEquals(0, buffer.readerIndex()) } @Test @@ -353,6 +366,7 @@ class TestHandler { val pillarHandler = PillarHandler(context) pillarHandler.channel = channel assertNull(pillarHandler.onReceive(buffer)) + assertEquals(0, buffer.readerIndex()) } @Test @@ -386,6 +400,7 @@ class TestHandler { val pillarHandler = PillarHandler(context) pillarHandler.channel = channel assertNull(pillarHandler.onReceive(buffer)) + assertEquals(0, buffer.readerIndex()) } @Test From 4f3463c71ba1b80a10760e87feff402ad63c12d9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= <89018421+tatianavvedenskaya@users.noreply.github.com> Date: Sun, 16 Jan 2022 12:51:09 +0300 Subject: [PATCH 27/49] [TH2-2806] Fixed PillarHandler --- .../com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt | 1 - 1 file changed, 1 deletion(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index 23440ee..42e2b06 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -230,7 +230,6 @@ class PillarHandler(private val context: IContext): IP private fun startSendHeartBeats() { channel.send(Heartbeat().heartbeat, messageMetadata(MessageType.HEARTBEAT), IChannel.SendMode.MANGLE) - LOGGER.info { "Message has been sent to server - Heartbeat." } clientFuture = executor.schedule(this::startSendHeartBeats, settings.heartbeatInterval, TimeUnit.MILLISECONDS) } From ce87b1ed8ab721243766400081f2af17deab1ab9 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Mon, 17 Jan 2022 11:00:35 +0300 Subject: [PATCH 28/49] [TH2-2806] Fixed PillarHandler, PillarMessageDecoder, TestHandler --- .../dirty/pillar/handler/PillarHandler.kt | 1 + .../pillar/handler/PillarMessageDecoder.kt | 28 ++++--------------- src/test/java/TestHandler.kt | 22 +++++++-------- 3 files changed, 18 insertions(+), 33 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index 42e2b06..c6e1f5d 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -138,6 +138,7 @@ class PillarHandler(private val context: IContext): IP serverFuture = executor.schedule(this::receivedHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) val streamAvail = StreamAvail(message) + message.readerIndex(4) streamId = StreamIdEncode(StreamId(message)) val open = Open( streamId.streamId, diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt index 6abb24f..8c70c31 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt @@ -16,6 +16,7 @@ package com.exactpro.th2.conn.dirty.pillar.handler +import com.exactpro.th2.conn.dirty.pillar.handler.util.MessageType import io.netty.buffer.ByteBuf import java.math.BigDecimal import java.math.BigInteger @@ -52,32 +53,25 @@ class StreamId(byteBuf: ByteBuf){ } class LoginResponse(byteBuf: ByteBuf) { - val header: MsgHeader val username: String val status: Short init { byteBuf.markReaderIndex() - header = MsgHeader(byteBuf) - byteBuf.readerIndex(4) username = byteBuf.readCharSequence(16, StandardCharsets.US_ASCII).toString().trimEnd(0.toChar()) byteBuf.readerIndex(20) status = byteBuf.readUnsignedByte() - - require(byteBuf.readerIndex() == header.length){ "There are bytes left in buffer to read" } + require(byteBuf.readerIndex() == MessageType.LOGIN_RESPONSE.length){ "There are bytes left in buffer to read" } } } class StreamAvail(byteBuf: ByteBuf) { - val header: MsgHeader val streamId: StreamId val nextSeq: BigDecimal val access: Short init { byteBuf.markReaderIndex() - header = MsgHeader(byteBuf) - byteBuf.readerIndex(4) streamId = StreamId(byteBuf) byteBuf.readerIndex(12) @@ -89,49 +83,42 @@ class StreamAvail(byteBuf: ByteBuf) { byteBuf.readerIndex(20) access = byteBuf.readUnsignedByte() - require(byteBuf.readerIndex() == header.length){ "There are bytes left in buffer to read" } + require(byteBuf.readerIndex() == MessageType.STREAM_AVAIL.length){ "There are bytes left in buffer to read" } } } class OpenResponse(byteBuf: ByteBuf) { - val header: MsgHeader val streamId: StreamId val status: Short val access: Short init { byteBuf.markReaderIndex() - header = MsgHeader(byteBuf) - byteBuf.readerIndex(4) streamId = StreamId(byteBuf) byteBuf.readerIndex(12) status = byteBuf.readUnsignedByte() byteBuf.readerIndex(13) access = byteBuf.readUnsignedByte() - require(byteBuf.readerIndex() == header.length){ "There are bytes left in buffer to read" } + require(byteBuf.readerIndex() == MessageType.OPEN_RESPONSE.length){ "There are bytes left in buffer to read" } } } class CloseResponse(byteBuf: ByteBuf){ - val header: MsgHeader val streamId: StreamId val status: Short init { byteBuf.markReaderIndex() - header = MsgHeader(byteBuf) - byteBuf.readerIndex(4) streamId = StreamId(byteBuf) byteBuf.readerIndex(12) status = byteBuf.readUnsignedByte() - require(byteBuf.readerIndex() == header.length){ "There are bytes left in buffer to read" } + require(byteBuf.readerIndex() == MessageType.CLOSE_RESPONSE.length){ "There are bytes left in buffer to read" } } } class SeqMsg(byteBuf: ByteBuf) { - val header: MsgHeader val streamId: StreamId val seq: BigDecimal val reserved1: Int @@ -139,9 +126,6 @@ class SeqMsg(byteBuf: ByteBuf) { init { byteBuf.markReaderIndex() - header = MsgHeader(byteBuf) - - byteBuf.readerIndex(4) streamId = StreamId(byteBuf) byteBuf.readerIndex(12) @@ -159,7 +143,7 @@ class SeqMsg(byteBuf: ByteBuf) { val nanoseconds = time % 1_000_000_000UL timestamp = LocalDateTime.ofInstant(Instant.ofEpochMilli(milliseconds.toLong()), ZoneOffset.UTC).withNano( nanoseconds.toInt()) - require(byteBuf.readerIndex() == header.length){ "There are bytes left in buffer to read" } + require(byteBuf.readerIndex() == MessageType.SEQMSG.length){ "There are bytes left in buffer to read" } } } diff --git a/src/test/java/TestHandler.kt b/src/test/java/TestHandler.kt index 52035ac..c5f0859 100644 --- a/src/test/java/TestHandler.kt +++ b/src/test/java/TestHandler.kt @@ -95,11 +95,12 @@ class TestHandler { val message = pillarHandler.onReceive(buffer) assertEquals(21, buffer.readerIndex()) - pillarHandler.onIncoming(message!!) + val metadata = pillarHandler.onIncoming(message!!) + message.readerIndex(4) val loginResponseMsg = LoginResponse(message) - assertEquals(514, loginResponseMsg.header.type) - assertEquals(21, loginResponseMsg.header.length) + assertEquals(514, metadata[TYPE_FIELD_NAME]!!.toInt()) + assertEquals(21, metadata[LENGTH_FIELD_NAME]!!.toInt()) assertEquals("username", loginResponseMsg.username) assertEquals(0, loginResponseMsg.status) } @@ -122,11 +123,8 @@ class TestHandler { pillarHandler.channel = channel val message = pillarHandler.onReceive(buffer) assertEquals(21, buffer.readerIndex()) - - val streamAvail = StreamAvail(message!!) - - assertEquals(515, streamAvail.header.type) - assertEquals(21, streamAvail.header.length) + buffer.readerIndex(4) + val streamAvail = StreamAvail(buffer) assertEquals(5, streamAvail.streamId.envId) assertEquals(4259845, streamAvail.streamId.sessNum) assertEquals(15, streamAvail.streamId.streamType) @@ -155,6 +153,7 @@ class TestHandler { assertEquals(14, buffer.readerIndex()) val metadata = pillarHandler.onIncoming(message!!) + message.readerIndex(4) val openResponseMsg = OpenResponse(message) assertEquals(518.toString(), metadata[TYPE_FIELD_NAME]) @@ -187,6 +186,7 @@ class TestHandler { assertEquals(13, buffer.readerIndex()) val metadata = pillarHandler.onIncoming(message!!) + message.readerIndex(4) val closeResponseMsg = CloseResponse(message) assertEquals(520.toString(), metadata[TYPE_FIELD_NAME]) @@ -225,10 +225,9 @@ class TestHandler { val message = pillarHandler.onReceive(buffer) assertEquals(32, buffer.readerIndex()) - val seqMsg = SeqMsg(message!!) + buffer.readerIndex(4) + val seqMsg = SeqMsg(buffer) - assertEquals(2309, seqMsg.header.type) - assertEquals(32, seqMsg.header.length) assertEquals(5, seqMsg.streamId.envId) assertEquals(4259845, seqMsg.streamId.sessNum) assertEquals(13, seqMsg.streamId.streamType) @@ -303,6 +302,7 @@ class TestHandler { .writerIndex(24) .writeLongLE((seconds * 1_000_000_000UL + nanoseconds).toLong()) + buffer.readerIndex(4) val seqMsg = SeqMsg(buffer) val seqMsgToSend = SeqMsgToSend(seqMsg).seqMsg() From 664a8535dbaeb4537f0181310f33bf7b60ece060 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Mon, 17 Jan 2022 11:12:38 +0300 Subject: [PATCH 29/49] [TH2-2806] Fixed State --- .../exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index c6e1f5d..bd42603 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -215,8 +215,8 @@ class PillarHandler(private val context: IContext): IP } private fun sendClose() { - if (state.compareAndSet(state.get(), State.LOGGED_OUT)) { - state.getAndSet(State.LOGGED_OUT) + if (state.compareAndSet(state.get(), State.SESSION_CLOSE)) { + state.getAndSet(State.SESSION_CLOSE) LOGGER.info { "Setting a new state -> ${state.get()}." } channel.send( Close(streamId.streamIdBuf).close(), From 829493b7590d82862c6169075515a367ca583ba3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= <89018421+tatianavvedenskaya@users.noreply.github.com> Date: Mon, 17 Jan 2022 12:33:44 +0300 Subject: [PATCH 30/49] [TH2-2806] Fixed PillarHandler --- .../exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index bd42603..289c908 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -101,7 +101,8 @@ class PillarHandler(private val context: IContext): IP override fun onIncoming(message: ByteBuf): Map { val msgHeader = MsgHeader(message) - + message.readerIndex(4) + when (val msgType = msgHeader.type) { MessageType.LOGIN_RESPONSE.type -> { LOGGER.info { "Type message - LoginResponse." } From 13536f368deb3d54a1af188a4e0c6ec93335f18d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Mon, 17 Jan 2022 12:56:05 +0300 Subject: [PATCH 31/49] [TH2-2806] Fixed PillarHandler --- .../exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index 289c908..082ec08 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -91,18 +91,16 @@ class PillarHandler(private val context: IContext): IP if(bufferLength > messageLength) { LOGGER.info { "Buffer length is longer than the declared one: $bufferLength -> $messageLength." } - return buffer.readSlice(messageLength) } - buffer.readerIndex(messageLength) - return buffer + buffer.readerIndex(bufferLength) + return buffer.copy(buffer.readerIndex() - messageLength, messageLength) } override fun onIncoming(message: ByteBuf): Map { val msgHeader = MsgHeader(message) message.readerIndex(4) - when (val msgType = msgHeader.type) { MessageType.LOGIN_RESPONSE.type -> { LOGGER.info { "Type message - LoginResponse." } From 0de0d3947055a2fb681801041ec88c98f7aa0ce6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Mon, 17 Jan 2022 13:42:05 +0300 Subject: [PATCH 32/49] [TH2-2806] Fixed PillarHandler, TestHandler --- .../dirty/pillar/handler/PillarHandler.kt | 2 +- src/test/java/TestHandler.kt | 26 ++++++++++++++++++- 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index 082ec08..bd3f7a6 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -94,7 +94,7 @@ class PillarHandler(private val context: IContext): IP return buffer.readSlice(messageLength) } - buffer.readerIndex(bufferLength) + buffer.readerIndex(buffer.writerIndex()) return buffer.copy(buffer.readerIndex() - messageLength, messageLength) } diff --git a/src/test/java/TestHandler.kt b/src/test/java/TestHandler.kt index c5f0859..b60997c 100644 --- a/src/test/java/TestHandler.kt +++ b/src/test/java/TestHandler.kt @@ -88,7 +88,6 @@ class TestHandler { .writeBytes("username".encodeToByteArray()) .writerIndex(20) .writeByte(0) - .writeShortLE(514) val pillarHandler = PillarHandler(context) pillarHandler.channel = channel @@ -103,6 +102,31 @@ class TestHandler { assertEquals(21, metadata[LENGTH_FIELD_NAME]!!.toInt()) assertEquals("username", loginResponseMsg.username) assertEquals(0, loginResponseMsg.status) + + buffer.writeShortLE(515) + .writeShortLE(21) + .writeByte(5) + .writeMedium(4259845) + .writeByte(15) + .writeShort(40287) + .writeByte(4) + .writeByte(BigDecimal.valueOf(23).toInt()) + .writerIndex(41) + .writeByte(6) + + val message2 = pillarHandler.onReceive(buffer) + assertEquals(42, buffer.readerIndex()) + + val copyBuf = buffer.copy(21, 21) + copyBuf.readerIndex(4) + val streamAvail = StreamAvail(copyBuf) + assertEquals(5, streamAvail.streamId.envId) + assertEquals(4259845, streamAvail.streamId.sessNum) + assertEquals(15, streamAvail.streamId.streamType) + assertEquals(40287, streamAvail.streamId.userId) + assertEquals(4, streamAvail.streamId.subId) + assertEquals(BigDecimal.valueOf(23), streamAvail.nextSeq) + assertEquals(6, streamAvail.access) } @Test From 64761512bd360cff78918c017dd661f636e7a20c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= <89018421+tatianavvedenskaya@users.noreply.github.com> Date: Mon, 17 Jan 2022 15:24:39 +0300 Subject: [PATCH 33/49] [TH2-2806] Fixed PillarMessageEncoder --- .../th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt index df7a239..63deb2b 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt @@ -165,7 +165,7 @@ class Close(private val streamId: ByteBuf) { closeMessage.writeShortLE(type) closeMessage.writeShortLE(length) closeMessage.writeBytes(streamId) - + closeMessage.writerIndex(length) require (closeMessage.writerIndex() == length){ "Message size exceeded." } return closeMessage } From b6728137cfb12878a188525878fea34dc69c955b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Mon, 17 Jan 2022 15:52:32 +0300 Subject: [PATCH 34/49] [TH2-2806] Fixed PillarHandler --- .../dirty/pillar/handler/PillarHandler.kt | 29 +++++++------------ 1 file changed, 11 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index bd3f7a6..ab2879e 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -36,7 +36,6 @@ class PillarHandler(private val context: IContext): IP private val executor = Executors.newSingleThreadScheduledExecutor() private var clientFuture: Future<*>? = CompletableFuture.completedFuture(null) private var serverFuture: Future<*>? = CompletableFuture.completedFuture(null) - private var reconnectFuture: Future<*>? = CompletableFuture.completedFuture(null) private lateinit var streamId: StreamIdEncode private var settings: PillarHandlerSettings lateinit var channel: IChannel @@ -201,11 +200,10 @@ class PillarHandler(private val context: IContext): IP override fun onClose() { sendClose() - if (state.compareAndSet(state.get(), State.SESSION_CLOSE)) { - state.getAndSet(State.SESSION_CLOSE) + if (state.compareAndSet(State.LOGGED_OUT, State.SESSION_CLOSE)) { LOGGER.info { "Setting a new state -> ${state.get()}." } LOGGER.info { "Handler is disconnected." } - } else LOGGER.info { "Failed to set a new state." } + } else LOGGER.info { "Failed to set a new state ${State.SESSION_CLOSE}." } } override fun close() { @@ -214,18 +212,16 @@ class PillarHandler(private val context: IContext): IP } private fun sendClose() { - if (state.compareAndSet(state.get(), State.SESSION_CLOSE)) { - state.getAndSet(State.SESSION_CLOSE) + if (state.compareAndSet(State.LOGGED_IN, State.LOGGED_OUT)) { + state.getAndSet(State.LOGGED_OUT) LOGGER.info { "Setting a new state -> ${state.get()}." } channel.send( Close(streamId.streamIdBuf).close(), messageMetadata(MessageType.CLOSE), IChannel.SendMode.MANGLE ) - reconnectFuture = - executor.schedule(this::reconnect, settings.streamAvailInterval, TimeUnit.MILLISECONDS) LOGGER.info { "Message has been sent to server - Close." } - } else LOGGER.info { "Failed to set a new state." } + } else LOGGER.info { "Failed to set a new state ${State.LOGGED_OUT}." } } private fun startSendHeartBeats() { @@ -238,23 +234,20 @@ class PillarHandler(private val context: IContext): IP } private fun reconnect() { - LOGGER.info { "Reconnect." } - if (state.compareAndSet(state.get(), State.SESSION_CREATED)) { - state.getAndSet(State.SESSION_CREATED) + LOGGER.info { "Reconnect to server." } + if (state.compareAndSet(State.NOT_HEARTBEAT, State.SESSION_CREATED)) { LOGGER.info { "Setting a new state -> ${state.get()}." } - channel.send(Login(settings).login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE) LOGGER.info { "Message has been sent to server - Login." } - } else LOGGER.info { "Failed to set a new state SESSION_CREATED." } + } else LOGGER.info { "Failed to set a new state ${State.SESSION_CREATED}." } } private fun receivedHeartBeats() { - if (state.compareAndSet(state.get(), State.NOT_HEARTBEAT)) { + if (state.compareAndSet(State.LOGGED_IN, State.NOT_HEARTBEAT)) { LOGGER.error { "Server stopped sending heartbeat." } - state.getAndSet(State.NOT_HEARTBEAT) LOGGER.info { "Setting a new state -> ${state.get()}." } - sendClose() - } else LOGGER.info { "Failed to set a new state NOT_HEARTBEAT." } + reconnect() + } else LOGGER.info { "Failed to set a new state ${State.NOT_HEARTBEAT}." } } private fun messageMetadata(messageType: MessageType): Map{ From 30e390f6e13c4aee6c3d67fbc3d5308eb656a20a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= <89018421+tatianavvedenskaya@users.noreply.github.com> Date: Mon, 17 Jan 2022 16:07:52 +0300 Subject: [PATCH 35/49] [TH2-2806] Fixed PillarHandler --- .../com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index ab2879e..7b3c2c0 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -243,7 +243,7 @@ class PillarHandler(private val context: IContext): IP } private fun receivedHeartBeats() { - if (state.compareAndSet(State.LOGGED_IN, State.NOT_HEARTBEAT)) { + if (state.compareAndSet(state.get(), State.NOT_HEARTBEAT)) { LOGGER.error { "Server stopped sending heartbeat." } LOGGER.info { "Setting a new state -> ${state.get()}." } reconnect() From a4b719983921a948d85905705846ecadfd32e122 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Mon, 17 Jan 2022 17:42:16 +0300 Subject: [PATCH 36/49] [TH2-2806] Fixed PillarHandler, PillarMessageDecoder --- .../dirty/pillar/handler/PillarHandler.kt | 22 ++++++++++++------- .../pillar/handler/PillarMessageDecoder.kt | 13 ++++++++--- 2 files changed, 24 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index 7b3c2c0..f801b76 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -98,8 +98,9 @@ class PillarHandler(private val context: IContext): IP } override fun onIncoming(message: ByteBuf): Map { + val msgHeader = MsgHeader(message) - message.readerIndex(4) + when (val msgType = msgHeader.type) { MessageType.LOGIN_RESPONSE.type -> { LOGGER.info { "Type message - LoginResponse." } @@ -111,12 +112,16 @@ class PillarHandler(private val context: IContext): IP if (state.compareAndSet( State.SESSION_CREATED, - State.LOGGED_IN) - ){ - LOGGER.info ("Setting a new state -> ${state.get()}.") - serverFuture = executor.schedule(this::receivedHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) - } - else LOGGER.info { "Failed to set a new state. ${State.LOGGED_IN} -> ${state.get()}." } + State.LOGGED_IN + ) + ) { + LOGGER.info("Setting a new state -> ${state.get()}.") + serverFuture = executor.schedule( + this::receivedHeartBeats, + settings.streamAvailInterval, + TimeUnit.MILLISECONDS + ) + } else LOGGER.info { "Failed to set a new state. ${State.LOGGED_IN} -> ${state.get()}." } } Status.NOT_LOGGED_IN -> { if (!state.compareAndSet(State.SESSION_CREATED, State.SESSION_CLOSE)) @@ -133,7 +138,8 @@ class PillarHandler(private val context: IContext): IP MessageType.STREAM_AVAIL.type -> { LOGGER.info { "Type message - StreamAvail." } - serverFuture = executor.schedule(this::receivedHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) + serverFuture = + executor.schedule(this::receivedHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) val streamAvail = StreamAvail(message) message.readerIndex(4) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt index 8c70c31..213c17a 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt @@ -18,6 +18,8 @@ package com.exactpro.th2.conn.dirty.pillar.handler import com.exactpro.th2.conn.dirty.pillar.handler.util.MessageType import io.netty.buffer.ByteBuf +import io.netty.buffer.ByteBufUtil +import java.lang.Exception import java.math.BigDecimal import java.math.BigInteger import java.nio.charset.StandardCharsets @@ -30,9 +32,14 @@ class MsgHeader(byteBuf: ByteBuf) { val length: Int init { - byteBuf.readerIndex(0) - type = byteBuf.readUnsignedShortLE() - length = byteBuf.readUnsignedShortLE() + try { + byteBuf.readerIndex(0) + type = byteBuf.readUnsignedShortLE() + length = byteBuf.readUnsignedShortLE() + } + catch (e: Exception){ + throw Exception ("Unable to read header in message: ${ByteBufUtil.hexDump(byteBuf)}", e) + } } } From 34465f888d1b63df2684c9755ac9ffe656137857 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= <89018421+tatianavvedenskaya@users.noreply.github.com> Date: Mon, 17 Jan 2022 18:40:22 +0300 Subject: [PATCH 37/49] [TH2-2806] Fixed PillarHandler --- .../com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index f801b76..77886c3 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -245,6 +245,7 @@ class PillarHandler(private val context: IContext): IP LOGGER.info { "Setting a new state -> ${state.get()}." } channel.send(Login(settings).login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE) LOGGER.info { "Message has been sent to server - Login." } + serverFuture?.cancel(false) } else LOGGER.info { "Failed to set a new state ${State.SESSION_CREATED}." } } From a4025aa459915eb3d06c468f45414e7e2611ecc0 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Tue, 18 Jan 2022 14:40:19 +0300 Subject: [PATCH 38/49] [TH2-2806] Fixed PillarHandler --- .../dirty/pillar/handler/PillarHandler.kt | 19 ++++++++----------- 1 file changed, 8 insertions(+), 11 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index 77886c3..1297458 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -53,8 +53,11 @@ class PillarHandler(private val context: IContext): IP channel = context.channel channel.send(Login(settings).login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE) LOGGER.info { "Message has been sent to server - Login." } + serverFuture = + executor.schedule(this::reconnect, settings.streamAvailInterval, TimeUnit.MILLISECONDS) - startSendHeartBeats() + clientFuture = executor.scheduleWithFixedDelay(this::startSendHeartBeats, settings.heartbeatInterval, settings.heartbeatInterval, TimeUnit.MILLISECONDS) + LOGGER.info { "Message has been sent to server - HeartBeats." } LOGGER.info { "Handler is connected." } } else LOGGER.info { "Failed to set a new state. ${State.SESSION_CLOSE} -> ${state.get()}." } @@ -98,7 +101,6 @@ class PillarHandler(private val context: IContext): IP } override fun onIncoming(message: ByteBuf): Map { - val msgHeader = MsgHeader(message) when (val msgType = msgHeader.type) { @@ -116,11 +118,8 @@ class PillarHandler(private val context: IContext): IP ) ) { LOGGER.info("Setting a new state -> ${state.get()}.") - serverFuture = executor.schedule( - this::receivedHeartBeats, - settings.streamAvailInterval, - TimeUnit.MILLISECONDS - ) + serverFuture = + executor.schedule(this::receivedHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) } else LOGGER.info { "Failed to set a new state. ${State.LOGGED_IN} -> ${state.get()}." } } Status.NOT_LOGGED_IN -> { @@ -214,7 +213,7 @@ class PillarHandler(private val context: IContext): IP override fun close() { executor.shutdown() - if (!executor.awaitTermination(5000, TimeUnit.MILLISECONDS)) executor.shutdownNow() + if (!executor.awaitTermination(3000, TimeUnit.MILLISECONDS)) executor.shutdownNow() } private fun sendClose() { @@ -232,7 +231,6 @@ class PillarHandler(private val context: IContext): IP private fun startSendHeartBeats() { channel.send(Heartbeat().heartbeat, messageMetadata(MessageType.HEARTBEAT), IChannel.SendMode.MANGLE) - clientFuture = executor.schedule(this::startSendHeartBeats, settings.heartbeatInterval, TimeUnit.MILLISECONDS) } private fun stopSendHeartBeats() { @@ -245,13 +243,12 @@ class PillarHandler(private val context: IContext): IP LOGGER.info { "Setting a new state -> ${state.get()}." } channel.send(Login(settings).login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE) LOGGER.info { "Message has been sent to server - Login." } - serverFuture?.cancel(false) } else LOGGER.info { "Failed to set a new state ${State.SESSION_CREATED}." } } private fun receivedHeartBeats() { if (state.compareAndSet(state.get(), State.NOT_HEARTBEAT)) { - LOGGER.error { "Server stopped sending heartbeat." } + LOGGER.warn { "Server stopped sending heartbeat." } LOGGER.info { "Setting a new state -> ${state.get()}." } reconnect() } else LOGGER.info { "Failed to set a new state ${State.NOT_HEARTBEAT}." } From ea93355a95118578f5e73ba59f65f4f9907e0301 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Tue, 18 Jan 2022 19:51:34 +0300 Subject: [PATCH 39/49] [TH2-2806] Fixed PillarHandler, PillarMessageEncoder, TestHandler --- .../dirty/pillar/handler/PillarHandler.kt | 26 +++++++---- .../pillar/handler/PillarMessageEncoder.kt | 5 +- src/test/java/TestHandler.kt | 46 ++++++++++++++----- 3 files changed, 54 insertions(+), 23 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index 1297458..fc23e38 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -33,7 +33,7 @@ import java.util.concurrent.atomic.AtomicReference class PillarHandler(private val context: IContext): IProtocolHandler { private var state = AtomicReference(State.SESSION_CLOSE) - private val executor = Executors.newSingleThreadScheduledExecutor() + private val executor = Executors.newScheduledThreadPool(1) private var clientFuture: Future<*>? = CompletableFuture.completedFuture(null) private var serverFuture: Future<*>? = CompletableFuture.completedFuture(null) private lateinit var streamId: StreamIdEncode @@ -137,15 +137,19 @@ class PillarHandler(private val context: IContext): IP MessageType.STREAM_AVAIL.type -> { LOGGER.info { "Type message - StreamAvail." } + executor.awaitTermination(0,TimeUnit.MILLISECONDS) serverFuture = executor.schedule(this::receivedHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) val streamAvail = StreamAvail(message) message.readerIndex(4) streamId = StreamIdEncode(StreamId(message)) + + val endSeq = 99999 val open = Open( streamId.streamId, - streamAvail.nextSeq + streamAvail.nextSeq, + endSeq ) channel.send( @@ -162,7 +166,15 @@ class PillarHandler(private val context: IContext): IP val openResponse = OpenResponse(message) when (Status.getStatus(openResponse.status)) { - Status.OK -> LOGGER.info("Open successful.") + Status.OK -> { + LOGGER.info("Open successful.") + channel.send( + Close(streamId.streamIdBuf).close(), + messageMetadata(MessageType.CLOSE), + IChannel.SendMode.MANGLE + ) + LOGGER.info { "Message has been sent to server - Close." } + } Status.NO_STREAM_PERMISSION -> LOGGER.warn { "No stream permission." } else -> error("This is not an OpenResponse status.") } @@ -220,12 +232,7 @@ class PillarHandler(private val context: IContext): IP if (state.compareAndSet(State.LOGGED_IN, State.LOGGED_OUT)) { state.getAndSet(State.LOGGED_OUT) LOGGER.info { "Setting a new state -> ${state.get()}." } - channel.send( - Close(streamId.streamIdBuf).close(), - messageMetadata(MessageType.CLOSE), - IChannel.SendMode.MANGLE - ) - LOGGER.info { "Message has been sent to server - Close." } + } else LOGGER.info { "Failed to set a new state ${State.LOGGED_OUT}." } } @@ -247,6 +254,7 @@ class PillarHandler(private val context: IContext): IP } private fun receivedHeartBeats() { + serverFuture?.cancel(true) if (state.compareAndSet(state.get(), State.NOT_HEARTBEAT)) { LOGGER.warn { "Server stopped sending heartbeat." } LOGGER.info { "Setting a new state -> ${state.get()}." } diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt index 63deb2b..bf01449 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt @@ -93,7 +93,8 @@ class Login(settings: PillarHandlerSettings) { } class Open(private val streamId: StreamId, - private val startSeq: BigDecimal){ + private val startSeq: BigDecimal, + private val endSeq: Int){ private val type: Int = MessageType.OPEN.type private val length: Int = MessageType.OPEN.length @@ -110,7 +111,7 @@ class Open(private val streamId: StreamId, openMessage.writerIndex(12) openMessage.writeLongLE(startSeq.toLong()) openMessage.writerIndex(20) - openMessage.writeLongLE(startSeq.toLong()+1) //TODO + openMessage.writeLongLE(endSeq.toLong()) //TODO openMessage.writerIndex(28) if (streamId.streamType == StreamType.REF.value || streamId.streamType == StreamType.GT.value) diff --git a/src/test/java/TestHandler.kt b/src/test/java/TestHandler.kt index b60997c..6204baf 100644 --- a/src/test/java/TestHandler.kt +++ b/src/test/java/TestHandler.kt @@ -81,7 +81,7 @@ class TestHandler { private var settings = PillarHandlerSettings() @Test - fun `sending LoginResponse with extra bytes`() { + fun `sending LoginResponse`() { val buffer: ByteBuf = Unpooled.buffer() buffer.writeShortLE(514) .writeShortLE(21) @@ -114,12 +114,38 @@ class TestHandler { .writerIndex(41) .writeByte(6) - val message2 = pillarHandler.onReceive(buffer) + pillarHandler.onReceive(buffer) assertEquals(42, buffer.readerIndex()) - val copyBuf = buffer.copy(21, 21) + var copyBuf = buffer.copy(21, 21) copyBuf.readerIndex(4) - val streamAvail = StreamAvail(copyBuf) + var streamAvail = StreamAvail(copyBuf) + assertEquals(5, streamAvail.streamId.envId) + assertEquals(4259845, streamAvail.streamId.sessNum) + assertEquals(15, streamAvail.streamId.streamType) + assertEquals(40287, streamAvail.streamId.userId) + assertEquals(4, streamAvail.streamId.subId) + assertEquals(BigDecimal.valueOf(23), streamAvail.nextSeq) + assertEquals(6, streamAvail.access) + + + buffer.writeShortLE(515) + .writeShortLE(21) + .writeByte(5) + .writeMedium(4259845) + .writeByte(15) + .writeShort(40287) + .writeByte(4) + .writeByte(BigDecimal.valueOf(23).toInt()) + .writerIndex(62) + .writeByte(6) + + pillarHandler.onReceive(buffer) + assertEquals(63, buffer.readerIndex()) + + copyBuf = buffer.copy(42, 21) + copyBuf.readerIndex(4) + streamAvail = StreamAvail(copyBuf) assertEquals(5, streamAvail.streamId.envId) assertEquals(4259845, streamAvail.streamId.sessNum) assertEquals(15, streamAvail.streamId.streamType) @@ -145,7 +171,7 @@ class TestHandler { val pillarHandler = PillarHandler(context) pillarHandler.channel = channel - val message = pillarHandler.onReceive(buffer) + pillarHandler.onReceive(buffer) assertEquals(21, buffer.readerIndex()) buffer.readerIndex(4) val streamAvail = StreamAvail(buffer) @@ -176,13 +202,9 @@ class TestHandler { val message = pillarHandler.onReceive(buffer) assertEquals(14, buffer.readerIndex()) - val metadata = pillarHandler.onIncoming(message!!) - message.readerIndex(4) + message!!.readerIndex(4) val openResponseMsg = OpenResponse(message) - assertEquals(518.toString(), metadata[TYPE_FIELD_NAME]) - assertEquals(14.toString(), metadata[LENGTH_FIELD_NAME]) - assertEquals(5, openResponseMsg.streamId.envId) assertEquals(4259845, openResponseMsg.streamId.sessNum) assertEquals(15, openResponseMsg.streamId.streamType) @@ -246,7 +268,7 @@ class TestHandler { val pillarHandler = PillarHandler(context) pillarHandler.channel = channel - val message = pillarHandler.onReceive(buffer) + pillarHandler.onReceive(buffer) assertEquals(32, buffer.readerIndex()) buffer.readerIndex(4) @@ -284,7 +306,7 @@ class TestHandler { ) val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(stream) - val open = Open(StreamId(buffer), BigDecimal.valueOf(23)).open() + val open = Open(StreamId(buffer), BigDecimal.valueOf(23), 9999).open() assertEquals(30, open.writerIndex()) From ed59ab703af67d914926066a2474d0548eb5fb48 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Thu, 27 Jan 2022 11:35:35 +0300 Subject: [PATCH 40/49] [TH2-2806] Plugin changes --- build.gradle | 38 +++++++++++-------- .../dirty/pillar/handler/PillarHandler.kt | 2 + .../pillar/handler/PillarHandlerFactory.kt | 3 +- .../pillar/handler/PillarHandlerSettings.kt | 2 + 4 files changed, 29 insertions(+), 16 deletions(-) diff --git a/build.gradle b/build.gradle index ba2dc75..ca0d123 100644 --- a/build.gradle +++ b/build.gradle @@ -15,20 +15,24 @@ */ plugins { - id 'com.palantir.docker' version '0.31.0' - id 'com.github.harbby.gradle.serviceloader' version '1.1.8' - id 'org.jetbrains.kotlin.jvm' version '1.6.0' - id 'application' + id 'java' + id 'org.jetbrains.kotlin.jvm' version '1.5.31' + id 'com.palantir.docker' version '0.25.0' } apply plugin: 'application' apply plugin: 'com.palantir.docker' +apply plugin: 'kotlin-kapt' group 'com.exactpro.th2' version release_version +sourceCompatibility = 11 +targetCompatibility = 11 + repositories { mavenCentral() + maven { name 'Sonatype_snapshots' url 'https://s01.oss.sonatype.org/content/repositories/snapshots/' @@ -40,13 +44,19 @@ repositories { } mavenLocal() + + configurations.all { + resolutionStrategy.cacheChangingModulesFor 0, 'seconds' + resolutionStrategy.cacheDynamicVersionsFor 0, 'seconds' + } } dependencies { api platform('com.exactpro.th2:bom:3.0.0') + implementation 'com.google.auto.service:auto-service:1.0.1' - implementation 'com.exactpro.th2:common:3.31.5' - implementation 'com.exactpro.th2:conn-dirty-tcp-core:0.0.1-th2-2785-1688122774-SNAPSHOT' + implementation 'com.exactpro.th2:common:3.32.0' + implementation 'com.exactpro.th2:conn-dirty-tcp-core:0.0.3' implementation 'io.netty:netty-all:4.1.72.Final' @@ -60,6 +70,10 @@ dependencies { testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' } +test { + useJUnitPlatform() +} + application { mainClassName 'com.exactpro.th2.conn.dirty.tcp.core.Main' } @@ -78,21 +92,15 @@ docker { copySpec.from(tarTree("$buildDir/distributions/${applicationName}.tar")) } -test { - useJUnitPlatform() -} - compileKotlin { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = '11' } } + compileTestKotlin { kotlinOptions { - jvmTarget = "1.8" + jvmTarget = '11' } } -serviceLoader { - serviceInterface 'com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandlerFactory' -} diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index fc23e38..4aa821e 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -29,7 +29,9 @@ import java.util.concurrent.Executors import java.util.concurrent.Future import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicReference +import com.google.auto.service.AutoService +@AutoService(PillarHandler::class) class PillarHandler(private val context: IContext): IProtocolHandler { private var state = AtomicReference(State.SESSION_CLOSE) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt index 5be40fc..49ef3e7 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerFactory.kt @@ -20,8 +20,9 @@ import com.exactpro.th2.conn.dirty.tcp.core.api.IContext import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandler import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandlerFactory import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandlerSettings -import com.exactpro.th2.conn.dirty.tcp.core.api.impl.Channel +import com.google.auto.service.AutoService +@AutoService(IProtocolHandlerFactory::class) class PillarHandlerFactory: IProtocolHandlerFactory { override val name: String = PillarHandlerFactory::class.java.name diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerSettings.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerSettings.kt index 93d580b..15dd68f 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerSettings.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerSettings.kt @@ -17,7 +17,9 @@ package com.exactpro.th2.conn.dirty.pillar.handler import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandlerSettings +import com.google.auto.service.AutoService +@AutoService(IProtocolHandlerSettings::class) class PillarHandlerSettings: IProtocolHandlerSettings { var username: String = "username" From 9979c7b3ecbc836307e61191674d238bcc68d152 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Mon, 31 Jan 2022 11:40:54 +0300 Subject: [PATCH 41/49] [TH2-2806] Plugin changes, fixed onOutgoing and onIncoming in handler, fixed encoder and decoder --- build.gradle | 8 +- .../dirty/pillar/handler/PillarHandler.kt | 264 ++++++++++++------ .../pillar/handler/PillarHandlerSettings.kt | 2 - .../pillar/handler/PillarMessageDecoder.kt | 65 +++-- .../pillar/handler/PillarMessageEncoder.kt | 19 +- 5 files changed, 235 insertions(+), 123 deletions(-) diff --git a/build.gradle b/build.gradle index ca0d123..9f7fa2b 100644 --- a/build.gradle +++ b/build.gradle @@ -27,9 +27,6 @@ apply plugin: 'kotlin-kapt' group 'com.exactpro.th2' version release_version -sourceCompatibility = 11 -targetCompatibility = 11 - repositories { mavenCentral() @@ -52,7 +49,7 @@ repositories { } dependencies { - api platform('com.exactpro.th2:bom:3.0.0') + api platform('com.exactpro.th2:bom:3.1.0') implementation 'com.google.auto.service:auto-service:1.0.1' implementation 'com.exactpro.th2:common:3.32.0' @@ -68,6 +65,9 @@ dependencies { testImplementation 'org.junit.jupiter:junit-jupiter-api:5.8.2' testRuntimeOnly 'org.junit.jupiter:junit-jupiter-engine:5.8.2' + + annotationProcessor 'com.google.auto.service:auto-service:1.0.1' + kapt 'com.google.auto.service:auto-service:1.0.1' } test { diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index 4aa821e..8d5d44e 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -29,9 +29,6 @@ import java.util.concurrent.Executors import java.util.concurrent.Future import java.util.concurrent.TimeUnit import java.util.concurrent.atomic.AtomicReference -import com.google.auto.service.AutoService - -@AutoService(PillarHandler::class) class PillarHandler(private val context: IContext): IProtocolHandler { private var state = AtomicReference(State.SESSION_CLOSE) @@ -41,6 +38,12 @@ class PillarHandler(private val context: IContext): IP private lateinit var streamId: StreamIdEncode private var settings: PillarHandlerSettings lateinit var channel: IChannel + private var startRead = AtomicReference(0) + private var endRead = AtomicReference(0) + private var startWrite = AtomicReference(0) + private var endWrite = AtomicReference(0) + private var readingConnection = AtomicReference(false) + private var writingConnection = AtomicReference(false) init{ settings = context.settings as PillarHandlerSettings @@ -55,9 +58,11 @@ class PillarHandler(private val context: IContext): IP channel = context.channel channel.send(Login(settings).login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE) LOGGER.info { "Message has been sent to server - Login." } + serverFuture?.cancel(false) serverFuture = executor.schedule(this::reconnect, settings.streamAvailInterval, TimeUnit.MILLISECONDS) + clientFuture?.cancel(false) clientFuture = executor.scheduleWithFixedDelay(this::startSendHeartBeats, settings.heartbeatInterval, settings.heartbeatInterval, TimeUnit.MILLISECONDS) LOGGER.info { "Message has been sent to server - HeartBeats." } @@ -83,7 +88,6 @@ class PillarHandler(private val context: IContext): IP buffer.resetReaderIndex() if (!MessageType.contains(messageType)){ - buffer.resetReaderIndex() LOGGER.error { "Message type is not supported. Type: $messageType, length: $messageLength" } return null } @@ -99,7 +103,7 @@ class PillarHandler(private val context: IContext): IP } buffer.readerIndex(buffer.writerIndex()) - return buffer.copy(buffer.readerIndex() - messageLength, messageLength) + return buffer.retainedSlice(buffer.readerIndex() - messageLength, messageLength) } override fun onIncoming(message: ByteBuf): Map { @@ -107,113 +111,187 @@ class PillarHandler(private val context: IContext): IP when (val msgType = msgHeader.type) { MessageType.LOGIN_RESPONSE.type -> { - LOGGER.info { "Type message - LoginResponse." } - val loginResponse = LoginResponse(message) - - when (val status = Status.getStatus(loginResponse.status)) { - Status.OK -> { - LOGGER.info { "Login successful. Start sending heartbeats." } - - if (state.compareAndSet( - State.SESSION_CREATED, - State.LOGGED_IN - ) - ) { - LOGGER.info("Setting a new state -> ${state.get()}.") - serverFuture = - executor.schedule(this::receivedHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) - } else LOGGER.info { "Failed to set a new state. ${State.LOGGED_IN} -> ${state.get()}." } - } - Status.NOT_LOGGED_IN -> { - if (!state.compareAndSet(State.SESSION_CREATED, State.SESSION_CLOSE)) - LOGGER.info { "Failed to set a new state. ${State.SESSION_CLOSE} -> ${state.get()}." } - stopSendHeartBeats() - LOGGER.info("Received `not logged in` status. Fall in to error state.") - sendClose() - } - else -> error("Received $status status.") - } - return messageMetadata(MessageType.LOGIN_RESPONSE) + return checkLoginResponse(message) } MessageType.STREAM_AVAIL.type -> { - LOGGER.info { "Type message - StreamAvail." } - - executor.awaitTermination(0,TimeUnit.MILLISECONDS) - serverFuture = - executor.schedule(this::receivedHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) - - val streamAvail = StreamAvail(message) - message.readerIndex(4) - streamId = StreamIdEncode(StreamId(message)) - - val endSeq = 99999 - val open = Open( - streamId.streamId, - streamAvail.nextSeq, - endSeq - ) - - channel.send( - open.open(), - messageMetadata(MessageType.OPEN), IChannel.SendMode.MANGLE - ) - LOGGER.info { "Message has been sent to server - Open." } - - return messageMetadata(MessageType.STREAM_AVAIL) + return checkStreamAvail(message) } MessageType.OPEN_RESPONSE.type -> { - LOGGER.info { "Type message - OpenResponse." } - val openResponse = OpenResponse(message) + return checkOpenResponse(message) + } - when (Status.getStatus(openResponse.status)) { - Status.OK -> { - LOGGER.info("Open successful.") + MessageType.SEQMSG.type -> { + return checkSeqMsg(message) + } + + MessageType.CLOSE_RESPONSE.type -> { + return checkCloseResponse(message) + } + + else -> error("Message type is not supported: $msgType.") + } + } + + private fun checkLoginResponse(message: ByteBuf): Map { + val loginResponse = LoginResponse(message) + + LOGGER.info { "Type message - LoginResponse: $loginResponse" } + when (val status = Status.getStatus(loginResponse.status)) { + Status.OK -> { + LOGGER.info { "Login successful. Server start sending heartbeats." } + + if (state.compareAndSet( + State.SESSION_CREATED, + State.LOGGED_IN + ) + ) { + LOGGER.info("Setting a new state -> ${state.get()}.") + serverFuture?.cancel(false) + serverFuture = + executor.schedule(this::receivedHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) + } else LOGGER.info { "Failed to set a new state. ${State.LOGGED_IN} -> ${state.get()}." } + } + Status.NOT_LOGGED_IN -> { + if (!state.compareAndSet(State.SESSION_CREATED, State.SESSION_CLOSE)) + LOGGER.info { "Failed to set a new state. ${State.SESSION_CLOSE} -> ${state.get()}." } + stopSendHeartBeats() + LOGGER.info("Received `not logged in` status. Fall in to error state.") + sendClose() + } + else -> error("Received $status status.") + } + return messageMetadata(MessageType.LOGIN_RESPONSE) + } + + private fun checkStreamAvail(message: ByteBuf): Map { + executor.awaitTermination(0,TimeUnit.MILLISECONDS) + serverFuture?.cancel(false) + serverFuture = + executor.schedule(this::receivedHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) + + val streamAvail = StreamAvail(message) + + LOGGER.info { "Type message - StreamAvail: $streamAvail" } + message.readerIndex(4) + streamId = StreamIdEncode(StreamId(message)) + + var open: ByteBuf = Unpooled.buffer() + + if (streamAvail.streamId.streamType == StreamType.REF.value || streamAvail.streamId.streamType == StreamType.GT.value){ + val streamType = Access.READ.value.toInt() + startRead.getAndSet(streamAvail.nextSeq.toInt()) + endRead.getAndSet(streamAvail.nextSeq.toInt()+1) + open = Open( + streamId.streamId, + startRead.get(), + endRead.get() + ).open() + readingConnection.getAndSet(true) + } + else if (streamAvail.streamId.streamType == StreamType.TG.value) { + val streamType = Access.WRITE.value.toInt() + startWrite.getAndSet(streamAvail.nextSeq.toInt()) + endWrite.getAndSet(streamAvail.nextSeq.toInt()+1) //TODO + open = Open( + streamId.streamId, + startWrite.get(), + endWrite.get() + ).open() + writingConnection.getAndSet(true) + } + + channel.send( + open, + messageMetadata(MessageType.OPEN), IChannel.SendMode.MANGLE + ) + + LOGGER.info { "Message has been sent to server - Open."} + return messageMetadata(MessageType.STREAM_AVAIL) + } + + private fun checkOpenResponse(message: ByteBuf): Map { + + val openResponse = OpenResponse(message) + LOGGER.info { "Type message - OpenResponse: $openResponse" } + + when (Status.getStatus(openResponse.status)) { + Status.OK -> { + LOGGER.info("Open successful.") + if (readingConnection.get()) { + LOGGER.info { "Open for READ" } + readingConnection.getAndSet(false) + } + + if (writingConnection.get()) { + LOGGER.info { "Open for WRITE" } + var i = startWrite.get() + while (i < endWrite.get()) { + LOGGER.info { "Message has been sent to server - Heartbeat" } channel.send( - Close(streamId.streamIdBuf).close(), - messageMetadata(MessageType.CLOSE), + //SeqMsgToSend(i, openResponse.streamId).seqMsg(), + Heartbeat().heartbeat, + messageMetadata(MessageType.SEQMSG), IChannel.SendMode.MANGLE ) - LOGGER.info { "Message has been sent to server - Close." } + i++ } - Status.NO_STREAM_PERMISSION -> LOGGER.warn { "No stream permission." } - else -> error("This is not an OpenResponse status.") + writingConnection.getAndSet(false) } - return messageMetadata(MessageType.OPEN_RESPONSE) } - MessageType.SEQMSG.type -> { - LOGGER.info { "Type message - SeqMsg." } - channel.send( - SeqMsgToSend(SeqMsg(message)).seqMsg(), - messageMetadata(MessageType.SEQMSG), - IChannel.SendMode.MANGLE - ) - LOGGER.info { "Message has been sent to server - SeqMsg." } - return messageMetadata(MessageType.SEQMSG) - } + Status.NO_STREAM_PERMISSION -> LOGGER.warn { "No stream permission." } + else -> error("This is not an OpenResponse status.") + } - MessageType.CLOSE_RESPONSE.type -> { - LOGGER.info { "Type message - CloseResponse." } - val closeResponse = CloseResponse(message) - when (Status.getStatus(closeResponse.status)) { - Status.OK -> LOGGER.info("Open successful.") - Status.STREAM_NOT_OPEN -> LOGGER.warn { "Stream not open." } - else -> error("This is not an CloseResponse status.") - } - return messageMetadata(MessageType.CLOSE_RESPONSE) - } + return messageMetadata(MessageType.OPEN_RESPONSE) + } - else -> error("Message type is not supported: $msgType.") + private fun checkSeqMsg(message: ByteBuf): Map { + val seqMsg = SeqMsg(message) + + LOGGER.info { "Type message - SeqMsg: $seqMsg" } + + startRead.getAndSet(1) + if (startRead == endRead){ + channel.send( + Close(streamId.streamIdBuf).close(), + messageMetadata(MessageType.CLOSE), + IChannel.SendMode.MANGLE + ) + LOGGER.info { "Message has been sent to server - Close." } + } + + return messageMetadata(MessageType.SEQMSG) + } + + private fun checkCloseResponse(message: ByteBuf): Map { + val closeResponse = CloseResponse(message) + + LOGGER.info { "Type message - CloseResponse: $closeResponse" } + + when (Status.getStatus(closeResponse.status)) { + Status.OK -> LOGGER.info("Open successful.") + Status.STREAM_NOT_OPEN -> LOGGER.warn { "Stream not open." } + else -> error("This is not an CloseResponse status.") } + + return messageMetadata(MessageType.CLOSE_RESPONSE) } override fun onOutgoing(message: ByteBuf, metadata: Map): Map { - val buffer: ByteBuf = Unpooled.buffer(message.readableBytes() + 4) - buffer.writeShort(metadata[TYPE_FIELD_NAME]!!.toInt()) - buffer.writeShort(message.readableBytes() + 4) - buffer.writeBytes(message) + val offset = message.readerIndex() + val msgHeader = MsgHeader(message) + val type = metadata[TYPE_FIELD_NAME]!!.toInt() + if (msgHeader.type!= type){ + val buffer: ByteBuf = message.copy(4, message.readableBytes()-4) + message.readerIndex(offset) + message.writerIndex(offset) + message.writeShortLE(type) + message.writeShortLE(metadata[LENGTH_FIELD_NAME]!!.toInt()) + message.writeBytes(buffer) + } return metadata } @@ -256,7 +334,7 @@ class PillarHandler(private val context: IContext): IP } private fun receivedHeartBeats() { - serverFuture?.cancel(true) + serverFuture?.cancel(false) if (state.compareAndSet(state.get(), State.NOT_HEARTBEAT)) { LOGGER.warn { "Server stopped sending heartbeat." } LOGGER.info { "Setting a new state -> ${state.get()}." } diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerSettings.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerSettings.kt index 15dd68f..93d580b 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerSettings.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandlerSettings.kt @@ -17,9 +17,7 @@ package com.exactpro.th2.conn.dirty.pillar.handler import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandlerSettings -import com.google.auto.service.AutoService -@AutoService(IProtocolHandlerSettings::class) class PillarHandlerSettings: IProtocolHandlerSettings { var username: String = "username" diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt index 213c17a..e236c8d 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt @@ -33,7 +33,6 @@ class MsgHeader(byteBuf: ByteBuf) { init { try { - byteBuf.readerIndex(0) type = byteBuf.readUnsignedShortLE() length = byteBuf.readUnsignedShortLE() } @@ -64,12 +63,17 @@ class LoginResponse(byteBuf: ByteBuf) { val status: Short init { - byteBuf.markReaderIndex() + var offset = byteBuf.readerIndex() username = byteBuf.readCharSequence(16, StandardCharsets.US_ASCII).toString().trimEnd(0.toChar()) - byteBuf.readerIndex(20) + offset += 16 + byteBuf.readerIndex(offset) status = byteBuf.readUnsignedByte() require(byteBuf.readerIndex() == MessageType.LOGIN_RESPONSE.length){ "There are bytes left in buffer to read" } } + + override fun toString(): String { + return "$username $status" + } } class StreamAvail(byteBuf: ByteBuf) { @@ -78,19 +82,25 @@ class StreamAvail(byteBuf: ByteBuf) { val access: Short init { - byteBuf.markReaderIndex() + var offset = byteBuf.readerIndex() streamId = StreamId(byteBuf) - byteBuf.readerIndex(12) + offset += 8 + byteBuf.readerIndex(offset) val bytes = ByteArray(8) byteBuf.readBytes(bytes) bytes.reverse() nextSeq = BigInteger(1, bytes).toBigDecimal() - byteBuf.readerIndex(20) + offset += 8 + byteBuf.readerIndex(offset) access = byteBuf.readUnsignedByte() - require(byteBuf.readerIndex() == MessageType.STREAM_AVAIL.length){ "There are bytes left in buffer to read" } + require(byteBuf.readerIndex() == MessageType.STREAM_AVAIL.length) { "There are bytes left in buffer to read" } + } + + override fun toString(): String { + return "${streamId.envId} ${streamId.sessNum} ${streamId.streamType} ${streamId.userId} ${streamId.subId} $nextSeq $access" } } @@ -100,15 +110,22 @@ class OpenResponse(byteBuf: ByteBuf) { val access: Short init { - byteBuf.markReaderIndex() + var offset = byteBuf.readerIndex() streamId = StreamId(byteBuf) - byteBuf.readerIndex(12) + + offset += 8 + byteBuf.readerIndex(offset) status = byteBuf.readUnsignedByte() - byteBuf.readerIndex(13) - access = byteBuf.readUnsignedByte() + offset++ + byteBuf.readerIndex(offset) + access = byteBuf.readUnsignedByte() require(byteBuf.readerIndex() == MessageType.OPEN_RESPONSE.length){ "There are bytes left in buffer to read" } } + + override fun toString(): String { + return "${streamId.envId} ${streamId.sessNum} ${streamId.streamType} ${streamId.userId} ${streamId.subId} $status $access" + } } class CloseResponse(byteBuf: ByteBuf){ @@ -116,13 +133,19 @@ class CloseResponse(byteBuf: ByteBuf){ val status: Short init { - byteBuf.markReaderIndex() + var offset = byteBuf.readerIndex() streamId = StreamId(byteBuf) - byteBuf.readerIndex(12) + + offset += 8 + byteBuf.readerIndex(offset) status = byteBuf.readUnsignedByte() require(byteBuf.readerIndex() == MessageType.CLOSE_RESPONSE.length){ "There are bytes left in buffer to read" } } + + override fun toString(): String { + return "${streamId.envId} ${streamId.sessNum} ${streamId.streamType} ${streamId.userId} ${streamId.subId} $status" + } } class SeqMsg(byteBuf: ByteBuf) { @@ -132,18 +155,22 @@ class SeqMsg(byteBuf: ByteBuf) { val timestamp: LocalDateTime init { - byteBuf.markReaderIndex() + var offset = byteBuf.readerIndex() streamId = StreamId(byteBuf) - byteBuf.readerIndex(12) + offset += 8 + byteBuf.readerIndex(offset) val bytes = ByteArray(8) byteBuf.readBytes(bytes) bytes.reverse() seq = BigInteger(1, bytes).toBigDecimal() - byteBuf.readerIndex(20) + offset += 8 + byteBuf.readerIndex(offset) reserved1 = byteBuf.readMedium() - byteBuf.readerIndex(24) + + offset += 4 + byteBuf.readerIndex(offset) val time = byteBuf.readLongLE().toULong() val milliseconds = time / 1_000_000UL @@ -152,6 +179,10 @@ class SeqMsg(byteBuf: ByteBuf) { nanoseconds.toInt()) require(byteBuf.readerIndex() == MessageType.SEQMSG.length){ "There are bytes left in buffer to read" } } + + override fun toString(): String { + return "${streamId.envId} ${streamId.sessNum} ${streamId.streamType} ${streamId.userId} ${streamId.subId} $seq $reserved1 $timestamp" + } } diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt index bf01449..a7a33b5 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt @@ -93,7 +93,7 @@ class Login(settings: PillarHandlerSettings) { } class Open(private val streamId: StreamId, - private val startSeq: BigDecimal, + private val startSeq: Int, private val endSeq: Int){ private val type: Int = MessageType.OPEN.type private val length: Int = MessageType.OPEN.length @@ -126,7 +126,8 @@ class Open(private val streamId: StreamId, } } -class SeqMsgToSend(private val seqmsg: SeqMsg){ +class SeqMsgToSend(private val num: Int, + private val streamId: StreamId) { private val type: Int = MessageType.SEQMSG.type private val length: Int = MessageType.SEQMSG.length @@ -138,12 +139,16 @@ class SeqMsgToSend(private val seqmsg: SeqMsg){ seqMsgMessage.writeShortLE(length) seqMsgMessage.writerIndex(4) - seqmsg.streamId.streamType = StreamType.TG.value - seqMsgMessage.writeBytes(StreamIdEncode(seqmsg.streamId).streamIdBuf) + seqMsgMessage.writeByte(streamId.envId.toInt()) + seqMsgMessage.writeMedium(streamId.sessNum) + seqMsgMessage.writeByte(streamId.streamType.toInt()) + seqMsgMessage.writeShort(streamId.userId) + seqMsgMessage.writeByte(streamId.subId) + seqMsgMessage.writerIndex(12) - seqMsgMessage.writeByte(seqmsg.seq.toInt()) + seqMsgMessage.writeByte(num) seqMsgMessage.writerIndex(20) - seqMsgMessage.writeInt(seqmsg.reserved1) + seqMsgMessage.writeInt(0)//TODO seqMsgMessage.writerIndex(24) val time = LocalDateTime.now() @@ -151,7 +156,7 @@ class SeqMsgToSend(private val seqmsg: SeqMsg){ val nanoseconds = time.nano.toULong() seqMsgMessage.writeLongLE((seconds * 1_000_000_000UL + nanoseconds).toLong()) - require (seqMsgMessage.writerIndex() == length){ "Message size exceeded." } + require(seqMsgMessage.writerIndex() == length) { "Message size exceeded." } return seqMsgMessage } } From 906c69520744ea7c9ce506d6e8105ac376c6a729 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Mon, 31 Jan 2022 11:52:18 +0300 Subject: [PATCH 42/49] Fixed test --- src/test/java/TestHandler.kt | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/src/test/java/TestHandler.kt b/src/test/java/TestHandler.kt index 6204baf..34afff1 100644 --- a/src/test/java/TestHandler.kt +++ b/src/test/java/TestHandler.kt @@ -112,7 +112,7 @@ class TestHandler { .writeByte(4) .writeByte(BigDecimal.valueOf(23).toInt()) .writerIndex(41) - .writeByte(6) + .writeByte(1) pillarHandler.onReceive(buffer) assertEquals(42, buffer.readerIndex()) @@ -126,7 +126,7 @@ class TestHandler { assertEquals(40287, streamAvail.streamId.userId) assertEquals(4, streamAvail.streamId.subId) assertEquals(BigDecimal.valueOf(23), streamAvail.nextSeq) - assertEquals(6, streamAvail.access) + assertEquals(1, streamAvail.access) buffer.writeShortLE(515) @@ -138,7 +138,7 @@ class TestHandler { .writeByte(4) .writeByte(BigDecimal.valueOf(23).toInt()) .writerIndex(62) - .writeByte(6) + .writeByte(2) pillarHandler.onReceive(buffer) assertEquals(63, buffer.readerIndex()) @@ -152,7 +152,7 @@ class TestHandler { assertEquals(40287, streamAvail.streamId.userId) assertEquals(4, streamAvail.streamId.subId) assertEquals(BigDecimal.valueOf(23), streamAvail.nextSeq) - assertEquals(6, streamAvail.access) + assertEquals(2, streamAvail.access) } @Test @@ -167,7 +167,7 @@ class TestHandler { .writeByte(4) .writeByte(BigDecimal.valueOf(23).toInt()) .writerIndex(20) - .writeByte(6) + .writeByte(1) val pillarHandler = PillarHandler(context) pillarHandler.channel = channel @@ -181,7 +181,7 @@ class TestHandler { assertEquals(40287, streamAvail.streamId.userId) assertEquals(4, streamAvail.streamId.subId) assertEquals(BigDecimal.valueOf(23), streamAvail.nextSeq) - assertEquals(6, streamAvail.access) + assertEquals(1, streamAvail.access) } @Test @@ -306,7 +306,7 @@ class TestHandler { ) val buffer: ByteBuf = Unpooled.buffer() buffer.writeBytes(stream) - val open = Open(StreamId(buffer), BigDecimal.valueOf(23), 9999).open() + val open = Open(StreamId(buffer), 23, 9999).open() assertEquals(30, open.writerIndex()) @@ -350,7 +350,7 @@ class TestHandler { buffer.readerIndex(4) val seqMsg = SeqMsg(buffer) - val seqMsgToSend = SeqMsgToSend(seqMsg).seqMsg() + val seqMsgToSend = SeqMsgToSend(1, seqMsg.streamId).seqMsg() assertEquals(32, seqMsgToSend.writerIndex()) @@ -428,12 +428,12 @@ class TestHandler { val pillarHandler = PillarHandler(context) val metadata = mutableMapOf() - metadata[TYPE_FIELD_NAME] = 517.toString() + metadata[TYPE_FIELD_NAME] = 500.toString() metadata[LENGTH_FIELD_NAME] = 21.toString() val onOutgoing = pillarHandler.onOutgoing(buffer, metadata) - assertEquals(517.toString(), onOutgoing[TYPE_FIELD_NAME]) + assertEquals(500.toString(), onOutgoing[TYPE_FIELD_NAME]) assertEquals(21.toString(), onOutgoing[LENGTH_FIELD_NAME]) } From 99240eab30104a72d024bfbdc84153ada4290827 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Mon, 31 Jan 2022 16:58:37 +0300 Subject: [PATCH 43/49] [TH2-2806] Fixed open and close stream, encode and decode SeqMsg --- .../dirty/pillar/handler/PillarHandler.kt | 160 ++++++++---------- .../pillar/handler/PillarMessageDecoder.kt | 17 +- .../pillar/handler/PillarMessageEncoder.kt | 65 +++---- .../dirty/pillar/handler/util/PillarUtils.kt | 23 ++- src/test/java/TestHandler.kt | 73 +++++--- 5 files changed, 175 insertions(+), 163 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index 8d5d44e..8edfebb 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -22,13 +22,14 @@ import com.exactpro.th2.conn.dirty.tcp.core.api.IContext import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandler import com.exactpro.th2.conn.dirty.tcp.core.api.IProtocolHandlerSettings import io.netty.buffer.ByteBuf -import io.netty.buffer.Unpooled import mu.KotlinLogging import java.util.concurrent.CompletableFuture import java.util.concurrent.Executors import java.util.concurrent.Future import java.util.concurrent.TimeUnit +import java.util.concurrent.atomic.AtomicInteger import java.util.concurrent.atomic.AtomicReference + class PillarHandler(private val context: IContext): IProtocolHandler { private var state = AtomicReference(State.SESSION_CLOSE) @@ -38,12 +39,11 @@ class PillarHandler(private val context: IContext): IP private lateinit var streamId: StreamIdEncode private var settings: PillarHandlerSettings lateinit var channel: IChannel - private var startRead = AtomicReference(0) - private var endRead = AtomicReference(0) - private var startWrite = AtomicReference(0) - private var endWrite = AtomicReference(0) - private var readingConnection = AtomicReference(false) - private var writingConnection = AtomicReference(false) + private var connectRead = AtomicReference(OpenType.CLOSE) + private var connectWrite = AtomicReference(OpenType.CLOSE) + private var serverSeqNum = AtomicInteger(0) + private var clientSeqNum = AtomicInteger(0) + private val seqNum = 1000 init{ settings = context.settings as PillarHandlerSettings @@ -64,7 +64,6 @@ class PillarHandler(private val context: IContext): IP clientFuture?.cancel(false) clientFuture = executor.scheduleWithFixedDelay(this::startSendHeartBeats, settings.heartbeatInterval, settings.heartbeatInterval, TimeUnit.MILLISECONDS) - LOGGER.info { "Message has been sent to server - HeartBeats." } LOGGER.info { "Handler is connected." } } else LOGGER.info { "Failed to set a new state. ${State.SESSION_CLOSE} -> ${state.get()}." } @@ -123,7 +122,7 @@ class PillarHandler(private val context: IContext): IP } MessageType.SEQMSG.type -> { - return checkSeqMsg(message) + return checkSeqMsg(message, msgHeader) } MessageType.CLOSE_RESPONSE.type -> { @@ -158,7 +157,7 @@ class PillarHandler(private val context: IContext): IP LOGGER.info { "Failed to set a new state. ${State.SESSION_CLOSE} -> ${state.get()}." } stopSendHeartBeats() LOGGER.info("Received `not logged in` status. Fall in to error state.") - sendClose() + channel.send(Login(settings).login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE) } else -> error("Received $status status.") } @@ -166,7 +165,7 @@ class PillarHandler(private val context: IContext): IP } private fun checkStreamAvail(message: ByteBuf): Map { - executor.awaitTermination(0,TimeUnit.MILLISECONDS) + executor.awaitTermination(0, TimeUnit.MILLISECONDS) serverFuture?.cancel(false) serverFuture = executor.schedule(this::receivedHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) @@ -177,37 +176,33 @@ class PillarHandler(private val context: IContext): IP message.readerIndex(4) streamId = StreamIdEncode(StreamId(message)) - var open: ByteBuf = Unpooled.buffer() - - if (streamAvail.streamId.streamType == StreamType.REF.value || streamAvail.streamId.streamType == StreamType.GT.value){ - val streamType = Access.READ.value.toInt() - startRead.getAndSet(streamAvail.nextSeq.toInt()) - endRead.getAndSet(streamAvail.nextSeq.toInt()+1) - open = Open( - streamId.streamId, - startRead.get(), - endRead.get() - ).open() - readingConnection.getAndSet(true) - } - else if (streamAvail.streamId.streamType == StreamType.TG.value) { - val streamType = Access.WRITE.value.toInt() - startWrite.getAndSet(streamAvail.nextSeq.toInt()) - endWrite.getAndSet(streamAvail.nextSeq.toInt()+1) //TODO - open = Open( - streamId.streamId, - startWrite.get(), - endWrite.get() - ).open() - writingConnection.getAndSet(true) - } - channel.send( - open, - messageMetadata(MessageType.OPEN), IChannel.SendMode.MANGLE - ) + if (streamAvail.streamId.streamType == StreamType.REF.value || streamAvail.streamId.streamType == StreamType.GT.value) { + if (connectRead.compareAndSet(OpenType.CLOSE, OpenType.SENT)) { + channel.send( + Open( + streamId.streamId, + streamAvail.nextSeq.toInt(), + streamAvail.nextSeq.toInt() + 12 + ).open(), + messageMetadata(MessageType.OPEN), IChannel.SendMode.MANGLE + ) + LOGGER.info { "Message has been sent to server - Open for read." } + } + } else if (streamAvail.streamId.streamType == StreamType.TG.value) { + if (connectWrite.compareAndSet(OpenType.CLOSE, OpenType.SENT)) { + channel.send( + Open( + streamId.streamId, + streamAvail.nextSeq.toInt(), + streamAvail.nextSeq.toInt() + seqNum + ).open(), + messageMetadata(MessageType.OPEN), IChannel.SendMode.MANGLE + ) + LOGGER.info { "Message has been sent to server - Open for write." } + } + } - LOGGER.info { "Message has been sent to server - Open."} return messageMetadata(MessageType.STREAM_AVAIL) } @@ -219,25 +214,13 @@ class PillarHandler(private val context: IContext): IP when (Status.getStatus(openResponse.status)) { Status.OK -> { LOGGER.info("Open successful.") - if (readingConnection.get()) { - LOGGER.info { "Open for READ" } - readingConnection.getAndSet(false) - } - if (writingConnection.get()) { - LOGGER.info { "Open for WRITE" } - var i = startWrite.get() - while (i < endWrite.get()) { - LOGGER.info { "Message has been sent to server - Heartbeat" } - channel.send( - //SeqMsgToSend(i, openResponse.streamId).seqMsg(), - Heartbeat().heartbeat, - messageMetadata(MessageType.SEQMSG), - IChannel.SendMode.MANGLE - ) - i++ - } - writingConnection.getAndSet(false) + connectRead.compareAndSet(OpenType.SENT, OpenType.OPEN) + connectWrite.compareAndSet(OpenType.SENT, OpenType.OPEN) + + if (connectRead.get() == OpenType.OPEN || connectWrite.get() == OpenType.OPEN){ + if (state.compareAndSet(State.LOGGED_IN, State.OPEN_IN)|| state.get() == State.OPEN_IN) + LOGGER.info { "Setting state -> ${state.get()}" } } } @@ -248,21 +231,14 @@ class PillarHandler(private val context: IContext): IP return messageMetadata(MessageType.OPEN_RESPONSE) } - private fun checkSeqMsg(message: ByteBuf): Map { - val seqMsg = SeqMsg(message) + private fun checkSeqMsg(message: ByteBuf, header: MsgHeader): Map { + val seqMsg = SeqMsg(message, header.length) LOGGER.info { "Type message - SeqMsg: $seqMsg" } - - startRead.getAndSet(1) - if (startRead == endRead){ - channel.send( - Close(streamId.streamIdBuf).close(), - messageMetadata(MessageType.CLOSE), - IChannel.SendMode.MANGLE - ) - LOGGER.info { "Message has been sent to server - Close." } + serverSeqNum.incrementAndGet() + if(serverSeqNum.get() == seqNum){ + connectRead.compareAndSet(OpenType.OPEN, OpenType.CLOSE) } - return messageMetadata(MessageType.SEQMSG) } @@ -272,8 +248,13 @@ class PillarHandler(private val context: IContext): IP LOGGER.info { "Type message - CloseResponse: $closeResponse" } when (Status.getStatus(closeResponse.status)) { - Status.OK -> LOGGER.info("Open successful.") - Status.STREAM_NOT_OPEN -> LOGGER.warn { "Stream not open." } + Status.OK -> { + LOGGER.info("Close successful.") + if (state.compareAndSet(State.OPEN_OUT, State.LOGGED_OUT)) { + LOGGER.info { "Setting a new state -> ${state.get()}." } + } else LOGGER.info { "Failed to set a new state ${State.LOGGED_OUT}." } + } + Status.STREAM_NOT_OPEN -> LOGGER.warn { "Stream not close." } else -> error("This is not an CloseResponse status.") } @@ -281,43 +262,38 @@ class PillarHandler(private val context: IContext): IP } override fun onOutgoing(message: ByteBuf, metadata: Map): Map { - val offset = message.readerIndex() - val msgHeader = MsgHeader(message) - val type = metadata[TYPE_FIELD_NAME]!!.toInt() - if (msgHeader.type!= type){ - val buffer: ByteBuf = message.copy(4, message.readableBytes()-4) - message.readerIndex(offset) - message.writerIndex(offset) - message.writeShortLE(type) - message.writeShortLE(metadata[LENGTH_FIELD_NAME]!!.toInt()) - message.writeBytes(buffer) + clientSeqNum.incrementAndGet() + SeqMsgToSend(message, clientSeqNum.get(), streamId.streamId, metadata) + if(clientSeqNum.get() == seqNum){ + connectWrite.compareAndSet(OpenType.OPEN, OpenType.CLOSE) } return metadata } override fun onClose() { - sendClose() - if (state.compareAndSet(State.LOGGED_OUT, State.SESSION_CLOSE)) { + if (state.compareAndSet(State.OPEN_IN, State.SESSION_CLOSE)) { LOGGER.info { "Setting a new state -> ${state.get()}." } LOGGER.info { "Handler is disconnected." } } else LOGGER.info { "Failed to set a new state ${State.SESSION_CLOSE}." } } override fun close() { + if (state.compareAndSet(State.OPEN_IN, State.OPEN_OUT)){ + LOGGER.info { "Setting a new state -> ${state.get()}." } + channel.send( + Close(streamId.streamIdBuf).close(), + messageMetadata(MessageType.CLOSE), + IChannel.SendMode.MANGLE + ) + LOGGER.info { "Message has been sent to server - Close." } + } else LOGGER.info { "Failed to set a new state ${State.OPEN_OUT}." } executor.shutdown() if (!executor.awaitTermination(3000, TimeUnit.MILLISECONDS)) executor.shutdownNow() } - private fun sendClose() { - if (state.compareAndSet(State.LOGGED_IN, State.LOGGED_OUT)) { - state.getAndSet(State.LOGGED_OUT) - LOGGER.info { "Setting a new state -> ${state.get()}." } - - } else LOGGER.info { "Failed to set a new state ${State.LOGGED_OUT}." } - } - private fun startSendHeartBeats() { channel.send(Heartbeat().heartbeat, messageMetadata(MessageType.HEARTBEAT), IChannel.SendMode.MANGLE) + LOGGER.info { "Message has been sent to server - HeartBeats." } } private fun stopSendHeartBeats() { diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt index e236c8d..8ac83fe 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageDecoder.kt @@ -19,6 +19,7 @@ package com.exactpro.th2.conn.dirty.pillar.handler import com.exactpro.th2.conn.dirty.pillar.handler.util.MessageType import io.netty.buffer.ByteBuf import io.netty.buffer.ByteBufUtil +import org.checkerframework.checker.units.qual.Length import java.lang.Exception import java.math.BigDecimal import java.math.BigInteger @@ -148,11 +149,12 @@ class CloseResponse(byteBuf: ByteBuf){ } } -class SeqMsg(byteBuf: ByteBuf) { +class SeqMsg(byteBuf: ByteBuf, length: Int) { val streamId: StreamId val seq: BigDecimal - val reserved1: Int + val reserved1: ByteBuf val timestamp: LocalDateTime + val payload: MsgHeader init { var offset = byteBuf.readerIndex() @@ -166,10 +168,9 @@ class SeqMsg(byteBuf: ByteBuf) { seq = BigInteger(1, bytes).toBigDecimal() offset += 8 - byteBuf.readerIndex(offset) - reserved1 = byteBuf.readMedium() + reserved1 = byteBuf.copy(offset, length - MessageType.SEQMSG.length) - offset += 4 + offset += length - MessageType.SEQMSG.length byteBuf.readerIndex(offset) val time = byteBuf.readLongLE().toULong() @@ -177,7 +178,11 @@ class SeqMsg(byteBuf: ByteBuf) { val nanoseconds = time % 1_000_000_000UL timestamp = LocalDateTime.ofInstant(Instant.ofEpochMilli(milliseconds.toLong()), ZoneOffset.UTC).withNano( nanoseconds.toInt()) - require(byteBuf.readerIndex() == MessageType.SEQMSG.length){ "There are bytes left in buffer to read" } + offset += 8 + byteBuf.readerIndex(offset) + payload = MsgHeader(byteBuf) + + require(byteBuf.readerIndex() == length){ "There are bytes left in buffer to read" } } override fun toString(): String { diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt index a7a33b5..714b720 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt @@ -16,13 +16,9 @@ package com.exactpro.th2.conn.dirty.pillar.handler -import com.exactpro.th2.conn.dirty.pillar.handler.util.Access -import com.exactpro.th2.conn.dirty.pillar.handler.util.MODE_LOSSY -import com.exactpro.th2.conn.dirty.pillar.handler.util.MessageType -import com.exactpro.th2.conn.dirty.pillar.handler.util.StreamType +import com.exactpro.th2.conn.dirty.pillar.handler.util.* import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled -import java.math.BigDecimal import java.time.LocalDateTime import java.time.ZoneOffset @@ -126,38 +122,47 @@ class Open(private val streamId: StreamId, } } -class SeqMsgToSend(private val num: Int, - private val streamId: StreamId) { +class SeqMsgToSend(private val message: ByteBuf, + private val num: Int, + private val streamId: StreamId, + private val metadata: Map) { private val type: Int = MessageType.SEQMSG.type private val length: Int = MessageType.SEQMSG.length - fun seqMsg(): ByteBuf { - val seqMsgMessage: ByteBuf = Unpooled.buffer(length) - - seqMsgMessage.markWriterIndex() - seqMsgMessage.writeShortLE(type) - seqMsgMessage.writeShortLE(length) - - seqMsgMessage.writerIndex(4) - seqMsgMessage.writeByte(streamId.envId.toInt()) - seqMsgMessage.writeMedium(streamId.sessNum) - seqMsgMessage.writeByte(streamId.streamType.toInt()) - seqMsgMessage.writeShort(streamId.userId) - seqMsgMessage.writeByte(streamId.subId) - - seqMsgMessage.writerIndex(12) - seqMsgMessage.writeByte(num) - seqMsgMessage.writerIndex(20) - seqMsgMessage.writeInt(0)//TODO - - seqMsgMessage.writerIndex(24) + fun seqMsg() { + val offset = message.readerIndex() + val size = message.readableBytes() + + val buffer: ByteBuf = message.copy(0, size) + message.writerIndex(offset) + message.writeShortLE(type) + message.writeShortLE(length + size) + + message.writeByte(streamId.envId.toInt()) + message.writeMedium(streamId.sessNum) + message.writeByte(streamId.streamType.toInt()) + message.writeShort(streamId.userId) + message.writeByte(streamId.subId) + message.writeByte(num) + message.writerIndex(20) + message.writeBytes(buffer) + + message.writerIndex(20 + size) val time = LocalDateTime.now() val seconds = time.toEpochSecond(ZoneOffset.UTC).toULong() val nanoseconds = time.nano.toULong() - seqMsgMessage.writeLongLE((seconds * 1_000_000_000UL + nanoseconds).toLong()) + message.writeLongLE((seconds * 1_000_000_000UL + nanoseconds).toLong()) + + println(message.writerIndex()) + if (metadata[TYPE_FIELD_NAME] != null) + message.writeShortLE(metadata[TYPE_FIELD_NAME]!!.toInt()) + else message.writeShortLE(0) + + if (metadata[LENGTH_FIELD_NAME] != null) + message.writeShortLE(metadata[LENGTH_FIELD_NAME]!!.toInt()) + else message.writeShortLE(size) - require(seqMsgMessage.writerIndex() == length) { "Message size exceeded." } - return seqMsgMessage + require(message.writerIndex() == size + length) { "Message size exceeded." } } } diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/util/PillarUtils.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/util/PillarUtils.kt index ec82030..35d8770 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/util/PillarUtils.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/util/PillarUtils.kt @@ -16,6 +16,9 @@ package com.exactpro.th2.conn.dirty.pillar.handler.util +import org.checkerframework.checker.units.qual.A +import java.util.concurrent.atomic.AtomicBoolean +import java.util.concurrent.atomic.AtomicReference import kotlin.experimental.and import kotlin.experimental.or @@ -28,7 +31,9 @@ enum class State(val value: Int){ SESSION_CLOSE(1), LOGGED_IN(2), LOGGED_OUT(3), - NOT_HEARTBEAT(4); + NOT_HEARTBEAT(4), + OPEN_IN(5), + OPEN_OUT(6); } enum class Status(val value: Short) { @@ -55,12 +60,8 @@ enum class Access(val value: Short) { THROTTLE_REJECT(4); companion object { - fun getPermission(permission: Short): Short { - var result: Short = 0 - values().forEach { access -> - result = result or (access.value and permission) - } - return result + fun getAccess(value: Short): Access? { + return values().find { it.value == value } } } } @@ -97,4 +98,10 @@ enum class MessageType(val type: Int, val length: Int) { return values().find { it.type == type } != null } } -} \ No newline at end of file +} + +enum class OpenType (type: Int){ + CLOSE(0), + SENT(1), + OPEN(2); +} diff --git a/src/test/java/TestHandler.kt b/src/test/java/TestHandler.kt index 34afff1..fc1726c 100644 --- a/src/test/java/TestHandler.kt +++ b/src/test/java/TestHandler.kt @@ -32,12 +32,11 @@ import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled import io.netty.channel.EventLoopGroup import io.netty.channel.nio.NioEventLoopGroup -import org.junit.jupiter.api.Assertions.assertEquals import org.junit.jupiter.api.Test import org.junit.jupiter.api.assertThrows import org.mockito.Mockito.mock import com.nhaarman.mockitokotlin2.mock -import org.junit.jupiter.api.Assertions.assertNull +import org.junit.jupiter.api.Assertions.* import java.io.InputStream import java.math.BigDecimal import java.math.BigInteger @@ -252,9 +251,11 @@ class TestHandler { val seconds = time.toEpochSecond(ZoneOffset.UTC).toULong() val nanoseconds = time.nano.toULong() + val reserved = Unpooled.buffer().writeBytes(byteArrayOf(0, 1, 2, 3)) + val buffer: ByteBuf = Unpooled.buffer() - buffer.writeShortLE(2309) - .writeShortLE(32) + .writeShortLE(2309) + .writeShortLE(36) .writeByte(5) .writeMedium(4259845) .writeByte(13) @@ -262,17 +263,20 @@ class TestHandler { .writeByte(4) .writeByte(BigDecimal.valueOf(23).toInt()) .writerIndex(20) - .writeMedium(0) + .writeBytes(reserved) .writerIndex(24) .writeLongLE((seconds * 1_000_000_000UL + nanoseconds).toLong()) + .writerIndex(32) + .writeShortLE(22) + .writeShortLE(4) val pillarHandler = PillarHandler(context) pillarHandler.channel = channel pillarHandler.onReceive(buffer) - assertEquals(32, buffer.readerIndex()) + assertEquals(36, buffer.readerIndex()) buffer.readerIndex(4) - val seqMsg = SeqMsg(buffer) + val seqMsg = SeqMsg(buffer, 36) assertEquals(5, seqMsg.streamId.envId) assertEquals(4259845, seqMsg.streamId.sessNum) @@ -280,8 +284,10 @@ class TestHandler { assertEquals(40287, seqMsg.streamId.userId) assertEquals(4, seqMsg.streamId.subId) assertEquals(BigDecimal.valueOf(23), seqMsg.seq) - assertEquals(0, seqMsg.reserved1) + //assertEquals(reserved.array(), seqMsg.reserved1.array()) assertEquals("2021-12-27T13:39:14.524104", seqMsg.timestamp.toString()) + assertEquals(22, seqMsg.payload.type) + assertEquals(4, seqMsg.payload.length) } @Test @@ -342,25 +348,32 @@ class TestHandler { .writeByte(15) .writeShort(40287) .writeByte(4) + .writerIndex(12) .writeByte(BigDecimal.valueOf(23).toInt()) .writerIndex(20) - .writeMedium(0) - .writerIndex(24) .writeLongLE((seconds * 1_000_000_000UL + nanoseconds).toLong()) + .writerIndex(28) + .writeShortLE(22) + .writeShortLE(0) buffer.readerIndex(4) - val seqMsg = SeqMsg(buffer) - val seqMsgToSend = SeqMsgToSend(1, seqMsg.streamId).seqMsg() - - assertEquals(32, seqMsgToSend.writerIndex()) - - assertEquals(2309, seqMsgToSend.readUnsignedShortLE()) - assertEquals(32, seqMsgToSend.readUnsignedShortLE()) - assertEquals(5, seqMsgToSend.readUnsignedByte()) - assertEquals(4259845, seqMsgToSend.readMedium()) - assertEquals(15, seqMsgToSend.readByte()) - assertEquals(40287, seqMsgToSend.readUnsignedShort()) - assertEquals(4, seqMsgToSend.readByte().toInt()) + + val seqMsg = SeqMsg(buffer, 32) + val message = Unpooled.buffer() + val metadata = HashMap() + metadata[TYPE_FIELD_NAME] = 22.toString() + metadata[LENGTH_FIELD_NAME] = 0.toString() + SeqMsgToSend(message, 1, seqMsg.streamId, metadata).seqMsg() + + assertEquals(32, message.writerIndex()) + + assertEquals(2309, message.readUnsignedShortLE()) + assertEquals(32, message.readUnsignedShortLE()) + assertEquals(5, message.readUnsignedByte()) + assertEquals(4259845, message.readMedium()) + assertEquals(15, message.readByte()) + assertEquals(40287, message.readUnsignedShort()) + assertEquals(4, message.readByte().toInt()) } @Test @@ -426,15 +439,21 @@ class TestHandler { .writeShort(40287) .writeByte(4) - val pillarHandler = PillarHandler(context) + val streamId: ByteBuf = Unpooled.buffer().writeByte(5) + .writeMedium(4259845) + .writeByte(15) + .writeShort(40287) + .writeByte(4) + .writeByte(BigDecimal.valueOf(23).toInt()) + val metadata = mutableMapOf() + metadata[TYPE_FIELD_NAME] = 500.toString() - metadata[LENGTH_FIELD_NAME] = 21.toString() + metadata[LENGTH_FIELD_NAME] = 12.toString() - val onOutgoing = pillarHandler.onOutgoing(buffer, metadata) + SeqMsgToSend(buffer, 1, StreamId(streamId), metadata) - assertEquals(500.toString(), onOutgoing[TYPE_FIELD_NAME]) - assertEquals(21.toString(), onOutgoing[LENGTH_FIELD_NAME]) + assertNotNull(buffer) } From e1136466117f1855bca67d9085cfb3e441d58410 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Mon, 31 Jan 2022 17:26:33 +0300 Subject: [PATCH 44/49] [TH2-2806] Plugin changes --- build.gradle | 2 +- src/test/java/TestHandler.kt | 4 +++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/build.gradle b/build.gradle index 9f7fa2b..3b503f0 100644 --- a/build.gradle +++ b/build.gradle @@ -53,7 +53,7 @@ dependencies { implementation 'com.google.auto.service:auto-service:1.0.1' implementation 'com.exactpro.th2:common:3.32.0' - implementation 'com.exactpro.th2:conn-dirty-tcp-core:0.0.3' + implementation 'com.exactpro.th2:conn-dirty-tcp-core:0.0.5' implementation 'io.netty:netty-all:4.1.72.Final' diff --git a/src/test/java/TestHandler.kt b/src/test/java/TestHandler.kt index fc1726c..8533bb2 100644 --- a/src/test/java/TestHandler.kt +++ b/src/test/java/TestHandler.kt @@ -45,6 +45,7 @@ import java.nio.charset.StandardCharsets import java.time.LocalDateTime import java.time.ZoneOffset import java.util.concurrent.Executor +import java.util.concurrent.ScheduledExecutorService class TestHandler { private val address: InetSocketAddress = mock(InetSocketAddress::class.java) @@ -56,7 +57,7 @@ class TestHandler { private val onEvent: (event: Event, parentEventId: EventID) -> Unit = mock {} private val onMessage: (RawMessage) -> Unit = mock { } private val eventLoopGroup: EventLoopGroup = NioEventLoopGroup() - private val executor: Executor = mock(Executor::class.java) + private val executor: ScheduledExecutorService = mock(ScheduledExecutorService::class.java) private val sequencePool = TaskSequencePool(executor) private val parentEventId = EventID.newBuilder().setId("root").build()!! @@ -69,6 +70,7 @@ class TestHandler { mangler, onEvent, onMessage, + executor, eventLoopGroup, sequencePool, parentEventId From 322b8038d8281b6615eff75e9085931d6d947e4d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Mon, 31 Jan 2022 17:53:32 +0300 Subject: [PATCH 45/49] [TH2-2806] Fixed encoder --- .../th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt | 3 ++- src/test/java/TestHandler.kt | 7 +++++-- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt index 714b720..218f858 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarMessageEncoder.kt @@ -153,7 +153,8 @@ class SeqMsgToSend(private val message: ByteBuf, val nanoseconds = time.nano.toULong() message.writeLongLE((seconds * 1_000_000_000UL + nanoseconds).toLong()) - println(message.writerIndex()) + message.writerIndex(28 + size) + if (metadata[TYPE_FIELD_NAME] != null) message.writeShortLE(metadata[TYPE_FIELD_NAME]!!.toInt()) else message.writeShortLE(0) diff --git a/src/test/java/TestHandler.kt b/src/test/java/TestHandler.kt index 8533bb2..0d964cb 100644 --- a/src/test/java/TestHandler.kt +++ b/src/test/java/TestHandler.kt @@ -363,8 +363,8 @@ class TestHandler { val seqMsg = SeqMsg(buffer, 32) val message = Unpooled.buffer() val metadata = HashMap() - metadata[TYPE_FIELD_NAME] = 22.toString() - metadata[LENGTH_FIELD_NAME] = 0.toString() +// metadata[TYPE_FIELD_NAME] = 22.toString() +// metadata[LENGTH_FIELD_NAME] = 0.toString() SeqMsgToSend(message, 1, seqMsg.streamId, metadata).seqMsg() assertEquals(32, message.writerIndex()) @@ -376,6 +376,9 @@ class TestHandler { assertEquals(15, message.readByte()) assertEquals(40287, message.readUnsignedShort()) assertEquals(4, message.readByte().toInt()) + message.readerIndex(28) + assertEquals(0, message.readUnsignedShortLE()) + assertEquals(0, message.readUnsignedShortLE()) } @Test From eb4252b2c407be500b3031b33358c5909d79d2b5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Mon, 31 Jan 2022 18:45:03 +0300 Subject: [PATCH 46/49] [TH2-2806] Fixed handler --- .../exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index 8edfebb..d312daa 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -252,6 +252,8 @@ class PillarHandler(private val context: IContext): IP LOGGER.info("Close successful.") if (state.compareAndSet(State.OPEN_OUT, State.LOGGED_OUT)) { LOGGER.info { "Setting a new state -> ${state.get()}." } + connectRead.getAndSet(OpenType.CLOSE) + connectWrite.getAndSet(OpenType.CLOSE) } else LOGGER.info { "Failed to set a new state ${State.LOGGED_OUT}." } } Status.STREAM_NOT_OPEN -> LOGGER.warn { "Stream not close." } @@ -274,6 +276,8 @@ class PillarHandler(private val context: IContext): IP if (state.compareAndSet(State.OPEN_IN, State.SESSION_CLOSE)) { LOGGER.info { "Setting a new state -> ${state.get()}." } LOGGER.info { "Handler is disconnected." } + connectRead.getAndSet(OpenType.CLOSE) + connectWrite.getAndSet(OpenType.CLOSE) } else LOGGER.info { "Failed to set a new state ${State.SESSION_CLOSE}." } } @@ -306,6 +310,8 @@ class PillarHandler(private val context: IContext): IP LOGGER.info { "Setting a new state -> ${state.get()}." } channel.send(Login(settings).login(), messageMetadata(MessageType.LOGIN), IChannel.SendMode.MANGLE) LOGGER.info { "Message has been sent to server - Login." } + connectRead.getAndSet(OpenType.CLOSE) + connectWrite.getAndSet(OpenType.CLOSE) } else LOGGER.info { "Failed to set a new state ${State.SESSION_CREATED}." } } From fe2edab567017e39f2cbee03e357e48253b513bb Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Thu, 3 Feb 2022 14:16:35 +0300 Subject: [PATCH 47/49] [TH2-2806] Fixed open and close session --- .../dirty/pillar/handler/PillarHandler.kt | 58 +++++++++++++------ 1 file changed, 40 insertions(+), 18 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index d312daa..9c63435 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -36,7 +36,8 @@ class PillarHandler(private val context: IContext): IP private val executor = Executors.newScheduledThreadPool(1) private var clientFuture: Future<*>? = CompletableFuture.completedFuture(null) private var serverFuture: Future<*>? = CompletableFuture.completedFuture(null) - private lateinit var streamId: StreamIdEncode + private lateinit var streamIdRead: StreamIdEncode + private lateinit var streamIdWrite: StreamIdEncode private var settings: PillarHandlerSettings lateinit var channel: IChannel private var connectRead = AtomicReference(OpenType.CLOSE) @@ -165,7 +166,6 @@ class PillarHandler(private val context: IContext): IP } private fun checkStreamAvail(message: ByteBuf): Map { - executor.awaitTermination(0, TimeUnit.MILLISECONDS) serverFuture?.cancel(false) serverFuture = executor.schedule(this::receivedHeartBeats, settings.streamAvailInterval, TimeUnit.MILLISECONDS) @@ -174,14 +174,15 @@ class PillarHandler(private val context: IContext): IP LOGGER.info { "Type message - StreamAvail: $streamAvail" } message.readerIndex(4) - streamId = StreamIdEncode(StreamId(message)) + val streamIdAvail = StreamIdEncode(StreamId(message)) if (streamAvail.streamId.streamType == StreamType.REF.value || streamAvail.streamId.streamType == StreamType.GT.value) { if (connectRead.compareAndSet(OpenType.CLOSE, OpenType.SENT)) { + streamIdRead = streamIdAvail channel.send( Open( - streamId.streamId, + streamIdRead.streamId, streamAvail.nextSeq.toInt(), streamAvail.nextSeq.toInt() + 12 ).open(), @@ -191,9 +192,10 @@ class PillarHandler(private val context: IContext): IP } } else if (streamAvail.streamId.streamType == StreamType.TG.value) { if (connectWrite.compareAndSet(OpenType.CLOSE, OpenType.SENT)) { + streamIdWrite = streamIdAvail channel.send( Open( - streamId.streamId, + streamIdWrite.streamId, streamAvail.nextSeq.toInt(), streamAvail.nextSeq.toInt() + seqNum ).open(), @@ -218,8 +220,8 @@ class PillarHandler(private val context: IContext): IP connectRead.compareAndSet(OpenType.SENT, OpenType.OPEN) connectWrite.compareAndSet(OpenType.SENT, OpenType.OPEN) - if (connectRead.get() == OpenType.OPEN || connectWrite.get() == OpenType.OPEN){ - if (state.compareAndSet(State.LOGGED_IN, State.OPEN_IN)|| state.get() == State.OPEN_IN) + if (connectRead.get() == OpenType.OPEN && connectWrite.get() == OpenType.OPEN){ + if (state.compareAndSet(State.LOGGED_IN, State.OPEN_IN)) LOGGER.info { "Setting state -> ${state.get()}" } } } @@ -250,11 +252,24 @@ class PillarHandler(private val context: IContext): IP when (Status.getStatus(closeResponse.status)) { Status.OK -> { LOGGER.info("Close successful.") - if (state.compareAndSet(State.OPEN_OUT, State.LOGGED_OUT)) { - LOGGER.info { "Setting a new state -> ${state.get()}." } + if (closeResponse.streamId == streamIdRead.streamId) connectRead.getAndSet(OpenType.CLOSE) + if (closeResponse.streamId == streamIdWrite.streamId) connectWrite.getAndSet(OpenType.CLOSE) - } else LOGGER.info { "Failed to set a new state ${State.LOGGED_OUT}." } + + if (connectRead.get()==OpenType.CLOSE && connectWrite.get()==OpenType.CLOSE) { + if (state.compareAndSet(State.OPEN_OUT, State.LOGGED_OUT)) { + LOGGER.info { "Setting a new state -> ${state.get()}." } + executor.shutdown() + try { + if (!executor.awaitTermination(3000, TimeUnit.MILLISECONDS)) { + executor.shutdownNow() + } + } catch (e: InterruptedException) { + executor.shutdownNow() + } + } else LOGGER.info { "Failed to set a new state ${State.LOGGED_OUT}." } + } } Status.STREAM_NOT_OPEN -> LOGGER.warn { "Stream not close." } else -> error("This is not an CloseResponse status.") @@ -265,7 +280,7 @@ class PillarHandler(private val context: IContext): IP override fun onOutgoing(message: ByteBuf, metadata: Map): Map { clientSeqNum.incrementAndGet() - SeqMsgToSend(message, clientSeqNum.get(), streamId.streamId, metadata) + SeqMsgToSend(message, clientSeqNum.get(), streamIdWrite.streamId, metadata).seqMsg() if(clientSeqNum.get() == seqNum){ connectWrite.compareAndSet(OpenType.OPEN, OpenType.CLOSE) } @@ -284,15 +299,22 @@ class PillarHandler(private val context: IContext): IP override fun close() { if (state.compareAndSet(State.OPEN_IN, State.OPEN_OUT)){ LOGGER.info { "Setting a new state -> ${state.get()}." } - channel.send( - Close(streamId.streamIdBuf).close(), - messageMetadata(MessageType.CLOSE), - IChannel.SendMode.MANGLE - ) + if (connectRead.get() == OpenType.OPEN) { + channel.send( + Close(streamIdRead.streamIdBuf).close(), + messageMetadata(MessageType.CLOSE), + IChannel.SendMode.MANGLE + ) + } + if (connectWrite.get() == OpenType.OPEN) { + channel.send( + Close(streamIdWrite.streamIdBuf).close(), + messageMetadata(MessageType.CLOSE), + IChannel.SendMode.MANGLE + ) + } LOGGER.info { "Message has been sent to server - Close." } } else LOGGER.info { "Failed to set a new state ${State.OPEN_OUT}." } - executor.shutdown() - if (!executor.awaitTermination(3000, TimeUnit.MILLISECONDS)) executor.shutdownNow() } private fun startSendHeartBeats() { From 570867d2c633dcd3164327f49378b68d94179812 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= <89018421+tatianavvedenskaya@users.noreply.github.com> Date: Thu, 3 Feb 2022 14:25:08 +0300 Subject: [PATCH 48/49] [TH2-2806] Fixed test --- src/test/java/TestHandler.kt | 34 +--------------------------------- 1 file changed, 1 insertion(+), 33 deletions(-) diff --git a/src/test/java/TestHandler.kt b/src/test/java/TestHandler.kt index 0d964cb..5f146f7 100644 --- a/src/test/java/TestHandler.kt +++ b/src/test/java/TestHandler.kt @@ -215,38 +215,6 @@ class TestHandler { assertEquals(2, openResponseMsg.access) } - @Test - fun `sending CloseResponse`() { - val buffer: ByteBuf = Unpooled.buffer() - buffer.writeShortLE(520) - .writeShortLE(13) - .writeByte(5) - .writeMedium(4259845) - .writeByte(15) - .writeShort(40287) - .writeByte(4) - .writeByte(0) - - val pillarHandler = PillarHandler(context) - pillarHandler.channel = channel - val message = pillarHandler.onReceive(buffer) - assertEquals(13, buffer.readerIndex()) - - val metadata = pillarHandler.onIncoming(message!!) - message.readerIndex(4) - val closeResponseMsg = CloseResponse(message) - - assertEquals(520.toString(), metadata[TYPE_FIELD_NAME]) - assertEquals(13.toString(), metadata[LENGTH_FIELD_NAME]) - - assertEquals(5, closeResponseMsg.streamId.envId) - assertEquals(4259845, closeResponseMsg.streamId.sessNum) - assertEquals(15, closeResponseMsg.streamId.streamType) - assertEquals(40287, closeResponseMsg.streamId.userId) - assertEquals(4, closeResponseMsg.streamId.subId) - assertEquals(0, closeResponseMsg.status) - } - @Test fun `sending SeqMsg`() { val time = LocalDateTime.parse("2021-12-27T13:39:14.524104") @@ -524,4 +492,4 @@ class TestHandler { val exception = assertThrows { Login(settings) } assertEquals("Size of version exceeds allowed size or equal to zero.", exception.message) } -} \ No newline at end of file +} From 195a182e1a1cd93c035a9e6dd69278872815084b Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=A2=D0=B0=D1=82=D1=8C=D1=8F=D0=BD=D0=B0=20=D0=92=D0=B2?= =?UTF-8?q?=D0=B5=D0=B4=D0=B5=D0=BD=D1=81=D0=BA=D0=B0=D1=8F?= Date: Thu, 3 Feb 2022 16:01:48 +0300 Subject: [PATCH 49/49] [TH2-2806] Fixed onReceive and seqNum --- .../dirty/pillar/handler/PillarHandler.kt | 25 ++++++++++--------- 1 file changed, 13 insertions(+), 12 deletions(-) diff --git a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt index 9c63435..b077a6e 100644 --- a/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt +++ b/src/main/java/com/exactpro/th2/conn/dirty/pillar/handler/PillarHandler.kt @@ -72,6 +72,7 @@ class PillarHandler(private val context: IContext): IP override fun onReceive(buffer: ByteBuf): ByteBuf? { val bufferLength = buffer.readableBytes() + val offset = buffer.readerIndex() if (bufferLength == 0) { LOGGER.warn { "Cannot parse empty buffer." } return null @@ -99,11 +100,12 @@ class PillarHandler(private val context: IContext): IP if(bufferLength > messageLength) { LOGGER.info { "Buffer length is longer than the declared one: $bufferLength -> $messageLength." } - return buffer.readSlice(messageLength) + buffer.readerIndex(buffer.writerIndex()) + return buffer.retainedSlice(offset, messageLength) } buffer.readerIndex(buffer.writerIndex()) - return buffer.retainedSlice(buffer.readerIndex() - messageLength, messageLength) + return buffer.retainedSlice(offset, messageLength) } override fun onIncoming(message: ByteBuf): Map { @@ -175,33 +177,33 @@ class PillarHandler(private val context: IContext): IP LOGGER.info { "Type message - StreamAvail: $streamAvail" } message.readerIndex(4) val streamIdAvail = StreamIdEncode(StreamId(message)) - + val nextSeq = streamAvail.nextSeq.toInt() if (streamAvail.streamId.streamType == StreamType.REF.value || streamAvail.streamId.streamType == StreamType.GT.value) { - if (connectRead.compareAndSet(OpenType.CLOSE, OpenType.SENT)) { + if (connectRead.compareAndSet(OpenType.CLOSE, OpenType.SENT) || connectRead.get() == OpenType.SENT) { streamIdRead = streamIdAvail + serverSeqNum.getAndSet(nextSeq) channel.send( Open( streamIdRead.streamId, - streamAvail.nextSeq.toInt(), - streamAvail.nextSeq.toInt() + 12 + nextSeq, + nextSeq + seqNum ).open(), messageMetadata(MessageType.OPEN), IChannel.SendMode.MANGLE ) - LOGGER.info { "Message has been sent to server - Open for read." } } } else if (streamAvail.streamId.streamType == StreamType.TG.value) { - if (connectWrite.compareAndSet(OpenType.CLOSE, OpenType.SENT)) { + if (connectWrite.compareAndSet(OpenType.CLOSE, OpenType.SENT) || connectWrite.get() == OpenType.SENT) { streamIdWrite = streamIdAvail + clientSeqNum.getAndSet(nextSeq) channel.send( Open( streamIdWrite.streamId, - streamAvail.nextSeq.toInt(), - streamAvail.nextSeq.toInt() + seqNum + nextSeq, + nextSeq + seqNum ).open(), messageMetadata(MessageType.OPEN), IChannel.SendMode.MANGLE ) - LOGGER.info { "Message has been sent to server - Open for write." } } } @@ -233,7 +235,6 @@ class PillarHandler(private val context: IContext): IP return messageMetadata(MessageType.OPEN_RESPONSE) } - private fun checkSeqMsg(message: ByteBuf, header: MsgHeader): Map { val seqMsg = SeqMsg(message, header.length) LOGGER.info { "Type message - SeqMsg: $seqMsg" }