Archives/Athou_commafeed
1
0
Fork 0
mirror of https://github.com/Athou/commafeed.git synced 2026-11-02 10:24:48 +00:00
Code Issues Packages Projects Releases Wiki Activity

add support for brotli compression

Browse Source
This commit is contained in:
Athou
2026-10-14 07:37:31 +02:00
parent 69c1e8a5b8
commit b865b3ff84
4 changed files with 14 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
commafeed-server/pom.xml
View File

@@ -465,6 +465,10 @@
<groupId>com.github.luben</groupId> <groupId>com.github.luben</groupId>
<artifactId>zstd-jni</artifactId> <artifactId>zstd-jni</artifactId>
</dependency> </dependency>
<dependency>
<groupId>com.aayushatharva.brotli4j</groupId>
<artifactId>brotli4j</artifactId>
</dependency>
<dependency> <dependency>
<groupId>com.github.seancfoley</groupId> <groupId>com.github.seancfoley</groupId>
<artifactId>ipaddress</artifactId> <artifactId>ipaddress</artifactId>

14
commafeed-server/src/main/java/com/commafeed/NativeImageClasses.java
View File

@@ -6,8 +6,6 @@ import com.codahale.metrics.Histogram;
import com.codahale.metrics.Meter; import com.codahale.metrics.Meter;
import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.MetricRegistry;
import com.codahale.metrics.Timer; import com.codahale.metrics.Timer;
import com.oracle.svm.core.annotate.Substitute;
import com.oracle.svm.core.annotate.TargetClass;
import io.quarkus.runtime.annotations.RegisterForReflection; import io.quarkus.runtime.annotations.RegisterForReflection;
@@ -348,14 +346,4 @@ import io.quarkus.runtime.annotations.RegisterForReflection;
com.rometools.opml.feed.synd.impl.ConverterForOPML10.class, com.rometools.opml.feed.synd.impl.ConverterForOPML10.class,
com.rometools.opml.feed.synd.impl.ConverterForOPML20.class, com.rometools.opml.feed.synd.impl.ConverterForOPML20.class,
}) })
public class NativeImageClasses { public class NativeImageClasses {}
// disable brotli runtime detection because it causes native image failure
@TargetClass(className = "org.apache.hc.client5.http.impl.Brotli4jRuntime")
static final class Brotli4jRuntime {
@Substitute
public static boolean available() {
return false;
}
}
}

2
commafeed-server/src/main/java/com/commafeed/backend/HttpClientFactory.java
View File

@@ -20,6 +20,7 @@ import nl.altindag.ssl.apache5.util.Apache5SslUtils;
import org.apache.hc.client5.http.DnsResolver; import org.apache.hc.client5.http.DnsResolver;
import org.apache.hc.client5.http.SystemDefaultDnsResolver; import org.apache.hc.client5.http.SystemDefaultDnsResolver;
import org.apache.hc.client5.http.async.methods.InflatingAsyncDataConsumer; import org.apache.hc.client5.http.async.methods.InflatingAsyncDataConsumer;
import org.apache.hc.client5.http.async.methods.InflatingBrotliDataConsumer;
import org.apache.hc.client5.http.async.methods.InflatingGzipDataConsumer; import org.apache.hc.client5.http.async.methods.InflatingGzipDataConsumer;
import org.apache.hc.client5.http.async.methods.InflatingZstdDataConsumer; import org.apache.hc.client5.http.async.methods.InflatingZstdDataConsumer;
import org.apache.hc.client5.http.config.ConnectionConfig; import org.apache.hc.client5.http.config.ConnectionConfig;
@@ -92,6 +93,7 @@ public class HttpClientFactory {
ContentCoding.DEFLATE.token(), d -> new InflatingAsyncDataConsumer(d, null)); ContentCoding.DEFLATE.token(), d -> new InflatingAsyncDataConsumer(d, null));
contentDecoderMap.put(ContentCoding.GZIP.token(), InflatingGzipDataConsumer::new); contentDecoderMap.put(ContentCoding.GZIP.token(), InflatingGzipDataConsumer::new);
contentDecoderMap.put(ContentCoding.ZSTD.token(), InflatingZstdDataConsumer::new); contentDecoderMap.put(ContentCoding.ZSTD.token(), InflatingZstdDataConsumer::new);
contentDecoderMap.put(ContentCoding.BROTLI.token(), InflatingBrotliDataConsumer::new);
RedirectStrategy redirectStrategy = RedirectStrategy redirectStrategy =
config.httpClient().blockLocalAddresses() config.httpClient().blockLocalAddresses()

8
commafeed-server/src/test/java/com/commafeed/backend/HttpGetterTest.java
View File

@@ -1,5 +1,6 @@
package com.commafeed.backend; package com.commafeed.backend;
import com.aayushatharva.brotli4j.encoder.BrotliOutputStream;
import com.codahale.metrics.MetricRegistry; import com.codahale.metrics.MetricRegistry;
import com.commafeed.CommaFeedConfiguration; import com.commafeed.CommaFeedConfiguration;
import com.commafeed.CommaFeedVersion; import com.commafeed.CommaFeedVersion;
@@ -418,7 +419,7 @@ class HttpGetterTest {
@Nested @Nested
class Compression { class Compression {
private static final String ACCEPT_ENCODING = "deflate, gzip, zstd"; private static final String ACCEPT_ENCODING = "deflate, gzip, zstd, br";
@Test @Test
void gzip() throws Exception { void gzip() throws Exception {
@@ -435,6 +436,11 @@ class HttpGetterTest {
supportsCompression("zstd", ZstdOutputStream::new); supportsCompression("zstd", ZstdOutputStream::new);
} }
@Test
void br() throws Exception {
supportsCompression("br", BrotliOutputStream::new);
}
void supportsCompression(String encoding, CompressionFunction compressionFunction) void supportsCompression(String encoding, CompressionFunction compressionFunction)
throws Exception { throws Exception {
String body = "my body"; String body = "my body";