diff --git a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbDecoder.kt b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbDecoder.kt index df1ac338..1a129eeb 100644 --- a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbDecoder.kt +++ b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbDecoder.kt @@ -3,24 +3,12 @@ package icu.samnyan.aqua.sega.aimedb import io.netty.buffer.ByteBuf import io.netty.channel.ChannelHandlerContext import io.netty.handler.codec.ByteToMessageDecoder -import org.slf4j.Logger -import org.slf4j.LoggerFactory -import org.springframework.beans.factory.config.BeanDefinition -import org.springframework.context.annotation.Scope -import org.springframework.stereotype.Component /** * A new decoder object will be created each time a new request comes in */ -@Component -@Scope(BeanDefinition.SCOPE_PROTOTYPE) class AimeDbDecoder : ByteToMessageDecoder() { - var length: Int = 0 - val logger: Logger = LoggerFactory.getLogger(AimeDbDecoder::class.java) - - init { - logger.info("AimeDB Decoder Created") - } + var length = 0 /** * Decrypt the incoming request including frame management @@ -30,10 +18,7 @@ class AimeDbDecoder : ByteToMessageDecoder() { */ override fun decode(ctx: ChannelHandlerContext, input: ByteBuf, out: MutableList) { if (input.readableBytes() < 16) return - if (length == 0) { - length = getLength(input) - logger.info("AimeDB Request Length: $length") - } + if (length == 0) length = getLength(input) if (input.readableBytes() < length) return diff --git a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbEncoder.kt b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbEncoder.kt index a37699bb..3eab687f 100644 --- a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbEncoder.kt +++ b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbEncoder.kt @@ -3,15 +3,10 @@ package icu.samnyan.aqua.sega.aimedb import io.netty.buffer.ByteBuf import io.netty.channel.ChannelHandlerContext import io.netty.handler.codec.MessageToByteEncoder -import org.springframework.beans.factory.config.BeanDefinition -import org.springframework.context.annotation.Scope -import org.springframework.stereotype.Component /** * @author samnyan (privateamusement@protonmail.com) */ -@Component -@Scope(BeanDefinition.SCOPE_PROTOTYPE) class AimeDbEncoder : MessageToByteEncoder() { override fun encode(ctx: ChannelHandlerContext, msg: ByteBuf, out: ByteBuf) { msg.writerIndex(0) diff --git a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbEncryption.kt b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbEncryption.kt index b7f17735..50c0e760 100644 --- a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbEncryption.kt +++ b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbEncryption.kt @@ -3,6 +3,8 @@ package icu.samnyan.aqua.sega.aimedb import icu.samnyan.aqua.sega.util.ByteBufUtil import io.netty.buffer.ByteBuf import io.netty.buffer.Unpooled.copiedBuffer +import org.slf4j.Logger +import org.slf4j.LoggerFactory import java.nio.charset.StandardCharsets import javax.crypto.Cipher import javax.crypto.spec.SecretKeySpec @@ -19,3 +21,5 @@ object AimeDbEncryption { fun encrypt(src: ByteBuf) = copiedBuffer(enc.doFinal(ByteBufUtil.toAllBytes(src))) } + +val logger: Logger = LoggerFactory.getLogger(AimeDbEncryption::class.java) diff --git a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbRequestHandler.kt b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbRequestHandler.kt index 48d53a04..31faa73d 100644 --- a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbRequestHandler.kt +++ b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbRequestHandler.kt @@ -10,7 +10,6 @@ import io.netty.channel.ChannelHandlerContext import io.netty.channel.ChannelInboundHandlerAdapter import org.slf4j.Logger import org.slf4j.LoggerFactory -import org.springframework.context.annotation.Scope import org.springframework.stereotype.Component import java.nio.charset.StandardCharsets import kotlin.jvm.optionals.getOrNull @@ -19,7 +18,6 @@ import kotlin.jvm.optionals.getOrNull * @author samnyan (privateamusement@protonmail.com) */ @Component -@Scope("prototype") @ChannelHandler.Sharable class AimeDbRequestHandler( val cardService: CardService diff --git a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbServer.kt b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbServer.kt index 6fb1afb7..32276891 100644 --- a/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbServer.kt +++ b/src/main/java/icu/samnyan/aqua/sega/aimedb/AimeDbServer.kt @@ -10,10 +10,8 @@ import io.netty.handler.logging.LogLevel import io.netty.handler.logging.LoggingHandler import org.slf4j.Logger import org.slf4j.LoggerFactory -import org.springframework.beans.factory.config.BeanDefinition import org.springframework.boot.context.properties.ConfigurationProperties import org.springframework.context.annotation.Configuration -import org.springframework.context.annotation.Scope import org.springframework.stereotype.Component import java.net.InetAddress import java.net.InetSocketAddress @@ -64,7 +62,6 @@ class AimeDbServer( } @Component -@Scope(BeanDefinition.SCOPE_PROTOTYPE) class AimeDbServerInitializer( val aimeDbRequestHandler: AimeDbRequestHandler ) : ChannelInitializer() {