release 5.4.0

chore(deps): update dependency vitest to v3

.github/workflows/ci.yml

@@ -7,8 +7,57 @@ env:
   DOCKER_BUILD_SUMMARY: false
 
 jobs:
-  build-linux:
+  build:
+    strategy:
+      matrix:
+        os: [ "ubuntu-latest", "ubuntu-24.04-arm", "windows-latest" ]
+        database: [ "h2", "postgresql", "mysql", "mariadb" ]
+
+    runs-on: ${{ matrix.os }}
+    steps:
+      # Checkout
+      - name: Configure git to checkout as-is
+        run: git config --global core.autocrlf false
+
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      # Setup
+      - name: Set up GraalVM
+        uses: graalvm/setup-graalvm@v1
+        with:
+          java-version: ${{ env.JAVA_VERSION }}
+          distribution: "graalvm"
+          cache: "maven"
+
+      - name: Install Playwright dependencies
+        run: sudo apt-get install -y libgbm1
+        if: matrix.os != 'windows-latest'
+
+      # Build & Test
+      - name: Build with Maven
+        run: mvn --batch-mode --no-transfer-progress install -Pnative -P${{ matrix.database }} -DskipTests=${{ matrix.os == 'windows-latest' && matrix.database != 'h2' }}
+
+      # Upload artifacts
+      - name: Upload cross-platform app
+        uses: actions/upload-artifact@v4
+        with:
+          name: commafeed-${{ matrix.database }}-jvm
+          path: commafeed-server/target/commafeed-*.zip
+          overwrite: true
+
+      - name: Upload native executable
+        uses: actions/upload-artifact@v4
+        with:
+          name: commafeed-${{ matrix.database }}-${{ runner.os }}-${{ runner.arch }}
+          path: commafeed-server/target/commafeed-*-runner*
+
+  docker:
+    needs: build
     runs-on: ubuntu-latest
+
     strategy:
       matrix:
         database: [ "h2", "postgresql", "mysql", "mariadb" ]
@@ -27,29 +76,29 @@ jobs:
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
 
-      - name: Set up GraalVM
-        uses: graalvm/setup-graalvm@v1
-        with:
-          java-version: ${{ env.JAVA_VERSION }}
-          distribution: "graalvm"
-          cache: "maven"
+      - name: Install required packages
+        run: sudo apt-get install -y rename unzip
 
-      # Build & Test
-      - name: Build with Maven
-        run: mvn --batch-mode --no-transfer-progress install -Pnative -P${{ matrix.database }}
-
-      # Upload artifacts
-      - name: Upload cross-platform app
-        uses: actions/upload-artifact@v4
+      # Prepare artifacts
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
         with:
-          name: commafeed-${{ matrix.database }}-jvm
-          path: commafeed-server/target/commafeed-*.zip
+          pattern: commafeed-${{ matrix.database }}-*
+          path: ./artifacts
+          merge-multiple: true
 
-      - name: Upload native executable
-        uses: actions/upload-artifact@v4
-        with:
-          name: commafeed-${{ matrix.database }}-${{ runner.os }}-${{ runner.arch }}
-          path: commafeed-server/target/commafeed-*-runner
+      - name: Set the exec flag on the native executables
+        run: chmod +x artifacts/*-runner
+
+      - name: Rename native executables to match buildx TARGETARCH
+        run: |
+          rename 's/x86_64/amd64/g' artifacts/*
+          rename 's/aarch_64/arm64/g' artifacts/*
+
+      - name: Unzip jvm package
+        run: |
+          unzip artifacts/*-jvm.zip -d artifacts/extracted-jvm-package
+          rename 's/commafeed-.*/quarkus-app/g' artifacts/extracted-jvm-package/*
 
       # Docker
       - name: Login to Container Registry
@@ -67,7 +116,7 @@ jobs:
           context: .
           file: commafeed-server/src/main/docker/Dockerfile.native
           push: true
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64/v8
           tags: |
             athou/commafeed:latest-${{ matrix.database }}
             athou/commafeed:${{ github.ref_name }}-${{ matrix.database }}
@@ -92,7 +141,7 @@ jobs:
           context: .
           file: commafeed-server/src/main/docker/Dockerfile.native
           push: true
-          platforms: linux/amd64
+          platforms: linux/amd64,linux/arm64/v8
           tags: athou/commafeed:master-${{ matrix.database }}
 
       - name: Docker build and push master - jvm
@@ -105,46 +154,10 @@ jobs:
           platforms: linux/amd64,linux/arm64/v8
           tags: athou/commafeed:master-${{ matrix.database }}-jvm
 
-  build-windows:
-    runs-on: windows-latest
-    strategy:
-      matrix:
-        database: [ "h2", "postgresql", "mysql", "mariadb" ]
-
-    steps:
-      # Checkout
-      - name: Configure git to checkout as-is
-        run: git config --global core.autocrlf false
-
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      # Setup
-      - name: Set up GraalVM
-        uses: graalvm/setup-graalvm@v1
-        with:
-          java-version: ${{ env.JAVA_VERSION }}
-          distribution: "graalvm"
-          cache: "maven"
-
-      # Build & Test
-      - name: Build with Maven
-        run: mvn --batch-mode --no-transfer-progress install -Pnative -P${{ matrix.database }} -DskipTests=${{ matrix.database != 'h2' }}
-
-      # Upload artifacts
-      - name: Upload native executable
-        uses: actions/upload-artifact@v4
-        with:
-          name: commafeed-${{ matrix.database }}-${{ runner.os }}-${{ runner.arch }}
-          path: commafeed-server/target/commafeed-*-runner.exe
-
   release:
     runs-on: ubuntu-latest
     needs:
-      - build-linux
-      - build-windows
+      - build
     if: github.ref_type == 'tag'
 
     steps:
@@ -160,6 +173,9 @@ jobs:
           path: ./artifacts
           merge-multiple: true
 
+      - name: Set the exec flag on the native executables
+        run: chmod +x artifacts/*-runner
+
       - name: Extract Changelog Entry
         uses: mindsers/changelog-reader-action@v2
         id: changelog_reader

CHANGELOG.md

@@ -1,5 +1,15 @@
 # Changelog
 
+## [5.4.0]
+
+- An arm64 native executable is now available for download on the releases page
+- The native executable Docker image now supports arm64
+- Fixed an issue with feeds that declared an invalid DOCTYPE (#1260)
+
+## [5.3.6]
+
+- Ignore invalid Cache-Control header values (#1619)
+
 ## [5.3.5]
 
 - Fixed an issue with the aspect ratio of images of some feeds (#1595)

commafeed-client/package.json

@@ -15,23 +15,23 @@
         "i18n:extract": "lingui extract --clean"
     },
     "dependencies": {
-        "@emotion/react": "^11.13.5",
-        "@fontsource/open-sans": "^5.1.0",
-        "@lingui/core": "^5.0.0",
-        "@lingui/react": "^5.0.0",
-        "@mantine/core": "^7.14.3",
-        "@mantine/form": "^7.14.3",
-        "@mantine/hooks": "^7.14.3",
-        "@mantine/modals": "^7.14.3",
-        "@mantine/notifications": "^7.14.3",
-        "@mantine/spotlight": "^7.14.3",
+        "@emotion/react": "^11.14.0",
+        "@fontsource/open-sans": "^5.1.1",
+        "@mantine/core": "^7.16.0",
+        "@mantine/form": "^7.16.0",
+        "@mantine/hooks": "^7.16.0",
+        "@mantine/modals": "^7.16.0",
+        "@mantine/notifications": "^7.16.0",
+        "@mantine/spotlight": "^7.16.0",
+        "@lingui/core": "^5.1.2",
+        "@lingui/react": "^5.1.2",
         "@monaco-editor/react": "^4.6.0",
-        "@reduxjs/toolkit": "^2.4.0",
-        "axios": "^1.7.8",
+        "@reduxjs/toolkit": "^2.5.0",
+        "axios": "^1.7.9",
         "dayjs": "^1.11.13",
         "escape-string-regexp": "^5.0.0",
         "interweave": "^13.1.0",
-        "monaco-editor": "^0.52.0",
+        "monaco-editor": "^0.52.2",
         "mousetrap": "^1.6.5",
         "react": "^18.3.1",
         "react-async-hook": "^4.0.0",
@@ -41,26 +41,26 @@
         "react-draggable": "^4.4.6",
         "react-ga4": "^2.1.0",
         "react-helmet": "^6.1.0",
-        "react-icons": "^5.3.0",
+        "react-icons": "^5.4.0",
         "react-infinite-scroller": "^1.2.6",
-        "react-redux": "^9.1.2",
-        "react-router-dom": "^7.0.1",
+        "react-redux": "^9.2.0",
+        "react-router-dom": "^7.1.2",
         "react-swipeable": "^7.0.2",
-        "redoc": "^2.2.0",
+        "redoc": "^2.3.0",
         "style-to-object": "^1.0.8",
         "throttle-debounce": "^5.0.2",
         "tinycon": "^0.6.8",
-        "tss-react": "^4.9.13",
+        "tss-react": "^4.9.14",
         "websocket-heartbeat-js": "^1.1.3"
     },
     "devDependencies": {
         "@biomejs/biome": "^1.9.4",
-        "@lingui/babel-plugin-lingui-macro": "^5.0.0",
-        "@lingui/cli": "^5.0.0",
-        "@lingui/vite-plugin": "^5.0.0",
+        "@lingui/babel-plugin-lingui-macro": "^5.1.2",
+        "@lingui/cli": "^5.1.2",
+        "@lingui/vite-plugin": "^5.1.2",
         "@types/mousetrap": "^1.6.15",
-        "@types/react": "^18.3.12",
-        "@types/react-dom": "^18.3.1",
+        "@types/react": "^18.3.18",
+        "@types/react-dom": "^18.3.5",
         "@types/react-helmet": "^6.1.11",
         "@types/react-infinite-scroller": "^1.2.5",
         "@types/swagger-ui-react": "^4.18.3",
@@ -68,13 +68,13 @@
         "@types/tinycon": "^0.6.7",
         "@vitejs/plugin-react": "^4.3.4",
         "babel-plugin-macros": "^3.1.0",
-        "jsdom": "^25.0.1",
-        "rollup-plugin-visualizer": "^5.12.0",
-        "typescript": "^5.7.2",
-        "vite": "^5.4.11",
+        "jsdom": "^26.0.0",
+        "rollup-plugin-visualizer": "^5.13.1",
+        "typescript": "^5.7.3",
+        "vite": "^6.0.7",
         "vite-plugin-checker": "^0.8.0",
-        "vite-tsconfig-paths": "^5.1.3",
-        "vitest": "^2.1.6",
+        "vite-tsconfig-paths": "^5.1.4",
+        "vitest": "^3.0.1",
         "vitest-mock-extended": "^2.0.2"
     }
 }

commafeed-client/pom.xml

@@ -6,16 +6,16 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>5.3.5</version>
+		<version>5.4.0</version>
 	</parent>
 	<artifactId>commafeed-client</artifactId>
 	<name>CommaFeed Client</name>
 
 	<properties>
 		<!-- renovate: datasource=node-version depName=node -->
-		<node.version>v22.11.0</node.version>
+		<node.version>v22.13.0</node.version>
 		<!-- renovate: datasource=npm depName=npm -->
-		<npm.version>10.9.1</npm.version>
+		<npm.version>11.0.0</npm.version>
 	</properties>
 
 	<build>

commafeed-client/src/locales/zh/messages.po

@@ -142,7 +142,7 @@ msgstr "浏览器扩展"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Browser tab"
-msgstr ""
+msgstr "浏览器标签页"
 
 #: src/components/admin/UserEdit.tsx
 #: src/components/content/add/AddCategory.tsx
@@ -323,7 +323,7 @@ msgstr "输入您当前的密码以更改配置文件设置"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Entries to keep above the selected entry when scrolling"
-msgstr ""
+msgstr "滚动时固定在顶部的条目"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Entry headers"
@@ -378,7 +378,7 @@ msgstr "过滤表达式"
 
 #: src/components/header/ProfileMenu.tsx
 msgid "Force fetching feeds is not yet available."
-msgstr ""
+msgstr "强制获取订阅源功能不可用。"
 
 #: src/pages/auth/LoginPage.tsx
 msgid "Forgot password?"
@@ -844,11 +844,11 @@ msgstr "显示星标图标"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show unread count in tab favicon"
-msgstr ""
+msgstr "在标签页图标上显示未读数量"
 
 #: src/components/settings/DisplaySettings.tsx
 msgid "Show unread count in tab title"
-msgstr ""
+msgstr "在标签页标题中显示未读数量"
 
 #: src/pages/auth/RegistrationPage.tsx
 #: src/pages/auth/RegistrationPage.tsx

commafeed-server/pom.xml

@@ -6,16 +6,16 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>5.3.5</version>
+		<version>5.4.0</version>
 	</parent>
 	<artifactId>commafeed-server</artifactId>
 	<name>CommaFeed Server</name>
 
 	<properties>
-		<quarkus.version>3.17.2</quarkus.version>
-		<querydsl.version>6.9</querydsl.version>
+		<quarkus.version>3.17.7</quarkus.version>
+		<querydsl.version>6.10.1</querydsl.version>
 		<rome.version>2.1.0</rome.version>
-		<swagger.version>2.2.26</swagger.version>
+		<swagger.version>2.2.28</swagger.version>
 
 		<build.database>h2</build.database>
 	</properties>
@@ -241,7 +241,7 @@
 					<dependency>
 						<groupId>com.puppycrawl.tools</groupId>
 						<artifactId>checkstyle</artifactId>
-						<version>10.20.2</version>
+						<version>10.21.1</version>
 					</dependency>
 				</dependencies>
 				<executions>
@@ -270,7 +270,7 @@
 			<plugin>
 				<groupId>com.diffplug.spotless</groupId>
 				<artifactId>spotless-maven-plugin</artifactId>
-				<version>2.43.0</version>
+				<version>2.44.2</version>
 				<?m2e ignore?>
 				<executions>
 					<execution>
@@ -297,7 +297,7 @@
 		<dependency>
 			<groupId>com.commafeed</groupId>
 			<artifactId>commafeed-client</artifactId>
-			<version>5.3.5</version>
+			<version>5.4.0</version>
 		</dependency>
 
 		<!-- compile-time processors -->
@@ -361,7 +361,7 @@
 		<dependency>
 			<groupId>io.dropwizard.metrics</groupId>
 			<artifactId>metrics-json</artifactId>
-			<version>4.2.29</version>
+			<version>4.2.30</version>
 		</dependency>
 		<dependency>
 			<groupId>io.swagger.core.v3</groupId>
@@ -464,7 +464,7 @@
 		<dependency>
 			<groupId>io.github.hakky54</groupId>
 			<artifactId>sslcontext-kickstart-for-apache5</artifactId>
-			<version>8.3.7</version>
+			<version>9.0.0</version>
 		</dependency>
 
 		<!-- test dependencies -->

commafeed-server/src/main/docker/Dockerfile.jvm

@@ -4,7 +4,7 @@ EXPOSE 8082
 RUN mkdir -p /commafeed/data
 VOLUME /commafeed/data
 
-COPY commafeed-server/target/quarkus-app/ /commafeed
+COPY artifacts/extracted-jvm-package/quarkus-app/ /commafeed
 WORKDIR /commafeed
 
 CMD ["java", \

commafeed-server/src/main/docker/Dockerfile.native

@@ -1,10 +1,12 @@
-FROM debian:12.8
+FROM debian:12.9
+ARG TARGETARCH
+
 EXPOSE 8082
 
 RUN mkdir -p /commafeed/data
 VOLUME /commafeed/data
 
-COPY commafeed-server/target/commafeed-*-runner /commafeed/application
+COPY artifacts/commafeed-*-${TARGETARCH}-runner /commafeed/application
 WORKDIR /commafeed
 
 CMD ["./application"]

commafeed-server/src/main/docker/README.md

@@ -92,5 +92,4 @@ Tags are of the form `<version>-<database>[-jvm]` where:
     - `latest` (always points to the latest version)
     - `master` (always points to the latest git commit)
 - `<database>` is the database to use (`h2`, `postgresql`, `mysql` or `mariadb`)
-- `-jvm` is optional and indicates that CommaFeed is running on a JVM, and not compiled natively. This image supports
-  the arm64 platform which is not yet supported by the native image.
+- `-jvm` is optional and indicates that CommaFeed is running on a JVM, and not compiled natively.

commafeed-server/src/main/java/com/commafeed/backend/HttpGetter.java

@@ -162,7 +162,7 @@ public class HttpGetter {
 			CacheControl cacheControl = Optional.ofNullable(resp.getFirstHeader(HttpHeaders.CACHE_CONTROL))
 					.map(NameValuePair::getValue)
 					.map(StringUtils::trimToNull)
-					.map(CacheControlDelegate.INSTANCE::fromString)
+					.map(HttpGetter::toCacheControl)
 					.orElse(null);
 
 			String contentType = Optional.ofNullable(resp.getEntity()).map(HttpEntity::getContentType).orElse(null);
@@ -176,6 +176,15 @@ public class HttpGetter {
 		});
 	}
 
+	private static CacheControl toCacheControl(String headerValue) {
+		try {
+			return CacheControlDelegate.INSTANCE.fromString(headerValue);
+		} catch (Exception e) {
+			log.debug("Invalid Cache-Control header: {}", headerValue);
+			return null;
+		}
+	}
+
 	private static byte[] toByteArray(HttpEntity entity, long maxBytes) throws IOException {
 		if (entity.getContentLength() > maxBytes) {
 			throw new IOException(

commafeed-server/src/main/java/com/commafeed/backend/feed/parser/FeedCleaner.java

@@ -1,6 +1,7 @@
 package com.commafeed.backend.feed.parser;
 
 import java.util.Collection;
+import java.util.regex.Pattern;
 
 import org.ahocorasick.trie.Emit;
 import org.ahocorasick.trie.Trie;
@@ -11,6 +12,8 @@ import jakarta.inject.Singleton;
 @Singleton
 class FeedCleaner {
 
+	private static final Pattern DOCTYPE_PATTERN = Pattern.compile("<!DOCTYPE[^>]*>", Pattern.CASE_INSENSITIVE);
+
 	public String trimInvalidXmlCharacters(String xml) {
 		if (StringUtils.isBlank(xml)) {
 			return null;
@@ -60,4 +63,8 @@ class FeedCleaner {
 		return sb.toString();
 	}
 
+	public String removeDoctypeDeclarations(String xml) {
+		return DOCTYPE_PATTERN.matcher(xml).replaceAll("");
+	}
+
 }

commafeed-server/src/main/java/com/commafeed/backend/feed/parser/FeedParser.java

@@ -64,6 +64,7 @@ public class FeedParser {
 				throw new FeedException("Input string is null for url " + feedUrl);
 			}
 			xmlString = feedCleaner.replaceHtmlEntitiesWithNumericEntities(xmlString);
+			xmlString = feedCleaner.removeDoctypeDeclarations(xmlString);
 
 			InputSource source = new InputSource(new StringReader(xmlString));
 			SyndFeed feed = new SyndFeedInput().build(source);

commafeed-server/src/main/resources/application.properties

@@ -50,6 +50,7 @@ quarkus.native.add-all-charsets=true
 %test.commafeed.users.allow-registrations=true
 %test.commafeed.password-recovery-enabled=true
 %test.commafeed.http-client.cache.enabled=false
+%test.commafeed.database.cleanup.entries-max-age=0
 %test.commafeed.feed-refresh.force-refresh-cooldown-duration=1m
 
 

commafeed-server/src/test/java/com/commafeed/backend/HttpGetterTest.java

@@ -94,7 +94,7 @@ class HttpGetterTest {
 						.withContentType(MediaType.APPLICATION_ATOM_XML)
 						.withHeader(HttpHeaders.LAST_MODIFIED, "123456")
 						.withHeader(HttpHeaders.ETAG, "78910")
-						.withHeader(HttpHeaders.CACHE_CONTROL, "max-age=60"));
+						.withHeader(HttpHeaders.CACHE_CONTROL, "max-age=60, must-revalidate"));
 
 		HttpResult result = getter.get(this.feedUrl);
 		Assertions.assertArrayEquals(feedContent, result.getContent());
@@ -105,6 +105,18 @@ class HttpGetterTest {
 		Assertions.assertEquals(this.feedUrl, result.getUrlAfterRedirect());
 	}
 
+	@Test
+	void ignoreInvalidCacheControlValue() throws Exception {
+		this.mockServerClient.when(HttpRequest.request().withMethod("GET"))
+				.respond(HttpResponse.response()
+						.withBody(feedContent)
+						.withContentType(MediaType.APPLICATION_ATOM_XML)
+						.withHeader(HttpHeaders.CACHE_CONTROL, "max-age=60; must-revalidate"));
+
+		HttpResult result = getter.get(this.feedUrl);
+		Assertions.assertEquals(Duration.ZERO, result.getValidFor());
+	}
+
 	@ParameterizedTest
 	@ValueSource(
 			ints = { HttpStatus.SC_MOVED_PERMANENTLY, HttpStatus.SC_MOVED_TEMPORARILY, HttpStatus.SC_TEMPORARY_REDIRECT,

commafeed-server/src/test/java/com/commafeed/backend/feed/parser/FeedCleanerTest.java

@@ -13,4 +13,22 @@ class FeedCleanerTest {
 		Assertions.assertEquals("<source>T&#180;l&#180;phone &#8242;</source>", feedCleaner.replaceHtmlEntitiesWithNumericEntities(source));
 	}
 
+	@Test
+	void testRemoveDoctype() {
+		String source = "<!DOCTYPE html><html><head></head><body></body></html>";
+		Assertions.assertEquals("<html><head></head><body></body></html>", feedCleaner.removeDoctypeDeclarations(source));
+	}
+
+	@Test
+	void testRemoveMultilineDoctype() {
+		String source = """
+				<!DOCTYPE
+					html
+				>
+				<html><head></head><body></body></html>""";
+		Assertions.assertEquals("""
+
+				<html><head></head><body></body></html>""", feedCleaner.removeDoctypeDeclarations(source));
+	}
+
 }

pom.xml

@@ -5,7 +5,7 @@
 
 	<groupId>com.commafeed</groupId>
 	<artifactId>commafeed</artifactId>
-	<version>5.3.5</version>
+	<version>5.4.0</version>
 	<name>CommaFeed</name>
 	<packaging>pom</packaging>