feat: qr detection with timeout (resolve #2)

Author: Cdm2883

server/src/main/kotlin/vip/cdms/maimaihelper/QrCapture.kt

@@ -21,8 +21,24 @@ object QrCapture {
         delay(3000)
         frameCard.click()
         delay(1500)
-        val screenshot = frameQr.capture()
+        val screenshot = waitForQr { frameQr.capture() }
         frameClose.click()
         screenshot
     }
+
+    private fun ScreenRobot.waitForQr(
+        timeout: Int = 15000,
+        interval: Int = 300,
+        capture: () -> BufferedImage
+    ): BufferedImage {
+        val begin = System.currentTimeMillis()
+        lateinit var screenshot: BufferedImage
+        do {
+            screenshot = capture()
+            val refactored = QrRefactor.refactor(screenshot)
+            if (refactored != null) return refactored
+            delay(interval)
+        } while (System.currentTimeMillis() - begin <= timeout)
+        return screenshot
+    }
 }

server/src/main/kotlin/vip/cdms/maimaihelper/QrRefactor.kt

@@ -10,7 +10,7 @@ import java.awt.image.BufferedImage
 object QrRefactor {
     private const val SIZE = 300
 
-    fun decode(qr: BufferedImage): String {
+    private fun decode(qr: BufferedImage): String {
         val hints = mapOf(
             DecodeHintType.CHARACTER_SET to "UTF-8",
             DecodeHintType.TRY_HARDER to true,
@@ -23,7 +23,7 @@ object QrRefactor {
         return result.text
     }
 
-    fun encode(content: String): BufferedImage {
+    private fun encode(content: String): BufferedImage {
         val hints = mapOf(
             EncodeHintType.ERROR_CORRECTION to ErrorCorrectionLevel.M,
             EncodeHintType.QR_VERSION to 4,
@@ -34,4 +34,10 @@ object QrRefactor {
         val matrix = writer.encode(content, BarcodeFormat.QR_CODE, SIZE, SIZE, hints)
         return MatrixToImageWriter.toBufferedImage(matrix)
     }
+
+    fun refactor(origin: BufferedImage) = try {
+        encode(decode(origin))
+    } catch (e: NotFoundException) {
+        null
+    }
 }

server/src/main/kotlin/vip/cdms/maimaihelper/Routing.kt

@@ -1,11 +1,9 @@
 package vip.cdms.maimaihelper
 
-import com.google.zxing.NotFoundException
 import io.ktor.http.*
 import io.ktor.server.application.*
 import io.ktor.server.response.*
 import io.ktor.server.routing.*
-import java.awt.image.BufferedImage
 import java.io.ByteArrayOutputStream
 import javax.imageio.ImageIO
 
@@ -19,17 +17,9 @@ fun Application.helperRouting() {
             if (config.token != null && call.queryParameters["token"] != config.token)
                 return@get call.respondText("Invalid token", status = HttpStatusCode.Unauthorized)
 
-            lateinit var output: BufferedImage
-
             desktopSwitcher.switchTo()
 
-            val screenshot = QrCapture.shot()
-            try {
-                val content = QrRefactor.decode(screenshot)
-                output = QrRefactor.encode(content)
-            } catch (e: NotFoundException) {
-                output = screenshot
-            }
+            val output = QrCapture.shot()
 
             desktopSwitcher.switchBack()