Basic CommonCrawl integration

Remove ExtractionService

build.gradle.kts

@@ -23,8 +23,11 @@ dependencies {
     implementation("io.quarkus:quarkus-rest-jackson")
     implementation("io.quarkus:quarkus-kotlin")
     implementation("org.jetbrains.kotlin:kotlin-stdlib-jdk8")
-    implementation("org.jsoup:jsoup:1.20.1")
     implementation("io.quarkus:quarkus-arc")
+    implementation("org.jsoup:jsoup:1.20.1")
+    implementation("org.netpreserve.commons:webarchive-commons:2.0.1")
+    implementation("com.fasterxml.jackson.module:jackson-module-kotlin:2.19.0")
+    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:2.19.1")
     testImplementation("io.quarkus:quarkus-junit5")
     testImplementation("io.rest-assured:rest-assured")
 }

settings.gradle.kts

@@ -10,4 +10,4 @@ pluginManagement {
         id(quarkusPluginId) version quarkusPluginVersion
     }
 }
-rootProject.name = "jsoup-scraper"
+rootProject.name = "dex-scraper"

sources.yml

@@ -1,47 +0,0 @@
-scraper:
-  sources:
-    - id: konami-official
-      name: "Konami Official Database"
-      domain: "yugioh-card.com"
-      url-patterns:
-        - "^https://www\\.yugioh-card\\.com/[a-z]{2}/products/.*$"
-      selectors:
-        card:
-          name:
-            steps:
-              - type: "css"
-                value: "h1.product-title"
-              - type: "xpath"
-                value: "//h1[@itemprop='name']"
-          attack:
-            steps:
-              - type: "css"
-                value: ".atk-value"
-
-    - id: ygo-fandom
-      name: "Yu-Gi-Oh Fandom Wiki"
-      domain: "yugioh.fandom.com"
-      url-patterns:
-        - "^https://yugioh\\.fandom\\.com/wiki/.*$"
-      selectors:
-        regional-set:
-          root: "h3:contains(Prefix(es)) + div > ul:nth-child(1) > li"
-          id:
-            steps:
-              - type: "xpath"
-                value: "//li/text()"
-            transform:
-              - name: "replace"
-                parameters:
-                  - " ("
-                  - ""
-          language:
-            steps:
-              - type: "xpath"
-                value: "//li/abbr"
-              - type: "xpath"
-                value: "//abbr/@title"
-          region-key:
-            steps:
-              - type: "xpath"
-                value: "//li/abbr/text()"

src/main/kotlin/com/rak/config/model/ProviderConfig.kt

@@ -11,8 +11,8 @@ interface ProviderConfig {
     fun getName(): String
     @WithName("domain")
     fun getDomain(): String
-    @WithName("url-patterns")
+    @WithName("url-pattern")
-    fun getUrlPatterns(): Optional<MutableSet<String>>
+    fun getUrlPattern(): String
     @WithName("targets")
     fun getTargets(): TargetsConfig
 

src/main/kotlin/com/rak/controller/ScrapeController.kt

@@ -1,8 +1,10 @@
 package com.rak.controller
 
 import com.rak.model.card.Card
+import com.rak.model.cc.CCIndexSuccessResponse
 import com.rak.model.set.CardSet
 import com.rak.model.set.RegionalSet
+import com.rak.service.CommonCrawlService
 import com.rak.service.ScrapeService
 import jakarta.ws.rs.Consumes
 import jakarta.ws.rs.GET
@@ -16,10 +18,9 @@ import org.jboss.resteasy.reactive.RestQuery
 @Path("/api")
 class ScrapeController(
     private val scrapeService: ScrapeService,
+    private val commonCrawlService: CommonCrawlService
 ) {
 
-
-
     @GET
     @Path("/{provider}/set")
     @Produces(MediaType.APPLICATION_JSON)

src/main/kotlin/com/rak/model/cc/CCIndexErrorResponse.kt

@@ -0,0 +1,5 @@
+package com.rak.model.cc
+
+data class CCIndexErrorResponse(
+    val message: String
+)

src/main/kotlin/com/rak/model/cc/CCIndexSuccessResponse.kt

@@ -0,0 +1,22 @@
+package com.rak.model.cc
+
+import com.fasterxml.jackson.annotation.JsonProperty
+import java.time.Instant
+
+data class CCIndexSuccessResponse(
+    @JsonProperty("urlkey")
+    val urlKey: String,
+    val timestamp: Instant,
+    val url: String,
+    val mime: String,
+    @JsonProperty("mime-detected")
+    val mimeDetected: String,
+    val status: String,
+    val digest: String,
+    val length: Int,
+    val offset: Int,
+    @JsonProperty("filename")
+    val fileName: String,
+    val languages: String,
+    val encoding: String,
+)

src/main/kotlin/com/rak/model/cc/CCIndices.kt

@@ -0,0 +1,9 @@
+package com.rak.model.cc
+
+enum class CCIndices(val indexName: String) {
+    CC_2025_21("CC-MAIN-2025-21"),
+    CC_2025_05("CC-MAIN-2024-05"),
+    CC_2024_46("CC-MAIN-2024-46"),
+    CC_2024_26("CC-MAIN-2024-26"),
+    CC_2023_50("CC-MAIN-2023-50");
+}

src/main/kotlin/com/rak/model/exception/TargetNotFoundException.kt

@@ -0,0 +1,3 @@
+package com.rak.model.exception
+
+class TargetNotFoundException(message: String) : RuntimeException(message)

src/main/kotlin/com/rak/model/set/CardSet.kt

@@ -3,7 +3,7 @@ package com.rak.model.set
 import kotlin.collections.Set
 
 data class CardSet(
-    val name: String,
+    var name: String,
     val regionalSets: Set<RegionalSet>
 ) {
     companion object {

src/main/kotlin/com/rak/service/CommonCrawlService.kt

@@ -0,0 +1,92 @@
+package com.rak.service
+
+import com.rak.model.cc.CCIndexSuccessResponse
+import com.rak.model.cc.CCIndices
+import com.rak.service.client.CommonCrawlRestClient
+import io.netty.buffer.ByteBufInputStream
+import io.quarkus.logging.Log
+import jakarta.enterprise.context.ApplicationScoped
+import org.archive.format.http.HttpResponseParser
+import org.archive.io.warc.WARCReaderFactory
+import org.eclipse.microprofile.rest.client.inject.RestClient
+import org.jsoup.helper.DataUtil
+import org.jsoup.nodes.Document
+
+
+@ApplicationScoped
+class CommonCrawlService(
+    @RestClient
+    private val commonCrawlRestClient: CommonCrawlRestClient
+) {
+
+    companion object {
+        private const val INDEX_QUERY_URL: String = "http://index.commoncrawl.org"
+        private const val DATA_URL: String = "http://data.commoncrawl.org"
+    }
+
+    fun queryIndex(
+        url: String
+    ): CCIndexSuccessResponse {
+        return commonCrawlRestClient.queryIndex(
+            INDEX_QUERY_URL,
+            url,
+            CCIndices.CC_2024_46.indexName
+        )
+    }
+
+    fun queryAllCrawlIndices(
+        url: String
+    ): List<CCIndexSuccessResponse> {
+        val responses = mutableListOf<CCIndexSuccessResponse>()
+        for (crawlName in CCIndices.entries) {
+            try {
+                responses.add(commonCrawlRestClient.queryIndex(
+                    INDEX_QUERY_URL,
+                    url,
+                    crawlName.indexName
+                ))
+            } catch (ex: RuntimeException) {
+                Log.warn("Error occurred querying crawl '${crawlName.indexName}' for URL $url")
+            }
+        }
+
+        return responses
+    }
+
+    fun getDocument(
+        ccIndexSuccessResponse: CCIndexSuccessResponse,
+        baseUri: String
+    ): Document? {
+        val fileName = "CC-MAIN-20241106230027-20241107020027-00740.warc.gz"
+        val buf: ByteBufInputStream = commonCrawlRestClient.getWarcArchive(
+            DATA_URL,
+            ccIndexSuccessResponse.fileName,
+            ccIndexSuccessResponse.length,
+            ccIndexSuccessResponse.offset
+        )
+
+        val test = WARCReaderFactory.get(
+            fileName,
+            buf,
+            true
+        )
+
+        val parser = HttpResponseParser()
+
+        for(record in test) {
+            val http = parser.parse(record.buffered())
+            val charSet = http.headers.get("charset")
+
+            val doc = DataUtil.load(
+                http.buffered(),
+                "UTF-8",
+                baseUri
+            )
+
+            return doc
+        }
+
+        return null
+    }
+
+}

src/main/kotlin/com/rak/service/ExtractionService.kt

@@ -1,273 +0,0 @@
-package com.rak.service
-
-import com.rak.config.model.CardPrintScrapeTargetConfig
-import com.rak.config.model.ExtractConfig
-import com.rak.config.model.ScrapeTargetFieldConfig
-import com.rak.model.Selector
-import com.rak.model.card.Card
-import com.rak.model.card.CardPrint
-import com.rak.model.exception.ElementNotFoundException
-import com.rak.model.exception.InvalidConfigurationException
-import com.rak.model.set.CardSet
-import com.rak.model.set.RegionalSet
-import com.rak.model.transform.TransformationRegistry
-import com.rak.util.XPathUtil
-import jakarta.enterprise.context.ApplicationScoped
-import org.jsoup.nodes.Document
-import org.jsoup.nodes.Element
-import org.jsoup.select.Elements
-import java.util.Optional
-
-@ApplicationScoped
-class ExtractionService(
-    private val sourceService: SourceService,
-) {
-
-    private val transformationRegistry = TransformationRegistry()
-
-    fun extractSet(setName: String, root: Element, provider: String): CardSet {
-        return CardSet(
-            name = setName,
-            regionalSets = extractRegionalSets(root, provider)
-        )
-    }
-
-    fun getRootElement(
-        document: Document,
-        globalRootExtractConfig: Optional<ExtractConfig>,
-        nodeRootExtractConfig: Optional<ExtractConfig>
-    ): Element {
-        val rootExtractConfig: ExtractConfig = globalRootExtractConfig.orElse(
-            nodeRootExtractConfig.orElseThrow {
-                InvalidConfigurationException("")
-            })
-
-        return getElementFromDocumentByExtractConfig(document, rootExtractConfig) ?: throw ElementNotFoundException("No root could be found")
-    }
-
-    fun extractCardPrint(document: Document, cardPrintConfig: CardPrintScrapeTargetConfig): CardPrint? {
-        val cardName = extractTextFromElementByTargetFieldConfig(
-            getRootElement(
-                document,
-                cardPrintConfig.getRootConfig(),
-                cardPrintConfig.getNameConfig().getRootConfig()
-            ),
-            cardPrintConfig.getNameConfig()
-        )
-
-        return null
-    }
-
-    fun extractRegionalSet(root: Element, provider: String): RegionalSet {
-        val source = sourceService.getSourceById(provider) ?: throw IllegalArgumentException("Provider $provider not found")
-        val setExtractionConfig = source.getTargets().getSetConfig().get()
-
-        if (setExtractionConfig.getRootConfig().isPresent) {
-            val setId: String = extractTextFromElementByTargetFieldConfig(
-                root,
-                setExtractionConfig.getIdConfig(),
-
-            ) ?: throw IllegalStateException("Parameter 'id' could not be found")
-            val setLanguage: String = extractTextFromElementByTargetFieldConfig(
-                root,
-                setExtractionConfig.getLanguageConfig()
-            ) ?: throw IllegalStateException("Parameter 'language' could not be found")
-            val setKey: String = extractTextFromElementByTargetFieldConfig(
-                root,
-                setExtractionConfig.getRegionKeyConfig()
-            ) ?: throw IllegalStateException("Parameter 'key' could not be found")
-
-            return RegionalSet(
-                setId,
-                setLanguage,
-                setKey,
-                listOf(),
-                -1
-            )
-        } else {
-            val setIdConfiguration = setExtractionConfig.getIdConfig()
-            val rootConfiguration = setIdConfiguration.getRootConfig().get()
-
-            val setIdRoot = getElementFromDocumentByExtractConfig(root, rootConfiguration) ?: throw ElementNotFoundException("TODO fix this")
-            val setId: String = extractTextFromElementByTargetFieldConfig(
-                setIdRoot,
-                setIdConfiguration
-            ) ?: throw IllegalStateException("Parameter 'id' could not be found")
-
-
-            val setLanguageConfiguration = setExtractionConfig.getIdConfig()
-            val setLanguageRoot = getElementFromDocumentByExtractConfig(root, rootConfiguration) ?: throw ElementNotFoundException("TODO fix this")
-            val setLanguage: String = extractTextFromElementByTargetFieldConfig(
-                setLanguageRoot,
-                setLanguageConfiguration
-            ) ?: throw IllegalStateException("Parameter 'language' could not be found")
-
-
-            val setKeyConfiguration = setExtractionConfig.getIdConfig()
-            val setKeyRoot = getElementFromDocumentByExtractConfig(root, rootConfiguration) ?: throw ElementNotFoundException("TODO fix this")
-            val setKey: String = extractTextFromElementByTargetFieldConfig(
-                setKeyRoot,
-                setKeyConfiguration
-            ) ?: throw IllegalStateException("Parameter 'key' could not be found")
-
-            return RegionalSet(
-                setId,
-                setLanguage,
-                setKey,
-                listOf(),
-                -1
-            )
-        }
-    }
-
-    fun extractRegionalSets(root: Element, provider: String): Set<RegionalSet> {
-        val source = sourceService.getSourceById(provider) ?: throw IllegalArgumentException("Provider $provider not found")
-        val setExtractionConfig = source.getTargets().getSetConfig().get()
-
-        if (setExtractionConfig.getRootConfig().isPresent) {
-            val rootConfiguration = setExtractionConfig.getRootConfig().get()
-            val regionalSetRoots: Elements = getElementsFromDocumentByExtractConfig(
-                root,
-                rootConfiguration
-            )
-
-            return regionalSetRoots.map {
-                extractRegionalSet(
-                    it,
-                    provider
-                )
-            }.toSet()
-        } else {
-            try {
-                val setIdConfiguration = setExtractionConfig.getIdConfig()
-                val setIdRoot = getElementsFromDocumentByExtractConfig(root, setIdConfiguration.getRootConfig().get())
-                val setIds = setIdRoot.map {
-                    extractTextFromElementByTargetFieldConfig(
-                        it,
-                        setIdConfiguration
-                    ) ?: throw IllegalStateException("Parameter 'id' could not be found")
-                }
-
-                val languageConfiguration = setExtractionConfig.getLanguageConfig()
-                val languageRoot = getElementsFromDocumentByExtractConfig(root, languageConfiguration.getRootConfig().get())
-                val languages = languageRoot.map {
-                    extractTextFromElementByTargetFieldConfig(
-                        it,
-                        languageConfiguration
-                    ) ?: throw IllegalStateException("Parameter 'id' could not be found")
-                }
-
-                val setKeyConfiguration = setExtractionConfig.getRegionKeyConfig()
-                val setKeyRoot = getElementsFromDocumentByExtractConfig(root, setKeyConfiguration.getRootConfig().get())
-                val setKeys = setKeyRoot.map {
-                    extractTextFromElementByTargetFieldConfig(
-                        it,
-                        setKeyConfiguration
-                    ) ?: throw IllegalStateException("Parameter 'id' could not be found")
-                }
-
-                return RegionalSet.flattenFromMemberLists(
-                    setIds,
-                    languages,
-                    setKeys
-                )
-            } catch (ex: NoSuchElementException) {
-                throw RuntimeException("sdfgs") // TODO handle me
-            }
-        }
-    }
-
-    fun extractCard(root: Document, provider: String): Card? {
-        val source = sourceService.getSourceById(provider) ?: throw IllegalArgumentException("Provider $provider not found")
-        val cardSelector = source.getTargets().getCardConfig().get()
-
-        val rootConfigurationOptional = cardSelector.getRootConfig()
-
-        if (rootConfigurationOptional.isPresent) {
-            val rootConfiguration = rootConfigurationOptional.get()
-            val rootElement: Element = getElementFromDocumentByExtractConfig(
-                root,
-                rootConfiguration
-            ) ?: throw ElementNotFoundException("TODO make this better")
-
-            val englishCardName: String = extractTextFromElementByTargetFieldConfig(
-                rootElement,
-                cardSelector.getEnglishNameConfig()
-            ) ?: throw IllegalStateException("Parameter 'name' could not be found")
-
-            val cardType: String = extractTextFromElementByTargetFieldConfig(
-                rootElement,
-                cardSelector.getEnglishNameConfig()
-            ) ?: throw IllegalStateException("Parameter 'name' could not be found")
-
-            val description: String = extractTextFromElementByTargetFieldConfig(
-                rootElement,
-                cardSelector.getEnglishNameConfig()
-            ) ?: throw IllegalStateException("Parameter 'name' could not be found")
-
-            return null
-        } else {
-            return null
-
-        }
-
-    }
-
-    private fun getElementsFromDocumentByExtractConfig(
-        document: Element,
-        step: ExtractConfig
-    ): Elements {
-        return if (step.selectorType() == Selector.CSS) {
-            document.select(step.getQueryString())
-        } else {
-            document.selectXpath(step.getQueryString())
-        }
-    }
-
-    private fun getElementFromDocumentByExtractConfig(
-        document: Element,
-        step: ExtractConfig,
-    ): Element? {
-        return if (step.selectorType() == Selector.CSS) {
-            document.select(step.getQueryString()).firstOrNull() ?: throw ElementNotFoundException("")
-        } else {
-            document.selectXpath(step.getQueryString()).firstOrNull() ?: throw ElementNotFoundException("")
-        }
-    }
-
-    private fun extractTextFromElementByTargetFieldConfig(
-        root: Element,
-        extractionConfig: ScrapeTargetFieldConfig
-    ): String? {
-        val extractionSteps = extractionConfig.getExtractionSteps()
-        val transformationSteps = extractionConfig.getOptionalTransformationSteps()
-
-        var currentElement: Element? = root.clone()
-        var result: String? = null
-
-        for (index in 0 until extractionSteps.size) {
-            val currentStep = extractionSteps.elementAtOrNull(index) ?: return null
-            if (currentElement == null) {
-                throw IllegalStateException()
-            }
-
-            if (index == extractionSteps.size - 1) {
-                result = XPathUtil.extractResult(currentElement, currentStep.getQueryString())
-            }
-            else {
-                currentElement = XPathUtil.getNextElement(currentElement, currentStep.getQueryString())
-            }
-        }
-
-        if (result == null) {
-            throw ElementNotFoundException("Result could not be extracted")
-        }
-
-        if (transformationSteps.isPresent) {
-            result = transformationRegistry.applyTransformations(result, transformationSteps.get())
-        }
-
-        return result
-    }
-
-}

src/main/kotlin/com/rak/service/ScrapeService.kt

@@ -1,20 +1,30 @@
 package com.rak.service
 
+import com.rak.config.model.ProviderConfig
 import com.rak.model.card.Card
+import com.rak.model.exception.NotImplementedException
+import com.rak.model.exception.TargetNotFoundException
 import com.rak.model.set.CardSet
 import com.rak.model.set.RegionalSet
+import com.rak.service.extract.RegionalSetExtractionService
+import com.rak.service.extract.SetExtractionService
+import io.quarkus.logging.Log
 import jakarta.enterprise.context.ApplicationScoped
 import org.jsoup.Jsoup
 import org.jsoup.nodes.Document
+import java.lang.Exception
 
 @ApplicationScoped
 class ScrapeService(
     private val sourceService: SourceService,
-    private val extractionService: ExtractionService,
     private val setExtractionService: SetExtractionService,
-    private val regionalSetExtractionService: RegionalSetExtractionService
+    private val regionalSetExtractionService: RegionalSetExtractionService,
+    private val commonCrawlService: CommonCrawlService
 ) {
 
+    fun ProviderConfig.buildUrl(targetName: String): String {
+        return this.getUrlPattern().format(targetName)
+    }
 
     fun scrapeSet(
         provider: String,
@@ -23,10 +33,39 @@ class ScrapeService(
         val source = sourceService.getSourceById(provider) ?: throw IllegalArgumentException("Provider $provider not found")
 
         val path: String = normalizePath(setName)
-        val document: Document = Jsoup.connect("https://${source.getDomain()}/$path").get()
+        val url = source.buildUrl(path)
+        val ccIndexResponses = commonCrawlService.queryAllCrawlIndices(url).sortedBy { it.timestamp }
 
-//        return extractionService.extractSet(setName, document, provider)
+        var document: Document? = null
-        return setExtractionService.extract(document, source, source.getTargets().getSetConfig().get())
+
+        for (indexResponse in ccIndexResponses) {
+            document = commonCrawlService.getDocument(
+                indexResponse,
+                source.getDomain()
+            )
+
+            if (document != null) {
+                break
+            }
+        }
+
+        if (document == null) {
+            // Fallback to Jsoup directly
+            try {
+                document = Jsoup.connect(url).get()
+            } catch(ex: Exception) {
+                Log.warn("Error occurred during Jsoup query")
+                throw TargetNotFoundException("Could not find '$setName' for Provider '$provider'")
+            }
+        }
+
+        return setExtractionService.extract(
+            document,
+            source,
+            source.getTargets().getSetConfig().get()
+        ).apply {
+            name = setName
+        }
     }
 
     fun scrapeRegionalSet(
@@ -45,12 +84,8 @@ class ScrapeService(
         provider: String,
         cardName: String,
     ): Card? {
-        val source = sourceService.getSourceById(provider) ?: throw IllegalArgumentException("Provider $provider not found")
+        throw NotImplementedException("Not implemented")
 
-        val path: String = normalizePath(cardName)
-        val document: Document = Jsoup.connect("https://${source.getDomain()}/$path").get()
-
-        return extractionService.extractCard(document, provider)
     }
 
     private fun normalizePath(path: String): String = path

src/main/kotlin/com/rak/service/client/CommonCrawlRestClient.kt

@@ -0,0 +1,49 @@
+package com.rak.service.client
+
+import com.rak.util.NDJsonReader
+import com.rak.model.cc.CCIndexSuccessResponse
+import io.netty.buffer.ByteBufInputStream
+import io.quarkus.rest.client.reactive.ClientQueryParam
+import io.quarkus.rest.client.reactive.NotBody
+import io.quarkus.rest.client.reactive.Url
+import jakarta.ws.rs.Consumes
+import jakarta.ws.rs.GET
+import jakarta.ws.rs.Path
+import jakarta.ws.rs.PathParam
+import jakarta.ws.rs.QueryParam
+import org.eclipse.microprofile.rest.client.annotation.ClientHeaderParam
+import org.eclipse.microprofile.rest.client.annotation.RegisterProvider
+import org.eclipse.microprofile.rest.client.inject.RegisterRestClient
+
+@RegisterRestClient(baseUri = "whatever")
+@RegisterProvider(NDJsonReader::class)
+interface CommonCrawlRestClient {
+
+    @GET
+    @ClientQueryParam(name = "output", value = ["json"])
+    @Path("/{index}-index")
+    @Consumes("text/x-ndjson")
+    fun queryIndex(
+        @Url
+        baseUrl: String,
+        @QueryParam("url")
+        queryUrl: String,
+        @PathParam("index")
+        indexName: String
+    ): CCIndexSuccessResponse
+
+    @GET
+    @Path("/{fileName}")
+    @ClientHeaderParam(name = "Range", value = ["{com.rak.util.HttpUtil.computeHeader}"])
+    fun getWarcArchive(
+        @Url
+        baseUrl: String,
+        @PathParam("fileName")
+        fileName: String,
+        @NotBody
+        fileLength: Int,
+        @NotBody
+        fileOffset: Int
+    ): ByteBufInputStream
+
+}

src/main/kotlin/com/rak/service/extract/AbstractExtractionService.kt

@@ -1,10 +1,9 @@
-package com.rak.service
+package com.rak.service.extract
 
 import com.rak.config.model.AbstractScrapeTargetConfig
 import com.rak.config.model.ExtractConfig
 import com.rak.config.model.ProviderConfig
 import com.rak.config.model.ScrapeTargetFieldConfig
-import com.rak.config.model.TransformationStepConfig
 import com.rak.model.Selector
 import com.rak.model.exception.ElementNotFoundException
 import com.rak.model.exception.InvalidConfigurationException

src/main/kotlin/com/rak/service/extract/CardPrintExtractionService.kt

@@ -1,4 +1,4 @@
-package com.rak.service
+package com.rak.service.extract
 
 import com.rak.config.model.CardPrintScrapeTargetConfig
 import com.rak.config.model.ProviderConfig

src/main/kotlin/com/rak/service/extract/RegionalSetExtractionService.kt

@@ -1,4 +1,4 @@
-package com.rak.service
+package com.rak.service.extract
 
 import com.rak.config.model.ProviderConfig
 import com.rak.config.model.ScrapeTargetFieldConfig

src/main/kotlin/com/rak/service/extract/SetExtractionService.kt

@@ -1,4 +1,4 @@
-package com.rak.service
+package com.rak.service.extract
 
 import com.rak.config.model.ProviderConfig
 import com.rak.config.model.ScrapeTargetFieldConfig

src/main/kotlin/com/rak/util/HttpUtil.kt

@@ -0,0 +1,23 @@
+package com.rak.util
+
+import io.quarkus.rest.client.reactive.ComputedParamContext
+
+class HttpUtil {
+
+    companion object {
+
+        private const val HEADER_FORMAT_STRING: String = "bytes=%d-%d"
+
+        @JvmStatic
+        fun computeHeader(context: ComputedParamContext): String {
+            val fileLengthContext = context.methodParameters().subList(2, 4)
+
+            val fileLength = fileLengthContext[0].value().toString().toInt()
+            val fileOffset = fileLengthContext[1].value().toString().toInt()
+
+            return HEADER_FORMAT_STRING.format(fileOffset, fileOffset + fileLength - 1)
+        }
+
+    }
+
+}

src/main/kotlin/com/rak/util/NDJsonReader.kt

@@ -0,0 +1,45 @@
+package com.rak.util
+
+import com.fasterxml.jackson.datatype.jsr310.JSR310Module
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule
+import com.fasterxml.jackson.module.kotlin.jacksonObjectMapper
+import com.rak.model.cc.CCIndexSuccessResponse
+import jakarta.ws.rs.Consumes
+import jakarta.ws.rs.core.MediaType
+import jakarta.ws.rs.core.MultivaluedMap
+import jakarta.ws.rs.ext.MessageBodyReader
+import jakarta.ws.rs.ext.Provider
+import java.io.BufferedReader
+import java.io.InputStream
+import java.io.InputStreamReader
+import java.lang.reflect.Type
+
+@Provider
+@Consumes("text/x-ndjson") // Handles NDJSON content
+class NDJsonReader : MessageBodyReader<CCIndexSuccessResponse> {
+
+    private val objectMapper = jacksonObjectMapper().registerModule(JavaTimeModule())
+
+    override fun isReadable(
+        type: Class<*>?,
+        genericType: Type?,
+        annotations: Array<out Annotation>?,
+        mediaType: MediaType?
+    ): Boolean {
+        return type == CCIndexSuccessResponse::class.java
+    }
+
+    override fun readFrom(
+        type: Class<CCIndexSuccessResponse>,
+        genericType: Type?,
+        annotations: Array<out Annotation>?,
+        mediaType: MediaType?,
+        httpHeaders: MultivaluedMap<String, String>?,
+        entityStream: InputStream
+    ): CCIndexSuccessResponse {
+        BufferedReader(InputStreamReader(entityStream)).use { reader ->
+            val firstLine = reader.readLine()
+            return objectMapper.readValue(firstLine, CCIndexSuccessResponse::class.java)
+        }
+    }
+}

src/main/resources/application.yml

@@ -7,8 +7,7 @@ scraper:
     - id: konami-official
       name: "Konami Official Database"
       domain: "yugioh-card.com"
-      url-patterns:
+      url-pattern: "^https://www\\.yugioh-card\\.com/[a-z]{2}/products/.*$"
-        - "^https://www\\.yugioh-card\\.com/[a-z]{2}/products/.*$"
       targets:
         card:
           root:
@@ -28,8 +27,7 @@ scraper:
     - id: ygo-fandom
       name: "Yu-Gi-Oh Fandom Wiki"
       domain: "yugioh.fandom.com"
-      url-patterns:
+      url-pattern: "https://yugioh.fandom.com/wiki/%s"
-        - "^https://yugioh\\.fandom\\.com/wiki/.*$"
       targets:
         set:
           root: