release 5.0.0

Migrate to Quarkus (#1517)

.dockerignore

@@ -1,6 +1 @@
-# ignore everything
-*
-
-# allow only what we need
-!commafeed-server/target/commafeed.jar
-!commafeed-server/config.yml.example
+commafeed-client

.github/workflows/build.yml

@@ -1,121 +0,0 @@
-name: Java CI
-
-on: [ push ]
-
-jobs:
-  build:
-    runs-on: ubuntu-latest
-    strategy:
-      matrix:
-        java: [ "17", "21" ]
-
-    steps:
-      - name: Checkout
-        uses: actions/checkout@v4
-        with:
-          fetch-depth: 0
-
-      # Setup
-      - name: Set up QEMU
-        uses: docker/setup-qemu-action@v3
-
-      - name: Set up Docker Buildx
-        uses: docker/setup-buildx-action@v3
-
-      - name: Set up Java
-        uses: actions/setup-java@v4
-        with:
-          java-version: ${{ matrix.java }}
-          distribution: "temurin"
-          cache: "maven"
-
-      # Build & Test
-      - name: Build with Maven
-        run: mvn --batch-mode --no-transfer-progress install
-        env:
-          TEST_DATABASE: h2
-
-      - name: Run integration tests on PostgreSQL
-        run: mvn --batch-mode --no-transfer-progress failsafe:integration-test failsafe:verify
-        env:
-          TEST_DATABASE: postgresql
-
-      - name: Run integration tests on MySQL
-        run: mvn --batch-mode --no-transfer-progress failsafe:integration-test failsafe:verify
-        env:
-          TEST_DATABASE: mysql
-
-      - name: Run integration tests on MariaDB
-        run: mvn --batch-mode --no-transfer-progress failsafe:integration-test failsafe:verify
-        env:
-          TEST_DATABASE: mariadb
-
-      - name: Run integration tests with Redis cache enabled
-        run: mvn --batch-mode --no-transfer-progress failsafe:integration-test failsafe:verify
-        env:
-          TEST_DATABASE: h2
-          REDIS: true
-
-      # Upload artifacts
-      - name: Upload JAR
-        uses: actions/upload-artifact@v4
-        if: ${{ matrix.java == '17' }}
-        with:
-          name: commafeed.jar
-          path: commafeed-server/target/commafeed.jar
-
-      - name: Upload Playwright artifacts
-        if: failure()
-        uses: actions/upload-artifact@v4
-        with:
-          name: playwright-artifacts
-          path: |
-            **/target/playwright-artifacts/
-
-      # Docker
-      - name: Login to Container Registry
-        uses: docker/login-action@v3
-        if: ${{ matrix.java == '17' && (github.ref_type == 'tag' || github.ref_name == 'master') }}
-        with:
-          username: ${{ secrets.DOCKERHUB_USERNAME }}
-          password: ${{ secrets.DOCKERHUB_TOKEN }}
-
-      - name: Docker build and push tag
-        uses: docker/build-push-action@v6
-        if: ${{ matrix.java == '17' && github.ref_type == 'tag' }}
-        with:
-          context: .
-          push: true
-          platforms: linux/amd64,linux/arm64/v8
-          tags: |
-            athou/commafeed:latest
-            athou/commafeed:${{ github.ref_name }}
-
-      - name: Docker build and push master
-        uses: docker/build-push-action@v6
-        if: ${{ matrix.java == '17' && github.ref_name == 'master' }}
-        with:
-          context: .
-          push: true
-          platforms: linux/amd64,linux/arm64/v8
-          tags: athou/commafeed:master
-
-      # Create GitHub release after Docker image has been published
-      - name: Extract Changelog Entry
-        uses: mindsers/changelog-reader-action@v2
-        if: ${{ matrix.java == '17' && github.ref_type == 'tag' }}
-        id: changelog_reader
-        with:
-          version: ${{ github.ref_name }}
-
-      - name: Create GitHub release
-        uses: softprops/action-gh-release@v2
-        if: ${{ matrix.java == '17' && github.ref_type == 'tag' }}
-        with:
-          name: CommaFeed ${{ github.ref_name }}
-          body: ${{ steps.changelog_reader.outputs.changes }}
-          draft: false
-          prerelease: false
-          files: |
-            commafeed-server/target/commafeed.jar
-            commafeed-server/config.yml.example

.github/workflows/ci.yml

@@ -0,0 +1,183 @@
+name: ci
+
+on: [ push ]
+
+env:
+  JAVA_VERSION: 21
+  DOCKER_BUILD_SUMMARY: false
+
+jobs:
+  build-linux:
+    runs-on: ubuntu-latest
+    strategy:
+      matrix:
+        database: [ "h2", "postgresql", "mysql", "mariadb" ]
+
+    steps:
+      # Checkout
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      # Setup
+      - name: Set up QEMU
+        uses: docker/setup-qemu-action@v3
+
+      - 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"
+
+      # 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
+        with:
+          name: commafeed-${{ matrix.database }}-jvm
+          path: commafeed-server/target/commafeed-*.zip
+
+      - 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
+      - name: Login to Container Registry
+        uses: docker/login-action@v3
+        if: ${{ github.ref_type == 'tag' || github.ref_name == 'master' }}
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+
+      ## tags
+      - name: Docker build and push tag - native
+        uses: docker/build-push-action@v6
+        if: ${{ github.ref_type == 'tag' }}
+        with:
+          context: .
+          file: commafeed-server/src/main/docker/Dockerfile.native
+          push: true
+          platforms: linux/amd64
+          tags: |
+            athou/commafeed:latest-${{ matrix.database }}
+            athou/commafeed:${{ github.ref_name }}-${{ matrix.database }}
+
+      - name: Docker build and push tag - jvm
+        uses: docker/build-push-action@v6
+        if: ${{ github.ref_type == 'tag' }}
+        with:
+          context: .
+          file: commafeed-server/src/main/docker/Dockerfile.jvm
+          push: true
+          platforms: linux/amd64,linux/arm64/v8
+          tags: |
+            athou/commafeed:latest-${{ matrix.database }}-jvm
+            athou/commafeed:${{ github.ref_name }}-${{ matrix.database }}-jvm
+
+      ## master
+      - name: Docker build and push master - native
+        uses: docker/build-push-action@v6
+        if: ${{ github.ref_name == 'master' }}
+        with:
+          context: .
+          file: commafeed-server/src/main/docker/Dockerfile.native
+          push: true
+          platforms: linux/amd64
+          tags: athou/commafeed:master-${{ matrix.database }}
+
+      - name: Docker build and push master - jvm
+        uses: docker/build-push-action@v6
+        if: ${{ github.ref_name == 'master' }}
+        with:
+          context: .
+          file: commafeed-server/src/main/docker/Dockerfile.jvm
+          push: true
+          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
+    if: github.ref_type == 'tag'
+
+    steps:
+      - name: Checkout
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Download artifacts
+        uses: actions/download-artifact@v4
+        with:
+          pattern: commafeed-*
+          path: ./artifacts
+          merge-multiple: true
+
+      - name: Extract Changelog Entry
+        uses: mindsers/changelog-reader-action@v2
+        id: changelog_reader
+        with:
+          version: ${{ github.ref_name }}
+
+      - name: Create GitHub release
+        uses: ncipollo/release-action@v1
+        with:
+          name: CommaFeed ${{ github.ref_name }}
+          body: ${{ steps.changelog_reader.outputs.changes }}
+          artifacts: ./artifacts/*
+
+      - name: Update Docker Hub Description
+        uses: peter-evans/dockerhub-description@v4
+        with:
+          username: ${{ secrets.DOCKERHUB_USERNAME }}
+          password: ${{ secrets.DOCKERHUB_TOKEN }}
+          repository: athou/commafeed
+          short-description: ${{ github.event.repository.description }}
+          readme-filepath: commafeed-server/src/main/docker/README.md

.mvn/wrapper/maven-wrapper.properties

@@ -15,4 +15,4 @@
 # specific language governing permissions and limitations
 # under the License.
 distributionType=only-script
-distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.8/apache-maven-3.9.8-bin.zip
+distributionUrl=https://repo.maven.apache.org/maven2/org/apache/maven/apache-maven/3.9.9/apache-maven-3.9.9-bin.zip

CHANGELOG.md

@@ -1,5 +1,38 @@
 # Changelog
 
+## [5.0.0]
+
+CommaFeed is now powered by Quarkus instead of Dropwizard. Read the rationale behind this change in
+the [announcement](https://github.com/Athou/commafeed/discussions/1517).
+The gist of it is that CommaFeed can now be compiled to a native binary, resulting in blazing fast startup times (around
+0.3s) and very low memory footprint (< 50M).
+
+- CommaFeed now has a different package for each supported database.
+    - If you are deploying CommaFeed with a precompiled package, please
+      read [this section of the README](https://github.com/Athou/commafeed/tree/master?tab=readme-ov-file#download-a-precompiled-package).
+    - If you are building CommaFeed from sources, please
+      read [this section of the README](https://github.com/Athou/commafeed/tree/master?tab=readme-ov-file#build-from-sources).
+    - If you are using the Docker image, please read the instructions on
+      the [Docker Hub page](https://hub.docker.com/r/athou/commafeed).
+- Due to the switch to Quarkus, the way CommaFeed is configured is very different (the `config.yml` file is gone).
+  Please
+  read [this section of the README](https://github.com/Athou/commafeed/tree/master?tab=readme-ov-file#configuration).
+  Note that a lot of configuration elements have been removed or renamed and are now nested/grouped by feature.
+- Added a setting to prevent parsing large feeds to avoid out of memory errors. The default is 5MB.
+- Use a different icon for filtering unread entries and marking an entry as read (#1506)
+- Added various HTML attributes to ease custom JS/CSS customization (#1507)
+- The Redis cache has been removed. There have been multiple enhancements to the feed refresh engine and it is no longer
+  needed, even for instances with a large number of feeds.
+- The H2 migration tool that automatically upgrades H2 databases from format 2 to 3 has been removed. If you're using
+  the H2 embedded database, please upgrade to at least version 4.3.0 before upgrading to CommaFeed 5.0.0.
+
+## [4.6.0]
+
+- switched from Temurin to OpenJ9 as the JVM used in the Docker image, resulting in memory usage reduction by up to 50%
+- fix an issue that could cause old entries to reappear if they were updated by their author (#1486)
+- show all entries regardless of their read status when searching with keywords, even if the ui is configured to show
+  unread entries only
+
 ## [4.5.0]
 
 - significantly reduce the time needed to retrieve entries or mark them as read, especially when there are a lot of

Dockerfile

@@ -1,12 +0,0 @@
-FROM eclipse-temurin:21.0.3_9-jre
-
-EXPOSE 8082
-
-RUN mkdir -p /commafeed/data
-VOLUME /commafeed/data
-
-COPY commafeed-server/config.yml.example config.yml
-COPY commafeed-server/target/commafeed.jar .
-
-ENV JAVA_TOOL_OPTIONS -Djava.net.preferIPv4Stack=true -Xms20m -XX:+UseG1GC -XX:-ShrinkHeapInSteps -XX:G1PeriodicGCInterval=10000 -XX:-G1PeriodicGCInvokesConcurrent -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10
-CMD ["java", "-jar", "commafeed.jar", "server", "config.yml"]

README.md

@@ -1,6 +1,6 @@
 # CommaFeed
 
-Google Reader inspired self-hosted RSS reader, based on Dropwizard and React/TypeScript.
+Google Reader inspired self-hosted RSS reader, based on Quarkus and React/TypeScript.
 
 ![preview](https://user-images.githubusercontent.com/1256795/184886828-1973f148-58a9-4c6d-9587-ee5e5d3cc2cb.png)
 
@@ -8,14 +8,22 @@ Google Reader inspired self-hosted RSS reader, based on Dropwizard and React/Typ
 
 - 4 different layouts
 - Light/Dark theme
-- Fully responsive
+- Fully responsive, works great on both mobile and desktop
 - Keyboard shortcuts for almost everything
 - Support for right-to-left feeds
 - Translated in 25+ languages
 - Supports thousands of users and millions of feeds
 - OPML import/export
-- REST API and a Fever-compatible API for native mobile apps
+- REST API
+- Fever-compatible API for native mobile apps
+- Can automatically mark articles as read based on user-defined rules
 - [Browser extension](https://github.com/Athou/commafeed-browser-extension)
+- Compiles to native code for blazing fast startup and low memory usage
+- Supports 4 databases
+    - H2 (embedded database)
+    - PostgreSQL
+    - MySQL
+    - MariaDB
 
 ## Deployment
 
@@ -33,32 +41,79 @@ PikaPods shares 20% of the revenue back to CommaFeed.
 
 [![PikaPods](https://www.pikapods.com/static/run-button.svg)](https://www.pikapods.com/pods?run=commafeed)
 
-### Download precompiled package
+### Download a precompiled package
 
-    mkdir commafeed && cd commafeed
-    wget https://github.com/Athou/commafeed/releases/latest/download/commafeed.jar
-    wget https://github.com/Athou/commafeed/releases/latest/download/config.yml.example -O config.yml
-    java -Djava.net.preferIPv4Stack=true -jar commafeed.jar server config.yml
+Go to the [release page](https://github.com/Athou/commafeed/releases) and download the latest version for your operating
+system and database of choice.
 
-The server will listen on http://localhost:8082. The default
-user is `admin` and the default password is `admin`.
+There are two types of packages:
+
+- The `linux-x86_64` and `windows-x86_64` packages are compiled natively and contain an executable that can be run
+  directly.
+- The `jvm` package is a zip file containing all `.jar` files required to run the application. This package works on all
+  platforms and is started with `java -jar quarkus-run.jar`.
+
+If available for your operating system, the native package is recommended because it has a faster startup time and lower
+memory usage.
 
 ### Build from sources
 
-    git clone https://github.com/Athou/commafeed.git
-    cd commafeed
-    ./mvnw clean package
-    cp commafeed-server/config.yml.example config.yml
-    java -Djava.net.preferIPv4Stack=true -jar commafeed-server/target/commafeed.jar server config.yml
+    ./mvnw clean package [-P<database>] [-Pnative] [-DskipTests]
 
-The server will listen on http://localhost:8082. The default
-user is `admin` and the default password is `admin`.
+- `<database>` can be one of `h2`, `postgresql`, `mysql` or `mariadb`. The default is `h2`.
+- `-Pnative` compiles the application to native code. This requires GraalVM to be installed (`GRAALVM_HOME` environment
+  variable pointing to a GraalVM installation).
+- `-DskipTests` to speed up the build process by skipping tests.
 
-### Memory management
+When the build is complete:
+
+- a zip containing all jars required to run the application is located at
+  `commafeed-server/target/commafeed-<version>-<database>-jvm.zip`. Extract it and run the application with
+  `java -jar quarkus-run.jar`
+- if you used the native profile, the executable is located at
+  `commafeed-server/target/commafeed-<version>-<database>-<platform>-<arch>-runner[.exe]`
+
+## Configuration
+
+CommaFeed doesn't require any configuration to run with its embedded database (H2). The database file will be stored in
+the `data` directory of the current directory.
+
+To use a different database, you will need to configure the following properties:
+
+- `quarkus.datasource.jdbc-url`
+    - e.g. for H2: `jdbc:h2:./data/db;DEFRAG_ALWAYS=TRUE`
+    - e.g. for PostgreSQL: `jdbc:postgresql://localhost:5432/commafeed`
+    - e.g. for MySQL:
+      `jdbc:mysql://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true&timezone=UTC`
+    - e.g. for MariaDB:
+      `jdbc:mariadb://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true&timezone=UTC`
+- `quarkus.datasource.username`
+- `quarkus.datasource.password`
+
+There are multiple ways to configure CommaFeed:
+
+- a [properties](https://en.wikipedia.org/wiki/.properties) file in `config/application.properties` (keys in kebab-case)
+- Command line arguments prefixed with `-D` (keys in kebab-case)
+- Environment variables (keys in UPPER_CASE)
+- an .env file in the working directory (keys in UPPER_CASE)
+
+The properties file is recommended because CommaFeed will be able to warn about invalid properties and typos.
+
+When logging in, credentials are stored in an encrypted cookie. The encryption key is randomly generated at startup,
+meaning that you will have to log back in after each restart of the application. To prevent this, you can set the
+`quarkus.http.auth.session.encryption-key` property to a fixed value (min. 16 characters).
+
+All [CommaFeed settings](commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java)
+are optional and have sensible default values.
+
+When started, the server will listen on http://localhost:8082.
+The default user is `admin` and the default password is `admin`.
+
+### Memory management (`jvm` package only)
 
 The Java Virtual Machine (JVM) is rather greedy by default and will not release unused memory to the
 operating system. This is because acquiring memory from the operating system is a relatively expensive operation.
-However, this can be problematic on systems with limited memory.
+This can be problematic on systems with limited memory.
 
 #### Hard limit
 
@@ -67,16 +122,25 @@ For example, to limit the JVM to 256MB of memory, use `-Xmx256m`.
 
 #### Dynamic sizing
 
-The JVM can be configured to release unused memory to the operating system with the following parameters:
+In addition to the previous setting, the JVM can be configured to release unused memory to the operating system with the
+following parameters:
 
-    -Xms20m -XX:+UseG1GC -XX:-ShrinkHeapInSteps -XX:G1PeriodicGCInterval=10000 -XX:-G1PeriodicGCInvokesConcurrent -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10
+    -Xms20m -XX:+UseG1GC -XX:+UseStringDeduplication -XX:-ShrinkHeapInSteps -XX:G1PeriodicGCInterval=10000 -XX:-G1PeriodicGCInvokesConcurrent -XX:MinHeapFreeRatio=5 -XX:MaxHeapFreeRatio=10
 
-This is how the Docker image is configured.
 See [here](https://docs.oracle.com/en/java/javase/17/gctuning/garbage-first-g1-garbage-collector1.html)
 and [here](https://docs.oracle.com/en/java/javase/17/gctuning/factors-affecting-garbage-collection-performance.html) for
 more
 information.
 
+#### OpenJ9
+
+The [OpenJ9](https://eclipse.dev/openj9/) JVM is a more memory-efficient alternative to the HotSpot JVM, at the cost of
+slightly slower throughput.
+
+IBM provides precompiled binaries for OpenJ9
+named [Semeru](https://developer.ibm.com/languages/java/semeru-runtimes/downloads/).
+This is the JVM used in the [Docker image](https://github.com/Athou/commafeed/blob/master/Dockerfile).
+
 ## Translation
 
 Files for internationalization are
@@ -99,7 +163,7 @@ two-letters [ISO-639-1 language code](http://en.wikipedia.org/wiki/List_of_ISO_6
 
 - Open `commafeed-server` in your preferred Java IDE.
     - CommaFeed uses Lombok, you need the Lombok plugin for your IDE.
-- Start `CommaFeedApplication.java` in debug mode with `server config.dev.yml` as arguments
+- run `./mvnw quarkus:dev`
 
 ### Frontend
 

commafeed-client/.linguirc

@@ -1,52 +0,0 @@
-{
-    "locales": [
-        "ar",
-        "ca",
-        "cs",
-        "cy",
-        "da",
-        "de",
-        "en",
-        "es",
-        "fa",
-        "fi",
-        "fr",
-        "gl",
-        "hu",
-        "id",
-        "it",
-        "ja",
-        "ko",
-        "ms",
-        "nb",
-        "nl",
-        "nn",
-        "pl",
-        "pt",
-        "ru",
-        "sk",
-        "sv",
-        "tr",
-        "zh"
-    ],
-    "catalogs": [
-        {
-            "path": "src/locales/{locale}/messages",
-            "include": [
-                "src"
-            ],
-            "exclude": [
-                "src/locales/**"
-            ]
-        }
-    ],
-    "format": "po",
-    "formatOptions": {
-        "origins": true,
-        "lineNumbers": false
-    },
-    "sourceLocale": "en",
-    "fallbackLocales": {
-        "default": "en"
-    }
-}

commafeed-client/lingui.config.ts

@@ -0,0 +1,52 @@
+import type { LinguiConfig } from "@lingui/conf"
+
+const config: LinguiConfig = {
+    locales: [
+        "ar",
+        "ca",
+        "cs",
+        "cy",
+        "da",
+        "de",
+        "en",
+        "es",
+        "fa",
+        "fi",
+        "fr",
+        "gl",
+        "hu",
+        "id",
+        "it",
+        "ja",
+        "ko",
+        "ms",
+        "nb",
+        "nl",
+        "nn",
+        "pl",
+        "pt",
+        "ru",
+        "sk",
+        "sv",
+        "tr",
+        "zh",
+    ],
+    catalogs: [
+        {
+            path: "src/locales/{locale}/messages",
+            include: ["src"],
+            exclude: ["src/locales/**"],
+        },
+    ],
+    format: "po",
+    formatOptions: {
+        origins: true,
+        lineNumbers: false,
+    },
+    sourceLocale: "en",
+    fallbackLocales: {
+        default: "en",
+    },
+}
+
+export default config

commafeed-client/package.json

@@ -15,21 +15,21 @@
         "i18n:extract": "lingui extract --clean"
     },
     "dependencies": {
-        "@emotion/react": "^11.11.4",
-        "@fontsource/open-sans": "^5.0.28",
-        "@lingui/core": "^4.11.2",
-        "@lingui/macro": "^4.11.2",
-        "@lingui/react": "^4.11.2",
-        "@mantine/core": "^7.11.1",
-        "@mantine/form": "^7.11.1",
-        "@mantine/hooks": "^7.11.1",
-        "@mantine/modals": "^7.11.1",
-        "@mantine/notifications": "^7.11.1",
-        "@mantine/spotlight": "^7.11.1",
+        "@emotion/react": "^11.13.0",
+        "@fontsource/open-sans": "^5.0.29",
+        "@lingui/core": "^4.11.3",
+        "@lingui/macro": "^4.11.3",
+        "@lingui/react": "^4.11.3",
+        "@mantine/core": "^7.12.1",
+        "@mantine/form": "^7.12.1",
+        "@mantine/hooks": "^7.12.1",
+        "@mantine/modals": "^7.12.1",
+        "@mantine/notifications": "^7.12.1",
+        "@mantine/spotlight": "^7.12.1",
         "@monaco-editor/react": "^4.6.0",
-        "@reduxjs/toolkit": "^2.2.6",
-        "axios": "^1.7.2",
-        "dayjs": "^1.11.11",
+        "@reduxjs/toolkit": "^2.2.7",
+        "axios": "^1.7.4",
+        "dayjs": "^1.11.12",
         "escape-string-regexp": "^5.0.0",
         "interweave": "^13.1.0",
         "monaco-editor": "^0.50.0",
@@ -45,20 +45,20 @@
         "react-icons": "^5.2.1",
         "react-infinite-scroller": "^1.2.6",
         "react-redux": "^9.1.2",
-        "react-router-dom": "^6.24.1",
+        "react-router-dom": "^6.26.1",
         "react-swipeable": "^7.0.1",
         "redoc": "^2.1.5",
         "throttle-debounce": "^5.0.2",
         "tinycon": "^0.6.8",
-        "tss-react": "^4.9.10",
+        "tss-react": "^4.9.12",
         "use-local-storage": "^3.0.0",
         "vite-plugin-biome": "^1.0.12",
         "websocket-heartbeat-js": "^1.1.3"
     },
     "devDependencies": {
         "@biomejs/biome": "^1.8.3",
-        "@lingui/cli": "^4.11.2",
-        "@lingui/vite-plugin": "^4.11.2",
+        "@lingui/cli": "^4.11.3",
+        "@lingui/vite-plugin": "^4.11.3",
         "@types/mousetrap": "^1.6.15",
         "@types/react": "^18.3.3",
         "@types/react-dom": "^18.3.0",
@@ -70,10 +70,10 @@
         "@vitejs/plugin-react": "^4.3.1",
         "babel-plugin-macros": "^3.1.0",
         "rollup-plugin-visualizer": "^5.12.0",
-        "typescript": "^5.5.3",
-        "vite": "^5.3.3",
-        "vite-tsconfig-paths": "^4.3.2",
-        "vitest": "^1.6.0",
-        "vitest-mock-extended": "^1.3.1"
+        "typescript": "^5.5.4",
+        "vite": "^5.4.1",
+        "vite-tsconfig-paths": "^5.0.1",
+        "vitest": "^2.0.5",
+        "vitest-mock-extended": "^2.0.0"
     }
 }

commafeed-client/pom.xml

@@ -6,16 +6,16 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>4.5.0</version>
+		<version>5.0.0</version>
 	</parent>
 	<artifactId>commafeed-client</artifactId>
 	<name>CommaFeed Client</name>
 
 	<properties>
 		<!-- renovate: datasource=node-version depName=node -->
-		<node.version>v20.15.0</node.version>
+		<node.version>v20.16.0</node.version>
 		<!-- renovate: datasource=npm depName=npm -->
-		<npm.version>10.8.1</npm.version>
+		<npm.version>10.8.2</npm.version>
 	</properties>
 
 	<build>
@@ -80,7 +80,7 @@
 							<goal>copy-resources</goal>
 						</goals>
 						<configuration>
-							<outputDirectory>${project.build.directory}/classes/assets</outputDirectory>
+							<outputDirectory>${project.build.directory}/classes/META-INF/resources</outputDirectory>
 							<resources>
 								<resource>
 									<directory>dist</directory>

commafeed-client/src/app/client.ts

@@ -81,7 +81,17 @@ export const client = {
         },
     },
     user: {
-        login: async (req: LoginRequest) => await axiosInstance.post("user/login", req),
+        login: async (req: LoginRequest) => {
+            const formData = new URLSearchParams()
+            formData.append("j_username", req.name)
+            formData.append("j_password", req.password)
+            return await axiosInstance.post("j_security_check", formData, {
+                baseURL: ".",
+                headers: {
+                    "Content-Type": "application/x-www-form-urlencoded",
+                },
+            })
+        },
         register: async (req: RegistrationRequest) => await axiosInstance.post("user/register", req),
         passwordReset: async (req: PasswordResetRequest) => await axiosInstance.post("user/passwordReset", req),
         getSettings: async () => await axiosInstance.get<Settings>("user/settings"),

commafeed-client/src/app/entries/entries.test.ts

@@ -5,7 +5,7 @@ import { type RootState, reducers } from "app/store"
 import type { Entries, Entry } from "app/types"
 import type { AxiosResponse } from "axios"
 import { beforeEach, describe, expect, it, vi } from "vitest"
-import { mockReset } from "vitest-mock-extended"
+import { any, mockReset } from "vitest-mock-extended"
 
 const mockClient = await vi.hoisted(async () => {
     const mockModule = await import("vitest-mock-extended")
@@ -19,7 +19,7 @@ describe("entries", () => {
     })
 
     it("loads entries", async () => {
-        mockClient.feed.getEntries.mockResolvedValue({
+        mockClient.feed.getEntries.calledWith(any()).mockResolvedValue({
             data: {
                 entries: [{ id: "3" } as Entry],
                 hasMore: false,
@@ -53,7 +53,7 @@ describe("entries", () => {
     })
 
     it("loads more entries", async () => {
-        mockClient.category.getEntries.mockResolvedValue({
+        mockClient.category.getEntries.calledWith(any()).mockResolvedValue({
             data: {
                 entries: [{ id: "4" } as Entry],
                 hasMore: false,

commafeed-client/src/app/entries/thunks.ts

@@ -40,7 +40,7 @@ export const loadMoreEntries = createAppAsyncThunk("entries/loadMore", async (_,
 const buildGetEntriesPaginatedRequest = (state: RootState, source: EntrySource, offset: number) => ({
     id: source.type === "tag" ? Constants.categories.all.id : source.id,
     order: state.user.settings?.readingOrder,
-    readType: state.user.settings?.readingMode,
+    readType: state.entries.search ? "all" : state.user.settings?.readingMode,
     offset,
     limit: 50,
     tag: source.type === "tag" ? source.id : undefined,

commafeed-client/src/components/ActionButton.tsx

@@ -1,3 +1,5 @@
+import type { MessageDescriptor } from "@lingui/core"
+import { useLingui } from "@lingui/react"
 import { ActionIcon, Button, type ButtonVariant, Tooltip, useMantineTheme } from "@mantine/core"
 import type { ActionIconVariant } from "@mantine/core/lib/components/ActionIcon/ActionIcon"
 import { Constants } from "app/constants"
@@ -7,7 +9,7 @@ import { type MouseEventHandler, type ReactNode, forwardRef } from "react"
 interface ActionButtonProps {
     className?: string
     icon?: ReactNode
-    label: ReactNode
+    label?: string | MessageDescriptor
     onClick?: MouseEventHandler
     variant?: ActionIconVariant & ButtonVariant
     hideLabelOnDesktop?: boolean
@@ -20,17 +22,35 @@ interface ActionButtonProps {
 export const ActionButton = forwardRef<HTMLButtonElement, ActionButtonProps>((props: ActionButtonProps, ref) => {
     const { mobile } = useActionButton()
     const theme = useMantineTheme()
+    const { _ } = useLingui()
+
+    const label = typeof props.label === "string" ? props.label : props.label && _(props.label)
     const variant = props.variant ?? "subtle"
     const iconOnly = (mobile && !props.showLabelOnMobile) || (!mobile && props.hideLabelOnDesktop)
     return iconOnly ? (
-        <Tooltip label={props.label} openDelay={Constants.tooltip.delay}>
-            <ActionIcon ref={ref} color={theme.primaryColor} variant={variant} className={props.className} onClick={props.onClick}>
+        <Tooltip label={label} openDelay={Constants.tooltip.delay}>
+            <ActionIcon
+                ref={ref}
+                color={theme.primaryColor}
+                variant={variant}
+                className={props.className}
+                onClick={props.onClick}
+                aria-label={label}
+            >
                 {props.icon}
             </ActionIcon>
         </Tooltip>
     ) : (
-        <Button ref={ref} variant={variant} size="xs" className={props.className} leftSection={props.icon} onClick={props.onClick}>
-            {props.label}
+        <Button
+            ref={ref}
+            variant={variant}
+            size="xs"
+            className={props.className}
+            leftSection={props.icon}
+            onClick={props.onClick}
+            aria-label={label}
+        >
+            {label}
         </Button>
     )
 })

commafeed-client/src/components/KeyboardShortcutsHelp.tsx

@@ -150,9 +150,7 @@ export function KeyboardShortcutsHelp() {
                             <Trans>Navigate to a subscription by entering its name</Trans>
                         </Table.Td>
                         <Table.Td>
-                            <Kbd>
-                                <Trans>{isMacOS ? "Cmd" : "Ctrl"}</Trans>
-                            </Kbd>
+                            <Kbd>{isMacOS ? <Trans>Cmd</Trans> : <Trans>Ctrl</Trans>}</Kbd>
                             <span> + </span>
                             <Kbd>K</Kbd>
                             <span>, </span>

commafeed-client/src/components/content/FeedEntries.tsx

@@ -305,11 +305,12 @@ export function FeedEntries() {
             loader={<Box key={0}>{loading && <Loader />}</Box>}
         >
             {entries.map(entry => (
-                <div
+                <article
                     key={entry.id}
                     ref={el => {
                         if (el) el.id = Constants.dom.entryId(entry)
                     }}
+                    data-id={entry.id}
                 >
                     <FeedEntry
                         entry={entry}
@@ -322,7 +323,7 @@ export function FeedEntries() {
                         onBodyClick={() => bodyClicked(entry)}
                         onSwipedLeft={async () => await swipedLeft(entry)}
                     />
-                </div>
+                </article>
             ))}
         </InfiniteScroll>
     )

commafeed-client/src/components/content/FeedEntryContextMenu.tsx

@@ -9,7 +9,7 @@ import { truncate } from "app/utils"
 import { useBrowserExtension } from "hooks/useBrowserExtension"
 import { useColorScheme } from "hooks/useColorScheme"
 import { Item, Menu, Separator } from "react-contexify"
-import { TbArrowBarToDown, TbExternalLink, TbEyeCheck, TbEyeOff, TbRss, TbStar, TbStarOff } from "react-icons/tb"
+import { TbArrowBarToDown, TbExternalLink, TbMail, TbMailOpened, TbRss, TbStar, TbStarOff } from "react-icons/tb"
 import { tss } from "tss"
 
 interface FeedEntryContextMenuProps {
@@ -70,7 +70,7 @@ export function FeedEntryContextMenu(props: FeedEntryContextMenuProps) {
             {props.entry.markable && (
                 <Item onClick={async () => await dispatch(markEntry({ entry: props.entry, read: !props.entry.read }))}>
                     <Group>
-                        {props.entry.read ? <TbEyeOff size={iconSize} /> : <TbEyeCheck size={iconSize} />}
+                        {props.entry.read ? <TbMail size={iconSize} /> : <TbMailOpened size={iconSize} />}
                         {props.entry.read ? <Trans>Keep unread</Trans> : <Trans>Mark as read</Trans>}
                     </Group>
                 </Item>

commafeed-client/src/components/content/FeedEntryFooter.tsx

@@ -1,4 +1,5 @@
-import { Trans, t } from "@lingui/macro"
+import { msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
 import { Group, Indicator, Popover, TagsInput } from "@mantine/core"
 import { markEntriesUpToEntry, markEntry, starEntry, tagEntry } from "app/entries/thunks"
 import { useAppDispatch, useAppSelector } from "app/store"
@@ -6,7 +7,7 @@ import type { Entry } from "app/types"
 import { ActionButton } from "components/ActionButton"
 import { useActionButton } from "hooks/useActionButton"
 import { useMobile } from "hooks/useMobile"
-import { TbArrowBarToDown, TbExternalLink, TbEyeCheck, TbEyeOff, TbShare, TbStar, TbStarOff, TbTag } from "react-icons/tb"
+import { TbArrowBarToDown, TbExternalLink, TbMail, TbMailOpened, TbShare, TbStar, TbStarOff, TbTag } from "react-icons/tb"
 import { ShareButtons } from "./ShareButtons"
 
 interface FeedEntryFooterProps {
@@ -18,6 +19,7 @@ export function FeedEntryFooter(props: FeedEntryFooterProps) {
     const mobile = useMobile()
     const { spacing } = useActionButton()
     const dispatch = useAppDispatch()
+    const { _ } = useLingui()
 
     const readStatusButtonClicked = async () =>
         await dispatch(
@@ -39,14 +41,14 @@ export function FeedEntryFooter(props: FeedEntryFooterProps) {
             <Group gap={spacing}>
                 {props.entry.markable && (
                     <ActionButton
-                        icon={props.entry.read ? <TbEyeOff size={18} /> : <TbEyeCheck size={18} />}
-                        label={props.entry.read ? <Trans>Keep unread</Trans> : <Trans>Mark as read</Trans>}
+                        icon={props.entry.read ? <TbMail size={18} /> : <TbMailOpened size={18} />}
+                        label={props.entry.read ? msg`Keep unread` : msg`Mark as read`}
                         onClick={readStatusButtonClicked}
                     />
                 )}
                 <ActionButton
                     icon={props.entry.starred ? <TbStarOff size={18} /> : <TbStar size={18} />}
-                    label={props.entry.starred ? <Trans>Unstar</Trans> : <Trans>Star</Trans>}
+                    label={props.entry.starred ? msg`Unstar` : msg`Star`}
                     onClick={async () =>
                         await dispatch(
                             starEntry({
@@ -59,7 +61,7 @@ export function FeedEntryFooter(props: FeedEntryFooterProps) {
 
                 <Popover withArrow withinPortal shadow="md" closeOnClickOutside={!mobile}>
                     <Popover.Target>
-                        <ActionButton icon={<TbShare size={18} />} label={<Trans>Share</Trans>} />
+                        <ActionButton icon={<TbShare size={18} />} label={msg`Share`} />
                     </Popover.Target>
                     <Popover.Dropdown>
                         <ShareButtons url={props.entry.url} description={props.entry.title} />
@@ -70,12 +72,12 @@ export function FeedEntryFooter(props: FeedEntryFooterProps) {
                     <Popover withArrow shadow="md" closeOnClickOutside={!mobile}>
                         <Popover.Target>
                             <Indicator label={props.entry.tags.length} disabled={props.entry.tags.length === 0} inline size={16}>
-                                <ActionButton icon={<TbTag size={18} />} label={<Trans>Tags</Trans>} />
+                                <ActionButton icon={<TbTag size={18} />} label={msg`Tags`} />
                             </Indicator>
                         </Popover.Target>
                         <Popover.Dropdown>
                             <TagsInput
-                                placeholder={t`Tags`}
+                                placeholder={_(msg`Tags`)}
                                 data={tags}
                                 value={props.entry.tags}
                                 onChange={onTagsChange}
@@ -88,13 +90,13 @@ export function FeedEntryFooter(props: FeedEntryFooterProps) {
                 )}
 
                 <a href={props.entry.url} target="_blank" rel="noreferrer">
-                    <ActionButton icon={<TbExternalLink size={18} />} label={<Trans>Open link</Trans>} />
+                    <ActionButton icon={<TbExternalLink size={18} />} label={msg`Open link`} />
                 </a>
             </Group>
 
             <ActionButton
                 icon={<TbArrowBarToDown size={18} />}
-                label={<Trans>Mark as read up to here</Trans>}
+                label={msg`Mark as read up to here`}
                 onClick={async () => await dispatch(markEntriesUpToEntry(props.entry))}
             />
         </Group>

commafeed-client/src/components/content/add/AddCategory.tsx

@@ -1,4 +1,5 @@
-import { Trans, t } from "@lingui/macro"
+import { Trans, msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
 import { Box, Button, Group, Stack, TextInput } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"
@@ -13,6 +14,7 @@ import { CategorySelect } from "./CategorySelect"
 
 export function AddCategory() {
     const dispatch = useAppDispatch()
+    const { _ } = useLingui()
 
     const form = useForm<AddCategoryRequest>()
 
@@ -33,7 +35,7 @@ export function AddCategory() {
 
             <form onSubmit={form.onSubmit(addCategory.execute)}>
                 <Stack>
-                    <TextInput label={<Trans>Category</Trans>} placeholder={t`Category`} {...form.getInputProps("name")} required />
+                    <TextInput label={<Trans>Category</Trans>} placeholder={_(msg`Category`)} {...form.getInputProps("name")} required />
                     <CategorySelect label={<Trans>Parent</Trans>} {...form.getInputProps("parentId")} clearable />
                     <Group justify="center">
                         <Button variant="default" onClick={async () => await dispatch(redirectToSelectedSource())}>

commafeed-client/src/components/content/add/CategorySelect.tsx

@@ -1,4 +1,5 @@
-import { t } from "@lingui/macro"
+import { msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
 import { Select, type SelectProps } from "@mantine/core"
 import type { ComboboxItem } from "@mantine/core/lib/components/Combobox/Combobox.types"
 import { Constants } from "app/constants"
@@ -13,6 +14,8 @@ type CategorySelectProps = Partial<SelectProps> & {
 
 export function CategorySelect(props: CategorySelectProps) {
     const rootCategory = useAppSelector(state => state.tree.rootCategory)
+    const { _ } = useLingui()
+
     const categories = rootCategory && flattenCategoryTree(rootCategory)
     const categoriesById = categories?.reduce((map, c) => {
         map.set(c.id, c)
@@ -43,7 +46,7 @@ export function CategorySelect(props: CategorySelectProps) {
         .sort((c1, c2) => c1.label.localeCompare(c2.label))
     if (props.withAll) {
         selectData?.unshift({
-            label: t`All`,
+            label: _(msg`All`),
             value: Constants.categories.all.id,
         })
     }

commafeed-client/src/components/content/add/ImportOpml.tsx

@@ -1,4 +1,5 @@
-import { Trans, t } from "@lingui/macro"
+import { Trans, msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
 import { Box, Button, FileInput, Group, Stack } from "@mantine/core"
 import { isNotEmpty, useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"
@@ -11,10 +12,11 @@ import { TbFileImport } from "react-icons/tb"
 
 export function ImportOpml() {
     const dispatch = useAppDispatch()
+    const { _ } = useLingui()
 
     const form = useForm<{ file: File }>({
         validate: {
-            file: isNotEmpty(t`OPML file is required`),
+            file: isNotEmpty(_(msg`OPML file is required`)),
         },
     })
 
@@ -38,7 +40,7 @@ export function ImportOpml() {
                     <FileInput
                         label={<Trans>OPML file</Trans>}
                         leftSection={<TbFileImport />}
-                        placeholder={t`OPML file`}
+                        placeholder={_(msg`OPML file`)}
                         description={
                             <Trans>
                                 An opml file is an XML file containing feed URLs and categories. You can get an OPML file by exporting your

commafeed-client/src/components/header/Header.tsx

@@ -1,4 +1,5 @@
-import { Trans, t } from "@lingui/macro"
+import { msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
 import { Box, Center, CloseButton, Divider, Group, Indicator, Popover, TextInput } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { reloadEntries, search, selectNextEntry, selectPreviousEntry } from "app/entries/thunks"
@@ -57,10 +58,11 @@ export function Header() {
     const searchFromStore = useAppSelector(state => state.entries.search)
     const { isBrowserExtensionPopup, openSettingsPage, openAppInNewTab } = useBrowserExtension()
     const dispatch = useAppDispatch()
+    const { _ } = useLingui()
 
     const searchForm = useForm<{ search: string }>({
         validate: {
-            search: value => (value.length > 0 && value.length < 3 ? t`Search requires at least 3 characters` : null),
+            search: value => (value.length > 0 && value.length < 3 ? _(msg`Search requires at least 3 characters`) : null),
         },
     })
     const { setValues } = searchForm
@@ -77,7 +79,7 @@ export function Header() {
             <HeaderToolbar>
                 <ActionButton
                     icon={<TbArrowUp size={iconSize} />}
-                    label={<Trans>Previous</Trans>}
+                    label={msg`Previous`}
                     onClick={async () =>
                         await dispatch(
                             selectPreviousEntry({
@@ -90,7 +92,7 @@ export function Header() {
                 />
                 <ActionButton
                     icon={<TbArrowDown size={iconSize} />}
-                    label={<Trans>Next</Trans>}
+                    label={msg`Next`}
                     onClick={async () =>
                         await dispatch(
                             selectNextEntry({
@@ -106,7 +108,7 @@ export function Header() {
 
                 <ActionButton
                     icon={<TbRefresh size={iconSize} />}
-                    label={<Trans>Refresh</Trans>}
+                    label={msg`Refresh`}
                     onClick={async () => await dispatch(reloadEntries())}
                 />
                 <MarkAllAsReadButton iconSize={iconSize} />
@@ -115,25 +117,25 @@ export function Header() {
 
                 <ActionButton
                     icon={settings.readingMode === "all" ? <TbEye size={iconSize} /> : <TbEyeOff size={iconSize} />}
-                    label={settings.readingMode === "all" ? <Trans>All</Trans> : <Trans>Unread</Trans>}
+                    label={settings.readingMode === "all" ? msg`All` : msg`Unread`}
                     onClick={async () => await dispatch(changeReadingMode(settings.readingMode === "all" ? "unread" : "all"))}
                 />
                 <ActionButton
                     icon={settings.readingOrder === "asc" ? <TbSortAscending size={iconSize} /> : <TbSortDescending size={iconSize} />}
-                    label={settings.readingOrder === "asc" ? <Trans>Asc</Trans> : <Trans>Desc</Trans>}
+                    label={settings.readingOrder === "asc" ? msg`Asc` : msg`Desc`}
                     onClick={async () => await dispatch(changeReadingOrder(settings.readingOrder === "asc" ? "desc" : "asc"))}
                 />
 
                 <Popover>
                     <Popover.Target>
                         <Indicator disabled={!searchFromStore}>
-                            <ActionButton icon={<TbSearch size={iconSize} />} label={<Trans>Search</Trans>} />
+                            <ActionButton icon={<TbSearch size={iconSize} />} label={msg`Search`} />
                         </Indicator>
                     </Popover.Target>
                     <Popover.Dropdown>
                         <form onSubmit={searchForm.onSubmit(async values => await dispatch(search(values.search)))}>
                             <TextInput
-                                placeholder={t`Search`}
+                                placeholder={_(msg`Search`)}
                                 {...searchForm.getInputProps("search")}
                                 leftSection={<TbSearch size={iconSize} />}
                                 rightSection={<CloseButton onClick={async () => await (searchFromStore && dispatch(search("")))} />}
@@ -153,12 +155,12 @@ export function Header() {
 
                         <ActionButton
                             icon={<TbSettings size={iconSize} />}
-                            label={<Trans>Extension options</Trans>}
+                            label={msg`Extension options`}
                             onClick={() => openSettingsPage()}
                         />
                         <ActionButton
                             icon={<TbExternalLink size={iconSize} />}
-                            label={<Trans>Open CommaFeed</Trans>}
+                            label={msg`Open CommaFeed`}
                             onClick={() => openAppInNewTab()}
                         />
                     </>

commafeed-client/src/components/header/MarkAllAsReadButton.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { Trans, msg } from "@lingui/macro"
 
 import { Button, Code, Group, Modal, Slider, Stack, Text } from "@mantine/core"
 import { markAllEntries } from "app/entries/thunks"
@@ -91,7 +91,7 @@ export function MarkAllAsReadButton(props: { iconSize: number }) {
                     </Group>
                 </Stack>
             </Modal>
-            <ActionButton icon={<TbChecks size={props.iconSize} />} label={<Trans>Mark all as read</Trans>} onClick={buttonClicked} />
+            <ActionButton icon={<TbChecks size={props.iconSize} />} label={msg`Mark all as read`} onClick={buttonClicked} />
         </>
     )
 }

commafeed-client/src/components/settings/DisplaySettings.tsx

@@ -1,4 +1,5 @@
-import { Trans, t } from "@lingui/macro"
+import { Trans, msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
 import { Divider, Group, Radio, Select, SimpleGrid, Stack, Switch } from "@mantine/core"
 import type { ComboboxData } from "@mantine/core/lib/components/Combobox/Combobox.types"
 import { Constants } from "app/constants"
@@ -33,6 +34,7 @@ export function DisplaySettings() {
     const mobileFooter = useAppSelector(state => state.user.settings?.mobileFooter)
     const sharingSettings = useAppSelector(state => state.user.settings?.sharingSettings)
     const dispatch = useAppDispatch()
+    const { _ } = useLingui()
 
     const scrollModeOptions: Record<ScrollMode, ReactNode> = {
         always: <Trans>Always</Trans>,
@@ -43,19 +45,19 @@ export function DisplaySettings() {
     const displayModeData: ComboboxData = [
         {
             value: "always",
-            label: t`Always`,
+            label: _(msg`Always`),
         },
         {
             value: "on_desktop",
-            label: t`On desktop`,
+            label: _(msg`On desktop`),
         },
         {
             value: "on_mobile",
-            label: t`On mobile`,
+            label: _(msg`On mobile`),
         },
         {
             value: "never",
-            label: t`Never`,
+            label: _(msg`Never`),
         },
     ]
 

commafeed-client/src/components/settings/ProfileSettings.tsx

@@ -1,4 +1,5 @@
-import { Trans, t } from "@lingui/macro"
+import { Trans, msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
 import { Anchor, Box, Button, Checkbox, Divider, Group, Input, PasswordInput, Stack, Text, TextInput } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { openConfirmModal } from "@mantine/modals"
@@ -19,10 +20,11 @@ interface FormData extends ProfileModificationRequest {
 export function ProfileSettings() {
     const profile = useAppSelector(state => state.user.profile)
     const dispatch = useAppDispatch()
+    const { _ } = useLingui()
 
     const form = useForm<FormData>({
         validate: {
-            newPasswordConfirmation: (value, values) => (value !== values.newPassword ? t`Passwords do not match` : null),
+            newPasswordConfirmation: (value, values) => (value !== values.newPassword ? _(msg`Passwords do not match`) : null),
         },
     })
     const { setValues } = form

commafeed-client/src/components/sidebar/Tree.tsx

@@ -70,6 +70,7 @@ export function Tree() {
     const allCategoryNode = () => (
         <TreeNode
             id={Constants.categories.all.id}
+            type="category"
             name={<Trans>All</Trans>}
             icon={allIcon}
             unread={categoryUnreadCount(root)}
@@ -83,6 +84,7 @@ export function Tree() {
     const starredCategoryNode = () => (
         <TreeNode
             id={Constants.categories.starred.id}
+            type="category"
             name={<Trans>Starred</Trans>}
             icon={starredIcon}
             unread={0}
@@ -102,6 +104,7 @@ export function Tree() {
         return (
             <TreeNode
                 id={category.id}
+                type="category"
                 name={category.name}
                 icon={category.expanded ? expandedIcon : collapsedIcon}
                 unread={unreadCount}
@@ -122,6 +125,7 @@ export function Tree() {
         return (
             <TreeNode
                 id={String(feed.id)}
+                type="feed"
                 name={feed.name}
                 icon={feed.iconUrl}
                 unread={feed.unread}
@@ -137,6 +141,7 @@ export function Tree() {
     const tagNode = (tag: string) => (
         <TreeNode
             id={tag}
+            type="tag"
             name={tag}
             icon={tagIcon}
             unread={0}

commafeed-client/src/components/sidebar/TreeNode.tsx

@@ -1,4 +1,5 @@
 import { Box, Center } from "@mantine/core"
+import type { EntrySourceType } from "app/entries/slice"
 import { FeedFavicon } from "components/content/FeedFavicon"
 import type React from "react"
 import { tss } from "tss"
@@ -6,6 +7,7 @@ import { UnreadCount } from "./UnreadCount"
 
 interface TreeNodeProps {
     id: string
+    type: EntrySourceType
     name: React.ReactNode
     icon: React.ReactNode
     unread: number
@@ -63,7 +65,15 @@ export function TreeNode(props: TreeNodeProps) {
         hasUnread: props.unread > 0,
     })
     return (
-        <Box py={1} pl={props.level * 20} className={classes.node} onClick={(e: React.MouseEvent) => props.onClick(e, props.id)}>
+        <Box
+            py={1}
+            pl={props.level * 20}
+            className={classes.node}
+            onClick={(e: React.MouseEvent) => props.onClick(e, props.id)}
+            data-id={props.id}
+            data-type={props.type}
+            data-unread-count={props.unread}
+        >
             <Box mr={6} onClick={(e: React.MouseEvent) => props.onIconClick?.(e, props.id)}>
                 <Center>{typeof props.icon === "string" ? <FeedFavicon url={props.icon} /> : props.icon}</Center>
             </Box>

commafeed-client/src/components/sidebar/TreeSearch.tsx

@@ -1,6 +1,6 @@
-import { Trans, t } from "@lingui/macro"
-import { Box, Center, Kbd, TextInput } from "@mantine/core"
-import { useOs } from "@mantine/hooks"
+import { Trans, msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
+import { TextInput } from "@mantine/core"
 import { Spotlight, type SpotlightActionData, spotlight } from "@mantine/spotlight"
 import { redirectToFeed } from "app/redirect/thunks"
 import { useAppDispatch } from "app/store"
@@ -15,7 +15,8 @@ export interface TreeSearchProps {
 
 export function TreeSearch(props: TreeSearchProps) {
     const dispatch = useAppDispatch()
-    const isMacOS = useOs() === "macos"
+    const { _ } = useLingui()
+
     const actions: SpotlightActionData[] = props.feeds
         .map(f => ({
             id: `${f.id}`,
@@ -26,13 +27,6 @@ export function TreeSearch(props: TreeSearchProps) {
         .sort((f1, f2) => f1.label.localeCompare(f2.label))
 
     const searchIcon = <TbSearch size={18} />
-    const rightSection = (
-        <Center style={{ cursor: "pointer" }} onClick={() => spotlight.open()}>
-            <Kbd>{isMacOS ? "Cmd" : "Ctrl"}</Kbd>
-            <Box mx={5}>+</Box>
-            <Kbd>K</Kbd>
-        </Center>
-    )
 
     // additional keyboard shortcut used by commafeed v1
     useMousetrap("g u", () => spotlight.open())
@@ -40,10 +34,9 @@ export function TreeSearch(props: TreeSearchProps) {
     return (
         <>
             <TextInput
-                placeholder={t`Search`}
+                placeholder={_(msg`Search`)}
                 leftSection={searchIcon}
                 rightSectionWidth={100}
-                rightSection={rightSection}
                 styles={{
                     input: {
                         cursor: "pointer",
@@ -60,7 +53,7 @@ export function TreeSearch(props: TreeSearchProps) {
                 shortcut="mod+k"
                 searchProps={{
                     leftSection: searchIcon,
-                    placeholder: t`Search`,
+                    placeholder: _(msg`Search`),
                 }}
                 nothingFound={<Trans>Nothing found</Trans>}
             />

commafeed-client/src/components/sidebar/UnreadCount.tsx

@@ -18,7 +18,7 @@ export function UnreadCount(props: { unreadCount: number }) {
     const count = props.unreadCount >= 10000 ? "10k+" : props.unreadCount
     return (
         <Tooltip label={props.unreadCount} disabled={props.unreadCount === count} openDelay={Constants.tooltip.delay}>
-            <Badge className={classes.badge} variant="light">
+            <Badge className={classes.badge} variant="light" fullWidth>
                 {count}
             </Badge>
         </Tooltip>

commafeed-client/src/hooks/useAppLoading.ts

@@ -1,4 +1,5 @@
-import { t } from "@lingui/macro"
+import { msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
 import { useAppSelector } from "app/store"
 
 interface Step {
@@ -11,22 +12,23 @@ export const useAppLoading = () => {
     const settings = useAppSelector(state => state.user.settings)
     const rootCategory = useAppSelector(state => state.tree.rootCategory)
     const tags = useAppSelector(state => state.user.tags)
+    const { _ } = useLingui()
 
     const steps: Step[] = [
         {
-            label: t`Loading settings...`,
+            label: _(msg`Loading settings...`),
             done: !!settings,
         },
         {
-            label: t`Loading profile...`,
+            label: _(msg`Loading profile...`),
             done: !!profile,
         },
         {
-            label: t`Loading subscriptions...`,
+            label: _(msg`Loading subscriptions...`),
             done: !!rootCategory,
         },
         {
-            label: t`Loading tags...`,
+            label: _(msg`Loading tags...`),
             done: !!tags,
         },
     ]

commafeed-client/src/i18n.ts

@@ -10,7 +10,7 @@ interface Locale {
 }
 
 // add an object to the array to add a new locale
-// don't forget to also add it to the 'locales' array in .linguirc
+// don't forget to also add it to the 'locales' array in lingui.config.ts
 export const locales: Locale[] = [
     { key: "ar", label: "العربية", dayjsImportFn: async () => await import("dayjs/locale/ar") },
     { key: "ca", label: "Català", dayjsImportFn: async () => await import("dayjs/locale/ca") },

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

@@ -176,6 +176,10 @@ msgstr "تأكد من عمل الخلاصة"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "Comproveu que el canal funciona"
 msgid "Close menu"
 msgstr "Tanca el menu"
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr "Versió de l'extensió del navegador CommaFeed {browserExtensionVersion}."

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

@@ -176,6 +176,10 @@ msgstr "Zkontrolujte, zda zdroj funguje"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "Gwiriwch fod y porthiant yn gweithio"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "Tjek, at foderet virker"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "Überprüfe, ob der Feed funktioniert"
 msgid "Close menu"
 msgstr "Menü schließen"
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr "CommaFeed Browser Erweiterung Version {browserExtensionVersion}."

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

@@ -176,6 +176,10 @@ msgstr "Check that the feed is working"
 msgid "Close menu"
 msgstr "Close menu"
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr "Cmd"
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr "CommaFeed browser extension version {browserExtensionVersion}."

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

@@ -176,6 +176,10 @@ msgstr "Compruebe que el feed funciona"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "بررسی کنید که خوراک کار می کند"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "Tarkista, että syöttö toimii"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "Vérifie que le flux fonctionne"
 msgid "Close menu"
 msgstr "Fermer le menu"
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr "Extension CommaFeed pour navigateur version {browserExtensionVersion}."

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

@@ -176,6 +176,10 @@ msgstr "Comproba que a fonte funciona"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "Ellenőrizze, hogy a feed működik-e"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "Periksa apakah umpannya berfungsi"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "Verifica che il feed funzioni"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "フィードが動作していることを確認してください"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "피드가 작동하는지 확인"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "Semak sama ada suapan berfungsi"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "Sjekk at feeden fungerer"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "Controleer of de feed werkt"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "Sjekk at feeden fungerer"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "Sprawdź, czy kanał działa"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "Verifique se o feed está funcionando"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "Проверьте, работает ли лента."
 msgid "Close menu"
 msgstr "Закрыть меню"
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr "Версия расширения браузера CommaFeed {browserExtensionVersion}."

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

@@ -176,6 +176,10 @@ msgstr "Skontrolujte, či feed funguje"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "Kontrollera att matningen fungerar"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr ""

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

@@ -176,6 +176,10 @@ msgstr "Feed'in çalışıp çalışmadığını kontrol edin"
 msgid "Close menu"
 msgstr ""
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr "CommaFeed tarayıcı eklentisi sürüm {browserExtensionVersion}."

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

@@ -176,6 +176,10 @@ msgstr "检查信息流是否正常工作"
 msgid "Close menu"
 msgstr "关闭菜单"
 
+#: src/components/KeyboardShortcutsHelp.tsx
+msgid "Cmd"
+msgstr ""
+
 #: src/pages/app/AboutPage.tsx
 msgid "CommaFeed browser extension version {browserExtensionVersion}."
 msgstr "CommaFeed的浏览器扩展版本：{browserExtensionVersion}。"

commafeed-client/src/pages/WelcomePage.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { msg } from "@lingui/macro"
 import { Anchor, Box, Center, Container, Divider, Group, Image, Space, Title, useMantineColorScheme } from "@mantine/core"
 import { client } from "app/client"
 import { redirectToApiDocumentation, redirectToLogin, redirectToRegistration, redirectToRootCategory } from "app/redirect/thunks"
@@ -38,7 +38,7 @@ export function WelcomePage() {
             {serverInfos?.demoAccountEnabled && (
                 <Center>
                     <ActionButton
-                        label={<Trans>Try the demo!</Trans>}
+                        label={msg`Try the demo!`}
                         icon={<TbClock size={iconSize} />}
                         variant="outline"
                         onClick={async () => await login.execute({ name: "demo", password: "demo" })}
@@ -96,7 +96,7 @@ function Buttons() {
     return (
         <Group gap={14}>
             <ActionButton
-                label={<Trans>Log in</Trans>}
+                label={msg`Log in`}
                 icon={<TbKey size={iconSize} />}
                 variant="outline"
                 onClick={async () => await dispatch(redirectToLogin())}
@@ -104,7 +104,7 @@ function Buttons() {
             />
             {serverInfos?.allowRegistrations && (
                 <ActionButton
-                    label={<Trans>Sign up</Trans>}
+                    label={msg`Sign up`}
                     icon={<TbUserPlus size={iconSize} />}
                     variant="filled"
                     onClick={async () => await dispatch(redirectToRegistration())}
@@ -113,7 +113,7 @@ function Buttons() {
             )}
 
             <ActionButton
-                label={dark ? <Trans>Switch to light theme</Trans> : <Trans>Switch to dark theme</Trans>}
+                label={dark ? msg`Switch to light theme` : msg`Switch to dark theme`}
                 icon={colorScheme === "dark" ? <TbSun size={18} /> : <TbMoon size={iconSize} />}
                 onClick={() => toggleColorScheme()}
                 hideLabelOnDesktop
@@ -121,7 +121,7 @@ function Buttons() {
 
             {isBrowserExtensionPopup && (
                 <ActionButton
-                    label={<Trans>Extension options</Trans>}
+                    label={msg`Extension options`}
                     icon={<TbSettings size={iconSize} />}
                     onClick={() => openSettingsPage()}
                     hideLabelOnDesktop

commafeed-client/src/pages/admin/MetricsPage.tsx

@@ -1,74 +1,63 @@
-import { Accordion, Box, Tabs } from "@mantine/core"
+import { Accordion, Box } from "@mantine/core"
 import { client } from "app/client"
 import { Loader } from "components/Loader"
 import { Gauge } from "components/metrics/Gauge"
 import { Meter } from "components/metrics/Meter"
 import { MetricAccordionItem } from "components/metrics/MetricAccordionItem"
-import { Timer } from "components/metrics/Timer"
+import { useEffect } from "react"
 import { useAsync } from "react-async-hook"
-import { TbChartAreaLine, TbClock } from "react-icons/tb"
 
 const shownMeters: Record<string, string> = {
     "com.commafeed.backend.feed.FeedRefreshEngine.refill": "Feed queue refill rate",
     "com.commafeed.backend.feed.FeedRefreshWorker.feedFetched": "Feed fetching rate",
     "com.commafeed.backend.feed.FeedRefreshUpdater.feedUpdated": "Feed update rate",
-    "com.commafeed.backend.feed.FeedRefreshUpdater.entryCacheHit": "Entry cache hit rate",
-    "com.commafeed.backend.feed.FeedRefreshUpdater.entryCacheMiss": "Entry cache miss rate",
+    "com.commafeed.backend.feed.FeedRefreshUpdater.entryInserted": "Entries inserted",
     "com.commafeed.backend.service.db.DatabaseCleaningService.entriesDeleted": "Entries deleted",
 }
 
 const shownGauges: Record<string, string> = {
-    "com.commafeed.backend.feed.FeedRefreshEngine.queue.size": "Queue size",
-    "com.commafeed.backend.feed.FeedRefreshEngine.worker.active": "Feed Worker active",
-    "com.commafeed.backend.feed.FeedRefreshEngine.updater.active": "Feed Updater active",
+    "com.commafeed.backend.feed.FeedRefreshEngine.queue.size": "Feed Refresh Engine queue size",
+    "com.commafeed.backend.feed.FeedRefreshEngine.worker.active": "Feed Refresh Engine active HTTP workers",
+    "com.commafeed.backend.feed.FeedRefreshEngine.updater.active": "Feed Refresh Engine active database update workers",
+    "com.commafeed.backend.HttpGetter.pool.max": "HttpGetter max pool size",
+    "com.commafeed.backend.HttpGetter.pool.size": "HttpGetter current pool size",
+    "com.commafeed.backend.HttpGetter.pool.leased": "HttpGetter active connections",
+    "com.commafeed.backend.HttpGetter.pool.pending": "HttpGetter waiting for a connection",
     "com.commafeed.frontend.ws.WebSocketSessions.users": "WebSocket users",
     "com.commafeed.frontend.ws.WebSocketSessions.sessions": "WebSocket sessions",
 }
 
 export function MetricsPage() {
-    const query = useAsync(async () => await client.admin.getMetrics(), [])
+    const query = useAsync(async () => await client.admin.getMetrics(), [], {
+        // keep previous results available while a new request is pending
+        setLoading: state => ({ ...state, loading: true }),
+    })
+
+    useEffect(() => {
+        const interval = setInterval(() => query.execute(), 2000)
+        return () => clearInterval(interval)
+    }, [query.execute])
 
     if (!query.result) return <Loader />
-    const { meters, gauges, timers } = query.result.data
+    const { meters, gauges } = query.result.data
     return (
-        <Tabs defaultValue="stats">
-            <Tabs.List>
-                <Tabs.Tab value="stats" leftSection={<TbChartAreaLine size={14} />}>
-                    Stats
-                </Tabs.Tab>
-                <Tabs.Tab value="timers" leftSection={<TbClock size={14} />}>
-                    Timers
-                </Tabs.Tab>
-            </Tabs.List>
+        <>
+            <Accordion variant="contained" chevronPosition="left">
+                {Object.keys(shownMeters).map(m => (
+                    <MetricAccordionItem key={m} metricKey={m} name={shownMeters[m]} headerValue={meters[m].count}>
+                        <Meter meter={meters[m]} />
+                    </MetricAccordionItem>
+                ))}
+            </Accordion>
 
-            <Tabs.Panel value="stats" pt="xs">
-                <Accordion variant="contained" chevronPosition="left">
-                    {Object.keys(shownMeters).map(m => (
-                        <MetricAccordionItem key={m} metricKey={m} name={shownMeters[m]} headerValue={meters[m].count}>
-                            <Meter meter={meters[m]} />
-                        </MetricAccordionItem>
-                    ))}
-                </Accordion>
-
-                <Box pt="xs">
-                    {Object.keys(shownGauges).map(g => (
-                        <Box key={g}>
-                            <span>{shownGauges[g]}&nbsp;</span>
-                            <Gauge gauge={gauges[g]} />
-                        </Box>
-                    ))}
-                </Box>
-            </Tabs.Panel>
-
-            <Tabs.Panel value="timers" pt="xs">
-                <Accordion variant="contained" chevronPosition="left">
-                    {Object.keys(timers).map(key => (
-                        <MetricAccordionItem key={key} metricKey={key} name={key} headerValue={timers[key].count}>
-                            <Timer timer={timers[key]} />
-                        </MetricAccordionItem>
-                    ))}
-                </Accordion>
-            </Tabs.Panel>
-        </Tabs>
+            <Box pt="xs">
+                {Object.keys(shownGauges).map(g => (
+                    <Box key={g}>
+                        <span>{shownGauges[g]}:&nbsp;</span>
+                        <Gauge gauge={gauges[g]} />
+                    </Box>
+                ))}
+            </Box>
+        </>
     )
 }

commafeed-client/src/pages/app/AboutPage.tsx

@@ -1,4 +1,5 @@
-import { Trans, t } from "@lingui/macro"
+import { Trans, msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
 import { Anchor, Box, Container, List, NativeSelect, SimpleGrid, Title } from "@mantine/core"
 import { Constants } from "app/constants"
 import { redirectToApiDocumentation } from "app/redirect/thunks"
@@ -36,6 +37,8 @@ function Section(props: { title: React.ReactNode; icon: React.ReactNode; childre
 function NextUnreadBookmarklet() {
     const [categoryId, setCategoryId] = useState(Constants.categories.all.id)
     const [order, setOrder] = useState("desc")
+    const { _ } = useLingui()
+
     const baseUrl = window.location.href.substring(0, window.location.href.lastIndexOf("#"))
     const href = `javascript:window.location.href='${baseUrl}next?category=${categoryId}&order=${order}&t='+new Date().getTime();`
 
@@ -44,8 +47,8 @@ function NextUnreadBookmarklet() {
             <CategorySelect value={categoryId} onChange={c => c && setCategoryId(c)} withAll description={<Trans>Category</Trans>} />
             <NativeSelect
                 data={[
-                    { value: "desc", label: t`Newest first` },
-                    { value: "asc", label: t`Oldest first` },
+                    { value: "desc", label: _(msg`Newest first`) },
+                    { value: "asc", label: _(msg`Oldest first`) },
                 ]}
                 value={order}
                 onChange={e => setOrder(e.target.value)}

commafeed-client/src/pages/app/FeedEntriesPage.tsx

@@ -80,7 +80,7 @@ export function FeedEntriesPage(props: FeedEntriesPageProps) {
     if (noSubscriptions) return <NoSubscriptionHelp />
     return (
         // add some room at the bottom of the page in order to be able to scroll the current entry at the top of the page when expanding
-        <Box mb={viewport.height * 0.75}>
+        <Box mb={viewport.height * 0.7}>
             <Group gap="xl">
                 {sourceWebsiteUrl && (
                     <a href={sourceWebsiteUrl} target="_blank" rel="noreferrer" className={classes.sourceWebsiteLink}>

commafeed-client/src/pages/app/Layout.tsx

@@ -1,4 +1,4 @@
-import { Trans } from "@lingui/macro"
+import { msg } from "@lingui/macro"
 import { ActionIcon, AppShell, Box, Center, Group, ScrollArea, Title, useMantineTheme } from "@mantine/core"
 import { Constants } from "app/constants"
 import { redirectToAdd, redirectToRootCategory } from "app/redirect/thunks"
@@ -101,7 +101,7 @@ export default function Layout(props: LayoutProps) {
 
     const burger = (
         <ActionButton
-            label={mobileMenuOpen ? <Trans>Close menu</Trans> : <Trans>Open menu</Trans>}
+            label={mobileMenuOpen ? msg`Close menu` : msg`Open menu`}
             icon={mobileMenuOpen ? <TbX size={18} /> : <TbMenu2 size={18} />}
             onClick={() => dispatch(setMobileMenuOpen(!mobileMenuOpen))}
         />

commafeed-client/src/pages/auth/LoginPage.tsx

@@ -1,4 +1,5 @@
-import { Trans, t } from "@lingui/macro"
+import { Trans, msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
 import { Anchor, Box, Button, Center, Container, Group, Paper, PasswordInput, Stack, TextInput, Title } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"
@@ -13,6 +14,7 @@ import { Link } from "react-router-dom"
 export function LoginPage() {
     const serverInfos = useAppSelector(state => state.server.serverInfos)
     const dispatch = useAppDispatch()
+    const { _ } = useLingui()
 
     const form = useForm<LoginRequest>({
         initialValues: {
@@ -43,7 +45,7 @@ export function LoginPage() {
                     <Stack>
                         <TextInput
                             label={<Trans>User Name or E-mail</Trans>}
-                            placeholder={t`User Name or E-mail`}
+                            placeholder={_(msg`User Name or E-mail`)}
                             {...form.getInputProps("name")}
                             description={
                                 serverInfos?.demoAccountEnabled ? <Trans>Try out CommaFeed with the demo account: demo/demo</Trans> : ""
@@ -54,7 +56,7 @@ export function LoginPage() {
                         />
                         <PasswordInput
                             label={<Trans>Password</Trans>}
-                            placeholder={t`Password`}
+                            placeholder={_(msg`Password`)}
                             {...form.getInputProps("password")}
                             size="md"
                             required

commafeed-client/src/pages/auth/PasswordRecoveryPage.tsx

@@ -1,4 +1,5 @@
-import { Trans, t } from "@lingui/macro"
+import { Trans, msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
 import { Anchor, Box, Button, Center, Container, Group, Paper, Stack, TextInput, Title } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"
@@ -11,6 +12,7 @@ import { Link } from "react-router-dom"
 
 export function PasswordRecoveryPage() {
     const [message, setMessage] = useState("")
+    const { _ } = useLingui()
 
     const form = useForm<PasswordResetRequest>({
         initialValues: {
@@ -20,7 +22,7 @@ export function PasswordRecoveryPage() {
 
     const recoverPassword = useAsyncCallback(client.user.passwordReset, {
         onSuccess: () => {
-            setMessage(t`An email has been sent if this address was registered. Check your inbox.`)
+            setMessage(_(msg`An email has been sent if this address was registered. Check your inbox.`))
         },
     })
 
@@ -54,7 +56,7 @@ export function PasswordRecoveryPage() {
                         <TextInput
                             type="email"
                             label={<Trans>E-mail</Trans>}
-                            placeholder={t`E-mail`}
+                            placeholder={_(msg`E-mail`)}
                             {...form.getInputProps("email")}
                             size="md"
                             required

commafeed-client/src/pages/auth/RegistrationPage.tsx

@@ -1,4 +1,5 @@
-import { Trans, t } from "@lingui/macro"
+import { Trans, msg } from "@lingui/macro"
+import { useLingui } from "@lingui/react"
 import { Anchor, Box, Button, Center, Container, Group, Paper, PasswordInput, Stack, TextInput, Title } from "@mantine/core"
 import { useForm } from "@mantine/form"
 import { client, errorToStrings } from "app/client"
@@ -13,6 +14,7 @@ import { Link } from "react-router-dom"
 export function RegistrationPage() {
     const serverInfos = useAppSelector(state => state.server.serverInfos)
     const dispatch = useAppDispatch()
+    const { _ } = useLingui()
 
     const form = useForm<RegistrationRequest>({
         initialValues: {
@@ -22,12 +24,18 @@ export function RegistrationPage() {
         },
     })
 
-    const register = useAsyncCallback(client.user.register, {
+    const login = useAsyncCallback(client.user.login, {
         onSuccess: () => {
             dispatch(redirectToRootCategory())
         },
     })
 
+    const register = useAsyncCallback(client.user.register, {
+        onSuccess: () => {
+            login.execute(form.values)
+        },
+    })
+
     return (
         <Container size="xs">
             <PageTitle />
@@ -37,7 +45,7 @@ export function RegistrationPage() {
                 </Title>
                 {serverInfos && !serverInfos.allowRegistrations && (
                     <Box mb="md">
-                        <Alert messages={[t`Registrations are closed on this CommaFeed instance`]} />
+                        <Alert messages={[_(msg`Registrations are closed on this CommaFeed instance`)]} />
                     </Box>
                 )}
                 {serverInfos?.allowRegistrations && (
@@ -48,25 +56,31 @@ export function RegistrationPage() {
                             </Box>
                         )}
 
+                        {login.error && (
+                            <Box mb="md">
+                                <Alert messages={errorToStrings(login.error)} />
+                            </Box>
+                        )}
+
                         <form onSubmit={form.onSubmit(register.execute)}>
                             <Stack>
                                 <TextInput label="User Name" placeholder="User Name" {...form.getInputProps("name")} size="md" required />
                                 <TextInput
                                     type="email"
                                     label={<Trans>E-mail address</Trans>}
-                                    placeholder={t`E-mail address`}
+                                    placeholder={_(msg`E-mail address`)}
                                     {...form.getInputProps("email")}
                                     size="md"
                                     required
                                 />
                                 <PasswordInput
                                     label={<Trans>Password</Trans>}
-                                    placeholder={t`Password`}
+                                    placeholder={_(msg`Password`)}
                                     {...form.getInputProps("password")}
                                     size="md"
                                     required
                                 />
-                                <Button type="submit" loading={register.loading}>
+                                <Button type="submit" loading={register.loading || login.loading}>
                                     <Trans>Sign up</Trans>
                                 </Button>
                                 <Center>

commafeed-client/vite.config.ts

@@ -15,12 +15,11 @@ export default defineConfig(env => ({
             },
         }),
         lingui(),
-        // https://github.com/vitest-dev/vitest/issues/4055#issuecomment-1732994672
         tsconfigPaths(),
         visualizer(),
         biomePlugin({
             mode: "check",
-            failOnError: true,
+            failOnError: env.mode !== "development",
         }),
     ],
     base: "./",
@@ -33,6 +32,7 @@ export default defineConfig(env => ({
             "/openapi.json": "http://localhost:8083",
             "/custom_css.css": "http://localhost:8083",
             "/custom_js.js": "http://localhost:8083",
+            "/j_security_check": "http://localhost:8083",
             "/logout": "http://localhost:8083",
         },
     },

commafeed-server/config.dev.yml

@@ -1,154 +0,0 @@
-# CommaFeed settings
-# ------------------
-app:
-  # url used to access commafeed
-  publicUrl: http://localhost:8082/
-
-  # whether to expose a robots.txt file that disallows web crawlers and search engine indexers
-  hideFromWebCrawlers: true
-  
-  # whether to allow user registrations
-  allowRegistrations: true
-
-  # whether to enable strict password validation (1 uppercase char, 1 lowercase char, 1 digit, 1 special char)
-  strictPasswordPolicy: true
-  
-  # create a demo account the first time the app starts
-  createDemoAccount: true
-  
-  # put your google analytics tracking code here
-  googleAnalyticsTrackingCode:
-  
-  # put your google server key (used for youtube favicon fetching)
-  googleAuthKey:
-  
-  # number of http threads
-  backgroundThreads: 3
-  
-  # number of database updating threads
-  databaseUpdateThreads: 1
-
-  # rows to delete per query while cleaning up old entries
-  databaseCleanupBatchSize: 100
-
-  # settings for sending emails (password recovery)
-  smtpHost: localhost
-  smtpPort: 25
-  smtpTls: false
-  smtpUserName: user
-  smtpPassword: pass
-  smtpFromAddress:
-
-  # Graphite Metric settings
-  # Allows those who use Graphite to have CommaFeed send metrics for graphing (time in seconds)
-  graphiteEnabled: false
-  graphitePrefix: "test.commafeed"
-  graphiteHost: "localhost"
-  graphitePort: 2003
-  graphiteInterval: 60
-  
-  # whether this commafeed instance has a lot of feeds to refresh
-  # leave this to false in almost all cases
-  heavyLoad: false
-  
-  # minimum amount of time commafeed will wait before refreshing the same feed
-  refreshIntervalMinutes: 5
-
-  # if enabled, images in feed entries will be proxied through the server instead of accessed directly by the browser
-  # useful if commafeed is usually accessed through a restricting proxy  
-  imageProxyEnabled: true
-  
-  # database query timeout (in milliseconds), 0 to disable
-  queryTimeout: 0
-  
-  # time to keep unread statuses (in days), 0 to disable
-  keepStatusDays: 0
-  
-  # entries to keep per feed, old entries will be deleted, 0 to disable
-  maxFeedCapacity: 500
-
-  # entries older than this will be deleted, 0 to disable
-  maxEntriesAgeDays: 365
-
-  # limit the number of feeds a user can subscribe to, 0 to disable
-  maxFeedsPerUser: 0
-
-  # cache service to use, possible values are 'noop' and 'redis'
-  cache: noop
-  
-  # announcement string displayed on the main page
-  announcement:
-  
-  # user-agent string that will be used by the http client, leave empty for the default one
-  userAgent:
-
-  # enable websocket connection so the server can notify the web client that there are new entries for your feeds
-  websocketEnabled: true
-
-  # interval at which the client will send a ping message on the websocket to keep the connection alive
-  websocketPingInterval: 15m
-
-  # if websocket is disabled or the connection is lost, the client will reload the feed tree at this interval
-  treeReloadInterval: 30s
-
-# Database connection
-# -------------------  
-# for MariaDB
-# driverClass is org.mariadb.jdbc.Driver
-# url is jdbc:mariadb://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true&timezone=UTC
-#
-# for MySQL
-# driverClass is com.mysql.cj.jdbc.Driver
-# url is jdbc:mysql://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true&timezone=UTC
-#
-# for PostgreSQL
-# driverClass is org.postgresql.Driver
-# url is jdbc:postgresql://localhost:5432/commafeed
-
-database:
-  driverClass: org.h2.Driver
-  url: jdbc:h2:./target/commafeed
-  user: sa
-  password: sa
-  properties:
-    charSet: UTF-8
-  validationQuery: "/* CommaFeed Health Check */ SELECT 1"
-
-server:
-  applicationConnectors:
-    - type: http
-      port: 8083
-  adminConnectors:
-    - type: http
-      port: 8084
-
-logging:
-  level: INFO
-  loggers:
-    com.commafeed: DEBUG
-    liquibase: INFO
-    org.hibernate.SQL: INFO # or ALL for sql debugging
-    org.hibernate.engine.internal.StatisticalLoggingSessionEventListener: WARN
-  appenders:
-    - type: console
-    - type: file
-      currentLogFilename: log/commafeed.log
-      threshold: ALL
-      archive: true
-      archivedLogFilenamePattern: log/commafeed-%d.log
-      archivedFileCount: 5
-      timeZone: UTC
-
-# Redis pool configuration
-# (only used if app.cache is 'redis')
-# -----------------------------------
-redis:
-  host: localhost
-  port: 6379
-  # username is only required when using ACLs
-  username:
-  password:
-  timeout: 2000
-  database: 0
-  maxTotal: 500
-   

commafeed-server/config.yml.example

@@ -1,155 +0,0 @@
-# CommaFeed settings
-# ------------------
-app:
-  # url used to access commafeed
-  publicUrl: http://localhost:8082/
-
-  # whether to expose a robots.txt file that disallows web crawlers and search engine indexers
-  hideFromWebCrawlers: true
-
-  # whether to allow user registrations
-  allowRegistrations: false
-
-  # whether to enable strict password validation (1 uppercase char, 1 lowercase char, 1 digit, 1 special char)
-  strictPasswordPolicy: true
-
-  # create a demo account the first time the app starts
-  createDemoAccount: false
-
-  # put your google analytics tracking code here
-  googleAnalyticsTrackingCode:
-
-  # put your google server key (used for youtube favicon fetching)
-  googleAuthKey:
-
-  # number of http threads
-  backgroundThreads: 3
-
-  # number of database updating threads
-  databaseUpdateThreads: 1
-
-  # rows to delete per query while cleaning up old entries
-  databaseCleanupBatchSize: 100
-
-  # settings for sending emails (password recovery)
-  smtpHost:
-  smtpPort:
-  smtpTls: false
-  smtpUserName:
-  smtpPassword:
-  smtpFromAddress:
-
-  # Graphite Metric settings
-  # Allows those who use Graphite to have CommaFeed send metrics for graphing (time in seconds)
-  graphiteEnabled: false
-  graphitePrefix: "test.commafeed"
-  graphiteHost: "localhost"
-  graphitePort: 2003
-  graphiteInterval: 60
-
-  # whether this commafeed instance has a lot of feeds to refresh
-  # leave this to false in almost all cases
-  heavyLoad: false
-
-  # minimum amount of time commafeed will wait before refreshing the same feed
-  refreshIntervalMinutes: 5
-
-  # if enabled, images in feed entries will be proxied through the server instead of accessed directly by the browser
-  # useful if commafeed is usually accessed through a restricting proxy
-  imageProxyEnabled: false
-
-  # database query timeout (in milliseconds), 0 to disable
-  queryTimeout: 0
-
-  # time to keep unread statuses (in days), 0 to disable
-  keepStatusDays: 0
-
-  # entries to keep per feed, old entries will be deleted, 0 to disable
-  maxFeedCapacity: 500
-
-  # entries older than this will be deleted, 0 to disable
-  maxEntriesAgeDays: 365
-
-  # limit the number of feeds a user can subscribe to, 0 to disable
-  maxFeedsPerUser: 0
-
-  # cache service to use, possible values are 'noop' and 'redis'
-  cache: noop
-
-  # announcement string displayed on the main page
-  announcement:
-
-  # user-agent string that will be used by the http client, leave empty for the default one
-  userAgent:
-
-  # enable websocket connection so the server can notify the web client that there are new entries for your feeds
-  websocketEnabled: true
-
-  # interval at which the client will send a ping message on the websocket to keep the connection alive
-  websocketPingInterval: 15m
-
-  # if websocket is disabled or the connection is lost, the client will reload the feed tree at this interval
-  treeReloadInterval: 30s
-
-# Database connection
-# -------------------
-# for MariaDB
-# driverClass is org.mariadb.jdbc.Driver
-# url is jdbc:mariadb://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true&timezone=UTC
-#
-# for MySQL
-# driverClass is com.mysql.cj.jdbc.Driver
-# url is jdbc:mysql://localhost/commafeed?autoReconnect=true&failOverReadOnly=false&maxReconnects=20&rewriteBatchedStatements=true&timezone=UTC
-#
-# for PostgreSQL
-# driverClass is org.postgresql.Driver
-# url is jdbc:postgresql://localhost:5432/commafeed
-
-database:
-  driverClass: org.h2.Driver
-  url: jdbc:h2:/commafeed/data/db;DEFRAG_ALWAYS=TRUE
-  user: sa
-  password: sa
-  properties:
-    charSet: UTF-8
-  validationQuery: "/* CommaFeed Health Check */ SELECT 1"
-  minSize: 1
-  maxSize: 50
-  maxConnectionAge: 30m
-
-server:
-  applicationConnectors:
-    - type: http
-      port: 8082
-  adminConnectors: [ ]
-  requestLog:
-    appenders: [ ]
-
-logging:
-  level: ERROR
-  loggers:
-    com.commafeed: INFO
-    liquibase: INFO
-    io.dropwizard.server.ServerFactory: INFO
-  appenders:
-    - type: console
-    - type: file
-      currentLogFilename: log/commafeed.log
-      threshold: ALL
-      archive: true
-      archivedLogFilenamePattern: log/commafeed-%d.log
-      archivedFileCount: 5
-      timeZone: UTC
-
-# Redis pool configuration
-# (only used if app.cache is 'redis')
-# -----------------------------------
-redis:
-  host: localhost
-  port: 6379
-  # username is only required when using ACLs
-  username:
-  password:
-  timeout: 2000
-  database: 0
-  maxTotal: 500

commafeed-server/docker-compose.dev.yml

@@ -4,7 +4,7 @@ services:
   mysql:
     image: mariadb
     environment:
-      - MYSQL_ROOT_PASSWORD=root
+      - MYSQL_ROOT_PASSWORD=commafeed
       - MYSQL_DATABASE=commafeed
     ports:
       - "3306:3306"
@@ -12,8 +12,8 @@ services:
   postgresql:
     image: postgres
     environment:
-      - POSTGRES_USER=root
-      - POSTGRES_PASSWORD=root
+      - POSTGRES_USER=commafeed
+      - POSTGRES_PASSWORD=commafeed
       - POSTGRES_DB=commafeed
     ports:
       - "5432:5432"

commafeed-server/pom.xml

@@ -6,33 +6,26 @@
 	<parent>
 		<groupId>com.commafeed</groupId>
 		<artifactId>commafeed</artifactId>
-		<version>4.5.0</version>
+		<version>5.0.0</version>
 	</parent>
 	<artifactId>commafeed-server</artifactId>
 	<name>CommaFeed Server</name>
 
 	<properties>
-		<guice.version>7.0.0</guice.version>
-		<querydsl.version>6.5</querydsl.version>
+		<quarkus.version>3.13.2</quarkus.version>
+		<querydsl.version>6.6</querydsl.version>
 		<rome.version>2.1.0</rome.version>
+		<properties-plugin.version>1.2.1</properties-plugin.version>
 
-		<testcontainers.version>1.19.8</testcontainers.version>
-		<!-- renovate: datasource=docker depName=postgres -->
-		<postgresql.image.version>16.3</postgresql.image.version>
-		<!-- renovate: datasource=docker depName=mysql -->
-		<mysql.image.version>9.0.0</mysql.image.version>
-		<!-- renovate: datasource=docker depName=mariadb -->
-		<mariadb.image.version>11.4.2</mariadb.image.version>
-		<!-- renovate: datasource=docker depName=redis -->
-		<redis.image.version>7.2.5</redis.image.version>
+		<build.database>h2</build.database>
 	</properties>
 
 	<dependencyManagement>
 		<dependencies>
 			<dependency>
-				<groupId>io.dropwizard</groupId>
-				<artifactId>dropwizard-dependencies</artifactId>
-				<version>4.0.7</version>
+				<groupId>io.quarkus.platform</groupId>
+				<artifactId>quarkus-bom</artifactId>
+				<version>${quarkus.version}</version>
 				<type>pom</type>
 				<scope>import</scope>
 			</dependency>
@@ -40,31 +33,85 @@
 	</dependencyManagement>
 
 	<build>
-		<finalName>commafeed</finalName>
-		<testResources>
-			<testResource>
-				<directory>src/test/resources</directory>
-				<filtering>false</filtering>
-			</testResource>
-			<testResource>
-				<directory>src/test/resources</directory>
-				<includes>
-					<include>docker-images.properties</include>
-				</includes>
-				<filtering>true</filtering>
-			</testResource>
-		</testResources>
-
+		<extensions>
+			<extension>
+				<groupId>kr.motd.maven</groupId>
+				<artifactId>os-maven-plugin</artifactId>
+				<version>1.7.1</version>
+			</extension>
+		</extensions>
 		<plugins>
+			<plugin>
+				<artifactId>maven-help-plugin</artifactId>
+				<version>3.4.1</version>
+				<executions>
+					<execution>
+						<phase>initialize</phase>
+						<goals>
+							<goal>active-profiles</goal>
+						</goals>
+					</execution>
+				</executions>
+			</plugin>
+
+			<plugin>
+				<groupId>io.quarkus.platform</groupId>
+				<artifactId>quarkus-maven-plugin</artifactId>
+				<version>${quarkus.version}</version>
+				<extensions>true</extensions>
+				<executions>
+					<execution>
+						<goals>
+							<goal>build</goal>
+							<goal>generate-code</goal>
+							<goal>generate-code-tests</goal>
+							<goal>native-image-agent</goal>
+						</goals>
+						<configuration>
+							<properties>
+								<quarkus.package.output-name>commafeed-${project.version}</quarkus.package.output-name>
+								<quarkus.package.runner-suffix>
+									-${build.database}-${os.detected.name}-${os.detected.arch}-runner
+								</quarkus.package.runner-suffix>
+							</properties>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
+			<plugin>
+				<groupId>org.apache.maven.plugins</groupId>
+				<artifactId>maven-assembly-plugin</artifactId>
+				<version>3.7.1</version>
+				<executions>
+					<execution>
+						<phase>package</phase>
+						<goals>
+							<goal>single</goal>
+						</goals>
+						<configuration>
+							<finalName>commafeed-${project.version}-${build.database}-jvm</finalName>
+							<appendAssemblyId>false</appendAssemblyId>
+							<descriptors>
+								<descriptor>src/main/assembly/zip-quarkus-app.xml</descriptor>
+							</descriptors>
+						</configuration>
+					</execution>
+				</executions>
+			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-surefire-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.3.1</version>
+				<configuration>
+					<systemPropertyVariables>
+						<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+					</systemPropertyVariables>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-failsafe-plugin</artifactId>
-				<version>3.3.0</version>
+				<version>3.3.1</version>
 				<executions>
 					<execution>
 						<goals>
@@ -73,6 +120,13 @@
 						</goals>
 					</execution>
 				</executions>
+				<configuration>
+					<systemPropertyVariables>
+						<native.image.path>${project.build.directory}/${project.build.finalName}-runner
+						</native.image.path>
+						<java.util.logging.manager>org.jboss.logmanager.LogManager</java.util.logging.manager>
+					</systemPropertyVariables>
+				</configuration>
 			</plugin>
 			<plugin>
 				<groupId>io.github.git-commit-id</groupId>
@@ -93,63 +147,13 @@
 					<failOnUnableToExtractRepoInfo>false</failOnUnableToExtractRepoInfo>
 				</configuration>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-shade-plugin</artifactId>
-				<version>3.6.0</version>
-				<dependencies>
-					<dependency>
-						<groupId>org.kordamp.shade</groupId>
-						<artifactId>maven-shade-ext-transformers</artifactId>
-						<version>1.4.0</version>
-					</dependency>
-				</dependencies>
-				<configuration>
-					<createDependencyReducedPom>false</createDependencyReducedPom>
-					<filters>
-						<filter>
-							<artifact>*:*</artifact>
-							<excludes>
-								<exclude>module-info.class</exclude>
-								<exclude>META-INF/*.SF</exclude>
-								<exclude>META-INF/*.DSA</exclude>
-								<exclude>META-INF/*.RSA</exclude>
-							</excludes>
-						</filter>
-					</filters>
-				</configuration>
-				<executions>
-					<execution>
-						<phase>package</phase>
-						<goals>
-							<goal>shade</goal>
-						</goals>
-						<configuration>
-							<transformers>
-								<transformer
-										implementation="org.apache.maven.plugins.shade.resource.ServicesResourceTransformer" />
-								<transformer
-										implementation="org.apache.maven.plugins.shade.resource.ManifestResourceTransformer">
-									<mainClass>com.commafeed.CommaFeedApplication</mainClass>
-								</transformer>
-								<transformer implementation="org.kordamp.shade.resources.PropertiesFileTransformer">
-									<paths>
-										<path>rome.properties</path>
-									</paths>
-									<mergeStrategy>append</mergeStrategy>
-								</transformer>
-							</transformers>
-						</configuration>
-					</execution>
-				</executions>
-			</plugin>
 			<plugin>
 				<groupId>io.swagger.core.v3</groupId>
 				<artifactId>swagger-maven-plugin-jakarta</artifactId>
 				<version>2.2.22</version>
 				<?m2e ignore?>
 				<configuration>
-					<outputPath>${project.build.directory}/classes/assets</outputPath>
+					<outputPath>${project.build.directory}/classes/META-INF/resources</outputPath>
 					<outputFormat>JSONANDYAML</outputFormat>
 					<resourcePackages>
 						<package>com.commafeed.frontend.resource</package>
@@ -167,18 +171,6 @@
 					</execution>
 				</executions>
 			</plugin>
-			<plugin>
-				<groupId>org.apache.maven.plugins</groupId>
-				<artifactId>maven-jar-plugin</artifactId>
-				<version>3.4.2</version>
-				<configuration>
-					<archive>
-						<manifest>
-							<addDefaultImplementationEntries>true</addDefaultImplementationEntries>
-						</manifest>
-					</archive>
-				</configuration>
-			</plugin>
 			<plugin>
 				<groupId>org.apache.maven.plugins</groupId>
 				<artifactId>maven-checkstyle-plugin</artifactId>
@@ -236,7 +228,7 @@
 		<dependency>
 			<groupId>com.commafeed</groupId>
 			<artifactId>commafeed-client</artifactId>
-			<version>4.5.0</version>
+			<version>5.0.0</version>
 		</dependency>
 
 		<dependency>
@@ -246,60 +238,69 @@
 			<scope>provided</scope>
 		</dependency>
 		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>slf4j-api</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>org.slf4j</groupId>
-			<artifactId>jcl-over-slf4j</artifactId>
+			<groupId>org.kohsuke.metainf-services</groupId>
+			<artifactId>metainf-services</artifactId>
+			<version>1.11</version>
+			<scope>provided</scope>
 		</dependency>
 
 		<dependency>
-			<groupId>com.google.inject</groupId>
-			<artifactId>guice</artifactId>
-			<version>${guice.version}</version>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-arc</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-security</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-hibernate-validator</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-rest</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-rest-jackson</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-websockets</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-mailer</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-hibernate-orm</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-liquibase</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-jdbc-h2</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-jdbc-mysql</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-jdbc-mariadb</artifactId>
+		</dependency>
+		<dependency>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-jdbc-postgresql</artifactId>
 		</dependency>
 
-		<dependency>
-			<groupId>io.dropwizard</groupId>
-			<artifactId>dropwizard-core</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.dropwizard</groupId>
-			<artifactId>dropwizard-unix-socket</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.dropwizard</groupId>
-			<artifactId>dropwizard-hibernate</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.dropwizard</groupId>
-			<artifactId>dropwizard-migrations</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.dropwizard</groupId>
-			<artifactId>dropwizard-assets</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.dropwizard</groupId>
-			<artifactId>dropwizard-forms</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.dropwizard.metrics</groupId>
-			<artifactId>metrics-graphite</artifactId>
-		</dependency>
 		<dependency>
 			<groupId>io.dropwizard.metrics</groupId>
 			<artifactId>metrics-json</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>io.whitfin</groupId>
-			<artifactId>dropwizard-environment-substitutor</artifactId>
-			<version>1.1.1</version>
-		</dependency>
-		<dependency>
-			<groupId>org.eclipse.jetty.websocket</groupId>
-			<artifactId>websocket-jakarta-server</artifactId>
+			<version>4.2.26</version>
 		</dependency>
 
 		<dependency>
@@ -348,17 +349,6 @@
 			<version>1.6.4</version>
 		</dependency>
 
-		<dependency>
-			<groupId>redis.clients</groupId>
-			<artifactId>jedis</artifactId>
-			<version>5.1.3</version>
-		</dependency>
-		<dependency>
-			<groupId>com.sun.mail</groupId>
-			<artifactId>jakarta.mail</artifactId>
-			<version>2.0.1</version>
-		</dependency>
-
 		<dependency>
 			<groupId>com.rometools</groupId>
 			<artifactId>rome</artifactId>
@@ -383,7 +373,7 @@
 		<dependency>
 			<groupId>org.jsoup</groupId>
 			<artifactId>jsoup</artifactId>
-			<version>1.17.2</version>
+			<version>1.18.1</version>
 		</dependency>
 		<dependency>
 			<groupId>com.ibm.icu</groupId>
@@ -408,7 +398,15 @@
 		<dependency>
 			<groupId>org.apache.httpcomponents.client5</groupId>
 			<artifactId>httpclient5</artifactId>
+			<version>5.3.1</version>
 		</dependency>
+		<!-- add brotli support for httpclient5 -->
+		<dependency>
+			<groupId>org.brotli</groupId>
+			<artifactId>dec</artifactId>
+			<version>0.1.2</version>
+		</dependency>
+
 		<dependency>
 			<groupId>io.github.hakky54</groupId>
 			<artifactId>sslcontext-kickstart-for-apache5</artifactId>
@@ -422,34 +420,8 @@
 		</dependency>
 
 		<dependency>
-			<groupId>com.h2database</groupId>
-			<artifactId>h2</artifactId>
-		</dependency>
-		<dependency>
-			<groupId>com.manticore-projects.tools</groupId>
-			<artifactId>h2migrationtool</artifactId>
-			<version>1.6</version>
-		</dependency>
-
-		<dependency>
-			<groupId>com.mysql</groupId>
-			<artifactId>mysql-connector-j</artifactId>
-			<version>9.0.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.mariadb.jdbc</groupId>
-			<artifactId>mariadb-java-client</artifactId>
-			<version>3.4.0</version>
-		</dependency>
-		<dependency>
-			<groupId>org.postgresql</groupId>
-			<artifactId>postgresql</artifactId>
-			<version>42.7.3</version>
-		</dependency>
-
-		<dependency>
-			<groupId>org.junit.jupiter</groupId>
-			<artifactId>junit-jupiter-engine</artifactId>
+			<groupId>io.quarkus</groupId>
+			<artifactId>quarkus-junit5</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -469,14 +441,8 @@
 			<scope>test</scope>
 		</dependency>
 		<dependency>
-			<groupId>com.icegreen</groupId>
-			<artifactId>greenmail-junit5</artifactId>
-			<version>2.0.1</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>io.dropwizard</groupId>
-			<artifactId>dropwizard-testing</artifactId>
+			<groupId>io.rest-assured</groupId>
+			<artifactId>rest-assured</artifactId>
 			<scope>test</scope>
 		</dependency>
 		<dependency>
@@ -487,33 +453,153 @@
 		<dependency>
 			<groupId>com.microsoft.playwright</groupId>
 			<artifactId>playwright</artifactId>
-			<version>1.45.0</version>
+			<version>1.46.0</version>
+			<scope>test</scope>
+		</dependency>
+		<dependency>
+			<groupId>org.reflections</groupId>
+			<artifactId>reflections</artifactId>
+			<version>0.10.2</version>
 			<scope>test</scope>
 		</dependency>
 
-		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>testcontainers</artifactId>
-			<version>${testcontainers.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>postgresql</artifactId>
-			<version>${testcontainers.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>mysql</artifactId>
-			<version>${testcontainers.version}</version>
-			<scope>test</scope>
-		</dependency>
-		<dependency>
-			<groupId>org.testcontainers</groupId>
-			<artifactId>mariadb</artifactId>
-			<version>${testcontainers.version}</version>
-			<scope>test</scope>
-		</dependency>
 	</dependencies>
+
+	<profiles>
+		<profile>
+			<id>native</id>
+			<activation>
+				<property>
+					<name>native</name>
+				</property>
+			</activation>
+			<properties>
+				<quarkus.native.enabled>true</quarkus.native.enabled>
+			</properties>
+		</profile>
+
+		<profile>
+			<id>h2</id>
+			<activation>
+				<activeByDefault>true</activeByDefault>
+			</activation>
+			<properties>
+				<build.database>h2</build.database>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>properties-maven-plugin</artifactId>
+						<version>${properties-plugin.version}</version>
+						<executions>
+							<execution>
+								<goals>
+									<goal>set-system-properties</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<properties>
+								<property>
+									<name>quarkus.datasource.db-kind</name>
+									<value>h2</value>
+								</property>
+							</properties>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>mysql</id>
+			<properties>
+				<build.database>mysql</build.database>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>properties-maven-plugin</artifactId>
+						<version>${properties-plugin.version}</version>
+						<executions>
+							<execution>
+								<goals>
+									<goal>set-system-properties</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<properties>
+								<property>
+									<name>quarkus.datasource.db-kind</name>
+									<value>mysql</value>
+								</property>
+							</properties>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>mariadb</id>
+			<properties>
+				<build.database>mariadb</build.database>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>properties-maven-plugin</artifactId>
+						<version>${properties-plugin.version}</version>
+						<executions>
+							<execution>
+								<goals>
+									<goal>set-system-properties</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<properties>
+								<property>
+									<name>quarkus.datasource.db-kind</name>
+									<value>mariadb</value>
+								</property>
+							</properties>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+		<profile>
+			<id>postgresql</id>
+			<properties>
+				<build.database>postgresql</build.database>
+			</properties>
+			<build>
+				<plugins>
+					<plugin>
+						<groupId>org.codehaus.mojo</groupId>
+						<artifactId>properties-maven-plugin</artifactId>
+						<version>${properties-plugin.version}</version>
+						<executions>
+							<execution>
+								<goals>
+									<goal>set-system-properties</goal>
+								</goals>
+							</execution>
+						</executions>
+						<configuration>
+							<properties>
+								<property>
+									<name>quarkus.datasource.db-kind</name>
+									<value>postgresql</value>
+								</property>
+							</properties>
+						</configuration>
+					</plugin>
+				</plugins>
+			</build>
+		</profile>
+	</profiles>
 </project>

commafeed-server/src/main/assembly/zip-quarkus-app.xml

@@ -0,0 +1,21 @@
+<assembly xmlns="http://maven.apache.org/ASSEMBLY/2.2.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+		  xsi:schemaLocation="http://maven.apache.org/ASSEMBLY/2.2.0 https://maven.apache.org/xsd/assembly-2.2.0.xsd">
+
+	<id>zip-quarkus-app</id>
+
+	<includeBaseDirectory>true</includeBaseDirectory>
+	<baseDirectory>commafeed-${project.version}-${build.database}</baseDirectory>
+
+	<formats>
+		<format>zip</format>
+	</formats>
+	<fileSets>
+		<fileSet>
+			<directory>${project.build.directory}/quarkus-app</directory>
+			<outputDirectory>/</outputDirectory>
+			<includes>
+				<include>**/*</include>
+			</includes>
+		</fileSet>
+	</fileSets>
+</assembly>

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

@@ -0,0 +1,16 @@
+FROM ibm-semeru-runtimes:open-21.0.4_7-jre
+
+EXPOSE 8082
+
+RUN mkdir -p /commafeed/data
+VOLUME /commafeed/data
+
+COPY commafeed-server/target/quarkus-app/ /commafeed
+WORKDIR /commafeed
+
+CMD ["java", \
+    "-Xtune:virtualized", \
+    "-Xminf0.05", \
+    "-Xmaxf0.1", \
+    "-jar", \
+    "quarkus-run.jar"]

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

@@ -0,0 +1,9 @@
+FROM debian:12.6
+EXPOSE 8082
+
+RUN mkdir -p /commafeed/data
+VOLUME /commafeed/data
+
+COPY commafeed-server/target/commafeed-*-runner /commafeed/application
+WORKDIR /commafeed
+CMD ["./application"]

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

@@ -0,0 +1,86 @@
+# CommaFeed
+
+Official docker images for https://github.com/Athou/commafeed/
+
+## Quickstart
+
+Start CommaFeed with an embedded database. Then login as `admin/admin` on http://localhost:8082/
+
+### docker
+
+`docker run --name commafeed --detach --publish 8082:8082 --restart unless-stopped --volume /path/to/commafeed/db:/commafeed/data --memory 256M athou/commafeed:latest-h2`
+
+### docker-compose
+
+```
+services:
+  commafeed:
+    image: athou/commafeed:latest-h2
+    restart: unless-stopped
+    volumes:
+      - /path/to/commafeed/db:/commafeed/data
+    deploy:
+      resources:
+        limits:
+          memory: 256M
+    ports:
+      - 8082:8082
+```
+
+## Advanced
+
+While using the embedded database is perfectly fine for small instances, you may want to have more control over the
+database. Here's an example that uses postgresql (note the different docker tag):
+
+```
+services:
+  commafeed:
+    image: athou/commafeed:latest-postgresql
+    restart: unless-stopped
+    environment:
+      - QUARKUS_DATASOURCE_JDBC_URL=jdbc:postgresql://postgresql:5432/commafeed
+      - QUARKUS_DATASOURCE_USERNAME=commafeed
+      - QUARKUS_DATASOURCE_PASSWORD=commafeed
+    deploy:
+      resources:
+        limits:
+          memory: 256M
+    ports:
+      - 8082:8082
+
+  postgresql:
+    image: postgres:latest
+    restart: unless-stopped
+    environment:
+      POSTGRES_USER: commafeed
+      POSTGRES_PASSWORD: commafeed
+      POSTGRES_DB: commafeed
+    volumes:
+      - /path/to/commafeed/db:/var/lib/postgresql/data
+```
+
+## Configuration
+
+All [CommaFeed settings](https://github.com/Athou/commafeed/blob/master/commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java)
+are optional and have sensible default values.
+
+Settings are overrideable with environment variables. For instance, `config.feedRefresh().intervalEmpirical()` can be
+set
+with the `COMMAFEED_FEED_REFRESH_INTERVAL_EMPIRICAL=true` variable.
+
+When logging in, credentials are stored in an encrypted cookie. The encryption key is randomly generated at startup,
+meaning that you will have to log back in after each restart of the application. To prevent this, you can set the
+`QUARKUS_HTTP_AUTH_SESSION_ENCRYPTION_KEY` property to a fixed value (min. 16 characters).
+
+## Docker tags
+
+Tags are of the form `<version>-<database>[-jvm]` where:
+
+- `<version>` is either:
+    - a specific CommaFeed version (e.g. `4.6.0`)
+    - `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.

commafeed-server/src/main/java/com/commafeed/CommaFeedApplication.java

@@ -1,277 +1,40 @@
 package com.commafeed;
 
-import java.io.IOException;
-import java.nio.file.Path;
-import java.nio.file.Paths;
-import java.time.Instant;
-import java.util.EnumSet;
-import java.util.Set;
-import java.util.concurrent.ScheduledExecutorService;
-import java.util.concurrent.TimeUnit;
-
-import org.eclipse.jetty.websocket.jakarta.server.config.JakartaWebSocketServletContainerInitializer;
-import org.hibernate.cfg.AvailableSettings;
-
-import com.codahale.metrics.json.MetricsModule;
-import com.commafeed.backend.dao.UserDAO;
 import com.commafeed.backend.feed.FeedRefreshEngine;
-import com.commafeed.backend.model.AbstractModel;
-import com.commafeed.backend.model.Feed;
-import com.commafeed.backend.model.FeedCategory;
-import com.commafeed.backend.model.FeedEntry;
-import com.commafeed.backend.model.FeedEntryContent;
-import com.commafeed.backend.model.FeedEntryStatus;
-import com.commafeed.backend.model.FeedEntryTag;
-import com.commafeed.backend.model.FeedSubscription;
-import com.commafeed.backend.model.User;
-import com.commafeed.backend.model.UserRole;
-import com.commafeed.backend.model.UserSettings;
-import com.commafeed.backend.service.UserService;
 import com.commafeed.backend.service.db.DatabaseStartupService;
-import com.commafeed.backend.service.db.H2MigrationService;
-import com.commafeed.backend.task.ScheduledTask;
-import com.commafeed.frontend.auth.PasswordConstraintValidator;
-import com.commafeed.frontend.auth.SecurityCheckFactoryProvider;
-import com.commafeed.frontend.resource.AdminREST;
-import com.commafeed.frontend.resource.CategoryREST;
-import com.commafeed.frontend.resource.EntryREST;
-import com.commafeed.frontend.resource.FeedREST;
-import com.commafeed.frontend.resource.ServerREST;
-import com.commafeed.frontend.resource.UserREST;
-import com.commafeed.frontend.resource.fever.FeverREST;
-import com.commafeed.frontend.servlet.CustomCssServlet;
-import com.commafeed.frontend.servlet.CustomJsServlet;
-import com.commafeed.frontend.servlet.LogoutServlet;
-import com.commafeed.frontend.servlet.NextUnreadServlet;
-import com.commafeed.frontend.servlet.RobotsTxtDisallowAllServlet;
-import com.commafeed.frontend.session.SessionHelperFactoryProvider;
-import com.commafeed.frontend.ws.WebSocketConfigurator;
-import com.commafeed.frontend.ws.WebSocketEndpoint;
-import com.fasterxml.jackson.databind.DeserializationFeature;
-import com.fasterxml.jackson.databind.MapperFeature;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.databind.SerializationFeature;
-import com.google.inject.Guice;
-import com.google.inject.Injector;
-import com.google.inject.Key;
-import com.google.inject.TypeLiteral;
+import com.commafeed.backend.task.TaskScheduler;
+import com.commafeed.security.password.PasswordConstraintValidator;
 
-import io.dropwizard.assets.AssetsBundle;
-import io.dropwizard.configuration.DefaultConfigurationFactoryFactory;
-import io.dropwizard.configuration.EnvironmentVariableSubstitutor;
-import io.dropwizard.configuration.SubstitutingSourceProvider;
-import io.dropwizard.core.Application;
-import io.dropwizard.core.ConfiguredBundle;
-import io.dropwizard.core.setup.Bootstrap;
-import io.dropwizard.core.setup.Environment;
-import io.dropwizard.db.DataSourceFactory;
-import io.dropwizard.forms.MultiPartBundle;
-import io.dropwizard.hibernate.HibernateBundle;
-import io.dropwizard.migrations.MigrationsBundle;
-import io.dropwizard.servlets.CacheBustingFilter;
-import io.whitfin.dropwizard.configuration.EnvironmentSubstitutor;
-import jakarta.servlet.DispatcherType;
-import jakarta.servlet.FilterChain;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.ServletRequest;
-import jakarta.servlet.ServletResponse;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.websocket.server.ServerEndpointConfig;
+import io.quarkus.runtime.ShutdownEvent;
+import io.quarkus.runtime.StartupEvent;
+import jakarta.enterprise.event.Observes;
+import jakarta.inject.Singleton;
+import lombok.RequiredArgsConstructor;
 
-public class CommaFeedApplication extends Application<CommaFeedConfiguration> {
+@Singleton
+@RequiredArgsConstructor
+public class CommaFeedApplication {
 
 	public static final String USERNAME_ADMIN = "admin";
 	public static final String USERNAME_DEMO = "demo";
 
-	public static final Instant STARTUP_TIME = Instant.now();
+	private final DatabaseStartupService databaseStartupService;
+	private final FeedRefreshEngine feedRefreshEngine;
+	private final TaskScheduler taskScheduler;
+	private final CommaFeedConfiguration config;
 
-	private HibernateBundle<CommaFeedConfiguration> hibernateBundle;
+	public void start(@Observes StartupEvent ev) {
+		PasswordConstraintValidator.setStrict(config.users().strictPasswordPolicy());
 
-	@Override
-	public String getName() {
-		return "CommaFeed";
+		databaseStartupService.populateInitialData();
+
+		feedRefreshEngine.start();
+		taskScheduler.start();
 	}
 
-	@Override
-	public void initialize(Bootstrap<CommaFeedConfiguration> bootstrap) {
-		configureEnvironmentSubstitutor(bootstrap);
-		configureObjectMapper(bootstrap.getObjectMapper());
-
-		// run h2 migration as the first bundle because we need to migrate before hibernate is initialized
-		bootstrap.addBundle(new ConfiguredBundle<>() {
-			@Override
-			public void run(CommaFeedConfiguration config, Environment environment) {
-				DataSourceFactory dataSourceFactory = config.getDataSourceFactory();
-				String url = dataSourceFactory.getUrl();
-				if (isFileBasedH2(url)) {
-					Path path = getFilePath(url);
-					String user = dataSourceFactory.getUser();
-					String password = dataSourceFactory.getPassword();
-					new H2MigrationService().migrateIfNeeded(path, user, password);
-				}
-			}
-
-			private boolean isFileBasedH2(String url) {
-				return url.startsWith("jdbc:h2:") && !url.startsWith("jdbc:h2:mem:");
-			}
-
-			private Path getFilePath(String url) {
-				String name = url.substring("jdbc:h2:".length()).split(";")[0];
-				return Paths.get(name + ".mv.db");
-			}
-		});
-
-		bootstrap.addBundle(hibernateBundle = new HibernateBundle<>(AbstractModel.class, Feed.class, FeedCategory.class, FeedEntry.class,
-				FeedEntryContent.class, FeedEntryStatus.class, FeedEntryTag.class, FeedSubscription.class, User.class, UserRole.class,
-				UserSettings.class) {
-			@Override
-			public DataSourceFactory getDataSourceFactory(CommaFeedConfiguration configuration) {
-				DataSourceFactory factory = configuration.getDataSourceFactory();
-
-				factory.getProperties().put(AvailableSettings.PREFERRED_POOLED_OPTIMIZER, "pooled-lo");
-
-				factory.getProperties().put(AvailableSettings.STATEMENT_BATCH_SIZE, "50");
-				factory.getProperties().put(AvailableSettings.BATCH_VERSIONED_DATA, "true");
-				factory.getProperties().put(AvailableSettings.ORDER_INSERTS, "true");
-				factory.getProperties().put(AvailableSettings.ORDER_UPDATES, "true");
-				return factory;
-			}
-		});
-
-		bootstrap.addBundle(new MigrationsBundle<>() {
-			@Override
-			public DataSourceFactory getDataSourceFactory(CommaFeedConfiguration configuration) {
-				return configuration.getDataSourceFactory();
-			}
-		});
-
-		bootstrap.addBundle(new AssetsBundle("/assets/", "/", "index.html"));
-		bootstrap.addBundle(new MultiPartBundle());
+	public void stop(@Observes ShutdownEvent ev) {
+		feedRefreshEngine.stop();
+		taskScheduler.stop();
 	}
 
-	private static void configureEnvironmentSubstitutor(Bootstrap<CommaFeedConfiguration> bootstrap) {
-		bootstrap.setConfigurationFactoryFactory(new DefaultConfigurationFactoryFactory<>() {
-			@Override
-			protected ObjectMapper configureObjectMapper(ObjectMapper objectMapper) {
-				// disable case sensitivity because EnvironmentSubstitutor maps MYPROPERTY to myproperty and not to myProperty
-				return objectMapper
-						.setConfig(objectMapper.getDeserializationConfig().with(MapperFeature.ACCEPT_CASE_INSENSITIVE_PROPERTIES));
-			}
-		});
-
-		bootstrap.setConfigurationSourceProvider(buildEnvironmentSubstitutor(bootstrap));
-	}
-
-	private static void configureObjectMapper(ObjectMapper objectMapper) {
-		// read and write instants as milliseconds instead of nanoseconds
-		objectMapper.configure(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS, false)
-				.configure(DeserializationFeature.READ_DATE_TIMESTAMPS_AS_NANOSECONDS, false);
-
-		// add support for serializing metrics
-		objectMapper.registerModule(new MetricsModule(TimeUnit.SECONDS, TimeUnit.SECONDS, false));
-	}
-
-	private static EnvironmentSubstitutor buildEnvironmentSubstitutor(Bootstrap<CommaFeedConfiguration> bootstrap) {
-		// enable config.yml string substitution
-		// e.g. having a custom config.yml file with app.session.path=${SOME_ENV_VAR} will substitute SOME_ENV_VAR
-		SubstitutingSourceProvider substitutingSourceProvider = new SubstitutingSourceProvider(bootstrap.getConfigurationSourceProvider(),
-				new EnvironmentVariableSubstitutor(false));
-
-		// enable config.yml properties override with env variables prefixed with CF_
-		// e.g. setting CF_APP_ALLOWREGISTRATIONS=true will set app.allowRegistrations to true
-		return new EnvironmentSubstitutor("CF", substitutingSourceProvider);
-	}
-
-	@Override
-	public void run(CommaFeedConfiguration config, Environment environment) {
-		PasswordConstraintValidator.setStrict(config.getApplicationSettings().getStrictPasswordPolicy());
-
-		// guice init
-		Injector injector = Guice.createInjector(new CommaFeedModule(hibernateBundle.getSessionFactory(), config, environment.metrics()));
-
-		// session management
-		environment.servlets().setSessionHandler(config.getSessionHandlerFactory().build(config.getDataSourceFactory()));
-
-		// support for "@SecurityCheck User user" injection
-		environment.jersey()
-				.register(new SecurityCheckFactoryProvider.Binder(injector.getInstance(UserDAO.class),
-						injector.getInstance(UserService.class), config));
-		// support for "@Context SessionHelper sessionHelper" injection
-		environment.jersey().register(new SessionHelperFactoryProvider.Binder());
-
-		// REST resources
-		environment.jersey().setUrlPattern("/rest/*");
-		environment.jersey().register(injector.getInstance(AdminREST.class));
-		environment.jersey().register(injector.getInstance(CategoryREST.class));
-		environment.jersey().register(injector.getInstance(EntryREST.class));
-		environment.jersey().register(injector.getInstance(FeedREST.class));
-		environment.jersey().register(injector.getInstance(ServerREST.class));
-		environment.jersey().register(injector.getInstance(UserREST.class));
-		environment.jersey().register(injector.getInstance(FeverREST.class));
-
-		// Servlets
-		environment.servlets().addServlet("next", injector.getInstance(NextUnreadServlet.class)).addMapping("/next");
-		environment.servlets().addServlet("logout", injector.getInstance(LogoutServlet.class)).addMapping("/logout");
-		environment.servlets().addServlet("customCss", injector.getInstance(CustomCssServlet.class)).addMapping("/custom_css.css");
-		environment.servlets().addServlet("customJs", injector.getInstance(CustomJsServlet.class)).addMapping("/custom_js.js");
-		if (Boolean.TRUE.equals(config.getApplicationSettings().getHideFromWebCrawlers())) {
-			environment.servlets()
-					.addServlet("robots.txt", injector.getInstance(RobotsTxtDisallowAllServlet.class))
-					.addMapping("/robots.txt");
-		}
-
-		// WebSocket endpoint
-		JakartaWebSocketServletContainerInitializer.configure(environment.getApplicationContext(), (context, container) -> {
-			container.setDefaultMaxSessionIdleTimeout(config.getApplicationSettings().getWebsocketPingInterval().toMilliseconds() + 10000);
-
-			container.addEndpoint(ServerEndpointConfig.Builder.create(WebSocketEndpoint.class, "/ws")
-					.configurator(injector.getInstance(WebSocketConfigurator.class))
-					.build());
-		});
-
-		// Scheduled tasks
-		Set<ScheduledTask> tasks = injector.getInstance(Key.get(new TypeLiteral<>() {
-		}));
-		ScheduledExecutorService executor = environment.lifecycle()
-				.scheduledExecutorService("task-scheduler", true)
-				.threads(tasks.size())
-				.build();
-		for (ScheduledTask task : tasks) {
-			task.register(executor);
-		}
-
-		// database init/changelogs
-		environment.lifecycle().manage(injector.getInstance(DatabaseStartupService.class));
-
-		// start feed fetching engine
-		environment.lifecycle().manage(injector.getInstance(FeedRefreshEngine.class));
-
-		// prevent caching index.html, so that the webapp is always up to date
-		environment.servlets()
-				.addFilter("index-cache-busting-filter", new CacheBustingFilter())
-				.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), false, "/");
-
-		// prevent caching openapi files, so that the documentation is always up to date
-		environment.servlets()
-				.addFilter("openapi-cache-busting-filter", new CacheBustingFilter())
-				.addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), false, "/openapi.json", "/openapi.yaml");
-
-		// prevent caching REST resources, except for favicons
-		environment.servlets().addFilter("rest-cache-busting-filter", new CacheBustingFilter() {
-			@Override
-			public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException {
-				String path = ((HttpServletRequest) request).getRequestURI();
-				if (path.contains("/feed/favicon")) {
-					chain.doFilter(request, response);
-				} else {
-					super.doFilter(request, response, chain);
-				}
-			}
-		}).addMappingForUrlPatterns(EnumSet.of(DispatcherType.REQUEST), false, "/rest/*");
-
-	}
-
-	public static void main(String[] args) throws Exception {
-		new CommaFeedApplication().run(args);
-	}
 }

commafeed-server/src/main/java/com/commafeed/CommaFeedConfiguration.java

@@ -1,183 +1,275 @@
 package com.commafeed;
 
-import java.io.IOException;
-import java.io.InputStream;
+import java.time.Duration;
 import java.time.Instant;
-import java.time.temporal.ChronoUnit;
-import java.util.Properties;
+import java.util.Optional;
 
-import com.commafeed.backend.cache.RedisPoolFactory;
-import com.commafeed.frontend.session.SessionHandlerFactory;
-import com.fasterxml.jackson.annotation.JsonProperty;
+import com.commafeed.backend.feed.FeedRefreshIntervalCalculator;
 
-import io.dropwizard.core.Configuration;
-import io.dropwizard.db.DataSourceFactory;
-import io.dropwizard.util.Duration;
-import jakarta.validation.Valid;
+import io.quarkus.runtime.configuration.MemorySize;
+import io.smallrye.config.ConfigMapping;
+import io.smallrye.config.WithDefault;
 import jakarta.validation.constraints.Min;
-import jakarta.validation.constraints.NotBlank;
-import jakarta.validation.constraints.NotNull;
 import jakarta.validation.constraints.Positive;
-import lombok.Getter;
-import lombok.Setter;
 
-@Getter
-@Setter
-public class CommaFeedConfiguration extends Configuration {
+/**
+ * CommaFeed configuration
+ *
+ * Default values are for production, they can be overridden in application.properties for other profiles
+ */
+@ConfigMapping(prefix = "commafeed")
+public interface CommaFeedConfiguration {
+	/**
+	 * Whether to expose a robots.txt file that disallows web crawlers and search engine indexers.
+	 */
+	@WithDefault("true")
+	boolean hideFromWebCrawlers();
 
-	public enum CacheType {
-		NOOP, REDIS
+	/**
+	 * If enabled, images in feed entries will be proxied through the server instead of accessed directly by the browser.
+	 * 
+	 * This is useful if commafeed is accessed through a restricting proxy that blocks some feeds that are followed.
+	 */
+	@WithDefault("false")
+	boolean imageProxyEnabled();
+
+	/**
+	 * Enable password recovery via email.
+	 *
+	 * Quarkus mailer will need to be configured.
+	 */
+	@WithDefault("false")
+	boolean passwordRecoveryEnabled();
+
+	/**
+	 * Message displayed in a notification at the bottom of the page.
+	 */
+	Optional<String> announcement();
+
+	/**
+	 * Google Analytics tracking code.
+	 */
+	Optional<String> googleAnalyticsTrackingCode();
+
+	/**
+	 * Google Auth key for fetching Youtube channel favicons.
+	 */
+	Optional<String> googleAuthKey();
+
+	/**
+	 * HTTP client configuration
+	 */
+	HttpClient httpClient();
+
+	/**
+	 * Feed refresh engine settings.
+	 */
+	FeedRefresh feedRefresh();
+
+	/**
+	 * Database settings.
+	 */
+	Database database();
+
+	/**
+	 * Users settings.
+	 */
+	Users users();
+
+	/**
+	 * Websocket settings.
+	 */
+	Websocket websocket();
+
+	interface HttpClient {
+		/**
+		 * User-Agent string that will be used by the http client, leave empty for the default one.
+		 */
+		Optional<String> userAgent();
+
+		/**
+		 * Time to wait for a connection to be established.
+		 */
+		@WithDefault("5s")
+		Duration connectTimeout();
+
+		/**
+		 * Time to wait for SSL handshake to complete.
+		 */
+		@WithDefault("5s")
+		Duration sslHandshakeTimeout();
+
+		/**
+		 * Time to wait between two packets before timeout.
+		 */
+		@WithDefault("10s")
+		Duration socketTimeout();
+
+		/**
+		 * Time to wait for the full response to be received.
+		 */
+		@WithDefault("10s")
+		Duration responseTimeout();
+
+		/**
+		 * Time to live for a connection in the pool.
+		 */
+		@WithDefault("30s")
+		Duration connectionTimeToLive();
+
+		/**
+		 * Time between eviction runs for idle connections.
+		 */
+		@WithDefault("1m")
+		Duration idleConnectionsEvictionInterval();
+
+		/**
+		 * If a feed is larger than this, it will be discarded to prevent memory issues while parsing the feed.
+		 */
+		@WithDefault("5M")
+		MemorySize maxResponseSize();
 	}
 
-	@Valid
-	@NotNull
-	@JsonProperty("database")
-	private final DataSourceFactory dataSourceFactory = new DataSourceFactory();
+	interface FeedRefresh {
+		/**
+		 * Amount of time CommaFeed will wait before refreshing the same feed.
+		 */
+		@WithDefault("5m")
+		Duration interval();
 
-	@Valid
-	@NotNull
-	@JsonProperty("redis")
-	private final RedisPoolFactory redisPoolFactory = new RedisPoolFactory();
+		/**
+		 * If true, CommaFeed will calculate the next refresh time based on the feed's average time between entries and the time since the
+		 * last entry was published. The interval will be somewhere between the default refresh interval and 24h.
+		 * 
+		 * See {@link FeedRefreshIntervalCalculator} for details.
+		 */
+		@WithDefault("false")
+		boolean intervalEmpirical();
 
-	@Valid
-	@NotNull
-	@JsonProperty("session")
-	private final SessionHandlerFactory sessionHandlerFactory = new SessionHandlerFactory();
+		/**
+		 * Amount of http threads used to fetch feeds.
+		 */
+		@Min(1)
+		@WithDefault("3")
+		int httpThreads();
 
-	@Valid
-	@NotNull
-	@JsonProperty("app")
-	private ApplicationSettings applicationSettings;
+		/**
+		 * Amount of threads used to insert new entries in the database.
+		 */
+		@Min(1)
+		@WithDefault("1")
+		int databaseThreads();
 
-	private final String version;
-	private final String gitCommit;
+		/**
+		 * Duration after which a user is considered inactive. Feeds for inactive users are not refreshed until they log in again.
+		 *
+		 * 0 to disable.
+		 */
+		@WithDefault("0")
+		Duration userInactivityPeriod();
 
-	public CommaFeedConfiguration() {
-		Properties properties = new Properties();
-		try (InputStream stream = getClass().getResourceAsStream("/git.properties")) {
-			if (stream != null) {
-				properties.load(stream);
+		/**
+		 * Duration after which the evaluation of a filtering expresion to mark an entry as read is considered to have timed out.
+		 */
+		@WithDefault("500ms")
+		Duration filteringExpressionEvaluationTimeout();
+	}
+
+	interface Database {
+		/**
+		 * Database query timeout.
+		 *
+		 * 0 to disable.
+		 */
+		@WithDefault("0")
+		Duration queryTimeout();
+
+		Cleanup cleanup();
+
+		interface Cleanup {
+			/**
+			 * Maximum age of feed entries in the database. Older entries will be deleted.
+			 *
+			 * 0 to disable.
+			 */
+			@WithDefault("365d")
+			Duration entriesMaxAge();
+
+			/**
+			 * Maximum age of feed entry statuses (read/unread) in the database. Older statuses will be deleted.
+			 *
+			 * 0 to disable.
+			 */
+			@WithDefault("0")
+			Duration statusesMaxAge();
+
+			/**
+			 * Maximum number of entries per feed to keep in the database.
+			 *
+			 * 0 to disable.
+			 */
+			@WithDefault("500")
+			int maxFeedCapacity();
+
+			/**
+			 * Limit the number of feeds a user can subscribe to.
+			 *
+			 * 0 to disable.
+			 */
+			@WithDefault("0")
+			int maxFeedsPerUser();
+
+			/**
+			 * Rows to delete per query while cleaning up old entries.
+			 */
+			@Positive
+			@WithDefault("100")
+			int batchSize();
+
+			default Instant statusesInstantThreshold() {
+				return statusesMaxAge().toMillis() > 0 ? Instant.now().minus(statusesMaxAge()) : null;
 			}
-		} catch (IOException e) {
-			throw new RuntimeException(e);
 		}
-
-		this.version = properties.getProperty("git.build.version", "unknown");
-		this.gitCommit = properties.getProperty("git.commit.id.abbrev", "unknown");
 	}
 
-	@Getter
-	@Setter
-	public static class ApplicationSettings {
-		@NotNull
-		@NotBlank
-		@Valid
-		private String publicUrl;
+	interface Users {
+		/**
+		 * Whether to let users create accounts for themselves.
+		 */
+		@WithDefault("false")
+		boolean allowRegistrations();
 
-		@NotNull
-		@Valid
-		private Boolean hideFromWebCrawlers = true;
+		/**
+		 * Whether to enable strict password validation (1 uppercase char, 1 lowercase char, 1 digit, 1 special char).
+		 */
+		@WithDefault("true")
+		boolean strictPasswordPolicy();
 
-		@NotNull
-		@Valid
-		private Boolean allowRegistrations;
+		/**
+		 * Whether to create a demo account the first time the app starts.
+		 */
+		@WithDefault("false")
+		boolean createDemoAccount();
+	}
 
-		@NotNull
-		@Valid
-		private Boolean strictPasswordPolicy = true;
+	interface Websocket {
+		/**
+		 * Enable websocket connection so the server can notify web clients that there are new entries for feeds.
+		 */
+		@WithDefault("true")
+		boolean enabled();
 
-		@NotNull
-		@Valid
-		private Boolean createDemoAccount;
-
-		private String googleAnalyticsTrackingCode;
-
-		private String googleAuthKey;
-
-		@NotNull
-		@Min(1)
-		@Valid
-		private Integer backgroundThreads;
-
-		@NotNull
-		@Min(1)
-		@Valid
-		private Integer databaseUpdateThreads;
-
-		@NotNull
-		@Positive
-		@Valid
-		private Integer databaseCleanupBatchSize = 100;
-
-		private String smtpHost;
-		private int smtpPort;
-		private boolean smtpTls;
-		private String smtpUserName;
-		private String smtpPassword;
-		private String smtpFromAddress;
-
-		private boolean graphiteEnabled;
-		private String graphitePrefix;
-		private String graphiteHost;
-		private int graphitePort;
-		private int graphiteInterval;
-
-		@NotNull
-		@Valid
-		private Boolean heavyLoad;
-
-		@NotNull
-		@Valid
-		private Boolean imageProxyEnabled;
-
-		@NotNull
-		@Min(0)
-		@Valid
-		private Integer queryTimeout;
-
-		@NotNull
-		@Min(0)
-		@Valid
-		private Integer keepStatusDays;
-
-		@NotNull
-		@Min(0)
-		@Valid
-		private Integer maxFeedCapacity;
-
-		@NotNull
-		@Min(0)
-		@Valid
-		private Integer maxEntriesAgeDays = 0;
-
-		@NotNull
-		@Valid
-		private Integer maxFeedsPerUser = 0;
-
-		@NotNull
-		@Min(0)
-		@Valid
-		private Integer refreshIntervalMinutes;
-
-		@NotNull
-		@Valid
-		private CacheType cache;
-
-		@Valid
-		private String announcement;
-
-		private String userAgent;
-
-		private Boolean websocketEnabled = true;
-
-		private Duration websocketPingInterval = Duration.minutes(15);
-
-		private Duration treeReloadInterval = Duration.seconds(30);
-
-		public Instant getUnreadThreshold() {
-			return getKeepStatusDays() > 0 ? Instant.now().minus(getKeepStatusDays(), ChronoUnit.DAYS) : null;
-		}
+		/**
+		 * Interval at which the client will send a ping message on the websocket to keep the connection alive.
+		 */
+		@WithDefault("15m")
+		Duration pingInterval();
 
+		/**
+		 * If the websocket connection is disabled or the connection is lost, the client will reload the feed tree at this interval.
+		 */
+		@WithDefault("30s")
+		Duration treeReloadInterval();
 	}
 
 }

commafeed-server/src/main/java/com/commafeed/CommaFeedModule.java

@@ -1,97 +0,0 @@
-package com.commafeed;
-
-import java.net.InetSocketAddress;
-import java.util.concurrent.TimeUnit;
-
-import org.hibernate.SessionFactory;
-
-import com.codahale.metrics.MetricFilter;
-import com.codahale.metrics.MetricRegistry;
-import com.codahale.metrics.graphite.Graphite;
-import com.codahale.metrics.graphite.GraphiteReporter;
-import com.commafeed.CommaFeedConfiguration.ApplicationSettings;
-import com.commafeed.CommaFeedConfiguration.CacheType;
-import com.commafeed.backend.cache.CacheService;
-import com.commafeed.backend.cache.NoopCacheService;
-import com.commafeed.backend.cache.RedisCacheService;
-import com.commafeed.backend.favicon.AbstractFaviconFetcher;
-import com.commafeed.backend.favicon.DefaultFaviconFetcher;
-import com.commafeed.backend.favicon.FacebookFaviconFetcher;
-import com.commafeed.backend.favicon.YoutubeFaviconFetcher;
-import com.commafeed.backend.task.DemoAccountCleanupTask;
-import com.commafeed.backend.task.EntriesExceedingFeedCapacityCleanupTask;
-import com.commafeed.backend.task.OldEntriesCleanupTask;
-import com.commafeed.backend.task.OldStatusesCleanupTask;
-import com.commafeed.backend.task.OrphanedContentsCleanupTask;
-import com.commafeed.backend.task.OrphanedFeedsCleanupTask;
-import com.commafeed.backend.task.ScheduledTask;
-import com.commafeed.backend.urlprovider.FeedURLProvider;
-import com.commafeed.backend.urlprovider.InPageReferenceFeedURLProvider;
-import com.commafeed.backend.urlprovider.YoutubeFeedURLProvider;
-import com.google.inject.AbstractModule;
-import com.google.inject.Provides;
-import com.google.inject.multibindings.Multibinder;
-
-import lombok.Getter;
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-
-@RequiredArgsConstructor
-@Slf4j
-public class CommaFeedModule extends AbstractModule {
-
-	@Getter(onMethod = @__({ @Provides }))
-	private final SessionFactory sessionFactory;
-
-	@Getter(onMethod = @__({ @Provides }))
-	private final CommaFeedConfiguration config;
-
-	@Getter(onMethod = @__({ @Provides }))
-	private final MetricRegistry metrics;
-
-	@Override
-	protected void configure() {
-		CacheService cacheService = config.getApplicationSettings().getCache() == CacheType.NOOP ? new NoopCacheService()
-				: new RedisCacheService(config.getRedisPoolFactory().build());
-		log.info("using cache {}", cacheService.getClass());
-		bind(CacheService.class).toInstance(cacheService);
-
-		Multibinder<AbstractFaviconFetcher> faviconMultibinder = Multibinder.newSetBinder(binder(), AbstractFaviconFetcher.class);
-		faviconMultibinder.addBinding().to(YoutubeFaviconFetcher.class);
-		faviconMultibinder.addBinding().to(FacebookFaviconFetcher.class);
-		faviconMultibinder.addBinding().to(DefaultFaviconFetcher.class);
-
-		Multibinder<FeedURLProvider> urlProviderMultibinder = Multibinder.newSetBinder(binder(), FeedURLProvider.class);
-		urlProviderMultibinder.addBinding().to(InPageReferenceFeedURLProvider.class);
-		urlProviderMultibinder.addBinding().to(YoutubeFeedURLProvider.class);
-
-		Multibinder<ScheduledTask> taskMultibinder = Multibinder.newSetBinder(binder(), ScheduledTask.class);
-		taskMultibinder.addBinding().to(OldStatusesCleanupTask.class);
-		taskMultibinder.addBinding().to(EntriesExceedingFeedCapacityCleanupTask.class);
-		taskMultibinder.addBinding().to(OldEntriesCleanupTask.class);
-		taskMultibinder.addBinding().to(OrphanedFeedsCleanupTask.class);
-		taskMultibinder.addBinding().to(OrphanedContentsCleanupTask.class);
-		taskMultibinder.addBinding().to(DemoAccountCleanupTask.class);
-
-		ApplicationSettings settings = config.getApplicationSettings();
-
-		if (settings.isGraphiteEnabled()) {
-			final String graphitePrefix = settings.getGraphitePrefix();
-			final String graphiteHost = settings.getGraphiteHost();
-			final int graphitePort = settings.getGraphitePort();
-			final int graphiteInterval = settings.getGraphiteInterval();
-
-			log.info("Graphite Metrics will be sent to host={}, port={}, prefix={}, interval={}sec", graphiteHost, graphitePort,
-					graphitePrefix, graphiteInterval);
-
-			final Graphite graphite = new Graphite(new InetSocketAddress(graphiteHost, graphitePort));
-			final GraphiteReporter reporter = GraphiteReporter.forRegistry(metrics)
-					.prefixedWith(graphitePrefix)
-					.convertRatesTo(TimeUnit.SECONDS)
-					.convertDurationsTo(TimeUnit.MILLISECONDS)
-					.filter(MetricFilter.ALL)
-					.build(graphite);
-			reporter.start(graphiteInterval, TimeUnit.SECONDS);
-		}
-	}
-}

commafeed-server/src/main/java/com/commafeed/CommaFeedProducers.java

@@ -0,0 +1,16 @@
+package com.commafeed;
+
+import com.codahale.metrics.MetricRegistry;
+
+import jakarta.enterprise.inject.Produces;
+import jakarta.inject.Singleton;
+
+@Singleton
+public class CommaFeedProducers {
+
+	@Produces
+	@Singleton
+	public MetricRegistry metricRegistry() {
+		return new MetricRegistry();
+	}
+}

commafeed-server/src/main/java/com/commafeed/CommaFeedVersion.java

@@ -0,0 +1,31 @@
+package com.commafeed;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.Properties;
+
+import jakarta.inject.Singleton;
+import lombok.Getter;
+
+@Singleton
+@Getter
+public class CommaFeedVersion {
+
+	private final String version;
+	private final String gitCommit;
+
+	public CommaFeedVersion() {
+		Properties properties = new Properties();
+		try (InputStream stream = getClass().getResourceAsStream("/git.properties")) {
+			if (stream != null) {
+				properties.load(stream);
+			}
+		} catch (IOException e) {
+			throw new RuntimeException(e);
+		}
+
+		this.version = properties.getProperty("git.build.version", "unknown");
+		this.gitCommit = properties.getProperty("git.commit.id.abbrev", "unknown");
+	}
+
+}

commafeed-server/src/main/java/com/commafeed/ExceptionMappers.java

@@ -0,0 +1,49 @@
+package com.commafeed;
+
+import org.jboss.resteasy.reactive.RestResponse;
+import org.jboss.resteasy.reactive.RestResponse.Status;
+import org.jboss.resteasy.reactive.server.ServerExceptionMapper;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+import io.quarkus.security.AuthenticationFailedException;
+import io.quarkus.security.UnauthorizedException;
+import jakarta.annotation.Priority;
+import jakarta.validation.ValidationException;
+import jakarta.ws.rs.ext.Provider;
+import lombok.RequiredArgsConstructor;
+
+@RequiredArgsConstructor
+@Provider
+@Priority(1)
+public class ExceptionMappers {
+
+	private final CommaFeedConfiguration config;
+
+	@ServerExceptionMapper(UnauthorizedException.class)
+	public RestResponse<UnauthorizedResponse> unauthorized(UnauthorizedException e) {
+		return RestResponse.status(RestResponse.Status.UNAUTHORIZED,
+				new UnauthorizedResponse(e.getMessage(), config.users().allowRegistrations()));
+	}
+
+	@ServerExceptionMapper(AuthenticationFailedException.class)
+	public RestResponse<AuthenticationFailed> authenticationFailed(AuthenticationFailedException e) {
+		return RestResponse.status(RestResponse.Status.UNAUTHORIZED, new AuthenticationFailed(e.getMessage()));
+	}
+
+	@ServerExceptionMapper(ValidationException.class)
+	public RestResponse<ValidationFailed> validationFailed(ValidationException e) {
+		return RestResponse.status(Status.BAD_REQUEST, new ValidationFailed(e.getMessage()));
+	}
+
+	@RegisterForReflection
+	public record UnauthorizedResponse(String message, boolean allowRegistrations) {
+	}
+
+	@RegisterForReflection
+	public record AuthenticationFailed(String message) {
+	}
+
+	@RegisterForReflection
+	public record ValidationFailed(String message) {
+	}
+}

commafeed-server/src/main/java/com/commafeed/JacksonCustomizer.java

@@ -0,0 +1,27 @@
+package com.commafeed;
+
+import java.util.concurrent.TimeUnit;
+
+import com.codahale.metrics.json.MetricsModule;
+import com.fasterxml.jackson.databind.DeserializationFeature;
+import com.fasterxml.jackson.databind.ObjectMapper;
+import com.fasterxml.jackson.databind.SerializationFeature;
+import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
+
+import io.quarkus.jackson.ObjectMapperCustomizer;
+import jakarta.inject.Singleton;
+
+@Singleton
+public class JacksonCustomizer implements ObjectMapperCustomizer {
+	@Override
+	public void customize(ObjectMapper objectMapper) {
+		objectMapper.registerModule(new JavaTimeModule());
+
+		// read and write instants as milliseconds instead of nanoseconds
+		objectMapper.configure(SerializationFeature.WRITE_DATE_TIMESTAMPS_AS_NANOSECONDS, false)
+				.configure(DeserializationFeature.READ_DATE_TIMESTAMPS_AS_NANOSECONDS, false);
+
+		// add support for serializing metrics
+		objectMapper.registerModule(new MetricsModule(TimeUnit.SECONDS, TimeUnit.SECONDS, false));
+	}
+}

commafeed-server/src/main/java/com/commafeed/NativeImageClasses.java

@@ -0,0 +1,226 @@
+package com.commafeed;
+
+import com.codahale.metrics.Counter;
+import com.codahale.metrics.Gauge;
+import com.codahale.metrics.Histogram;
+import com.codahale.metrics.Meter;
+import com.codahale.metrics.MetricRegistry;
+import com.codahale.metrics.Timer;
+
+import io.quarkus.runtime.annotations.RegisterForReflection;
+
+@RegisterForReflection(
+		targets = {
+				// metrics
+				MetricRegistry.class, Meter.class, Gauge.class, Counter.class, Timer.class, Histogram.class,
+
+				// rome
+				java.util.Date.class, com.rometools.opml.feed.synd.impl.TreeCategoryImpl.class,
+				com.rometools.rome.feed.synd.SyndFeedImpl.class, com.rometools.rome.feed.module.DCSubjectImpl.class,
+				com.rometools.rome.feed.synd.SyndEntryImpl.class, com.rometools.modules.psc.types.SimpleChapter.class,
+				com.rometools.rome.feed.synd.SyndCategoryImpl.class, com.rometools.rome.feed.synd.SyndImageImpl.class,
+				com.rometools.rome.feed.synd.SyndContentImpl.class, com.rometools.rome.feed.synd.SyndEnclosureImpl.class,
+
+				// rome cloneable
+				com.rometools.modules.activitystreams.types.Article.class, com.rometools.modules.activitystreams.types.Audio.class,
+				com.rometools.modules.activitystreams.types.Bookmark.class, com.rometools.modules.activitystreams.types.Comment.class,
+				com.rometools.modules.activitystreams.types.Event.class, com.rometools.modules.activitystreams.types.File.class,
+				com.rometools.modules.activitystreams.types.Folder.class, com.rometools.modules.activitystreams.types.List.class,
+				com.rometools.modules.activitystreams.types.Note.class, com.rometools.modules.activitystreams.types.Person.class,
+				com.rometools.modules.activitystreams.types.Photo.class, com.rometools.modules.activitystreams.types.PhotoAlbum.class,
+				com.rometools.modules.activitystreams.types.Place.class, com.rometools.modules.activitystreams.types.Playlist.class,
+				com.rometools.modules.activitystreams.types.Product.class, com.rometools.modules.activitystreams.types.Review.class,
+				com.rometools.modules.activitystreams.types.Service.class, com.rometools.modules.activitystreams.types.Song.class,
+				com.rometools.modules.activitystreams.types.Status.class, com.rometools.modules.base.types.DateTimeRange.class,
+				com.rometools.modules.base.types.FloatUnit.class, com.rometools.modules.base.types.GenderEnumeration.class,
+				com.rometools.modules.base.types.IntUnit.class, com.rometools.modules.base.types.PriceTypeEnumeration.class,
+				com.rometools.modules.base.types.ShippingType.class, com.rometools.modules.base.types.ShortDate.class,
+				com.rometools.modules.base.types.Size.class, com.rometools.modules.base.types.YearType.class,
+				com.rometools.modules.content.ContentItem.class, com.rometools.modules.georss.GeoRSSPoint.class,
+				com.rometools.modules.georss.geometries.Envelope.class, com.rometools.modules.georss.geometries.LineString.class,
+				com.rometools.modules.georss.geometries.LinearRing.class, com.rometools.modules.georss.geometries.Point.class,
+				com.rometools.modules.georss.geometries.Polygon.class, com.rometools.modules.georss.geometries.Position.class,
+				com.rometools.modules.georss.geometries.PositionList.class, com.rometools.modules.mediarss.types.MediaGroup.class,
+				com.rometools.modules.mediarss.types.Metadata.class, com.rometools.modules.mediarss.types.Thumbnail.class,
+				com.rometools.modules.opensearch.entity.OSQuery.class, com.rometools.modules.photocast.types.PhotoDate.class,
+				com.rometools.modules.sle.types.DateValue.class, com.rometools.modules.sle.types.Group.class,
+				com.rometools.modules.sle.types.NumberValue.class, com.rometools.modules.sle.types.Sort.class,
+				com.rometools.modules.sle.types.StringValue.class, com.rometools.modules.yahooweather.types.Astronomy.class,
+				com.rometools.modules.yahooweather.types.Atmosphere.class, com.rometools.modules.yahooweather.types.Condition.class,
+				com.rometools.modules.yahooweather.types.Forecast.class, com.rometools.modules.yahooweather.types.Location.class,
+				com.rometools.modules.yahooweather.types.Units.class, com.rometools.modules.yahooweather.types.Wind.class,
+				com.rometools.opml.feed.opml.Attribute.class, com.rometools.opml.feed.opml.Opml.class,
+				com.rometools.opml.feed.opml.Outline.class, com.rometools.rome.feed.atom.Category.class,
+				com.rometools.rome.feed.atom.Content.class, com.rometools.rome.feed.atom.Entry.class,
+				com.rometools.rome.feed.atom.Feed.class, com.rometools.rome.feed.atom.Generator.class,
+				com.rometools.rome.feed.atom.Link.class, com.rometools.rome.feed.atom.Person.class,
+				com.rometools.rome.feed.rss.Category.class, com.rometools.rome.feed.rss.Channel.class,
+				com.rometools.rome.feed.rss.Cloud.class, com.rometools.rome.feed.rss.Content.class,
+				com.rometools.rome.feed.rss.Description.class, com.rometools.rome.feed.rss.Enclosure.class,
+				com.rometools.rome.feed.rss.Guid.class, com.rometools.rome.feed.rss.Image.class, com.rometools.rome.feed.rss.Item.class,
+				com.rometools.rome.feed.rss.Source.class, com.rometools.rome.feed.rss.TextInput.class,
+				com.rometools.rome.feed.synd.SyndLinkImpl.class, com.rometools.rome.feed.synd.SyndPersonImpl.class,
+				java.util.ArrayList.class,
+
+				// rome modules
+				com.rometools.modules.sse.modules.Conflict.class, com.rometools.modules.sse.modules.Conflicts.class,
+				com.rometools.modules.cc.CreativeCommonsImpl.class, com.rometools.modules.feedpress.modules.FeedpressModuleImpl.class,
+				com.rometools.modules.opensearch.impl.OpenSearchModuleImpl.class, com.rometools.modules.sse.modules.Sharing.class,
+				com.rometools.modules.georss.SimpleModuleImpl.class, com.rometools.modules.atom.modules.AtomLinkModuleImpl.class,
+				com.rometools.modules.itunes.EntryInformationImpl.class, com.rometools.modules.sse.modules.Update.class,
+				com.rometools.modules.photocast.PhotocastModuleImpl.class, com.rometools.modules.itunes.FeedInformationImpl.class,
+				com.rometools.modules.yahooweather.YWeatherModuleImpl.class, com.rometools.modules.feedburner.FeedBurnerImpl.class,
+				com.rometools.modules.sse.modules.Related.class, com.rometools.modules.fyyd.modules.FyydModuleImpl.class,
+				com.rometools.modules.psc.modules.PodloveSimpleChapterModuleImpl.class, com.rometools.modules.thr.ThreadingModuleImpl.class,
+				com.rometools.modules.sse.modules.Sync.class, com.rometools.modules.sle.SimpleListExtensionImpl.class,
+				com.rometools.modules.slash.SlashImpl.class, com.rometools.modules.sse.modules.History.class,
+				com.rometools.modules.georss.GMLModuleImpl.class, com.rometools.modules.base.CustomTagsImpl.class,
+				com.rometools.modules.base.GoogleBaseImpl.class, com.rometools.modules.sle.SleEntryImpl.class,
+				com.rometools.modules.mediarss.MediaEntryModuleImpl.class, com.rometools.modules.content.ContentModuleImpl.class,
+				com.rometools.modules.georss.W3CGeoModuleImpl.class, com.rometools.rome.feed.module.DCModuleImpl.class,
+				com.rometools.modules.mediarss.MediaModuleImpl.class, com.rometools.rome.feed.module.SyModuleImpl.class,
+
+				// extracted from all 3 rome.properties files of rome library
+				com.rometools.rome.io.impl.RSS090Parser.class, com.rometools.rome.io.impl.RSS091NetscapeParser.class,
+				com.rometools.rome.io.impl.RSS091UserlandParser.class, com.rometools.rome.io.impl.RSS092Parser.class,
+				com.rometools.rome.io.impl.RSS093Parser.class, com.rometools.rome.io.impl.RSS094Parser.class,
+				com.rometools.rome.io.impl.RSS10Parser.class, com.rometools.rome.io.impl.RSS20wNSParser.class,
+				com.rometools.rome.io.impl.RSS20Parser.class, com.rometools.rome.io.impl.Atom10Parser.class,
+				com.rometools.rome.io.impl.Atom03Parser.class,
+
+				com.rometools.rome.io.impl.SyModuleParser.class, com.rometools.rome.io.impl.DCModuleParser.class,
+
+				com.rometools.rome.io.impl.RSS090Generator.class, com.rometools.rome.io.impl.RSS091NetscapeGenerator.class,
+				com.rometools.rome.io.impl.RSS091UserlandGenerator.class, com.rometools.rome.io.impl.RSS092Generator.class,
+				com.rometools.rome.io.impl.RSS093Generator.class, com.rometools.rome.io.impl.RSS094Generator.class,
+				com.rometools.rome.io.impl.RSS10Generator.class, com.rometools.rome.io.impl.RSS20Generator.class,
+				com.rometools.rome.io.impl.Atom10Generator.class, com.rometools.rome.io.impl.Atom03Generator.class,
+
+				com.rometools.rome.feed.synd.impl.ConverterForAtom10.class, com.rometools.rome.feed.synd.impl.ConverterForAtom03.class,
+				com.rometools.rome.feed.synd.impl.ConverterForRSS090.class,
+				com.rometools.rome.feed.synd.impl.ConverterForRSS091Netscape.class,
+				com.rometools.rome.feed.synd.impl.ConverterForRSS091Userland.class,
+				com.rometools.rome.feed.synd.impl.ConverterForRSS092.class, com.rometools.rome.feed.synd.impl.ConverterForRSS093.class,
+				com.rometools.rome.feed.synd.impl.ConverterForRSS094.class, com.rometools.rome.feed.synd.impl.ConverterForRSS10.class,
+				com.rometools.rome.feed.synd.impl.ConverterForRSS20.class,
+
+				com.rometools.modules.mediarss.io.RSS20YahooParser.class,
+
+				com.rometools.modules.cc.io.ModuleParserRSS2.class, com.rometools.modules.content.io.ContentModuleParser.class,
+				com.rometools.modules.itunes.io.ITunesParser.class, com.rometools.modules.mediarss.io.MediaModuleParser.class,
+				com.rometools.modules.opensearch.impl.OpenSearchModuleParser.class, com.rometools.modules.georss.SimpleParser.class,
+				com.rometools.modules.georss.W3CGeoParser.class, com.rometools.modules.photocast.io.Parser.class,
+				com.rometools.modules.mediarss.io.MediaModuleParser.class, com.rometools.modules.atom.io.AtomModuleParser.class,
+				com.rometools.modules.itunes.io.ITunesParserOldNamespace.class,
+				com.rometools.modules.mediarss.io.AlternateMediaModuleParser.class, com.rometools.modules.sle.io.ModuleParser.class,
+				com.rometools.modules.yahooweather.io.WeatherModuleParser.class, com.rometools.modules.feedpress.io.FeedpressParser.class,
+				com.rometools.modules.fyyd.io.FyydParser.class,
+
+				com.rometools.modules.cc.io.ModuleParserRSS2.class, com.rometools.modules.content.io.ContentModuleParser.class,
+				com.rometools.modules.itunes.io.ITunesParser.class, com.rometools.modules.mediarss.io.MediaModuleParser.class,
+				com.rometools.modules.opensearch.impl.OpenSearchModuleParser.class, com.rometools.modules.georss.SimpleParser.class,
+				com.rometools.modules.georss.W3CGeoParser.class, com.rometools.modules.photocast.io.Parser.class,
+				com.rometools.modules.mediarss.io.MediaModuleParser.class, com.rometools.modules.atom.io.AtomModuleParser.class,
+				com.rometools.modules.itunes.io.ITunesParserOldNamespace.class,
+				com.rometools.modules.mediarss.io.AlternateMediaModuleParser.class, com.rometools.modules.sle.io.ModuleParser.class,
+				com.rometools.modules.yahooweather.io.WeatherModuleParser.class, com.rometools.modules.feedpress.io.FeedpressParser.class,
+				com.rometools.modules.fyyd.io.FyydParser.class,
+
+				com.rometools.modules.cc.io.ModuleParserRSS1.class, com.rometools.modules.content.io.ContentModuleParser.class,
+
+				com.rometools.modules.cc.io.ModuleParserRSS2.class, com.rometools.modules.opensearch.impl.OpenSearchModuleParser.class,
+				com.rometools.modules.georss.SimpleParser.class, com.rometools.modules.georss.W3CGeoParser.class,
+				com.rometools.modules.photocast.io.Parser.class, com.rometools.modules.mediarss.io.MediaModuleParser.class,
+				com.rometools.modules.mediarss.io.AlternateMediaModuleParser.class,
+
+				com.rometools.modules.cc.io.ModuleParserRSS2.class, com.rometools.modules.opensearch.impl.OpenSearchModuleParser.class,
+				com.rometools.modules.georss.SimpleParser.class, com.rometools.modules.georss.W3CGeoParser.class,
+				com.rometools.modules.photocast.io.Parser.class, com.rometools.modules.mediarss.io.MediaModuleParser.class,
+				com.rometools.modules.mediarss.io.AlternateMediaModuleParser.class,
+				com.rometools.modules.feedpress.io.FeedpressParser.class, com.rometools.modules.fyyd.io.FyydParser.class,
+
+				com.rometools.modules.cc.io.ModuleParserRSS2.class, com.rometools.modules.base.io.GoogleBaseParser.class,
+				com.rometools.modules.content.io.ContentModuleParser.class, com.rometools.modules.slash.io.SlashModuleParser.class,
+				com.rometools.modules.itunes.io.ITunesParser.class, com.rometools.modules.mediarss.io.MediaModuleParser.class,
+				com.rometools.modules.atom.io.AtomModuleParser.class, com.rometools.modules.opensearch.impl.OpenSearchModuleParser.class,
+				com.rometools.modules.georss.SimpleParser.class, com.rometools.modules.georss.W3CGeoParser.class,
+				com.rometools.modules.photocast.io.Parser.class, com.rometools.modules.itunes.io.ITunesParserOldNamespace.class,
+				com.rometools.modules.mediarss.io.AlternateMediaModuleParser.class, com.rometools.modules.sle.io.ItemParser.class,
+				com.rometools.modules.yahooweather.io.WeatherModuleParser.class,
+				com.rometools.modules.psc.io.PodloveSimpleChapterParser.class,
+
+				com.rometools.modules.cc.io.ModuleParserRSS1.class, com.rometools.modules.base.io.GoogleBaseParser.class,
+				com.rometools.modules.base.io.CustomTagParser.class, com.rometools.modules.content.io.ContentModuleParser.class,
+				com.rometools.modules.slash.io.SlashModuleParser.class,
+
+				com.rometools.modules.cc.io.ModuleParserRSS2.class, com.rometools.modules.base.io.GoogleBaseParser.class,
+				com.rometools.modules.base.io.CustomTagParser.class, com.rometools.modules.slash.io.SlashModuleParser.class,
+				com.rometools.modules.opensearch.impl.OpenSearchModuleParser.class, com.rometools.modules.georss.SimpleParser.class,
+				com.rometools.modules.georss.W3CGeoParser.class, com.rometools.modules.photocast.io.Parser.class,
+				com.rometools.modules.mediarss.io.MediaModuleParser.class,
+				com.rometools.modules.mediarss.io.AlternateMediaModuleParser.class,
+
+				com.rometools.modules.cc.io.ModuleParserRSS2.class, com.rometools.modules.base.io.GoogleBaseParser.class,
+				com.rometools.modules.base.io.CustomTagParser.class, com.rometools.modules.slash.io.SlashModuleParser.class,
+				com.rometools.modules.opensearch.impl.OpenSearchModuleParser.class, com.rometools.modules.georss.SimpleParser.class,
+				com.rometools.modules.georss.W3CGeoParser.class, com.rometools.modules.photocast.io.Parser.class,
+				com.rometools.modules.mediarss.io.MediaModuleParser.class,
+				com.rometools.modules.mediarss.io.AlternateMediaModuleParser.class,
+				com.rometools.modules.thr.io.ThreadingModuleParser.class, com.rometools.modules.psc.io.PodloveSimpleChapterParser.class,
+
+				com.rometools.modules.cc.io.CCModuleGenerator.class, com.rometools.modules.content.io.ContentModuleGenerator.class,
+				com.rometools.modules.itunes.io.ITunesGenerator.class,
+				com.rometools.modules.opensearch.impl.OpenSearchModuleGenerator.class, com.rometools.modules.georss.SimpleGenerator.class,
+				com.rometools.modules.georss.W3CGeoGenerator.class, com.rometools.modules.photocast.io.Generator.class,
+				com.rometools.modules.mediarss.io.MediaModuleGenerator.class, com.rometools.modules.atom.io.AtomModuleGenerator.class,
+				com.rometools.modules.sle.io.ModuleGenerator.class, com.rometools.modules.yahooweather.io.WeatherModuleGenerator.class,
+				com.rometools.modules.feedpress.io.FeedpressGenerator.class, com.rometools.modules.fyyd.io.FyydGenerator.class,
+
+				com.rometools.modules.content.io.ContentModuleGenerator.class,
+
+				com.rometools.modules.cc.io.CCModuleGenerator.class, com.rometools.modules.opensearch.impl.OpenSearchModuleGenerator.class,
+				com.rometools.modules.georss.SimpleGenerator.class, com.rometools.modules.georss.W3CGeoGenerator.class,
+				com.rometools.modules.photocast.io.Generator.class, com.rometools.modules.mediarss.io.MediaModuleGenerator.class,
+
+				com.rometools.modules.cc.io.CCModuleGenerator.class, com.rometools.modules.opensearch.impl.OpenSearchModuleGenerator.class,
+				com.rometools.modules.georss.SimpleGenerator.class, com.rometools.modules.georss.W3CGeoGenerator.class,
+				com.rometools.modules.photocast.io.Generator.class, com.rometools.modules.mediarss.io.MediaModuleGenerator.class,
+				com.rometools.modules.feedpress.io.FeedpressGenerator.class, com.rometools.modules.fyyd.io.FyydGenerator.class,
+
+				com.rometools.modules.cc.io.CCModuleGenerator.class, com.rometools.modules.base.io.GoogleBaseGenerator.class,
+				com.rometools.modules.base.io.CustomTagGenerator.class, com.rometools.modules.content.io.ContentModuleGenerator.class,
+				com.rometools.modules.slash.io.SlashModuleGenerator.class, com.rometools.modules.itunes.io.ITunesGenerator.class,
+				com.rometools.modules.opensearch.impl.OpenSearchModuleGenerator.class, com.rometools.modules.georss.SimpleGenerator.class,
+				com.rometools.modules.georss.W3CGeoGenerator.class, com.rometools.modules.photocast.io.Generator.class,
+				com.rometools.modules.mediarss.io.MediaModuleGenerator.class, com.rometools.modules.atom.io.AtomModuleGenerator.class,
+				com.rometools.modules.yahooweather.io.WeatherModuleGenerator.class,
+				com.rometools.modules.psc.io.PodloveSimpleChapterGenerator.class,
+
+				com.rometools.modules.base.io.GoogleBaseGenerator.class, com.rometools.modules.content.io.ContentModuleGenerator.class,
+				com.rometools.modules.slash.io.SlashModuleGenerator.class,
+
+				com.rometools.modules.cc.io.CCModuleGenerator.class, com.rometools.modules.base.io.GoogleBaseGenerator.class,
+				com.rometools.modules.base.io.CustomTagGenerator.class, com.rometools.modules.slash.io.SlashModuleGenerator.class,
+				com.rometools.modules.opensearch.impl.OpenSearchModuleGenerator.class, com.rometools.modules.georss.SimpleGenerator.class,
+				com.rometools.modules.georss.W3CGeoGenerator.class, com.rometools.modules.photocast.io.Generator.class,
+				com.rometools.modules.mediarss.io.MediaModuleGenerator.class,
+
+				com.rometools.modules.cc.io.CCModuleGenerator.class, com.rometools.modules.base.io.CustomTagGenerator.class,
+				com.rometools.modules.slash.io.SlashModuleGenerator.class,
+				com.rometools.modules.opensearch.impl.OpenSearchModuleGenerator.class, com.rometools.modules.georss.SimpleGenerator.class,
+				com.rometools.modules.georss.W3CGeoGenerator.class, com.rometools.modules.photocast.io.Generator.class,
+				com.rometools.modules.mediarss.io.MediaModuleGenerator.class, com.rometools.modules.thr.io.ThreadingModuleGenerator.class,
+				com.rometools.modules.psc.io.PodloveSimpleChapterGenerator.class,
+
+				com.rometools.modules.mediarss.io.MediaModuleParser.class,
+
+				com.rometools.modules.mediarss.io.MediaModuleGenerator.class,
+
+				com.rometools.opml.io.impl.OPML10Generator.class, com.rometools.opml.io.impl.OPML20Generator.class,
+
+				com.rometools.opml.io.impl.OPML10Parser.class, com.rometools.opml.io.impl.OPML20Parser.class,
+
+				com.rometools.opml.feed.synd.impl.ConverterForOPML10.class, com.rometools.opml.feed.synd.impl.ConverterForOPML20.class, })
+
+public class NativeImageClasses {
+}

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

@@ -1,37 +1,41 @@
 package com.commafeed.backend;
 
 import java.io.IOException;
+import java.io.InputStream;
 import java.net.URI;
+import java.time.Duration;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.Optional;
-import java.util.concurrent.TimeUnit;
 
 import org.apache.commons.lang3.StringUtils;
 import org.apache.hc.client5.http.config.ConnectionConfig;
 import org.apache.hc.client5.http.config.RequestConfig;
+import org.apache.hc.client5.http.config.TlsConfig;
 import org.apache.hc.client5.http.impl.classic.CloseableHttpClient;
 import org.apache.hc.client5.http.impl.classic.HttpClientBuilder;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManager;
 import org.apache.hc.client5.http.impl.io.PoolingHttpClientConnectionManagerBuilder;
+import org.apache.hc.client5.http.io.HttpClientConnectionManager;
 import org.apache.hc.client5.http.protocol.HttpClientContext;
 import org.apache.hc.client5.http.protocol.RedirectLocations;
 import org.apache.hc.core5.http.ClassicHttpRequest;
 import org.apache.hc.core5.http.Header;
 import org.apache.hc.core5.http.HttpEntity;
+import org.apache.hc.core5.http.HttpStatus;
 import org.apache.hc.core5.http.NameValuePair;
-import org.apache.hc.core5.http.io.entity.EntityUtils;
 import org.apache.hc.core5.http.io.support.ClassicRequestBuilder;
 import org.apache.hc.core5.http.message.BasicHeader;
 import org.apache.hc.core5.util.TimeValue;
 import org.apache.hc.core5.util.Timeout;
-import org.eclipse.jetty.http.HttpStatus;
 
+import com.codahale.metrics.MetricRegistry;
 import com.commafeed.CommaFeedConfiguration;
+import com.commafeed.CommaFeedVersion;
 import com.google.common.collect.Iterables;
+import com.google.common.io.ByteStreams;
 import com.google.common.net.HttpHeaders;
 
-import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
 import lombok.Getter;
 import lombok.RequiredArgsConstructor;
@@ -41,27 +45,36 @@ import nl.altindag.ssl.apache5.util.Apache5SslUtils;
 
 /**
  * Smart HTTP getter: handles gzip, ssl, last modified and etag headers
- *
  */
 @Singleton
 @Slf4j
 public class HttpGetter {
 
+	private final CommaFeedConfiguration config;
 	private final CloseableHttpClient client;
 
-	@Inject
-	public HttpGetter(CommaFeedConfiguration config) {
-		String userAgent = Optional.ofNullable(config.getApplicationSettings().getUserAgent())
-				.orElseGet(() -> String.format("CommaFeed/%s (https://github.com/Athou/commafeed)", config.getVersion()));
-		this.client = newClient(userAgent, config.getApplicationSettings().getBackgroundThreads());
+	public HttpGetter(CommaFeedConfiguration config, CommaFeedVersion version, MetricRegistry metrics) {
+		this.config = config;
+
+		PoolingHttpClientConnectionManager connectionManager = newConnectionManager(config);
+		String userAgent = config.httpClient()
+				.userAgent()
+				.orElseGet(() -> String.format("CommaFeed/%s (https://github.com/Athou/commafeed)", version.getVersion()));
+
+		this.client = newClient(connectionManager, userAgent, config.httpClient().idleConnectionsEvictionInterval());
+
+		metrics.registerGauge(MetricRegistry.name(getClass(), "pool", "max"), () -> connectionManager.getTotalStats().getMax());
+		metrics.registerGauge(MetricRegistry.name(getClass(), "pool", "size"),
+				() -> connectionManager.getTotalStats().getAvailable() + connectionManager.getTotalStats().getLeased());
+		metrics.registerGauge(MetricRegistry.name(getClass(), "pool", "leased"), () -> connectionManager.getTotalStats().getLeased());
+		metrics.registerGauge(MetricRegistry.name(getClass(), "pool", "pending"), () -> connectionManager.getTotalStats().getPending());
 	}
 
-	public HttpResult getBinary(String url, int timeout) throws IOException, NotModifiedException {
-		return getBinary(url, null, null, timeout);
+	public HttpResult getBinary(String url) throws IOException, NotModifiedException {
+		return getBinary(url, null, null);
 	}
 
 	/**
-	 *
 	 * @param url
 	 *            the url to retrive
 	 * @param lastModified
@@ -71,10 +84,9 @@ public class HttpGetter {
 	 * @throws NotModifiedException
 	 *             if the url hasn't changed since we asked for it last time
 	 */
-	public HttpResult getBinary(String url, String lastModified, String eTag, int timeout) throws IOException, NotModifiedException {
+	public HttpResult getBinary(String url, String lastModified, String eTag) throws IOException, NotModifiedException {
 		log.debug("fetching {}", url);
 
-		long start = System.currentTimeMillis();
 		ClassicHttpRequest request = ClassicRequestBuilder.get(url).build();
 		if (lastModified != null) {
 			request.addHeader(HttpHeaders.IF_MODIFIED_SINCE, lastModified);
@@ -84,9 +96,10 @@ public class HttpGetter {
 		}
 
 		HttpClientContext context = HttpClientContext.create();
-		context.setRequestConfig(RequestConfig.custom().setResponseTimeout(timeout, TimeUnit.MILLISECONDS).build());
-
+		context.setRequestConfig(RequestConfig.custom().setResponseTimeout(Timeout.of(config.httpClient().responseTimeout())).build());
 		HttpResponse response = client.execute(request, context, resp -> {
+			byte[] content = resp.getEntity() == null ? null
+					: toByteArray(resp.getEntity(), config.httpClient().maxResponseSize().asLongValue());
 			int code = resp.getCode();
 			String lastModifiedHeader = Optional.ofNullable(resp.getFirstHeader(HttpHeaders.LAST_MODIFIED))
 					.map(NameValuePair::getValue)
@@ -97,7 +110,6 @@ public class HttpGetter {
 					.map(StringUtils::trimToNull)
 					.orElse(null);
 
-			byte[] content = resp.getEntity() == null ? null : EntityUtils.toByteArray(resp.getEntity());
 			String contentType = Optional.ofNullable(resp.getEntity()).map(HttpEntity::getContentType).orElse(null);
 			String urlAfterRedirect = Optional.ofNullable(context.getRedirectLocations())
 					.map(RedirectLocations::getAll)
@@ -109,7 +121,7 @@ public class HttpGetter {
 		});
 
 		int code = response.getCode();
-		if (code == HttpStatus.NOT_MODIFIED_304) {
+		if (code == HttpStatus.SC_NOT_MODIFIED) {
 			throw new NotModifiedException("'304 - not modified' http code received");
 		} else if (code >= 300) {
 			throw new HttpResponseException(code, "Server returned HTTP error code " + code);
@@ -125,27 +137,54 @@ public class HttpGetter {
 			throw new NotModifiedException("eTagHeader is the same");
 		}
 
-		long duration = System.currentTimeMillis() - start;
-		return new HttpResult(response.getContent(), response.getContentType(), lastModifiedHeader, eTagHeader, duration,
+		return new HttpResult(response.getContent(), response.getContentType(), lastModifiedHeader, eTagHeader,
 				response.getUrlAfterRedirect());
 	}
 
-	private static CloseableHttpClient newClient(String userAgent, int poolSize) {
+	private static byte[] toByteArray(HttpEntity entity, long maxBytes) throws IOException {
+		if (entity.getContentLength() > maxBytes) {
+			throw new IOException(
+					"Response size (%s bytes) exceeds the maximum allowed size (%s bytes)".formatted(entity.getContentLength(), maxBytes));
+		}
+
+		try (InputStream input = entity.getContent()) {
+			if (input == null) {
+				return null;
+			}
+
+			byte[] bytes = ByteStreams.limit(input, maxBytes).readAllBytes();
+			if (bytes.length == maxBytes) {
+				throw new IOException("Response size exceeds the maximum allowed size (%s bytes)".formatted(maxBytes));
+			}
+			return bytes;
+		}
+	}
+
+	private static PoolingHttpClientConnectionManager newConnectionManager(CommaFeedConfiguration config) {
 		SSLFactory sslFactory = SSLFactory.builder().withUnsafeTrustMaterial().withUnsafeHostnameVerifier().build();
 
+		int poolSize = config.feedRefresh().httpThreads();
+		return PoolingHttpClientConnectionManagerBuilder.create()
+				.setSSLSocketFactory(Apache5SslUtils.toSocketFactory(sslFactory))
+				.setDefaultConnectionConfig(ConnectionConfig.custom()
+						.setConnectTimeout(Timeout.of(config.httpClient().connectTimeout()))
+						.setSocketTimeout(Timeout.of(config.httpClient().socketTimeout()))
+						.setTimeToLive(Timeout.of(config.httpClient().connectionTimeToLive()))
+						.build())
+				.setDefaultTlsConfig(TlsConfig.custom().setHandshakeTimeout(Timeout.of(config.httpClient().sslHandshakeTimeout())).build())
+				.setMaxConnPerRoute(poolSize)
+				.setMaxConnTotal(poolSize)
+				.build();
+
+	}
+
+	private static CloseableHttpClient newClient(HttpClientConnectionManager connectionManager, String userAgent,
+			Duration idleConnectionsEvictionInterval) {
 		List<Header> headers = new ArrayList<>();
 		headers.add(new BasicHeader(HttpHeaders.ACCEPT_LANGUAGE, "en"));
 		headers.add(new BasicHeader(HttpHeaders.PRAGMA, "No-cache"));
 		headers.add(new BasicHeader(HttpHeaders.CACHE_CONTROL, "no-cache"));
 
-		PoolingHttpClientConnectionManager connectionManager = PoolingHttpClientConnectionManagerBuilder.create()
-				.setSSLSocketFactory(Apache5SslUtils.toSocketFactory(sslFactory))
-				.setDefaultConnectionConfig(
-						ConnectionConfig.custom().setConnectTimeout(Timeout.ofSeconds(5)).setTimeToLive(TimeValue.ofSeconds(30)).build())
-				.setMaxConnPerRoute(poolSize)
-				.setMaxConnTotal(poolSize)
-				.build();
-
 		return HttpClientBuilder.create()
 				.useSystemProperties()
 				.disableAutomaticRetries()
@@ -153,6 +192,8 @@ public class HttpGetter {
 				.setUserAgent(userAgent)
 				.setDefaultHeaders(headers)
 				.setConnectionManager(connectionManager)
+				.evictExpiredConnections()
+				.evictIdleConnections(TimeValue.of(idleConnectionsEvictionInterval))
 				.build();
 	}
 
@@ -212,7 +253,6 @@ public class HttpGetter {
 		private final String contentType;
 		private final String lastModifiedSince;
 		private final String eTag;
-		private final long duration;
 		private final String urlAfterRedirect;
 	}
 

commafeed-server/src/main/java/com/commafeed/backend/cache/CacheService.java

@@ -1,39 +0,0 @@
-package com.commafeed.backend.cache;
-
-import java.util.List;
-import java.util.Set;
-
-import com.commafeed.backend.Digests;
-import com.commafeed.backend.feed.parser.FeedParserResult.Entry;
-import com.commafeed.backend.model.Feed;
-import com.commafeed.backend.model.FeedSubscription;
-import com.commafeed.backend.model.User;
-import com.commafeed.frontend.model.Category;
-import com.commafeed.frontend.model.UnreadCount;
-
-public abstract class CacheService {
-
-	// feed entries for faster refresh
-	public abstract Set<String> getLastEntries(Feed feed);
-
-	public abstract void setLastEntries(Feed feed, List<String> entries);
-
-	public String buildUniqueEntryKey(Entry entry) {
-		return Digests.sha1Hex(entry.guid() + entry.url());
-	}
-
-	// user categories
-	public abstract Category getUserRootCategory(User user);
-
-	public abstract void setUserRootCategory(User user, Category category);
-
-	public abstract void invalidateUserRootCategory(User... users);
-
-	// unread count
-	public abstract UnreadCount getUnreadCount(FeedSubscription sub);
-
-	public abstract void setUnreadCount(FeedSubscription sub, UnreadCount count);
-
-	public abstract void invalidateUnreadCount(FeedSubscription... subs);
-
-}

commafeed-server/src/main/java/com/commafeed/backend/cache/NoopCacheService.java

@@ -1,54 +0,0 @@
-package com.commafeed.backend.cache;
-
-import java.util.Collections;
-import java.util.List;
-import java.util.Set;
-
-import com.commafeed.backend.model.Feed;
-import com.commafeed.backend.model.FeedSubscription;
-import com.commafeed.backend.model.User;
-import com.commafeed.frontend.model.Category;
-import com.commafeed.frontend.model.UnreadCount;
-
-public class NoopCacheService extends CacheService {
-
-	@Override
-	public Set<String> getLastEntries(Feed feed) {
-		return Collections.emptySet();
-	}
-
-	@Override
-	public void setLastEntries(Feed feed, List<String> entries) {
-	}
-
-	@Override
-	public UnreadCount getUnreadCount(FeedSubscription sub) {
-		return null;
-	}
-
-	@Override
-	public void setUnreadCount(FeedSubscription sub, UnreadCount count) {
-
-	}
-
-	@Override
-	public void invalidateUnreadCount(FeedSubscription... subs) {
-
-	}
-
-	@Override
-	public Category getUserRootCategory(User user) {
-		return null;
-	}
-
-	@Override
-	public void setUserRootCategory(User user, Category category) {
-
-	}
-
-	@Override
-	public void invalidateUserRootCategory(User... users) {
-
-	}
-
-}

commafeed-server/src/main/java/com/commafeed/backend/cache/RedisCacheService.java

@@ -1,154 +0,0 @@
-package com.commafeed.backend.cache;
-
-import java.util.List;
-import java.util.Set;
-import java.util.concurrent.TimeUnit;
-
-import com.commafeed.backend.model.Feed;
-import com.commafeed.backend.model.FeedSubscription;
-import com.commafeed.backend.model.Models;
-import com.commafeed.backend.model.User;
-import com.commafeed.frontend.model.Category;
-import com.commafeed.frontend.model.UnreadCount;
-import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.databind.ObjectMapper;
-import com.fasterxml.jackson.datatype.jsr310.JavaTimeModule;
-
-import lombok.RequiredArgsConstructor;
-import lombok.extern.slf4j.Slf4j;
-import redis.clients.jedis.Jedis;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.Pipeline;
-
-@Slf4j
-@RequiredArgsConstructor
-public class RedisCacheService extends CacheService {
-
-	private static final ObjectMapper MAPPER = new ObjectMapper().registerModule(new JavaTimeModule());
-
-	private final JedisPool pool;
-
-	@Override
-	public Set<String> getLastEntries(Feed feed) {
-		try (Jedis jedis = pool.getResource()) {
-			String key = buildRedisEntryKey(feed);
-			return jedis.smembers(key);
-		}
-	}
-
-	@Override
-	public void setLastEntries(Feed feed, List<String> entries) {
-		try (Jedis jedis = pool.getResource()) {
-			String key = buildRedisEntryKey(feed);
-
-			Pipeline pipe = jedis.pipelined();
-			pipe.del(key);
-			for (String entry : entries) {
-				pipe.sadd(key, entry);
-			}
-			pipe.expire(key, (int) TimeUnit.DAYS.toSeconds(7));
-			pipe.sync();
-		}
-	}
-
-	@Override
-	public Category getUserRootCategory(User user) {
-		Category cat = null;
-		try (Jedis jedis = pool.getResource()) {
-			String key = buildRedisUserRootCategoryKey(user);
-			String json = jedis.get(key);
-			if (json != null) {
-				cat = MAPPER.readValue(json, Category.class);
-			}
-		} catch (Exception e) {
-			log.error(e.getMessage(), e);
-		}
-		return cat;
-	}
-
-	@Override
-	public void setUserRootCategory(User user, Category category) {
-		try (Jedis jedis = pool.getResource()) {
-			String key = buildRedisUserRootCategoryKey(user);
-
-			Pipeline pipe = jedis.pipelined();
-			pipe.del(key);
-			pipe.set(key, MAPPER.writeValueAsString(category));
-			pipe.expire(key, (int) TimeUnit.MINUTES.toSeconds(30));
-			pipe.sync();
-		} catch (JsonProcessingException e) {
-			log.error(e.getMessage(), e);
-		}
-	}
-
-	@Override
-	public UnreadCount getUnreadCount(FeedSubscription sub) {
-		UnreadCount count = null;
-		try (Jedis jedis = pool.getResource()) {
-			String key = buildRedisUnreadCountKey(sub);
-			String json = jedis.get(key);
-			if (json != null) {
-				count = MAPPER.readValue(json, UnreadCount.class);
-			}
-		} catch (Exception e) {
-			log.error(e.getMessage(), e);
-		}
-		return count;
-	}
-
-	@Override
-	public void setUnreadCount(FeedSubscription sub, UnreadCount count) {
-		try (Jedis jedis = pool.getResource()) {
-			String key = buildRedisUnreadCountKey(sub);
-
-			Pipeline pipe = jedis.pipelined();
-			pipe.del(key);
-			pipe.set(key, MAPPER.writeValueAsString(count));
-			pipe.expire(key, (int) TimeUnit.MINUTES.toSeconds(30));
-			pipe.sync();
-		} catch (Exception e) {
-			log.error(e.getMessage(), e);
-		}
-	}
-
-	@Override
-	public void invalidateUserRootCategory(User... users) {
-		try (Jedis jedis = pool.getResource()) {
-			Pipeline pipe = jedis.pipelined();
-			if (users != null) {
-				for (User user : users) {
-					String key = buildRedisUserRootCategoryKey(user);
-					pipe.del(key);
-				}
-			}
-			pipe.sync();
-		}
-	}
-
-	@Override
-	public void invalidateUnreadCount(FeedSubscription... subs) {
-		try (Jedis jedis = pool.getResource()) {
-			Pipeline pipe = jedis.pipelined();
-			if (subs != null) {
-				for (FeedSubscription sub : subs) {
-					String key = buildRedisUnreadCountKey(sub);
-					pipe.del(key);
-				}
-			}
-			pipe.sync();
-		}
-	}
-
-	private String buildRedisEntryKey(Feed feed) {
-		return "f:" + Models.getId(feed);
-	}
-
-	private String buildRedisUserRootCategoryKey(User user) {
-		return "c:" + Models.getId(user);
-	}
-
-	private String buildRedisUnreadCountKey(FeedSubscription sub) {
-		return "u:" + Models.getId(sub);
-	}
-
-}

commafeed-server/src/main/java/com/commafeed/backend/cache/RedisPoolFactory.java

@@ -1,51 +0,0 @@
-package com.commafeed.backend.cache;
-
-import com.fasterxml.jackson.annotation.JsonProperty;
-
-import lombok.Getter;
-import redis.clients.jedis.DefaultJedisClientConfig;
-import redis.clients.jedis.HostAndPort;
-import redis.clients.jedis.JedisClientConfig;
-import redis.clients.jedis.JedisPool;
-import redis.clients.jedis.JedisPoolConfig;
-import redis.clients.jedis.Protocol;
-
-@Getter
-public class RedisPoolFactory {
-
-	@JsonProperty
-	private String host = "localhost";
-
-	@JsonProperty
-	private int port = Protocol.DEFAULT_PORT;
-
-	@JsonProperty
-	private String username;
-
-	@JsonProperty
-	private String password;
-
-	@JsonProperty
-	private int timeout = Protocol.DEFAULT_TIMEOUT;
-
-	@JsonProperty
-	private int database = Protocol.DEFAULT_DATABASE;
-
-	@JsonProperty
-	private int maxTotal = 500;
-
-	public JedisPool build() {
-		JedisPoolConfig poolConfig = new JedisPoolConfig();
-		poolConfig.setMaxTotal(maxTotal);
-
-		JedisClientConfig clientConfig = DefaultJedisClientConfig.builder()
-				.user(username)
-				.password(password)
-				.timeoutMillis(timeout)
-				.database(database)
-				.build();
-
-		return new JedisPool(poolConfig, new HostAndPort(host, port), clientConfig);
-	}
-
-}

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedCategoryDAO.java

@@ -3,25 +3,22 @@ package com.commafeed.backend.dao;
 import java.util.List;
 import java.util.Objects;
 
-import org.hibernate.SessionFactory;
-
 import com.commafeed.backend.model.FeedCategory;
 import com.commafeed.backend.model.QFeedCategory;
 import com.commafeed.backend.model.QUser;
 import com.commafeed.backend.model.User;
 import com.querydsl.core.types.Predicate;
 
-import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
+import jakarta.persistence.EntityManager;
 
 @Singleton
 public class FeedCategoryDAO extends GenericDAO<FeedCategory> {
 
 	private static final QFeedCategory CATEGORY = QFeedCategory.feedCategory;
 
-	@Inject
-	public FeedCategoryDAO(SessionFactory sessionFactory) {
-		super(sessionFactory);
+	public FeedCategoryDAO(EntityManager entityManager) {
+		super(entityManager, FeedCategory.class);
 	}
 
 	public List<FeedCategory> findAll(User user) {

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedDAO.java

@@ -4,7 +4,6 @@ import java.time.Instant;
 import java.util.List;
 
 import org.apache.commons.lang3.StringUtils;
-import org.hibernate.SessionFactory;
 
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.QFeed;
@@ -12,8 +11,8 @@ import com.commafeed.backend.model.QFeedSubscription;
 import com.querydsl.jpa.JPAExpressions;
 import com.querydsl.jpa.impl.JPAQuery;
 
-import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
+import jakarta.persistence.EntityManager;
 
 @Singleton
 public class FeedDAO extends GenericDAO<Feed> {
@@ -21,9 +20,12 @@ public class FeedDAO extends GenericDAO<Feed> {
 	private static final QFeed FEED = QFeed.feed;
 	private static final QFeedSubscription SUBSCRIPTION = QFeedSubscription.feedSubscription;
 
-	@Inject
-	public FeedDAO(SessionFactory sessionFactory) {
-		super(sessionFactory);
+	public FeedDAO(EntityManager entityManager) {
+		super(entityManager, Feed.class);
+	}
+
+	public List<Feed> findByIds(List<Long> id) {
+		return query().selectFrom(FEED).where(FEED.id.in(id)).fetch();
 	}
 
 	public List<Feed> findNextUpdatable(int count, Instant lastLoginThreshold) {

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryContentDAO.java

@@ -2,16 +2,12 @@ package com.commafeed.backend.dao;
 
 import java.util.List;
 
-import org.hibernate.SessionFactory;
-
 import com.commafeed.backend.model.FeedEntryContent;
 import com.commafeed.backend.model.QFeedEntry;
 import com.commafeed.backend.model.QFeedEntryContent;
-import com.querydsl.jpa.JPAExpressions;
-import com.querydsl.jpa.JPQLSubQuery;
 
-import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
+import jakarta.persistence.EntityManager;
 
 @Singleton
 public class FeedEntryContentDAO extends GenericDAO<FeedEntryContent> {
@@ -19,9 +15,8 @@ public class FeedEntryContentDAO extends GenericDAO<FeedEntryContent> {
 	private static final QFeedEntryContent CONTENT = QFeedEntryContent.feedEntryContent;
 	private static final QFeedEntry ENTRY = QFeedEntry.feedEntry;
 
-	@Inject
-	public FeedEntryContentDAO(SessionFactory sessionFactory) {
-		super(sessionFactory);
+	public FeedEntryContentDAO(EntityManager entityManager) {
+		super(entityManager, FeedEntryContent.class);
 	}
 
 	public List<FeedEntryContent> findExisting(String contentHash, String titleHash) {
@@ -29,9 +24,13 @@ public class FeedEntryContentDAO extends GenericDAO<FeedEntryContent> {
 	}
 
 	public long deleteWithoutEntries(int max) {
-		JPQLSubQuery<Integer> subQuery = JPAExpressions.selectOne().from(ENTRY).where(ENTRY.content.id.eq(CONTENT.id));
-		List<Long> ids = query().select(CONTENT.id).from(CONTENT).where(subQuery.notExists()).limit(max).fetch();
-
+		List<Long> ids = query().select(CONTENT.id)
+				.from(CONTENT)
+				.leftJoin(ENTRY)
+				.on(ENTRY.content.id.eq(CONTENT.id))
+				.where(ENTRY.id.isNull())
+				.limit(max)
+				.fetch();
 		return deleteQuery(CONTENT).where(CONTENT.id.in(ids)).execute();
 	}
 }

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryDAO.java

@@ -3,16 +3,14 @@ package com.commafeed.backend.dao;
 import java.time.Instant;
 import java.util.List;
 
-import org.hibernate.SessionFactory;
-
 import com.commafeed.backend.model.Feed;
 import com.commafeed.backend.model.FeedEntry;
 import com.commafeed.backend.model.QFeedEntry;
 import com.querydsl.core.Tuple;
 import com.querydsl.core.types.dsl.NumberExpression;
 
-import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
+import jakarta.persistence.EntityManager;
 import lombok.AllArgsConstructor;
 import lombok.Getter;
 
@@ -21,9 +19,8 @@ public class FeedEntryDAO extends GenericDAO<FeedEntry> {
 
 	private static final QFeedEntry ENTRY = QFeedEntry.feedEntry;
 
-	@Inject
-	public FeedEntryDAO(SessionFactory sessionFactory) {
-		super(sessionFactory);
+	public FeedEntryDAO(EntityManager entityManager) {
+		super(entityManager, FeedEntry.class);
 	}
 
 	public FeedEntry findExisting(String guidHash, Feed feed) {
@@ -50,7 +47,11 @@ public class FeedEntryDAO extends GenericDAO<FeedEntry> {
 	 * Delete entries older than a certain date
 	 */
 	public int deleteEntriesOlderThan(Instant olderThan, long max) {
-		List<FeedEntry> list = query().selectFrom(ENTRY).where(ENTRY.updated.lt(olderThan)).orderBy(ENTRY.updated.asc()).limit(max).fetch();
+		List<FeedEntry> list = query().selectFrom(ENTRY)
+				.where(ENTRY.published.lt(olderThan))
+				.orderBy(ENTRY.published.asc())
+				.limit(max)
+				.fetch();
 		return delete(list);
 	}
 
@@ -58,7 +59,7 @@ public class FeedEntryDAO extends GenericDAO<FeedEntry> {
 	 * Delete the oldest entries of a feed
 	 */
 	public int deleteOldEntries(Long feedId, long max) {
-		List<FeedEntry> list = query().selectFrom(ENTRY).where(ENTRY.feed.id.eq(feedId)).orderBy(ENTRY.updated.asc()).limit(max).fetch();
+		List<FeedEntry> list = query().selectFrom(ENTRY).where(ENTRY.feed.id.eq(feedId)).orderBy(ENTRY.published.asc()).limit(max).fetch();
 		return delete(list);
 	}
 

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryStatusDAO.java

@@ -7,7 +7,6 @@ import java.util.Map;
 import java.util.stream.Collectors;
 
 import org.apache.commons.collections4.CollectionUtils;
-import org.hibernate.SessionFactory;
 
 import com.commafeed.CommaFeedConfiguration;
 import com.commafeed.backend.feed.FeedEntryKeyword;
@@ -28,8 +27,8 @@ import com.querydsl.core.BooleanBuilder;
 import com.querydsl.core.Tuple;
 import com.querydsl.jpa.impl.JPAQuery;
 
-import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
+import jakarta.persistence.EntityManager;
 
 @Singleton
 public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
@@ -42,9 +41,8 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 	private final FeedEntryTagDAO feedEntryTagDAO;
 	private final CommaFeedConfiguration config;
 
-	@Inject
-	public FeedEntryStatusDAO(SessionFactory sessionFactory, FeedEntryTagDAO feedEntryTagDAO, CommaFeedConfiguration config) {
-		super(sessionFactory);
+	public FeedEntryStatusDAO(EntityManager entityManager, FeedEntryTagDAO feedEntryTagDAO, CommaFeedConfiguration config) {
+		super(entityManager, FeedEntryStatus.class);
 		this.feedEntryTagDAO = feedEntryTagDAO;
 		this.config = config;
 	}
@@ -60,8 +58,8 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 	 */
 	private FeedEntryStatus handleStatus(User user, FeedEntryStatus status, FeedSubscription sub, FeedEntry entry) {
 		if (status == null) {
-			Instant unreadThreshold = config.getApplicationSettings().getUnreadThreshold();
-			boolean read = unreadThreshold != null && entry.getUpdated().isBefore(unreadThreshold);
+			Instant statusesInstantThreshold = config.database().cleanup().statusesInstantThreshold();
+			boolean read = statusesInstantThreshold != null && entry.getPublished().isBefore(statusesInstantThreshold);
 			status = new FeedEntryStatus(user, sub, entry);
 			status.setRead(read);
 			status.setMarkable(!read);
@@ -84,6 +82,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 			boolean includeContent) {
 		JPAQuery<FeedEntryStatus> query = query().selectFrom(STATUS).where(STATUS.user.eq(user), STATUS.starred.isTrue());
 		if (includeContent) {
+			query.join(STATUS.entry).fetchJoin();
 			query.join(STATUS.entry.content).fetchJoin();
 		}
 
@@ -92,9 +91,9 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 		}
 
 		if (order == ReadingOrder.asc) {
-			query.orderBy(STATUS.entryUpdated.asc(), STATUS.id.asc());
+			query.orderBy(STATUS.entryPublished.asc(), STATUS.id.asc());
 		} else {
-			query.orderBy(STATUS.entryUpdated.desc(), STATUS.id.desc());
+			query.orderBy(STATUS.entryPublished.desc(), STATUS.id.desc());
 		}
 
 		if (offset > -1) {
@@ -105,7 +104,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 			query.limit(limit);
 		}
 
-		setTimeout(query, config.getApplicationSettings().getQueryTimeout());
+		setTimeout(query, config.database().queryTimeout());
 
 		List<FeedEntryStatus> statuses = query.fetch();
 		statuses.forEach(s -> s.setMarkable(true));
@@ -165,9 +164,9 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 
 		if (order != null) {
 			if (order == ReadingOrder.asc) {
-				query.orderBy(ENTRY.updated.asc(), ENTRY.id.asc());
+				query.orderBy(ENTRY.published.asc(), ENTRY.id.asc());
 			} else {
-				query.orderBy(ENTRY.updated.desc(), ENTRY.id.desc());
+				query.orderBy(ENTRY.published.desc(), ENTRY.id.desc());
 			}
 		}
 
@@ -179,7 +178,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 			query.limit(limit);
 		}
 
-		setTimeout(query, config.getApplicationSettings().getQueryTimeout());
+		setTimeout(query, config.database().queryTimeout());
 
 		List<FeedEntryStatus> statuses = new ArrayList<>();
 		List<Tuple> tuples = query.fetch();
@@ -199,7 +198,7 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 	}
 
 	public UnreadCount getUnreadCount(FeedSubscription sub) {
-		JPAQuery<Tuple> query = query().select(ENTRY.count(), ENTRY.updated.max())
+		JPAQuery<Tuple> query = query().select(ENTRY.count(), ENTRY.published.max())
 				.from(ENTRY)
 				.leftJoin(ENTRY.statuses, STATUS)
 				.on(STATUS.subscription.eq(sub))
@@ -208,8 +207,8 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 
 		Tuple tuple = query.fetchOne();
 		Long count = tuple.get(ENTRY.count());
-		Instant updated = tuple.get(ENTRY.updated.max());
-		return new UnreadCount(sub.getId(), count == null ? 0 : count, updated);
+		Instant published = tuple.get(ENTRY.published.max());
+		return new UnreadCount(sub.getId(), count == null ? 0 : count, published);
 	}
 
 	private BooleanBuilder buildUnreadPredicate() {
@@ -217,9 +216,9 @@ public class FeedEntryStatusDAO extends GenericDAO<FeedEntryStatus> {
 		or.or(STATUS.read.isNull());
 		or.or(STATUS.read.isFalse());
 
-		Instant unreadThreshold = config.getApplicationSettings().getUnreadThreshold();
-		if (unreadThreshold != null) {
-			return or.and(ENTRY.updated.goe(unreadThreshold));
+		Instant statusesInstantThreshold = config.database().cleanup().statusesInstantThreshold();
+		if (statusesInstantThreshold != null) {
+			return or.and(ENTRY.published.goe(statusesInstantThreshold));
 		} else {
 			return or;
 		}

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedEntryTagDAO.java

@@ -4,24 +4,21 @@ import java.util.List;
 import java.util.Map;
 import java.util.stream.Collectors;
 
-import org.hibernate.SessionFactory;
-
 import com.commafeed.backend.model.FeedEntry;
 import com.commafeed.backend.model.FeedEntryTag;
 import com.commafeed.backend.model.QFeedEntryTag;
 import com.commafeed.backend.model.User;
 
-import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
+import jakarta.persistence.EntityManager;
 
 @Singleton
 public class FeedEntryTagDAO extends GenericDAO<FeedEntryTag> {
 
 	private static final QFeedEntryTag TAG = QFeedEntryTag.feedEntryTag;
 
-	@Inject
-	public FeedEntryTagDAO(SessionFactory sessionFactory) {
-		super(sessionFactory);
+	public FeedEntryTagDAO(EntityManager entityManager) {
+		super(entityManager, FeedEntryTag.class);
 	}
 
 	public List<String> findByUser(User user) {

commafeed-server/src/main/java/com/commafeed/backend/dao/FeedSubscriptionDAO.java

@@ -5,12 +5,11 @@ import java.util.Set;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-import org.hibernate.SessionFactory;
-import org.hibernate.engine.spi.SessionFactoryImplementor;
+import org.hibernate.engine.spi.SharedSessionContractImplementor;
 import org.hibernate.event.service.spi.EventListenerRegistry;
 import org.hibernate.event.spi.EventType;
+import org.hibernate.event.spi.PostCommitInsertEventListener;
 import org.hibernate.event.spi.PostInsertEvent;
-import org.hibernate.event.spi.PostInsertEventListener;
 import org.hibernate.persister.entity.EntityPersister;
 
 import com.commafeed.backend.model.AbstractModel;
@@ -23,28 +22,28 @@ import com.commafeed.backend.model.User;
 import com.google.common.collect.Iterables;
 import com.querydsl.jpa.JPQLQuery;
 
-import jakarta.inject.Inject;
 import jakarta.inject.Singleton;
+import jakarta.persistence.EntityManager;
 
 @Singleton
 public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
 
 	private static final QFeedSubscription SUBSCRIPTION = QFeedSubscription.feedSubscription;
 
-	private final SessionFactory sessionFactory;
+	private final EntityManager entityManager;
 
-	@Inject
-	public FeedSubscriptionDAO(SessionFactory sessionFactory) {
-		super(sessionFactory);
-		this.sessionFactory = sessionFactory;
+	public FeedSubscriptionDAO(EntityManager entityManager) {
+		super(entityManager, FeedSubscription.class);
+		this.entityManager = entityManager;
 	}
 
 	public void onPostCommitInsert(Consumer<FeedSubscription> consumer) {
-		sessionFactory.unwrap(SessionFactoryImplementor.class)
+		entityManager.unwrap(SharedSessionContractImplementor.class)
+				.getFactory()
 				.getServiceRegistry()
 				.getService(EventListenerRegistry.class)
 				.getEventListenerGroup(EventType.POST_COMMIT_INSERT)
-				.appendListener(new PostInsertEventListener() {
+				.appendListener(new PostCommitInsertEventListener() {
 					@Override
 					public void onPostInsert(PostInsertEvent event) {
 						if (event.getEntity() instanceof FeedSubscription s) {
@@ -56,6 +55,11 @@ public class FeedSubscriptionDAO extends GenericDAO<FeedSubscription> {
 					public boolean requiresPostCommitHandling(EntityPersister persister) {
 						return true;
 					}
+
+					@Override
+					public void onPostInsertCommitFailed(PostInsertEvent event) {
+						// do nothing
+					}
 				});
 	}
 

commafeed-server/src/main/java/com/commafeed/backend/dao/GenericDAO.java

@@ -1,8 +1,9 @@
 package com.commafeed.backend.dao;
 
+import java.time.Duration;
 import java.util.Collection;
 
-import org.hibernate.SessionFactory;
+import org.hibernate.Session;
 import org.hibernate.jpa.SpecHints;
 
 import com.commafeed.backend.model.AbstractModel;
@@ -12,45 +13,51 @@ import com.querydsl.jpa.impl.JPAQuery;
 import com.querydsl.jpa.impl.JPAQueryFactory;
 import com.querydsl.jpa.impl.JPAUpdateClause;
 
-import io.dropwizard.hibernate.AbstractDAO;
+import jakarta.persistence.EntityManager;
+import lombok.RequiredArgsConstructor;
 
-public abstract class GenericDAO<T extends AbstractModel> extends AbstractDAO<T> {
+@RequiredArgsConstructor
+public abstract class GenericDAO<T extends AbstractModel> {
 
-	protected GenericDAO(SessionFactory sessionFactory) {
-		super(sessionFactory);
-	}
+	private final EntityManager entityManager;
+	private final Class<T> entityClass;
 
 	protected JPAQueryFactory query() {
-		return new JPAQueryFactory(currentSession());
+		return new JPAQueryFactory(entityManager);
 	}
 
 	protected JPAUpdateClause updateQuery(EntityPath<T> entityPath) {
-		return new JPAUpdateClause(currentSession(), entityPath);
+		return new JPAUpdateClause(entityManager, entityPath);
 	}
 
 	protected JPADeleteClause deleteQuery(EntityPath<T> entityPath) {
-		return new JPADeleteClause(currentSession(), entityPath);
+		return new JPADeleteClause(entityManager, entityPath);
 	}
 
+	@SuppressWarnings("deprecation")
 	public void saveOrUpdate(T model) {
-		persist(model);
+		entityManager.unwrap(Session.class).saveOrUpdate(model);
 	}
 
 	public void saveOrUpdate(Collection<T> models) {
-		models.forEach(this::persist);
+		models.forEach(this::saveOrUpdate);
 	}
 
-	public void update(T model) {
-		currentSession().merge(model);
+	public void persist(T model) {
+		entityManager.persist(model);
+	}
+
+	public T merge(T model) {
+		return entityManager.merge(model);
 	}
 
 	public T findById(Long id) {
-		return get(id);
+		return entityManager.find(entityClass, id);
 	}
 
 	public void delete(T object) {
 		if (object != null) {
-			currentSession().remove(object);
+			entityManager.remove(object);
 		}
 	}
 
@@ -59,9 +66,9 @@ public abstract class GenericDAO<T extends AbstractModel> extends AbstractDAO<T>
 		return objects.size();
 	}
 
-	protected void setTimeout(JPAQuery<?> query, int timeoutMs) {
-		if (timeoutMs > 0) {
-			query.setHint(SpecHints.HINT_SPEC_QUERY_TIMEOUT, timeoutMs);
+	protected void setTimeout(JPAQuery<?> query, Duration timeout) {
+		if (!timeout.isZero()) {
+			query.setHint(SpecHints.HINT_SPEC_QUERY_TIMEOUT, Math.toIntExact(timeout.toMillis()));
 		}
 	}
 

commafeed-server/src/main/java/com/commafeed/backend/dao/UnitOfWork.java

@@ -1,68 +1,20 @@
 package com.commafeed.backend.dao;
 
-import org.hibernate.Session;
-import org.hibernate.SessionFactory;
-import org.hibernate.Transaction;
-import org.hibernate.context.internal.ManagedSessionContext;
-
-import jakarta.inject.Inject;
+import io.quarkus.narayana.jta.QuarkusTransaction;
 import jakarta.inject.Singleton;
-import lombok.RequiredArgsConstructor;
 
-@RequiredArgsConstructor(onConstructor = @__({ @Inject }))
 @Singleton
 public class UnitOfWork {
 
-	private final SessionFactory sessionFactory;
-
-	public void run(SessionRunner sessionRunner) {
+	public void run(SessionRunner runner) {
 		call(() -> {
-			sessionRunner.runInSession();
+			runner.runInSession();
 			return null;
 		});
 	}
 
-	public <T> T call(SessionRunnerReturningValue<T> sessionRunner) {
-		T t = null;
-
-		boolean sessionAlreadyBound = ManagedSessionContext.hasBind(sessionFactory);
-		try (Session session = sessionFactory.openSession()) {
-			if (!sessionAlreadyBound) {
-				ManagedSessionContext.bind(session);
-			}
-
-			Transaction tx = session.beginTransaction();
-			try {
-				t = sessionRunner.runInSession();
-				commitTransaction(tx);
-			} catch (Exception e) {
-				rollbackTransaction(tx);
-				UnitOfWork.rethrow(e);
-			}
-		} finally {
-			if (!sessionAlreadyBound) {
-				ManagedSessionContext.unbind(sessionFactory);
-			}
-		}
-
-		return t;
-	}
-
-	private static void rollbackTransaction(Transaction tx) {
-		if (tx != null && tx.isActive()) {
-			tx.rollback();
-		}
-	}
-
-	private static void commitTransaction(Transaction tx) {
-		if (tx != null && tx.isActive()) {
-			tx.commit();
-		}
-	}
-
-	@SuppressWarnings("unchecked")
-	private static <E extends Exception> void rethrow(Exception e) throws E {
-		throw (E) e;
+	public <T> T call(SessionRunnerReturningValue<T> runner) {
+		return QuarkusTransaction.joiningExisting().call(runner::runInSession);
 	}
 
 	@FunctionalInterface