Merge pull request #891 from RakambdaOrg/develop

2.3.3
RakambdaOrg · Oct 3, 2024 · d9d6a2a · d9d6a2a
2 parents edeb727 + 6be9420
commit d9d6a2a
Show file tree

Hide file tree

Showing 13 changed files with 52 additions and 44 deletions.
diff --git a/.github/ISSUE_TEMPLATE/0_bug_report.yml b/.github/ISSUE_TEMPLATE/0_bug_report.yml
@@ -1,6 +1,7 @@
 name: Bug report
 description: Create a report to help us improve
 labels: ["type: 🐛 bug"]
+type: 'Bug'
 assignees:
   - Rakambda
 body:

diff --git a/.github/ISSUE_TEMPLATE/1_feature_request.yml b/.github/ISSUE_TEMPLATE/1_feature_request.yml
@@ -1,6 +1,7 @@
 name: Feature request
 description: Suggest an idea for this project
 labels: ["type: 🧱 enhancement"]
+type: 'Enhancement'
 assignees:
   - Rakambda
 body:

diff --git a/.github/workflows/build-test-deploy.yml b/.github/workflows/build-test-deploy.yml
@@ -27,7 +27,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Generate and submit dependency graph
-        uses: gradle/actions/dependency-submission@v4.0.1
+        uses: gradle/actions/dependency-submission@v4.1.0
         continue-on-error: true
 
   build:
@@ -45,7 +45,7 @@ jobs:
           java-version: ${{ vars.JAVA_VERSION }}
 
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.0.1
+        uses: gradle/actions/setup-gradle@v4.1.0
       - name: Build project
         run: |
           ./gradlew \
@@ -86,7 +86,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.0.1
+        uses: gradle/actions/setup-gradle@v4.1.0
 
       - name: Run tests
         run: |
@@ -105,7 +105,7 @@ jobs:
         with:
           report_paths: 'miner/build/test-results/test/*.xml'
       - name: Publish coverage on CodeCov
-        uses: codecov/codecov-action@v4.5.0
+        uses: codecov/codecov-action@v4.6.0
         if: always()
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -150,7 +150,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.0.1
+        uses: gradle/actions/setup-gradle@v4.1.0
 
       - name: Run tests
         run: |
@@ -169,7 +169,7 @@ jobs:
         with:
           report_paths: 'viewer/build/test-results/test/*.xml'
       - name: Publish coverage on CodeCov
-        uses: codecov/codecov-action@v4.5.0
+        uses: codecov/codecov-action@v4.6.0
         if: always()
         with:
           token: ${{ secrets.CODECOV_TOKEN }}
@@ -214,7 +214,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.0.1
+        uses: gradle/actions/setup-gradle@v4.1.0
 
       - name: Calculate miner image name
         id: miner-image-name
@@ -244,7 +244,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.0.1
+        uses: gradle/actions/setup-gradle@v4.1.0
 
       - name: Calculate viewer image name
         id: viewer-image-name

diff --git a/.github/workflows/manual-docker.yml b/.github/workflows/manual-docker.yml
@@ -17,7 +17,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.0.1
+        uses: gradle/actions/setup-gradle@v4.1.0
 
       - name: Calculate miner image name
         id: miner-image-name
@@ -53,7 +53,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.0.1
+        uses: gradle/actions/setup-gradle@v4.1.0
 
       - name: Calculate viewer image name
         id: viewer-image-name

diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml
@@ -19,7 +19,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.0.1
+        uses: gradle/actions/setup-gradle@v4.1.0
 
       - name: Push latest on Docker Hub
         run: |
@@ -42,7 +42,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.0.1
+        uses: gradle/actions/setup-gradle@v4.1.0
 
       - name: Push latest on Docker Hub
         run: |
@@ -66,7 +66,7 @@ jobs:
           distribution: 'temurin'
           java-version: ${{ vars.JAVA_VERSION }}
       - name: Setup Gradle
-        uses: gradle/actions/setup-gradle@v4.0.1
+        uses: gradle/actions/setup-gradle@v4.1.0
 
       - name: Build project
         run: |

diff --git a/gradle.properties b/gradle.properties
@@ -1 +1 @@
-version=2.3.2
+version=2.3.3
diff --git a/gradle/libs.versions.toml b/gradle/libs.versions.toml
@@ -1,46 +1,47 @@
 [versions]
 slf4j-version = "2.0.16"
-log4j2-version = "2.23.1"
-log4j2-slf4j-version = "2.23.1"
+log4j2-version = "2.24.1"
 unirest-version = "4.4.4"
 picocli-version = "4.7.6"
-jackson-version = "2.17.2"
+jackson-version = "2.18.0"
 jsonschema-generator-version = "4.36.0"
 httpclient-version = "4.5.14"
-lang3-version = "3.16.0"
+lang3-version = "3.17.0"
 commons-text-version = "1.12.0"
-jetbrains-annotations-version = "24.1.0"
+jetbrains-annotations-version = "25.0.0"
 websocket-version = "1.5.7"
-junitVersion = "5.11.0"
+junitVersion = "5.11.1"
 assertj-core-version = "3.26.3"
 assertj-db-version = "2.0.2"
-mockito-version = "5.13.0"
+mockito-version = "5.14.1"
 awaitility-version = "4.2.2"
 json-unit-version = "3.4.1"
 kitteh-irc-version = "9.0.0"
-hikari-cp-version = "5.1.0"
+hikari-cp-version = "6.0.0"
 mariadb-version = "3.4.1"
-sqlite-version = "3.46.1.0"
+sqlite-version = "3.46.1.3"
 mysql-version = "9.0.0"
 rerunner-jupiter-version = "2.1.6"
-flyway-version = "10.17.2"
-selenide-version = "7.4.2"
+flyway-version = "10.18.2"
+selenide-version = "7.5.1"
 lombok-version = "1.18.34"
 jacocoVersion = "0.8.12"
 
 shadow-version = "8.1.1"
 names-version = "0.51.0"
 jib-version = "3.4.3"
 git-properties-version = "2.4.2"
-springboot-version = "3.3.3"
+springboot-version = "3.3.4"
 springboot-dependencies-version = "1.1.6"
 test-logger-version = "4.0.0"
 git-version-plugin-version = "3.1.0"
 
 [libraries]
 slf4j = { group = "org.slf4j", name = "slf4j-api", version.ref = "slf4j-version" }
-log4j2-core = { group = "org.apache.logging.log4j", name = "log4j-core", version.ref = "log4j2-version" }
-log4j2-slf4j = { group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl", version.ref = "log4j2-slf4j-version" }
+log4j2Bom = { group = "org.apache.logging.log4j", name = "log4j-bom", version.ref = "log4j2-version"}
+log4j2-core = { group = "org.apache.logging.log4j", name = "log4j-core" }
+log4j2-slf4j = { group = "org.apache.logging.log4j", name = "log4j-slf4j2-impl" }
+log4j2-json = { group = "org.apache.logging.log4j", name = "log4j-layout-template-json" }
 unirestBom = { group = "com.konghq", name = "unirest-java-bom", version.ref = "unirest-version" }
 unirest-java = { group = "com.konghq", name = "unirest-java-core" }
 unirest-modules-jackson = { group = "com.konghq", name = "unirest-modules-jackson" }
@@ -82,7 +83,7 @@ rerunnerJupiter = { group = "io.github.artsok", name = "rerunner-jupiter", versi
 
 [bundles]
 jackson = ["jackson-core", "jackson-annotations", "jackson-databind", "jackson-jsr310"]
-log4j2 = ["log4j2-core", "log4j2-slf4j"]
+log4j2 = ["log4j2-core", "log4j2-slf4j", "log4j2-json"]
 unirest = ["unirest-java", "unirest-modules-jackson"]
 flyway = ["flyway-core", "flyway-mysql"]
 jsonschemaGenerator = ["jsonschema-generator", "jsonschema-module-jackson"]

diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties
@@ -1,6 +1,6 @@
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-8.10-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-8.10.2-bin.zip
 networkTimeout=10000
 validateDistributionUrl=true
 zipStoreBase=GRADLE_USER_HOME

diff --git a/miner/build.gradle.kts b/miner/build.gradle.kts
@@ -1,3 +1,5 @@
+import com.github.jengelman.gradle.plugins.shadow.transformers.Log4j2PluginsCacheFileTransformer
+
 plugins {
     application
     jacoco
@@ -10,6 +12,7 @@ plugins {
 dependencies {
     implementation(platform(libs.jacksonBom))
     implementation(platform(libs.unirestBom))
+    implementation(platform(libs.log4j2Bom))
 
     implementation(libs.slf4j)
     implementation(libs.bundles.log4j2)
@@ -109,6 +112,8 @@ tasks {
 
         exclude("META-INF/*.DSA", "META-INF/*.RSA", "META-INF/*.SF")
         mergeServiceFiles()
+
+        transform(Log4j2PluginsCacheFileTransformer::class.java)
     }
 }
 

diff --git a/...rakambda/channelpointsminer/miner/api/gql/integrity/browser/BrowserIntegrityProvider.java b/...rakambda/channelpointsminer/miner/api/gql/integrity/browser/BrowserIntegrityProvider.java
@@ -16,7 +16,7 @@
 import lombok.RequiredArgsConstructor;
 import lombok.extern.log4j.Log4j2;
 import org.jetbrains.annotations.NotNull;
-import org.openqa.selenium.devtools.v125.page.model.FrameId;
+import org.openqa.selenium.devtools.v128.page.model.FrameId;
 import java.io.IOException;
 import java.time.Duration;
 import java.util.Comparator;

diff --git a/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/twitch/TwitchApi.java b/miner/src/main/java/fr/rakambda/channelpointsminer/miner/api/twitch/TwitchApi.java
@@ -25,7 +25,7 @@ public class TwitchApi{
 	private static final Pattern SETTINGS_URL_PATTERN = Pattern.compile("(https://static.twitchcdn.net/config/settings.*?js|https://assets.twitch.tv/config/settings.*?.js)");
 	private static final Pattern SPADE_URL_PATTERN = Pattern.compile("\"spade(Url|_url)\":\"(.*?)\"");
 	private static final Pattern M3U8_STREAM_PATTERN = Pattern.compile("(https://[/\\-.:\\\\,\"=\\w]+\\.m3u8)", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
-	private static final Pattern M3U8_CHUNK_PATTERN = Pattern.compile("^(https://[/\\-.:\\\\,\"=\\w]+\\.ts(\\?[.\\w\\-/=&]+)?)", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
+	private static final Pattern M3U8_CHUNK_PATTERN = Pattern.compile("^(https://[/\\-.:\\\\,\"=\\w]+\\.(ts|mp4)(\\?[.\\w\\-/=&]+)?)", Pattern.CASE_INSENSITIVE | Pattern.MULTILINE);
 
 	private final UnirestInstance unirest;
 

diff --git a/miner/src/main/java/fr/rakambda/channelpointsminer/miner/browser/Browser.java b/miner/src/main/java/fr/rakambda/channelpointsminer/miner/browser/Browser.java
@@ -16,10 +16,10 @@
 import org.openqa.selenium.devtools.Command;
 import org.openqa.selenium.devtools.DevTools;
 import org.openqa.selenium.devtools.HasDevTools;
-import org.openqa.selenium.devtools.v125.network.Network;
-import org.openqa.selenium.devtools.v125.network.model.RequestId;
-import org.openqa.selenium.devtools.v125.network.model.RequestWillBeSent;
-import org.openqa.selenium.devtools.v125.network.model.ResponseReceived;
+import org.openqa.selenium.devtools.v128.network.Network;
+import org.openqa.selenium.devtools.v128.network.model.RequestId;
+import org.openqa.selenium.devtools.v128.network.model.RequestWillBeSent;
+import org.openqa.selenium.devtools.v128.network.model.ResponseReceived;
 import org.openqa.selenium.firefox.FirefoxDriver;
 import org.openqa.selenium.firefox.FirefoxOptions;
 import org.openqa.selenium.firefox.FirefoxProfile;

diff --git a/...mbda/channelpointsminer/miner/api/gql/integrity/browser/BrowserIntegrityProviderTest.java b/...mbda/channelpointsminer/miner/api/gql/integrity/browser/BrowserIntegrityProviderTest.java
@@ -14,14 +14,14 @@
 import org.mockito.InjectMocks;
 import org.mockito.Mock;
 import org.mockito.junit.jupiter.MockitoExtension;
-import org.openqa.selenium.devtools.v125.network.model.Headers;
-import org.openqa.selenium.devtools.v125.network.model.MonotonicTime;
-import org.openqa.selenium.devtools.v125.network.model.Request;
-import org.openqa.selenium.devtools.v125.network.model.RequestId;
-import org.openqa.selenium.devtools.v125.network.model.RequestWillBeSent;
-import org.openqa.selenium.devtools.v125.network.model.Response;
-import org.openqa.selenium.devtools.v125.network.model.ResponseReceived;
-import org.openqa.selenium.devtools.v125.page.model.FrameId;
+import org.openqa.selenium.devtools.v128.network.model.Headers;
+import org.openqa.selenium.devtools.v128.network.model.MonotonicTime;
+import org.openqa.selenium.devtools.v128.network.model.Request;
+import org.openqa.selenium.devtools.v128.network.model.RequestId;
+import org.openqa.selenium.devtools.v128.network.model.RequestWillBeSent;
+import org.openqa.selenium.devtools.v128.network.model.Response;
+import org.openqa.selenium.devtools.v128.network.model.ResponseReceived;
+import org.openqa.selenium.devtools.v128.page.model.FrameId;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 import org.junit.jupiter.api.extension.ExtendWith;