updated lys-catalog version

gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/GradleBuildCacheServerCli.kt

@@ -5,6 +5,7 @@ import net.woggioni.gbcs.cli.impl.GbcsCommand
 import net.woggioni.gbcs.cli.impl.commands.BenchmarkCommand
 import net.woggioni.gbcs.cli.impl.commands.ClientCommand
 import net.woggioni.gbcs.cli.impl.commands.GetCommand
+import net.woggioni.gbcs.cli.impl.commands.HealthCheckCommand
 import net.woggioni.gbcs.cli.impl.commands.PasswordHashCommand
 import net.woggioni.gbcs.cli.impl.commands.PutCommand
 import net.woggioni.gbcs.cli.impl.commands.ServerCommand
@@ -24,8 +25,12 @@ class GradleBuildCacheServerCli : GbcsCommand() {
     companion object {
         @JvmStatic
         fun main(vararg args: String) {
-            Thread.currentThread().contextClassLoader = GradleBuildCacheServerCli::class.java.classLoader
+            val currentClassLoader = GradleBuildCacheServerCli::class.java.classLoader
-            GbcsUrlStreamHandlerFactory.install()
+            Thread.currentThread().contextClassLoader = currentClassLoader
+            if(currentClassLoader.javaClass.name == "net.woggioni.envelope.loader.ModuleClassLoader") {
+                //We're running in an envelope jar and custom URL protocols won't work
+                GbcsUrlStreamHandlerFactory.install()
+            }
             val log = contextLogger()
             val app = Application.builder("gbcs")
                 .configurationDirectoryEnvVar("GBCS_CONFIGURATION_DIR")
@@ -44,6 +49,7 @@ class GradleBuildCacheServerCli : GbcsCommand() {
                     addSubcommand(BenchmarkCommand())
                     addSubcommand(PutCommand())
                     addSubcommand(GetCommand())
+                    addSubcommand(HealthCheckCommand())
                 })
             System.exit(commandLine.execute(*args))
         }

gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/BenchmarkCommand.kt

@@ -46,90 +46,97 @@ class BenchmarkCommand : GbcsCommand() {
             clientCommand.configuration.profiles[profileName]
                 ?: throw IllegalArgumentException("Profile $profileName does not exist in configuration")
         }
-        val client = GradleBuildCacheClient(profile)
+        GradleBuildCacheClient(profile).use { client ->
 
-        val entryGenerator = sequence {
+            val entryGenerator = sequence {
-            val random = Random(SecureRandom.getInstance("NativePRNGNonBlocking").nextLong())
+                val random = Random(SecureRandom.getInstance("NativePRNGNonBlocking").nextLong())
-            while (true) {
+                while (true) {
-                val key = JWO.bytesToHex(random.nextBytes(16))
+                    val key = JWO.bytesToHex(random.nextBytes(16))
-                val content = random.nextInt().toByte()
+                    val content = random.nextInt().toByte()
-                val value = ByteArray(size, { _ -> content })
+                    val value = ByteArray(size, { _ -> content })
-                yield(key to value)
+                    yield(key to value)
+                }
             }
-        }
 
-        log.info {
+            log.info {
-            "Starting insertion"
+                "Starting insertion"
-        }
+            }
-        val entries = let {
+            val entries = let {
-            val completionCounter = AtomicLong(0)
+                val completionCounter = AtomicLong(0)
-            val completionQueue = LinkedBlockingQueue<Pair<String, ByteArray>>(numberOfEntries)
+                val completionQueue = LinkedBlockingQueue<Pair<String, ByteArray>>(numberOfEntries)
-            val start = Instant.now()
+                val start = Instant.now()
-            val semaphore = Semaphore(profile.maxConnections * 3)
+                val semaphore = Semaphore(profile.maxConnections * 3)
-            val iterator = entryGenerator.take(numberOfEntries).iterator()
+                val iterator = entryGenerator.take(numberOfEntries).iterator()
-            while(completionCounter.get() < numberOfEntries) {
+                while (completionCounter.get() < numberOfEntries) {
-                if(iterator.hasNext()) {
+                    if (iterator.hasNext()) {
-                    val entry = iterator.next()
+                        val entry = iterator.next()
-                    semaphore.acquire()
+                        semaphore.acquire()
-                    val future = client.put(entry.first, entry.second).thenApply { entry }
+                        val future = client.put(entry.first, entry.second).thenApply { entry }
-                    future.whenComplete { result, ex ->
+                        future.whenComplete { result, ex ->
-                        if (ex != null) {
+                            if (ex != null) {
-                            log.error(ex.message, ex)
+                                log.error(ex.message, ex)
-                        } else {
+                            } else {
-                            completionQueue.put(result)
+                                completionQueue.put(result)
+                            }
+                            semaphore.release()
+                            completionCounter.incrementAndGet()
                         }
-                        semaphore.release()
+                    } else {
-                        completionCounter.incrementAndGet()
+                        Thread.sleep(0)
                     }
                 }
-            }
 
-            val inserted = completionQueue.toList()
+                val inserted = completionQueue.toList()
-            val end = Instant.now()
+                val end = Instant.now()
+                log.info {
+                    val elapsed = Duration.between(start, end).toMillis()
+                    val opsPerSecond = String.format("%.2f", numberOfEntries.toDouble() / elapsed * 1000)
+                    "Insertion rate: $opsPerSecond ops/s"
+                }
+                inserted
+            }
             log.info {
-                val elapsed = Duration.between(start, end).toMillis()
+                "Inserted ${entries.size} entries"
-                val opsPerSecond = String.format("%.2f", numberOfEntries.toDouble() / elapsed * 1000)
-                "Insertion rate: $opsPerSecond ops/s"
             }
-            inserted
+            log.info {
-        }
+                "Starting retrieval"
-        log.info {
+            }
-            "Inserted ${entries.size} entries"
+            if (entries.isNotEmpty()) {
-        }
+                val completionCounter = AtomicLong(0)
-        log.info {
+                val semaphore = Semaphore(profile.maxConnections * 3)
-            "Starting retrieval"
+                val start = Instant.now()
-        }
+                val it = entries.iterator()
-        if (entries.isNotEmpty()) {
+                while (completionCounter.get() < entries.size) {
-            val completionCounter = AtomicLong(0)
+                    if (it.hasNext()) {
-            val semaphore = Semaphore(profile.maxConnections * 3)
+                        val entry = it.next()
-            val start = Instant.now()
+                        val future = client.get(entry.first).thenApply {
-            entries.forEach { entry ->
+                            if (it == null) {
-                semaphore.acquire()
+                                log.error {
-
+                                    "Missing entry for key '${entry.first}'"
-                val future = client.get(entry.first).thenApply {
+                                }
-                    if (it == null) {
+                            } else if (!entry.second.contentEquals(it)) {
-                        log.error {
+                                log.error {
-                            "Missing entry for key '${entry.first}'"
+                                    "Retrieved a value different from what was inserted for key '${entry.first}'"
+                                }
+                            }
                         }
-                    } else if (!entry.second.contentEquals(it)) {
+                        future.whenComplete { _, _ ->
-                        log.error {
+                            completionCounter.incrementAndGet()
-                            "Retrieved a value different from what was inserted for key '${entry.first}'"
+                            semaphore.release()
                         }
+                    } else {
+                        Thread.sleep(0)
                     }
                 }
-                future.whenComplete { _, _ ->
+                val end = Instant.now()
-                    completionCounter.incrementAndGet()
+                log.info {
-                    semaphore.release()
+                    val elapsed = Duration.between(start, end).toMillis()
+                    val opsPerSecond = String.format("%.2f", entries.size.toDouble() / elapsed * 1000)
+                    "Retrieval rate: $opsPerSecond ops/s"
                 }
+            } else {
+                log.error("Skipping retrieval benchmark as it was not possible to insert any entry in the cache")
             }
-            val end = Instant.now()
-            log.info {
-                val elapsed = Duration.between(start, end).toMillis()
-                val opsPerSecond = String.format("%.2f", entries.size.toDouble() / elapsed * 1000)
-                "Retrieval rate: $opsPerSecond ops/s"
-            }
-        } else {
-            log.error("Skipping retrieval benchmark as it was not possible to insert any entry in the cache")
         }
     }
 }

gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/HealthCheckCommand.kt

@@ -0,0 +1,45 @@
+package net.woggioni.gbcs.cli.impl.commands
+
+import net.woggioni.gbcs.cli.impl.GbcsCommand
+import net.woggioni.gbcs.client.GradleBuildCacheClient
+import net.woggioni.gbcs.common.contextLogger
+import picocli.CommandLine
+import java.security.SecureRandom
+import kotlin.random.Random
+
+@CommandLine.Command(
+    name = "health",
+    description = ["Check server health"],
+    showDefaultValues = true
+)
+class HealthCheckCommand : GbcsCommand() {
+    private val log = contextLogger()
+
+    @CommandLine.Spec
+    private lateinit var spec: CommandLine.Model.CommandSpec
+
+    override fun run() {
+        val clientCommand = spec.parent().userObject() as ClientCommand
+        val profile = clientCommand.profileName.let { profileName ->
+            clientCommand.configuration.profiles[profileName]
+                ?: throw IllegalArgumentException("Profile $profileName does not exist in configuration")
+        }
+        GradleBuildCacheClient(profile).use { client ->
+            val random = Random(SecureRandom.getInstance("NativePRNGNonBlocking").nextLong())
+            val nonce = ByteArray(0xa0)
+            random.nextBytes(nonce)
+            client.healthCheck(nonce).thenApply { value ->
+                if(value == null) {
+                    throw IllegalStateException("Empty response from server")
+                }
+                for(i in 0 until nonce.size) {
+                    for(j in value.size - nonce.size until nonce.size) {
+                        if(nonce[i] != value[j]) {
+                            throw IllegalStateException("Server nonce does not match")
+                        }
+                    }
+                }
+            }.get()
+        }
+    }
+}

gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/commands/ServerCommand.kt

@@ -2,6 +2,7 @@ package net.woggioni.gbcs.cli.impl.commands
 
 import net.woggioni.gbcs.api.Configuration
 import net.woggioni.gbcs.cli.impl.GbcsCommand
+import net.woggioni.gbcs.cli.impl.converters.DurationConverter
 import net.woggioni.gbcs.common.contextLogger
 import net.woggioni.gbcs.common.debug
 import net.woggioni.gbcs.common.info
@@ -13,6 +14,7 @@ import picocli.CommandLine
 import java.io.ByteArrayOutputStream
 import java.nio.file.Files
 import java.nio.file.Path
+import java.time.Duration
 
 @CommandLine.Command(
     name = "server",
@@ -35,6 +37,14 @@ class ServerCommand(app : Application) : GbcsCommand() {
         }
     }
 
+    @CommandLine.Option(
+        names = ["-t", "--timeout"],
+        description = ["Exit after the specified time"],
+        paramLabel = "TIMEOUT",
+        converter = [DurationConverter::class]
+    )
+    private var timeout: Duration? = null
+
     @CommandLine.Option(
         names = ["-c", "--config-file"],
         description = ["Read the application configuration from this file"],
@@ -42,10 +52,6 @@ class ServerCommand(app : Application) : GbcsCommand() {
     )
     private var configurationFile: Path = findConfigurationFile(app, "gbcs-server.xml")
 
-    val configuration : Configuration by lazy {
-        GradleBuildCacheServer.loadConfiguration(configurationFile)
-    }
-
     override fun run() {
         if (!Files.exists(configurationFile)) {
             Files.createDirectories(configurationFile.parent)
@@ -61,7 +67,11 @@ class ServerCommand(app : Application) : GbcsCommand() {
             }
         }
         val server = GradleBuildCacheServer(configuration)
-        server.run().use {
+        server.run().use { server ->
+            timeout?.let {
+                Thread.sleep(it)
+                server.shutdown()
+            }
         }
     }
 }

gbcs-cli/src/main/kotlin/net/woggioni/gbcs/cli/impl/converters/DurationConverter.kt

@@ -0,0 +1,11 @@
+package net.woggioni.gbcs.cli.impl.converters
+
+import picocli.CommandLine
+import java.time.Duration
+
+
+class DurationConverter : CommandLine.ITypeConverter<Duration> {
+    override fun convert(value: String): Duration {
+        return Duration.parse(value)
+    }
+}

gbcs-cli/src/main/resources/net/woggioni/gbcs/cli/logback.xml

@@ -15,6 +15,4 @@
     <root level="info">
         <appender-ref ref="console"/>
     </root>
-    <logger name="com.google.code.yanf4j" level="warn"/>
-    <logger name="net.rubyeye.xmemcached" level="warn"/>
 </configuration>

gbcs-client/src/main/kotlin/net/woggioni/gbcs/client/Client.kt

@@ -213,6 +213,25 @@ class GradleBuildCacheClient(private val profile: Configuration.Profile) : AutoC
         }
     }
 
+    fun healthCheck(nonce: ByteArray): CompletableFuture<ByteArray?> {
+        return executeWithRetry {
+            sendRequest(profile.serverURI, HttpMethod.TRACE, nonce)
+        }.thenApply {
+            val status = it.status()
+            if (it.status() != HttpResponseStatus.OK) {
+                throw HttpException(status)
+            } else {
+                it.content()
+            }
+        }.thenApply { maybeByteBuf ->
+            maybeByteBuf?.let {
+                val result = ByteArray(it.readableBytes())
+                it.getBytes(0, result)
+                result
+            }
+        }
+    }
+
     fun get(key: String): CompletableFuture<ByteArray?> {
         return executeWithRetry {
             sendRequest(profile.serverURI.resolve(key), HttpMethod.GET, null)

gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/ByteBufOutputStream.kt

@@ -0,0 +1,19 @@
+package net.woggioni.gbcs.common
+
+import io.netty.buffer.ByteBuf
+import java.io.InputStream
+import java.io.OutputStream
+
+class ByteBufOutputStream(private val buf : ByteBuf) : OutputStream() {
+    override fun write(b: Int) {
+        buf.writeByte(b)
+    }
+
+    override fun write(b: ByteArray, off: Int, len: Int) {
+        buf.writeBytes(b, off, len)
+    }
+
+    override fun close() {
+        buf.release()
+    }
+}

gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/Exception.kt

@@ -0,0 +1,7 @@
+package net.woggioni.gbcs.common
+
+class ResourceNotFoundException(msg : String? = null, cause: Throwable? = null) : RuntimeException(msg, cause) {
+}
+
+class ModuleNotFoundException(msg : String? = null, cause: Throwable? = null) : RuntimeException(msg, cause) {
+}

gbcs-common/src/main/kotlin/net/woggioni/gbcs/common/GbcsUrlStreamHandlerFactory.kt

@@ -36,13 +36,17 @@ class GbcsUrlStreamHandlerFactory : URLStreamHandlerProvider() {
     private class JpmsHandler : URLStreamHandler() {
 
         override fun openConnection(u: URL): URLConnection {
+            val moduleName = u.host
             val thisModule = javaClass.module
-            val sourceModule = Optional.ofNullable(thisModule)
+            val sourceModule =
-                .map { obj: Module -> obj.layer }
+                thisModule
-                .flatMap { layer: ModuleLayer ->
+                ?.let(Module::getLayer)
-                    val moduleName = u.host
+                ?.let { layer: ModuleLayer ->
-                    layer.findModule(moduleName)
+                    layer.findModule(moduleName).orElse(null)
-                }.orElse(thisModule)
+                } ?: if(thisModule.layer == null) {
+                    thisModule
+                } else throw ModuleNotFoundException("Module '$moduleName' not found")
+
             return JpmsResourceURLConnection(u, sourceModule)
         }
     }
@@ -53,7 +57,9 @@ class GbcsUrlStreamHandlerFactory : URLStreamHandlerProvider() {
 
         @Throws(IOException::class)
         override fun getInputStream(): InputStream {
-            return module.getResourceAsStream(getURL().path)
+            val resource = getURL().path
+            return module.getResourceAsStream(resource)
+                ?: throw ResourceNotFoundException("Resource '$resource' not found in module '${module.name}'")
         }
     }
 

gbcs-server-memcache/src/main/kotlin/net/woggioni/gbcs/server/memcache/client/MemcacheClient.kt

@@ -24,6 +24,7 @@ import io.netty.handler.codec.memcache.binary.FullBinaryMemcacheRequest
 import io.netty.handler.codec.memcache.binary.FullBinaryMemcacheResponse
 import io.netty.util.concurrent.GenericFutureListener
 import net.woggioni.gbcs.common.ByteBufInputStream
+import net.woggioni.gbcs.common.ByteBufOutputStream
 import net.woggioni.gbcs.common.GBCS.digest
 import net.woggioni.gbcs.common.HostAndPort
 import net.woggioni.gbcs.common.contextLogger
@@ -114,13 +115,14 @@ class MemcacheClient(private val cfg: MemcacheCacheConfiguration) : AutoCloseabl
                     val channel = channelFuture.now
                     val pipeline = channel.pipeline()
                     channel.pipeline()
-                        .addLast("handler", object : SimpleChannelInboundHandler<FullBinaryMemcacheResponse>() {
+                        .addLast("client-handler", object : SimpleChannelInboundHandler<FullBinaryMemcacheResponse>() {
                             override fun channelRead0(
                                 ctx: ChannelHandlerContext,
                                 msg: FullBinaryMemcacheResponse
                             ) {
                                 pipeline.removeLast()
                                 pool.release(channel)
+                                msg.touch("The method's caller must remember to release this")
                                 response.complete(msg.retain())
                             }
 
@@ -135,6 +137,7 @@ class MemcacheClient(private val cfg: MemcacheCacheConfiguration) : AutoCloseabl
                                 response.completeExceptionally(ex)
                             }
                         })
+                    request.touch()
                     channel.writeAndFlush(request)
                 } else {
                     response.completeExceptionally(channelFuture.cause())
@@ -161,28 +164,35 @@ class MemcacheClient(private val cfg: MemcacheCacheConfiguration) : AutoCloseabl
             }
         }
         return sendRequest(request).thenApply { response ->
-            when (val status = response.status()) {
+            try {
-                BinaryMemcacheResponseStatus.SUCCESS -> {
+                when (val status = response.status()) {
-                    val compressionMode = cfg.compressionMode
+                    BinaryMemcacheResponseStatus.SUCCESS -> {
-                    val content = response.content()
+                        val compressionMode = cfg.compressionMode
-                    if (compressionMode != null) {
+                        val content = response.content().retain()
-                        when (compressionMode) {
+                        content.touch()
-                            MemcacheCacheConfiguration.CompressionMode.GZIP -> {
+                        if (compressionMode != null) {
-                                GZIPInputStream(ByteBufInputStream(content))
+                            when (compressionMode) {
-                            }
+                                MemcacheCacheConfiguration.CompressionMode.GZIP -> {
+                                    GZIPInputStream(ByteBufInputStream(content))
+                                }
 
-                            MemcacheCacheConfiguration.CompressionMode.DEFLATE -> {
+                                MemcacheCacheConfiguration.CompressionMode.DEFLATE -> {
-                                InflaterInputStream(ByteBufInputStream(content))
+                                    InflaterInputStream(ByteBufInputStream(content))
+                                }
                             }
-                        }
+                        } else {
-                    } else {
+                            ByteBufInputStream(content)
-                        ByteBufInputStream(content)
+                        }.let(Channels::newChannel)
-                    }.let(Channels::newChannel)
+                    }
+
+                    BinaryMemcacheResponseStatus.KEY_ENOENT -> {
+                        null
+                    }
+
+                    else -> throw MemcacheException(status)
                 }
-                BinaryMemcacheResponseStatus.KEY_ENOENT -> {
+            } finally {
-                    null
+                response.release()
-                }
-                else -> throw MemcacheException(status)
             }
         }
     }
@@ -197,16 +207,18 @@ class MemcacheClient(private val cfg: MemcacheCacheConfiguration) : AutoCloseabl
             extras.writeInt(0)
             extras.writeInt(encodeExpiry(expiry))
             val compressionMode = cfg.compressionMode
+            content.retain()
             val payload = if (compressionMode != null) {
-                val inputStream = ByteBufInputStream(Unpooled.wrappedBuffer(content))
+                val inputStream = ByteBufInputStream(content)
-                val baos = ByteArrayOutputStream()
+                val buf = content.alloc().buffer()
+                buf.retain()
                 val outputStream = when (compressionMode) {
                     MemcacheCacheConfiguration.CompressionMode.GZIP -> {
-                        GZIPOutputStream(baos)
+                        GZIPOutputStream(ByteBufOutputStream(buf))
                     }
 
                     MemcacheCacheConfiguration.CompressionMode.DEFLATE -> {
-                        DeflaterOutputStream(baos, Deflater(Deflater.DEFAULT_COMPRESSION, false))
+                        DeflaterOutputStream(ByteBufOutputStream(buf), Deflater(Deflater.DEFAULT_COMPRESSION, false))
                     }
                 }
                 inputStream.use { i ->
@@ -214,7 +226,7 @@ class MemcacheClient(private val cfg: MemcacheCacheConfiguration) : AutoCloseabl
                         JWO.copy(i, o)
                     }
                 }
-                Unpooled.wrappedBuffer(baos.toByteArray())
+                buf
             } else {
                 content
             }
@@ -224,9 +236,13 @@ class MemcacheClient(private val cfg: MemcacheCacheConfiguration) : AutoCloseabl
             }
         }
         return sendRequest(request).thenApply { response ->
-            when(val status = response.status()) {
+            try {
-                BinaryMemcacheResponseStatus.SUCCESS -> null
+                when (val status = response.status()) {
-                else -> throw MemcacheException(status)
+                    BinaryMemcacheResponseStatus.SUCCESS -> null
+                    else -> throw MemcacheException(status)
+                }
+            } finally {
+                response.release()
             }
         }
     }

gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/InMemoryCache.kt

@@ -1,12 +1,12 @@
 package net.woggioni.gbcs.server.cache
 
 import io.netty.buffer.ByteBuf
-import io.netty.buffer.Unpooled
 import net.woggioni.gbcs.api.Cache
 import net.woggioni.gbcs.common.ByteBufInputStream
+import net.woggioni.gbcs.common.ByteBufOutputStream
 import net.woggioni.gbcs.common.GBCS.digestString
+import net.woggioni.gbcs.common.contextLogger
 import net.woggioni.jwo.JWO
-import java.io.ByteArrayOutputStream
 import java.nio.channels.Channels
 import java.security.MessageDigest
 import java.time.Duration
@@ -14,6 +14,7 @@ import java.time.Instant
 import java.util.concurrent.CompletableFuture
 import java.util.concurrent.ConcurrentHashMap
 import java.util.concurrent.PriorityBlockingQueue
+import java.util.concurrent.atomic.AtomicLong
 import java.util.zip.Deflater
 import java.util.zip.DeflaterOutputStream
 import java.util.zip.Inflater
@@ -21,11 +22,18 @@ import java.util.zip.InflaterInputStream
 
 class InMemoryCache(
     val maxAge: Duration,
+    val maxSize: Long,
     val digestAlgorithm: String?,
     val compressionEnabled: Boolean,
     val compressionLevel: Int
 ) : Cache {
 
+    companion object {
+        @JvmStatic
+        private val log = contextLogger()
+    }
+
+    private val size = AtomicLong()
     private val map = ConcurrentHashMap<String, ByteBuf>()
     
     private class RemovalQueueElement(val key: String, val value : ByteBuf, val expiry : Instant) : Comparable<RemovalQueueElement> {
@@ -38,9 +46,17 @@ class InMemoryCache(
     private val garbageCollector = Thread {
         while(true) {
             val el = removalQueue.take()
+            val buf = el.value
             val now = Instant.now()
             if(now > el.expiry) {
-                map.remove(el.key, el.value)
+                val removed = map.remove(el.key, buf)
+                if(removed) {
+                    updateSizeAfterRemoval(buf)
+                    //Decrease the reference count for map
+                    buf.release()
+                }
+                //Decrease the reference count for removalQueue
+                buf.release()
             } else {
                 removalQueue.put(el)
                 Thread.sleep(minOf(Duration.between(now, el.expiry), Duration.ofSeconds(1)))
@@ -50,6 +66,28 @@ class InMemoryCache(
         start()
     }
 
+    private fun removeEldest() : Long {
+        while(true) {
+            val el = removalQueue.take()
+            val buf = el.value
+            val removed = map.remove(el.key, buf)
+            //Decrease the reference count for removalQueue
+            buf.release()
+            if(removed) {
+                val newSize = updateSizeAfterRemoval(buf)
+                //Decrease the reference count for map
+                buf.release()
+                return newSize
+            }
+        }
+    }
+
+    private fun updateSizeAfterRemoval(removed: ByteBuf) : Long {
+        return size.updateAndGet { currentSize : Long ->
+            currentSize - removed.readableBytes()
+        }
+    }
+
     override fun close() {
         running = false
         garbageCollector.join()
@@ -64,11 +102,13 @@ class InMemoryCache(
                 ).let { digest ->
                 map[digest]
                     ?.let { value ->
+                    val copy = value.retainedDuplicate()
+                    copy.touch("This has to be released by the caller of the cache")
                     if (compressionEnabled) {
                         val inflater = Inflater()
-                        Channels.newChannel(InflaterInputStream(ByteBufInputStream(value), inflater))
+                        Channels.newChannel(InflaterInputStream(ByteBufInputStream(copy), inflater))
                     } else {
-                        Channels.newChannel(ByteBufInputStream(value))
+                        Channels.newChannel(ByteBufInputStream(copy))
                     }
                 }
             }.let {
@@ -81,18 +121,29 @@ class InMemoryCache(
             ?.let { md ->
                 digestString(key.toByteArray(), md)
             } ?: key).let { digest ->
+            content.retain()
             val value = if (compressionEnabled) {
                 val deflater = Deflater(compressionLevel)
-                val baos = ByteArrayOutputStream()
+                val buf = content.alloc().buffer()
-                DeflaterOutputStream(baos, deflater).use { stream ->
+                buf.retain()
-                    JWO.copy(ByteBufInputStream(content), stream)
+                DeflaterOutputStream(ByteBufOutputStream(buf), deflater).use { outputStream ->
+                    ByteBufInputStream(content).use { inputStream ->
+                        JWO.copy(inputStream, outputStream)
+                    }
                 }
-                Unpooled.wrappedBuffer(baos.toByteArray())
+                buf
             } else {
                 content
             }
-            map[digest] = value
+            val old = map.put(digest, value)
-            removalQueue.put(RemovalQueueElement(digest, value, Instant.now().plus(maxAge)))
+            val delta = value.readableBytes() - (old?.readableBytes() ?: 0)
+            var newSize = size.updateAndGet { currentSize : Long ->
+                currentSize + delta
+            }
+            removalQueue.put(RemovalQueueElement(digest, value.retain(), Instant.now().plus(maxAge)))
+            while(newSize > maxSize) {
+                newSize = removeEldest()
+            }
         }.let {
             CompletableFuture.completedFuture<Void>(null)
         }

gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/InMemoryCacheConfiguration.kt

@@ -6,12 +6,14 @@ import java.time.Duration
 
 data class InMemoryCacheConfiguration(
     val maxAge: Duration,
+    val maxSize: Long,
     val digestAlgorithm : String?,
     val compressionEnabled: Boolean,
     val compressionLevel: Int,
 ) : Configuration.Cache {
     override fun materialize() = InMemoryCache(
         maxAge,
+        maxSize,
         digestAlgorithm,
         compressionEnabled,
         compressionLevel

gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/cache/InMemoryCacheProvider.kt

@@ -21,6 +21,9 @@ class InMemoryCacheProvider : CacheProvider<InMemoryCacheConfiguration> {
         val maxAge = el.renderAttribute("max-age")
             ?.let(Duration::parse)
             ?: Duration.ofDays(1)
+        val maxSize = el.renderAttribute("max-size")
+            ?.let(java.lang.Long::decode)
+            ?: 0x1000000
         val enableCompression = el.renderAttribute("enable-compression")
             ?.let(String::toBoolean)
             ?: true
@@ -31,6 +34,7 @@ class InMemoryCacheProvider : CacheProvider<InMemoryCacheConfiguration> {
 
         return InMemoryCacheConfiguration(
             maxAge,
+            maxSize,
             digestAlgorithm,
             enableCompression,
             compressionLevel
@@ -43,6 +47,7 @@ class InMemoryCacheProvider : CacheProvider<InMemoryCacheConfiguration> {
             val prefix = doc.lookupPrefix(GBCS.GBCS_NAMESPACE_URI)
             attr("xs:type", "${prefix}:inMemoryCacheType", GBCS.XML_SCHEMA_NAMESPACE_URI)
             attr("max-age", maxAge.toString())
+            attr("max-size", maxSize.toString())
             digestAlgorithm?.let { digestAlgorithm ->
                 attr("digest", digestAlgorithm)
             }

gbcs-server/src/main/kotlin/net/woggioni/gbcs/server/handler/ServerHandler.kt

@@ -57,16 +57,29 @@ class ServerHandler(private val cache: Cache, private val serverPrefix: Path) :
                             response.headers().set(HttpHeaderNames.TRANSFER_ENCODING, HttpHeaderValues.CHUNKED)
                         }
                         ctx.write(response)
-                        val content : Any = when (channel) {
+                        when (channel) {
-                            is FileChannel -> DefaultFileRegion(channel, 0, channel.size())
+                            is FileChannel -> {
-                            else -> ChunkedNioStream(channel)
+                                val content = DefaultFileRegion(channel, 0, channel.size())
-                        }
+                                if (keepAlive) {
-                        if (keepAlive) {
+                                    ctx.write(content)
-                            ctx.write(content)
+                                    ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT.retainedDuplicate())
-                            ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT.retainedDuplicate())
+                                } else {
-                        } else {
+                                    ctx.writeAndFlush(content)
-                            ctx.writeAndFlush(content)
+                                        .addListener(ChannelFutureListener.CLOSE)
-                                .addListener(ChannelFutureListener.CLOSE)
+                                }
+                            }
+                            else -> {
+                                val content = ChunkedNioStream(channel)
+                                if (keepAlive) {
+                                    ctx.write(content).addListener {
+                                        content.close()
+                                    }
+                                    ctx.writeAndFlush(LastHttpContent.EMPTY_LAST_CONTENT.retainedDuplicate())
+                                } else {
+                                    ctx.writeAndFlush(content)
+                                        .addListener(ChannelFutureListener.CLOSE)
+                                }
+                            }
                         }
                     } else {
                         log.debug(ctx) {
@@ -94,7 +107,7 @@ class ServerHandler(private val cache: Cache, private val serverPrefix: Path) :
                 log.debug(ctx) {
                     "Added value for key '$key' to build cache"
                 }
-                cache.put(key, msg.content().retain()).thenRun {
+                cache.put(key, msg.content()).thenRun {
                     val response = DefaultFullHttpResponse(
                         msg.protocolVersion(), HttpResponseStatus.CREATED,
                         Unpooled.copiedBuffer(key.toByteArray())

gbcs-server/src/main/resources/net/woggioni/gbcs/server/schema/gbcs.xsd

@@ -52,6 +52,7 @@
         <xs:complexContent>
             <xs:extension base="gbcs:cacheType">
                 <xs:attribute name="max-age" type="xs:duration" default="P1D"/>
+                <xs:attribute name="max-size" type="xs:token" default="0x1000000"/>
                 <xs:attribute name="digest" type="xs:token" default="MD5"/>
                 <xs:attribute name="enable-compression" type="xs:boolean" default="true"/>
                 <xs:attribute name="compression-level" type="xs:byte" default="-1"/>

gbcs-server/src/test/kotlin/net/woggioni/gbcs/server/test/NoAuthServerTest.kt

@@ -51,7 +51,8 @@ class NoAuthServerTest : AbstractServerTest() {
                 maxAge = Duration.ofSeconds(3600 * 24),
                 compressionEnabled = true,
                 digestAlgorithm = "MD5",
-                compressionLevel = Deflater.DEFAULT_COMPRESSION
+                compressionLevel = Deflater.DEFAULT_COMPRESSION,
+                maxSize = 0x1000000
             ),
             null,
             null,

gradle.properties

@@ -2,9 +2,9 @@ org.gradle.configuration-cache=false
 org.gradle.parallel=true
 org.gradle.caching=true
 
-gbcs.version = 0.1.2
+gbcs.version = 0.1.3
 
-lys.version = 2025.01.31
+lys.version = 2025.02.05
 
 gitea.maven.url = https://gitea.woggioni.net/api/packages/woggioni/maven
 docker.registry.url=gitea.woggioni.net