Merge pull request #178 from Z-Jais/master

Update dependencies and add caching images
Z-Jais · Oct 9, 2023 · 2321391 · 2321391
2 parents 671115c + 393ee11
commit 2321391
Show file tree

Hide file tree

Showing 2 changed files with 32 additions and 19 deletions.
diff --git a/pom.xml b/pom.xml
@@ -9,7 +9,7 @@
     <description>api</description>
 
     <properties>
-        <ktor_version>2.3.4</ktor_version>
+        <ktor_version>2.3.5</ktor_version>
         <kotlin.code.style>official</kotlin.code.style>
         <kotlin.version>1.9.10</kotlin.version>
         <kotlin.compiler.jvmTarget>17</kotlin.compiler.jvmTarget>
@@ -102,6 +102,11 @@
             <artifactId>ktor-server-netty-jvm</artifactId>
             <version>${ktor_version}</version>
         </dependency>
+        <dependency>
+            <groupId>io.ktor</groupId>
+            <artifactId>ktor-server-caching-headers-jvm</artifactId>
+            <version>${ktor_version}</version>
+        </dependency>
         <dependency>
             <groupId>ch.qos.logback</groupId>
             <artifactId>logback-classic</artifactId>

diff --git a/src/main/kotlin/fr/ziedelth/controllers/AttachmentController.kt b/src/main/kotlin/fr/ziedelth/controllers/AttachmentController.kt
@@ -3,7 +3,9 @@ package fr.ziedelth.controllers
 import fr.ziedelth.utils.ImageCache
 import fr.ziedelth.utils.routes.APIIgnore
 import io.ktor.http.*
+import io.ktor.http.content.*
 import io.ktor.server.application.*
+import io.ktor.server.plugins.cachingheaders.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
 import java.io.Serializable
@@ -12,28 +14,34 @@ import java.util.*
 @APIIgnore
 open class AttachmentController<T : Serializable>(override val prefix: String) : AbstractController<T>(prefix) {
     fun Route.attachmentByUUID() {
-        get("/attachment/{uuid}") {
-            val string = call.parameters["uuid"]!!
-            val uuidRegex =
-                "^[0-9(a-f|A-F)]{8}-[0-9(a-f|A-F)]{4}-4[0-9(a-f|A-F)]{3}-[89ab][0-9(a-f|A-F)]{3}-[0-9(a-f|A-F)]{12}\$".toRegex()
-
-            if (!uuidRegex.matches(string)) {
-                println("GET $prefix/attachment/$string : Invalid UUID")
-                return@get call.respond(HttpStatusCode.BadRequest)
+        route("/attachment/{uuid}") {
+            install(CachingHeaders) {
+                options { _, _ -> CachingOptions(CacheControl.MaxAge(maxAgeSeconds = 172800)) }
             }
 
-            val uuid = UUID.fromString(string)
-            println("GET ${prefix}/attachment/$uuid")
+            get {
+                val string = call.parameters["uuid"]!!
+                val uuidRegex =
+                    "^[0-9(a-f|A-F)]{8}-[0-9(a-f|A-F)]{4}-4[0-9(a-f|A-F)]{3}-[89ab][0-9(a-f|A-F)]{3}-[0-9(a-f|A-F)]{12}\$".toRegex()
 
-            if (!ImageCache.contains(uuid)) {
-                println("Attachment $uuid not found")
-                call.respond(HttpStatusCode.NoContent)
-                return@get
-            }
+                if (!uuidRegex.matches(string)) {
+                    println("GET $prefix/attachment/$string : Invalid UUID")
+                    return@get call.respond(HttpStatusCode.BadRequest)
+                }
+
+                val uuid = UUID.fromString(string)
+                println("GET ${prefix}/attachment/$uuid")
 
-            val image = ImageCache.get(uuid)!!
-            println("Attachment $uuid found (${image.bytes.size} bytes)")
-            call.respondBytes(image.bytes, ContentType("image", image.type))
+                if (!ImageCache.contains(uuid)) {
+                    println("Attachment $uuid not found")
+                    call.respond(HttpStatusCode.NoContent)
+                    return@get
+                }
+
+                val image = ImageCache.get(uuid)!!
+                println("Attachment $uuid found (${image.bytes.size} bytes)")
+                call.respondBytes(image.bytes, ContentType("image", image.type))
+            }
         }
     }
 }