Merge branch 'master' into dev

# Conflicts:
#	src/main/java/com/ghostchu/peerbanhelper/gui/PBHGuiBridge.java

Author: paulzzh

.github/workflows/build_fe.yml

@@ -43,7 +43,7 @@ jobs:
         run: pnpm run build
         env:
           GIT_HASH: ${{ github.sha }}
-          SENTRY_DSN: ${{ secrets.SENTRY_DSN }}
+          SENTRY_DSN: ${{ secrets.WEBUI_SENTRY_DSN }}
 
       - name: Upload artifact
         uses: actions/upload-artifact@v6

.github/workflows/build_installers.yml

@@ -27,7 +27,7 @@ jobs:
           path: ~/.cache/install4j/v11
           key: install4j-11-${{ hashFiles('**/*.install4j') }}
           restore-keys: |
-            install4j-11-
+            install4j-11-${{ hashFiles('**/*.install4j') }}
       - name: Make installers
         run: |
           /opt/install4j/bin/install4jc -L ${{ secrets.INSTALL4J_LICENSE }} -r ${{ steps.java_info.outputs.x_version }} -g -d build/media -D librariesPath=$(pwd)/build/libraries install4j/project.install4j
@@ -42,9 +42,20 @@ jobs:
           path: |
             build/media/*
         id: project
-      - name: Upload generated jres
+      - name: Copy JBR Bundles
+        id: jbr_bundles
+        run: |
+          dir="${1:-$HOME/.cache/install4j/v11/cached_jres/generated}"
+          find "$dir" -type f -name 'windows-amd64-*.tar.gz' -printf '%T@ %p\n' \
+            | sort -nr | cut -d' ' -f2- \
+            | while IFS= read -r f; do
+                if tar -xOzf "$f" lib/classlist 2>/dev/null | grep -q 'com/jetbrains/exported/JBRApi'; then
+                  echo "jbr_path=$(realpath "$f")" >> $GITHUB_OUTPUT
+                  break
+                fi
+              done
+      - name: Upload JBR Bundles
         uses: actions/upload-artifact@v6
         with:
-          name: jre-dist
-          path: |
-            ~/.cache/install4j/v11/cached_jres/generated/**/*.tar.gz
+          name: jbr-dist
+          path: ${{ steps.jbr_bundles.outputs.jbr_path }}

.github/workflows/build_portable.yml

@@ -15,8 +15,8 @@ jobs:
           path: build/
       - uses: actions/download-artifact@v7
         with:
-          name: jre-dist
-          path: jre-dist/
+          name: jbr-dist
+          path: jbr-dist/
       - name: Build Portable package
         id: build-portable
         run: |
@@ -29,7 +29,7 @@ jobs:
           mv pkg/portable/*.bat pkg/portable/PeerBanHelper/
           (cd pkg/portable && zip -r PeerBanHelper_Windows_${{ env.PBH_VERSION }}_Portable_nojava.zip PeerBanHelper)
           mkdir -p jre
-          mv jre-dist/*/windows-amd64-25.0.2.tar.gz jre/jre.tar.gz
+          mv jbr-dist/windows-amd64-*.tar.gz jre/jre.tar.gz
           (cd jre && tar -zxvf jre.tar.gz && rm jre.tar.gz)
           mv jre pkg/portable/PeerBanHelper/
           (cd pkg/portable && zip -r PeerBanHelper_Windows_${{ env.PBH_VERSION }}_Portable.zip PeerBanHelper)

.github/workflows/jvm-release.yml

@@ -200,6 +200,97 @@ jobs:
         with:
           asset_paths: '["build/media/PeerBanHelper_*", "build/media/peerbanhelper_*", "build/media/peerbanhelper-*", "build/media/_____UNSUPPORTED_PeerBanHelper_*", "peerbanhelper.torrent", "PeerBanHelper_Installers.tar.gz"]'
 
+  Publish_Changelog:
+    name: Publish Changelog to Forum
+    continue-on-error: true
+    if: github.event_name == 'release'
+    needs: Upload_Artifacts
+    runs-on: ubuntu-latest
+    steps:
+      - name: Check if release body is empty
+        id: check_body
+        run: |
+          BODY=$(cat <<'EOFBODY'
+          ${{ github.event.release.body }}
+          EOFBODY
+          )
+          if [[ -z "$(echo "$BODY" | tr -d '[:space:]')" ]]; then
+            echo "Release body is empty, skipping changelog publication"
+            echo "skip=true" >> $GITHUB_OUTPUT
+          else
+            echo "Release body found, will publish changelog"
+            echo "skip=false" >> $GITHUB_OUTPUT
+          fi
+      - name: Ensure jq is installed
+        if: steps.check_body.outputs.skip != 'true'
+        run: which jq || (sudo apt-get update && sudo apt-get install -y jq)
+      - name: Prepare and send changelog to forum
+        if: steps.check_body.outputs.skip != 'true'
+        run: |
+          # Escape title and body for JSON using jq with heredoc to avoid shell expansion
+          TITLE=$(cat <<'EOFTITLE' | jq -Rs .
+          ${{ github.event.release.name }}
+          EOFTITLE
+          )
+          BODY=$(cat <<'EOFBODY' | jq -Rs .
+          ${{ github.event.release.body }}
+          EOFBODY
+          )
+          
+          # Build JSON payload
+          JSON_PAYLOAD=$(cat <<EOF
+          {
+            "data": {
+              "type": "discussions",
+              "attributes": {
+                "title": $TITLE,
+                "content": $BODY
+              },
+              "relationships": {
+                "tags": {
+                  "data": [
+                    {
+                      "type": "tags",
+                      "id": "5"
+                    },
+                    {
+                      "type": "tags",
+                      "id": "25"
+                    }
+                  ]
+                }
+              }
+            }
+          }
+          EOF
+          )
+          
+          echo "Sending changelog to forum API..."
+          echo "JSON Payload:"
+          echo "$JSON_PAYLOAD" | jq .
+          
+          # Send POST request with retry
+          RESPONSE=$(curl --retry 3 --retry-delay 2 --retry-connrefused \
+            -i -X POST \
+            -H "Content-Type: application/json" \
+            -H "Authorization: Token ${{ secrets.FLARUM_BBS_API_KEY }}" \
+            -d "$JSON_PAYLOAD" \
+            https://bbs.pbh-btn.com/api/discussions)
+          
+          echo "API Response:"
+          echo "$RESPONSE"
+          
+          # Extract and check HTTP status code
+          HTTP_CODE=$(echo "$RESPONSE" | grep -i "^HTTP" | tail -1 | awk '{print $2}')
+          echo "HTTP Status Code: $HTTP_CODE"
+          
+          if [[ "$HTTP_CODE" =~ ^2[0-9]{2}$ ]]; then
+            echo "✓ Changelog published successfully"
+          else
+            echo "⚠ API returned non-2xx status code: $HTTP_CODE"
+            echo "This is a warning only, workflow will continue"
+          fi
+
   Build_Docker:
     name: Build Docker Image
     if: github.event_name != 'workflow_dispatch'

Dockerfile

@@ -22,4 +22,4 @@ VOLUME /tmp
 COPY --from=build build/build/libraries /app/libraries
 COPY --from=build build/build/libs/PeerBanHelper.jar /app/PeerBanHelper.jar
 ENV PATH="/usr/lib/jvm/liberica25-container-jre/bin:${PATH}"
-ENTRYPOINT ["sh", "-c", "java -XX:+UseCompactObjectHeaders -XX:ZCollectionInterval=60 --enable-native-access=ALL-UNNAMED -Djdk.attach.allowAttachSelf=true -Dsun.net.useExclusiveBind=false -Dpbh.release=docker -Djava.awt.headless=true -XX:+UseZGC -XX:ZUncommitDelay=1 -Xss512k -XX:+UseStringDeduplication -XX:-ShrinkHeapInSteps -XX:MaxRAMPercentage=85.0 -jar PeerBanHelper.jar"]
+ENTRYPOINT ["sh", "-c", "java -XX:+UseCompactObjectHeaders -XX:SoftMaxHeapSize=386M --enable-native-access=ALL-UNNAMED -Djdk.attach.allowAttachSelf=true -Dsun.net.useExclusiveBind=false -Dpbh.release=docker -Djava.awt.headless=true -XX:+UseG1GC -XX:G1PeriodicGCInterval=60000 -XX:MaxHeapFreeRatio=15 -XX:MinHeapFreeRatio=5 -Xss512k -XX:+UseStringDeduplication -XX:-ShrinkHeapInSteps -XX:MaxRAMPercentage=85.0 -jar PeerBanHelper.jar"]

Dockerfile-Release

@@ -7,4 +7,4 @@ WORKDIR /app
 VOLUME /tmp
 COPY build/libraries /app/libraries
 COPY build/libs/PeerBanHelper.jar /app/PeerBanHelper.jar
-ENTRYPOINT ["sh", "-c", "java -XX:+UseCompactObjectHeaders -XX:ZCollectionInterval=60 --enable-native-access=ALL-UNNAMED -Djdk.attach.allowAttachSelf=true -Dsun.net.useExclusiveBind=false -Dpbh.release=docker -Djava.awt.headless=true -XX:+UseZGC -XX:ZUncommitDelay=1 -Xss512k -XX:+UseStringDeduplication -XX:-ShrinkHeapInSteps -XX:MaxRAMPercentage=85.0 -jar PeerBanHelper.jar"]
+ENTRYPOINT ["sh", "-c", "java -XX:+UseCompactObjectHeaders -XX:SoftMaxHeapSize=386M --enable-native-access=ALL-UNNAMED -Djdk.attach.allowAttachSelf=true -Dsun.net.useExclusiveBind=false -Dpbh.release=docker -Djava.awt.headless=true -XX:+UseG1GC -XX:G1PeriodicGCInterval=60000 -XX:MaxHeapFreeRatio=15 -XX:MinHeapFreeRatio=5 -Xss512k -XX:+UseStringDeduplication -XX:-ShrinkHeapInSteps -XX:MaxRAMPercentage=85.0 -jar PeerBanHelper.jar"]

build.gradle.kts

@@ -10,7 +10,7 @@ plugins {
 }
 
 group = "com.ghostchu.peerbanhelper"
-version = "9.3.3"
+version = "9.3.7"
 
 java {
     sourceCompatibility = JavaVersion.VERSION_25
@@ -184,6 +184,8 @@ dependencies {
     implementation(platform("io.sentry:sentry-bom:8.33.0")) //import bom
     implementation("io.sentry:sentry")
     implementation("io.sentry:sentry-logback")
+    implementation("io.sentry:sentry-jdbc")
+
     implementation(kotlin("stdlib-jdk8"))
     implementation("org.jetbrains.kotlinx:kotlinx-coroutines-core:1.10.2")
     implementation("p6spy:p6spy:3.9.1")
@@ -193,6 +195,7 @@ dependencies {
     testRuntimeOnly("org.junit.platform:junit-platform-launcher")
     testImplementation("org.mockito:mockito-core:5.21.0")
     testImplementation("org.mockito.kotlin:mockito-kotlin:6.2.3")
+
 }
 
 tasks.test {

gradle.properties

@@ -2,7 +2,7 @@
 org.gradle.jvmargs=-Xmx2G -XX:MaxMetaspaceSize=512m
 org.gradle.parallel=true
 org.gradle.caching=true
-org.gradle.configuration-cache=true
+org.gradle.configuration-cache=false
 # Java version
 javaVersion=25
 

install4j/project.install4j

@@ -13,18 +13,19 @@
     <variables>
       <variable name="jarPath" value="../build/libs/PeerBanHelper.jar" />
       <variable name="librariesPath" value="../build/libraries" />
-      <variable name="startupFlagPlatform" value="-XX:+UseCompactObjectHeaders -XX:ZCollectionInterval=60 -Djdk.attach.allowAttachSelf=true -XX:MaxRAMPercentage=85.0 -XX:+UseZGC -XX:ZUncommitDelay=1 -Xss512k -XX:+UseStringDeduplication -XX:-ShrinkHeapInSteps -Dfile.encoding=UTF-8 -Dpbh.usePlatformConfigLocation=true -Dpbh.release=install4j" overrideWindows="true" valueWindows="-Dsun.net.useExclusiveBind=false -XX:OnError=&quot;scripts\win-error-handler.bat %p&quot; ${compiler:startupFlagPlatform}" overrideMacos="true" valueMacos="-XX:OnError=&quot;scripts/macos-error-handler.sh %p&quot; ${compiler:startupFlagPlatform}" overrideUnix="true" valueUnix="-XX:OnError=&quot;scripts/linux-error-handler.sh %p&quot; ${compiler:startupFlagPlatform}" />
-      <variable name="startupFlagPlatformNoGUI" value="-XX:+UseCompactObjectHeaders -XX:ZCollectionInterval=60 -Djdk.attach.allowAttachSelf=true -XX:MaxRAMPercentage=85.0 -XX:+UseZGC -XX:ZUncommitDelay=1 -Xss512k -XX:+UseStringDeduplication -XX:-ShrinkHeapInSteps -Dfile.encoding=UTF-8 -Dpbh.usePlatformConfigLocation=true -Dpbh.release=install4j" overrideWindows="true" valueWindows="-Dsun.net.useExclusiveBind=false -XX:OnError=&quot;scripts\win-error-handler.bat %p&quot; ${compiler:startupFlagPlatformNoGUI}" overrideMacos="true" valueMacos="-XX:OnError=&quot;scripts/macos-error-handler.sh %p&quot; ${compiler:startupFlagPlatformNoGUI}" overrideUnix="true" valueUnix="-XX:OnError=&quot;scripts/linux-error-handler.sh %p&quot; ${compiler:startupFlagPlatformNoGUI}" />
+      <variable name="startupFlagPlatform" value="-XX:+UseCompactObjectHeaders -XX:SoftMaxHeapSize=386M -Djdk.attach.allowAttachSelf=true -XX:MaxRAMPercentage=85.0 -XX:+UseG1GC -XX:G1PeriodicGCInterval=60000 -XX:MaxHeapFreeRatio=15 -XX:MinHeapFreeRatio=5 -Xss512k -XX:+UseStringDeduplication -XX:-ShrinkHeapInSteps -Dfile.encoding=UTF-8 -Dpbh.usePlatformConfigLocation=true -Dpbh.release=install4j" overrideWindows="true" valueWindows="-Dsun.net.useExclusiveBind=false -XX:OnError=&quot;scripts\win-error-handler.bat %p&quot; ${compiler:startupFlagPlatform}" overrideMacos="true" valueMacos="-XX:OnError=&quot;scripts/macos-error-handler.sh %p&quot; ${compiler:startupFlagPlatform}" overrideUnix="true" valueUnix="-XX:OnError=&quot;scripts/linux-error-handler.sh %p&quot; ${compiler:startupFlagPlatform}" />
+      <variable name="startupFlagPlatformNoGUI" value="-XX:+UseCompactObjectHeaders -XX:SoftMaxHeapSize=386M -Djdk.attach.allowAttachSelf=true -XX:MaxRAMPercentage=85.0 -XX:+UseG1GC -XX:G1PeriodicGCInterval=60000 -XX:MaxHeapFreeRatio=15 -XX:MinHeapFreeRatio=5 -Xss512k -XX:+UseStringDeduplication -XX:-ShrinkHeapInSteps -Dfile.encoding=UTF-8 -Dpbh.usePlatformConfigLocation=true -Dpbh.release=install4j" overrideWindows="true" valueWindows="-Dsun.net.useExclusiveBind=false -XX:OnError=&quot;scripts\win-error-handler.bat %p&quot; ${compiler:startupFlagPlatformNoGUI}" overrideMacos="true" valueMacos="-XX:OnError=&quot;scripts/macos-error-handler.sh %p&quot; ${compiler:startupFlagPlatformNoGUI}" overrideUnix="true" valueUnix="-XX:OnError=&quot;scripts/linux-error-handler.sh %p&quot; ${compiler:startupFlagPlatformNoGUI}" />
       <variable name="jvmOptionsFile" value="${LOCALAPPDATA}\PeerBanHelper\java.vmoptions" overrideWindows="true" valueWindows="${LOCALAPPDATA}\PeerBanHelper\java.vmoptions" overrideMacos="true" valueMacos="${user.home}/Library/Application Support/PeerBanHelper" overrideUnix="true" valueUnix="${user.home}/.config/PeerBanHelper" />
     </variables>
-    <jreBundles jdkProviderId="JBR" release="25/25.0.2-b300.57">
+    <jreBundles jdkProviderId="JBR" release="25/25.0.2-b329.66">
       <modules>
         <module name="java.base" />
         <module name="java.desktop" />
         <module name="java.sql.rowset" />
         <module name="jdk.unsupported" />
         <module name="java.net.http" />
         <module name="java.management" />
+        <module name="jdk.management" />
       </modules>
     </jreBundles>
   </application>
@@ -235,7 +236,7 @@ return console.askOkCancel(message, true);
               </formComponent>
             </formComponents>
           </screen>
-          <screen name="Unsupport platform check" id="338" beanClass="com.install4j.runtime.beans.screens.DefaultInfoScreen" rollbackBarrierExitCode="0" backButton="hidden" finishScreen="true">
+          <screen name="Unsupport platform check" id="338" beanClass="com.install4j.runtime.beans.screens.DefaultInfoScreen" enabled="false" rollbackBarrierExitCode="0" backButton="hidden" finishScreen="true">
             <condition>List&lt;String&gt; unsupportedWindows = List.of("Windows 95","Windows 98","Windows 2000", "Windows ME", "Windows XP", "Windows Vista", "Windows 7", "Windows 8", "Windows 8.1");
 
 String osName = System.getProperty("os.name");
@@ -261,9 +262,9 @@ ${i18n:unsupported-os}</property>
                   <property name="textSource" type="enum" class="com.install4j.runtime.beans.screens.components.TextSource" value="DIRECT" />
                 </serializedBean>
                 <externalParametrizationPropertyNames>
-                  <propertyName>textSource</propertyName>
                   <propertyName>displayedText</propertyName>
                   <propertyName>displayedTextFile</propertyName>
+                  <propertyName>textSource</propertyName>
                   <propertyName>variableName</propertyName>
                 </externalParametrizationPropertyNames>
               </formComponent>
@@ -1910,6 +1911,13 @@ return true;</property>
       </exclude>
       <jreBundle jreBundleSource="none" />
     </windows>
+    <windows name="Windows x64 (Win7 Compatible)" id="344" mediaFileName="${compiler:sys.shortName}_${compiler:sys.platform}_win7_${compiler:sys.version}" architecture="64">
+      <excludedComponents>
+        <component id="326" />
+        <component id="327" />
+      </excludedComponents>
+      <jreBundle jdkProviderId="Liberica" release="25/25.0.2+12" overrideJdkRelease="true" />
+    </windows>
     <macosFolder name="macOS Folder" id="98" mediaFileName="${compiler:sys.shortName}_macos_${compiler:sys.jreBundleArch}_${compiler:sys.version}">
       <exclude>
         <entry filesetId="306" />

pkg/deb/usr/lib/systemd/system/peerbanhelper.service

@@ -5,7 +5,7 @@ After=network.target
 [Service]
 User=peerbanhelper
 WorkingDirectory=/usr/lib/peerbanhelper
-ExecStart=/usr/bin/java -XX:ZCollectionInterval=60 --enable-native-access=ALL-UNNAMED -XX:+UseCompactObjectHeaders -Dpbh.release=debian -Dpbh.datadir=/var/lib/peerbanhelper -Dpbh.configdir=/etc/peerbanhelper -Dpbh.logsdir=/var/log/peerbanhelper -Dpbh.log.level=WARN -Djdk.attach.allowAttachSelf=true -XX:MaxRAMPercentage=85.0 -XX:+UseZGC -XX:ZUncommitDelay=1 -Xss512k -XX:+UseStringDeduplication -XX:-ShrinkHeapInSteps -jar PeerBanHelper.jar
+ExecStart=/usr/bin/java -XX:SoftMaxHeapSize=386M --enable-native-access=ALL-UNNAMED -XX:+UseCompactObjectHeaders -Dpbh.release=debian -Dpbh.datadir=/var/lib/peerbanhelper -Dpbh.configdir=/etc/peerbanhelper -Dpbh.logsdir=/var/log/peerbanhelper -Dpbh.log.level=WARN -Djdk.attach.allowAttachSelf=true -XX:MaxRAMPercentage=85.0 -XX:+UseG1GC -XX:G1PeriodicGCInterval=60000 -XX:MaxHeapFreeRatio=15 -XX:MinHeapFreeRatio=5 -Xss512k -XX:+UseStringDeduplication -XX:-ShrinkHeapInSteps -jar PeerBanHelper.jar
 SuccessExitStatus=143
 AmbientCapabilities=CAP_NET_ADMIN
 Restart=on-failure