diff --git a/.gitattributes b/.gitattributes index a19ade0..d45c625 100755 --- a/.gitattributes +++ b/.gitattributes @@ -1 +1,2 @@ CHANGELOG.md merge=union +* text=auto eol=lf diff --git a/build.gradle b/build.gradle index 1def174..5175b98 100644 --- a/build.gradle +++ b/build.gradle @@ -1,12 +1,12 @@ plugins { id "jacoco" id "java" - id "org.jetbrains.kotlin.jvm" version "1.4.30" - id "org.jetbrains.kotlin.kapt" version "1.4.0" + id "org.jetbrains.kotlin.jvm" version "1.5.10" + id "org.jetbrains.kotlin.kapt" version "1.5.10" id "application" id "com.github.johnrengelman.shadow" version "5.2.0" id "com.diffplug.spotless" version "5.8.2" - id "dev.afanasev.sekret" version "0.0.7" + id "net.afanasev.sekret" version "0.1.0" } group = "com.mangadex" @@ -15,7 +15,6 @@ mainClassName = "mdnet.MainKt" repositories { mavenCentral() - jcenter() } configurations { @@ -23,7 +22,9 @@ configurations { } dependencies { - compileOnly group: "dev.afanasev", name: "sekret-annotation", version: "0.0.7" + implementation "org.jetbrains.kotlin:kotlin-reflect" + + compileOnly group: "net.afanasev", name: "sekret-annotation", version: "0.1.0" implementation group: "commons-io", name: "commons-io", version: "2.8.0" implementation group: "org.apache.commons", name: "commons-compress", version: "1.20" @@ -63,11 +64,13 @@ dependencies { testImplementation "io.mockk:mockk:1.10.4" } -test { +tasks.withType(Test) { useJUnitPlatform() + javaLauncher = javaToolchains.launcherFor { + languageVersion = JavaLanguageVersion.of(8) + } } - -task testDev(type: Test) { +tasks.register("testDev", Test) { group = "verification" useJUnitPlatform() filter { @@ -116,9 +119,11 @@ tasks.register("generateVersion", Copy) { into "$buildDir/generated/java" expand templateContext } +//tasks.named(":kaptKotlin").dependsOn generateVersion +compileJava.dependsOn generateVersion +sourceSets.main.java.srcDir generateVersion -sourceSets.main.java.srcDir generateVersion.outputs.files - +// https://gist.github.com/medvedev/968119d7786966d9ed4442ae17aca279 tasks.register("depsize") { description = 'Prints dependencies for "default" configuration' doLast() { diff --git a/gradle.properties b/gradle.properties index e5e8f9a..a896030 100644 --- a/gradle.properties +++ b/gradle.properties @@ -1,4 +1,4 @@ http_4k_version=4.3.0.0 -kotest_version=4.4.1 +kotest_version=4.6.0 ktorm_version=3.3.0 picocli_version=4.6.1 \ No newline at end of file diff --git a/gradle/wrapper/gradle-wrapper.jar b/gradle/wrapper/gradle-wrapper.jar index 87b738c..62d4c05 100644 Binary files a/gradle/wrapper/gradle-wrapper.jar and b/gradle/wrapper/gradle-wrapper.jar differ diff --git a/gradle/wrapper/gradle-wrapper.properties b/gradle/wrapper/gradle-wrapper.properties index fc72034..05679dc 100644 --- a/gradle/wrapper/gradle-wrapper.properties +++ b/gradle/wrapper/gradle-wrapper.properties @@ -1,6 +1,5 @@ -#Thu Jul 02 11:52:16 CDT 2020 -distributionUrl=https\://services.gradle.org/distributions/gradle-6.5.1-all.zip distributionBase=GRADLE_USER_HOME distributionPath=wrapper/dists -zipStorePath=wrapper/dists +distributionUrl=https\://services.gradle.org/distributions/gradle-7.1.1-bin.zip zipStoreBase=GRADLE_USER_HOME +zipStorePath=wrapper/dists diff --git a/gradlew b/gradlew index af6708f..fbd7c51 100755 --- a/gradlew +++ b/gradlew @@ -1,5 +1,21 @@ #!/usr/bin/env sh +# +# Copyright 2015 the original author or authors. +# +# Licensed under the Apache License, Version 2.0 (the "License"); +# you may not use this file except in compliance with the License. +# You may obtain a copy of the License at +# +# https://www.apache.org/licenses/LICENSE-2.0 +# +# Unless required by applicable law or agreed to in writing, software +# distributed under the License is distributed on an "AS IS" BASIS, +# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +# See the License for the specific language governing permissions and +# limitations under the License. +# + ############################################################################## ## ## Gradle start up script for UN*X @@ -28,7 +44,7 @@ APP_NAME="Gradle" APP_BASE_NAME=`basename "$0"` # Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -DEFAULT_JVM_OPTS='"-Xmx64m"' +DEFAULT_JVM_OPTS='"-Xmx64m" "-Xms64m"' # Use the maximum available, or set MAX_FD != -1 to use that value. MAX_FD="maximum" @@ -66,6 +82,7 @@ esac CLASSPATH=$APP_HOME/gradle/wrapper/gradle-wrapper.jar + # Determine the Java command to use to start the JVM. if [ -n "$JAVA_HOME" ] ; then if [ -x "$JAVA_HOME/jre/sh/java" ] ; then @@ -109,10 +126,11 @@ if $darwin; then GRADLE_OPTS="$GRADLE_OPTS \"-Xdock:name=$APP_NAME\" \"-Xdock:icon=$APP_HOME/media/gradle.icns\"" fi -# For Cygwin, switch paths to Windows format before running java -if $cygwin ; then +# For Cygwin or MSYS, switch paths to Windows format before running java +if [ "$cygwin" = "true" -o "$msys" = "true" ] ; then APP_HOME=`cygpath --path --mixed "$APP_HOME"` CLASSPATH=`cygpath --path --mixed "$CLASSPATH"` + JAVACMD=`cygpath --unix "$JAVACMD"` # We build the pattern for arguments to be converted via cygpath @@ -138,19 +156,19 @@ if $cygwin ; then else eval `echo args$i`="\"$arg\"" fi - i=$((i+1)) + i=`expr $i + 1` done case $i in - (0) set -- ;; - (1) set -- "$args0" ;; - (2) set -- "$args0" "$args1" ;; - (3) set -- "$args0" "$args1" "$args2" ;; - (4) set -- "$args0" "$args1" "$args2" "$args3" ;; - (5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; - (6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; - (7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; - (8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; - (9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; + 0) set -- ;; + 1) set -- "$args0" ;; + 2) set -- "$args0" "$args1" ;; + 3) set -- "$args0" "$args1" "$args2" ;; + 4) set -- "$args0" "$args1" "$args2" "$args3" ;; + 5) set -- "$args0" "$args1" "$args2" "$args3" "$args4" ;; + 6) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" ;; + 7) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" ;; + 8) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" ;; + 9) set -- "$args0" "$args1" "$args2" "$args3" "$args4" "$args5" "$args6" "$args7" "$args8" ;; esac fi @@ -159,14 +177,9 @@ save () { for i do printf %s\\n "$i" | sed "s/'/'\\\\''/g;1s/^/'/;\$s/\$/' \\\\/" ; done echo " " } -APP_ARGS=$(save "$@") +APP_ARGS=`save "$@"` # Collect all arguments for the java command, following the shell quoting and substitution rules eval set -- $DEFAULT_JVM_OPTS $JAVA_OPTS $GRADLE_OPTS "\"-Dorg.gradle.appname=$APP_BASE_NAME\"" -classpath "\"$CLASSPATH\"" org.gradle.wrapper.GradleWrapperMain "$APP_ARGS" -# by default we should be in the correct project dir, but when run from Finder on Mac, the cwd is wrong -if [ "$(uname)" = "Darwin" ] && [ "$HOME" = "$PWD" ]; then - cd "$(dirname "$0")" -fi - exec "$JAVACMD" "$@" diff --git a/gradlew.bat b/gradlew.bat index 6d57edc..5093609 100644 --- a/gradlew.bat +++ b/gradlew.bat @@ -1,3 +1,19 @@ +@rem +@rem Copyright 2015 the original author or authors. +@rem +@rem Licensed under the Apache License, Version 2.0 (the "License"); +@rem you may not use this file except in compliance with the License. +@rem You may obtain a copy of the License at +@rem +@rem https://www.apache.org/licenses/LICENSE-2.0 +@rem +@rem Unless required by applicable law or agreed to in writing, software +@rem distributed under the License is distributed on an "AS IS" BASIS, +@rem WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +@rem See the License for the specific language governing permissions and +@rem limitations under the License. +@rem + @if "%DEBUG%" == "" @echo off @rem ########################################################################## @rem @@ -13,8 +29,11 @@ if "%DIRNAME%" == "" set DIRNAME=. set APP_BASE_NAME=%~n0 set APP_HOME=%DIRNAME% +@rem Resolve any "." and ".." in APP_HOME to make it shorter. +for %%i in ("%APP_HOME%") do set APP_HOME=%%~fi + @rem Add default JVM options here. You can also use JAVA_OPTS and GRADLE_OPTS to pass JVM options to this script. -set DEFAULT_JVM_OPTS="-Xmx64m" +set DEFAULT_JVM_OPTS="-Xmx64m" "-Xms64m" @rem Find java.exe if defined JAVA_HOME goto findJavaFromJavaHome @@ -65,6 +84,7 @@ set CMD_LINE_ARGS=%* set CLASSPATH=%APP_HOME%\gradle\wrapper\gradle-wrapper.jar + @rem Execute Gradle "%JAVA_EXE%" %DEFAULT_JVM_OPTS% %JAVA_OPTS% %GRADLE_OPTS% "-Dorg.gradle.appname=%APP_BASE_NAME%" -classpath "%CLASSPATH%" org.gradle.wrapper.GradleWrapperMain %CMD_LINE_ARGS% diff --git a/settings.gradle b/settings.gradle index 6d9ad4a..935730c 100644 --- a/settings.gradle +++ b/settings.gradle @@ -1,7 +1,6 @@ pluginManagement { repositories { gradlePluginPortal() - jcenter() google() } resolutionStrategy { diff --git a/settings.sample.yaml b/settings.sample.yaml index c0abf59..454d877 100644 --- a/settings.sample.yaml +++ b/settings.sample.yaml @@ -80,3 +80,13 @@ server_settings: # 0 defaults to (2 * your available processors) # https://docs.oracle.com/en/java/javase/11/docs/api/java.base/java/lang/Runtime.html#availableProcessors() threads: 0 + + +# Settings intended for advanced use cases or tinkering +dev_settings: + # The url to override the MD@H backend with + dev_url: ~ + # Whether to disable the sni check for mangadex.network and localhost + disable_sni_check: false + # Whether to send the server header or not, defaults to false + send_server_header: false \ No newline at end of file diff --git a/src/main/kotlin/mdnet/metrics/PostTransactionLabeler.kt b/src/main/kotlin/mdnet/metrics/PostTransactionLabeler.kt index 81b1515..d8d16fe 100644 --- a/src/main/kotlin/mdnet/metrics/PostTransactionLabeler.kt +++ b/src/main/kotlin/mdnet/metrics/PostTransactionLabeler.kt @@ -28,7 +28,7 @@ class PostTransactionLabeler : HttpTransactionLabeler { "method" to transaction.request.method.toString(), "status" to transaction.response.status.code.toString(), "path" to transaction.routingGroup, - "cache" to (transaction.response.header("X-Cache") ?: "MISS").toUpperCase() + "cache" to (transaction.response.header("X-Cache") ?: "MISS").uppercase() ) ) } diff --git a/src/main/kotlin/mdnet/netty/ApplicationNetty.kt b/src/main/kotlin/mdnet/netty/ApplicationNetty.kt index 016084e..7a4da2d 100644 --- a/src/main/kotlin/mdnet/netty/ApplicationNetty.kt +++ b/src/main/kotlin/mdnet/netty/ApplicationNetty.kt @@ -104,7 +104,7 @@ sealed class NettyTransport(threads: Int) { private fun defaultNumThreads() = Runtime.getRuntime().availableProcessors() * 2 fun bestForPlatform(threads: Int): NettyTransport { - val name = SystemPropertyUtil.get("os.name").toLowerCase(Locale.UK).trim { it <= ' ' } + val name = SystemPropertyUtil.get("os.name").lowercase(Locale.US).trim { it <= ' ' } val threadsToUse = if (threads == 0) defaultNumThreads() else threads LOGGER.info { "Choosing a transport with $threadsToUse threads" } @@ -188,7 +188,8 @@ class Netty( override fun userEventTriggered(ctx: ChannelHandlerContext, evt: Any) { if (evt is SniCompletionEvent) { if (!devSettings.disableSniCheck) { - if (!evt.hostname().endsWith(hostToTest) && + if (evt.hostname() != null && + !evt.hostname().endsWith(hostToTest) && !evt.hostname().endsWith("localhost") ) { ctx.close() diff --git a/src/main/kotlin/mdnet/settings/ClientSettings.kt b/src/main/kotlin/mdnet/settings/ClientSettings.kt index e8a52d5..d3fbbab 100644 --- a/src/main/kotlin/mdnet/settings/ClientSettings.kt +++ b/src/main/kotlin/mdnet/settings/ClientSettings.kt @@ -20,7 +20,7 @@ package mdnet.settings import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming -import dev.afanasev.sekret.Secret +import net.afanasev.sekret.Secret @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class) data class ClientSettings( diff --git a/src/main/kotlin/mdnet/settings/PingResult.kt b/src/main/kotlin/mdnet/settings/PingResult.kt index 68ced00..1ccd86f 100644 --- a/src/main/kotlin/mdnet/settings/PingResult.kt +++ b/src/main/kotlin/mdnet/settings/PingResult.kt @@ -20,7 +20,7 @@ package mdnet.settings import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming -import dev.afanasev.sekret.Secret +import net.afanasev.sekret.Secret import org.http4k.core.Uri sealed class PingResult diff --git a/src/main/kotlin/mdnet/settings/SettingsRequest.kt b/src/main/kotlin/mdnet/settings/SettingsRequest.kt index 9a88046..974ec28 100644 --- a/src/main/kotlin/mdnet/settings/SettingsRequest.kt +++ b/src/main/kotlin/mdnet/settings/SettingsRequest.kt @@ -20,7 +20,7 @@ package mdnet.settings import com.fasterxml.jackson.databind.PropertyNamingStrategies import com.fasterxml.jackson.databind.annotation.JsonNaming -import dev.afanasev.sekret.Secret +import net.afanasev.sekret.Secret @JsonNaming(PropertyNamingStrategies.SnakeCaseStrategy::class) data class SettingsRequest( diff --git a/src/test/kotlin/mdnet/cache/ImageStorageTest.kt b/src/test/kotlin/mdnet/cache/ImageStorageTest.kt index a33d666..67db2eb 100644 --- a/src/test/kotlin/mdnet/cache/ImageStorageTest.kt +++ b/src/test/kotlin/mdnet/cache/ImageStorageTest.kt @@ -32,8 +32,8 @@ import io.kotest.matchers.nulls.shouldNotBeNull import io.kotest.matchers.shouldBe import org.apache.commons.io.IOUtils import org.ktorm.database.Database +import kotlin.time.Duration import kotlin.time.ExperimentalTime -import kotlin.time.minutes class ImageStorageTest : FreeSpec() { override fun isolationMode() = IsolationMode.InstancePerTest @@ -171,7 +171,7 @@ class ImageStorageSlowTest : FreeSpec() { writer.stream.write(ByteArray(4096)) writer.commit(4096).shouldBeTrue() - eventually(5.minutes) { + eventually(Duration.minutes(5)) { imageStorage.size.shouldBeGreaterThan(0) } } @@ -185,7 +185,7 @@ class ImageStorageSlowTest : FreeSpec() { writer.stream.write(ByteArray(8192)) writer.commit(8192).shouldBeTrue() - eventually(5.minutes) { + eventually(Duration.minutes(5)) { imageStorage.size.shouldBeZero() } }