Merge pull request #651 from PBH-BTN/master

v7.0.0 release

.github/ISSUE_TEMPLATE/any_other.yml

@@ -1,25 +1,25 @@
-name: '任何其它 - Other'
-description: '报告其它分类均无关的问题'
+name: "任何其它 - Other"
+description: "报告其它分类均无关的问题"
 
-title: '[Other] '
+title: "[Other] "
 labels:
-  - 'Other'
+  - "Other"
 body:
-  - type: 'textarea'
+  - type: "textarea"
     attributes:
-      label: '问题描述 - Issue Description'
+      label: "问题描述 - Issue Description"
       description: |-
         Describe the problem you encounted.
         在此详细的描述你所遇到的问题
     validations:
       required: true
-  - type: 'textarea'
+  - type: "textarea"
     attributes:
-      label: '额外信息 - Addition Information'
+      label: "额外信息 - Addition Information"
       description: |-
         If you have any related informations, please insert them into this text area.
         如果你还有其他觉得可能对排查和解决此问题有帮助的更多信息，可以在这里告诉我们
-      placeholder: '在此填写可能有用的额外信息...'
+      placeholder: "在此填写可能有用的额外信息..."
   - type: checkboxes
     id: check-list
     attributes:
@@ -32,7 +32,7 @@ body:
           required: false
         - label: "PeerBanHelper 已更新到最新版本，非最新版本不接受任何错误反馈，任何非最新版本的 Issue 将被 立 刻 关 闭，不会有人给您提供任何支持 (I'm running the latest version of PBH that can be found in Github Relases, non-latest release won't receive any support)"
           required: false
-        - label: "我已检查过 [PBH 文档](https://pbh-btn.github.io/pbh-docs/)（特别是常见问题），且即使使用了搜索也没有找到与此有关的内容 (This not a question/or the question that not listed in README's FAQ or [PBH WIKI](https://pbh-btn.github.io/pbh-docs/))"
+        - label: "我已检查过 [PBH 文档](https://docs.pbh-btn.com/)（特别是常见问题），且即使使用了搜索也没有找到与此有关的内容 (This not a question/or the question that not listed in README's FAQ or [PBH WIKI](https://docs.pbh-btn.com/))"
           required: false
         - label: "我同意遵守 PBH-BTN 包容性条约，不发布 “嘲讽、骂战、引战、开盒（有时也称为人肉搜索）、人身攻击、仇恨、暴力、侮辱性言辞、违法违规、黑灰产、危害国家安全、实施或帮助他人实施电信犯罪” 等内容。并已知晓如果仍旧发布了这些内容，我的账号将立刻从包括但不限于 PBH-BTN 组织、社交软件中封禁。所有主题、内容都将被立刻删除或折叠，撤销、删除和收回您所做出的一切贡献，并封禁 BTN 网络的中账号权限、排除您所提交的所有数据。在您违反相关规则时，PBH-BTN 将会将您的注册、登录、和最近访问的 IP 地址、电子邮件地址、以及其它可能追踪您或将您去匿名化的信息从定期删除转为永不删除，并在任何国家或地区的政府、公安机关或有关部门需要时无通知的提供这些数据。 (I agree to abide by the PBH-BTN Inclusivity Pact by not posting content such as “taunting, name-calling, war-mongering, open-boxing (sometimes referred to as mansplaining), personal attacks, hatred, violence, insulting language, illegal activities, black and grey business, endangering national security, and committing or assisting others in committing telecommunication crimes”. I am aware that if I continue to post such content, my account will be immediately banned from organizations including but not limited to PBH-BTN, social software. All topics and content will be immediately deleted or collapsed, all contributions will be revoked, deleted and retracted, and you will be banned from the BTN network and all data you have submitted will be excluded. In the event of a violation of these rules, PBH-BTN will delete your registration, login, and most recent IP address, email address, and any other information that may be used to track you or de-anonymize you from regular to permanent deletion, and will make this data available to the government, public security, or other relevant authorities without notice if they request it, no matter what country or region.)"
           required: false

.github/ISSUE_TEMPLATE/bug_report.yml

@@ -1,11 +1,11 @@
-name: '错误报告 - Bug Report'
-description: '报告与 PeerBanHelper 有关的程序错误 - Report the errors that related to PeerBanHelper'
+name: "错误报告 - Bug Report"
+description: "报告与 PeerBanHelper 有关的程序错误 - Report the errors that related to PeerBanHelper"
 
-title: '[BUG] '
+title: "[BUG] "
 labels:
-  - 'Bug'
+  - "Bug"
 body:
-  - type: 'markdown'
+  - type: "markdown"
     attributes:
       value: |-
         ## 请注意 - Caution
@@ -14,30 +14,30 @@ body:
         请尽可能完整且详细地填写所有表单项，以便我们以最高效率并准确的排查故障和诊断问题。
         **错误填写或者没有仔细检查末尾的检查清单，将导致此 Issue 被立刻关闭。**
         **只有最新版本的 PeerBanHelper 才会得到支持，任何非最新版本的 Issue 将被 立 刻 关 闭，不会有人给您提供任何支持** [在此查看最新版本的版本号](https://github.com/PBH-BTN/PeerBanHelper/releases/latest)
-  - type: 'input'
+  - type: "input"
     attributes:
-      label: '版本号 - Version'
+      label: "版本号 - Version"
       description: |-
         Enter the PBH version that display on WebUI footer or GUI window title.  
         输入您正在使用 PeerBanHelper 的版本号，通常可在窗口标题或者 WebUI 页面的底部找到
-      placeholder: 'vX.X.X'
+      placeholder: "vX.X.X"
     validations:
       required: true
-  - type: 'textarea'
+  - type: "textarea"
     attributes:
-      label: '操作系统平台和系统架构 - OS  and CPU Arch'
+      label: "操作系统平台和系统架构 - OS  and CPU Arch"
       description: |-
         Enter the OS version/arch that PBH running on (not downloader), E.g Windows, Debian, iStoreOS.
         输入 PBH 所在的操作系统平台（不是下载器），例如：Windows、Debian、iStoreOS 等  
         And please also enter the system arch if you know it, E.g x86, arm64
         此外，您还需要输入系统架构。如果是 x86 设备，则通常为 x64；如果是 arm 设备，则通常为 arm64。请根据实际情况填写。如果不知道，也可以不写系统架构类型。
-      placeholder: '操作系统平台名称……'
+      placeholder: "操作系统平台名称……"
     validations:
       required: true
   - type: checkboxes
     id: deploy-methods
     attributes:
-      label: '部署方式 - Deploy methods'
+      label: "部署方式 - Deploy methods"
       description: |-
         Check and tick checkboxes that deploy methods that you're using
         请检查并勾选你正在使用的 PeerBanHelper 部署方式
@@ -59,7 +59,7 @@ body:
   - type: checkboxes
     id: downloaders
     attributes:
-      label: '添加的下载器 - Added Downloaders'
+      label: "添加的下载器 - Added Downloaders"
       description: |-
         Check and tick checkboxes if you added those downloader(s) into your PeerBanHelper installation
         请勾选被你添加到 PeerBanHelper 中的下载器类型
@@ -76,17 +76,17 @@ body:
           required: false
     validations:
       required: true
-  - type: 'textarea'
+  - type: "textarea"
     attributes:
-      label: '问题描述 - Issue Description'
+      label: "问题描述 - Issue Description"
       description: |-
         Describe the problem you encounted.
         在此详细的描述你所遇到的问题
     validations:
       required: true
-  - type: 'textarea'
+  - type: "textarea"
     attributes:
-      label: '复现步骤 - Reproduce steps'
+      label: "复现步骤 - Reproduce steps"
       description: |-
         If you know how to reproduce the error, please type it in this text area.  
         如果你清楚如何复现此故障，也欢迎告诉我们，帮助我们更快的复现它。如果它是一个偶尔才会出现的错误，请告诉我们它通常可能会在什么情况下出现。
@@ -96,22 +96,22 @@ body:
         3. 出现 BUG!
     validations:
       required: true
-  - type: 'textarea'
+  - type: "textarea"
     attributes:
-      label: '截图/日志文件 - Screenshot / Logs '
+      label: "截图/日志文件 - Screenshot / Logs "
       description: |-
         If you have some screenshot or logs file can help us, please upload them here.  
         如果你有一些截图或者日志能够更好的解释你所提出的问题，你可以在这里上传。
-      placeholder: '<截图文件>'
+      placeholder: "<截图文件>"
     validations:
       required: false
-  - type: 'textarea'
+  - type: "textarea"
     attributes:
-      label: '额外信息 - Addition Information'
+      label: "额外信息 - Addition Information"
       description: |-
         If you have any related informations, please insert them into this text area.
         如果你还有其他觉得可能对排查和解决此问题有帮助的更多信息，可以在这里告诉我们
-      placeholder: '在此填写可能有用的额外信息...'
+      placeholder: "在此填写可能有用的额外信息..."
   - type: checkboxes
     id: check-list
     attributes:
@@ -124,7 +124,7 @@ body:
           required: false
         - label: "所添加的下载器已满足 README 中的前置要求（如版本号和插件）(The downloaders that I've added already satisfied the requirements (E.g install plugins/adapters))"
           required: false
-        - label: "我已检查过 [PBH 文档](https://pbh-btn.github.io/pbh-docs/)（特别是常见问题），且即使使用了搜索也没有找到与此有关的内容 (This not a question/or the question that not listed in README's FAQ or [PBH WIKI](https://pbh-btn.github.io/pbh-docs/))"
+        - label: "我已检查过 [PBH 文档](https://docs.pbh-btn.com/)（特别是常见问题），且即使使用了搜索也没有找到与此有关的内容 (This not a question/or the question that not listed in README's FAQ or [PBH WIKI](https://docs.pbh-btn.com/))"
           required: false
         - label: "我没有检查这个检查清单，只是闭眼选中了所有的复选框，请关闭这个 Issue (I have not read these checkboxes and therefore I just ticked them all, Please close this issue)"
           required: false

.github/ISSUE_TEMPLATE/web_ui.yml

@@ -1,37 +1,37 @@
-name: 'WebUI'
-description: '报告与 WebUI 有关的程序错误 - Report the errors that related to WebUI'
+name: "WebUI"
+description: "报告与 WebUI 有关的程序错误 - Report the errors that related to WebUI"
 
-title: '[WebUI] '
+title: "[WebUI] "
 labels:
-  - 'WebUI'
+  - "WebUI"
 body:
-  - type: 'markdown'
+  - type: "markdown"
     attributes:
       value: |-
         ## 请注意 - Caution
         This form only used for WebUI, for any other cases, please [click here](https://github.com/PBH-BTN/PeerBanHelper/issues/new)  
         此表单**仅用于反馈WebUI相关错误**，如果是其它类型的反馈，请[点击这里以重新选择](https://github.com/PBH-BTN/PeerBanHelper/issues/new/choose)。 
         请尽可能完整且详细地填写所有表单项，以便我们以最高效率并准确的排查故障和诊断问题
-  - type: 'input'
+  - type: "input"
     attributes:
-      label: 'WebUI 版本号 - Version'
+      label: "WebUI 版本号 - Version"
       description: |-
         Enter the PBH version that display on WebUI footer or GUI window title.  
         输入您正在使用 WebUI 的版本号，可在 WebUI 页面的底部找到
-      placeholder: 'vX.X.X-(aabbccdd)'
+      placeholder: "vX.X.X-(aabbccdd)"
     validations:
       required: true
-  - type: 'textarea'
+  - type: "textarea"
     attributes:
-      label: '问题描述 - Issue Description'
+      label: "问题描述 - Issue Description"
       description: |-
         Describe the problem you encounted.
         在此详细的描述你所遇到的问题
     validations:
       required: true
-  - type: 'textarea'
+  - type: "textarea"
     attributes:
-      label: '复现步骤 - Reproduce steps'
+      label: "复现步骤 - Reproduce steps"
       description: |-
         If you know how to reproduce the error, please type it in this text area.  
         如果你清楚如何复现此故障，也欢迎告诉我们，帮助我们更快的复现它。如果它是一个偶尔才会出现的错误，请告诉我们它通常可能会在什么情况下出现。
@@ -41,22 +41,22 @@ body:
         3. 出现 BUG!
     validations:
       required: true
-  - type: 'textarea'
+  - type: "textarea"
     attributes:
-      label: '截图 - Screenshot  '
+      label: "截图 - Screenshot  "
       description: |-
         Please upload screenshot here.  
         请上传问题截图。
-      placeholder: '<截图文件>'
+      placeholder: "<截图文件>"
     validations:
       required: true
-  - type: 'textarea'
+  - type: "textarea"
     attributes:
-      label: '额外信息 - Addition Information'
+      label: "额外信息 - Addition Information"
       description: |-
         If you have any related informations, please insert them into this text area.
         如果你还有其他觉得可能对排查和解决此问题有帮助的更多信息，可以在这里告诉我们
-      placeholder: '在此填写可能有用的额外信息...'
+      placeholder: "在此填写可能有用的额外信息..."
   - type: checkboxes
     id: check-list
     attributes:
@@ -67,7 +67,7 @@ body:
       options:
         - label: "PeerBanHelper 已更新到最新版本，非最新版本不接受任何错误反馈，任何非最新版本的 Issue 将被 立 刻 关 闭，不会有人给您提供任何支持 (I'm running the latest version of PBH that can be found in Github Relases, non-latest release won't receive any support)"
           required: false
-        - label: "我已检查过 [PBH 文档](https://pbh-btn.github.io/pbh-docs/)（特别是常见问题），且即使使用了搜索也没有找到与此有关的内容 (This not a question/or the question that not listed in README's FAQ or [PBH WIKI](https://pbh-btn.github.io/pbh-docs/))"
+        - label: "我已检查过 [PBH 文档](https://docs.pbh-btn.com/)（特别是常见问题），且即使使用了搜索也没有找到与此有关的内容 (This not a question/or the question that not listed in README's FAQ or [PBH WIKI](https://docs.pbh-btn.com/))"
           required: false
         - label: "我没有检查这个检查清单，只是闭眼选中了所有的复选框，请关闭这个 Issue (I have not read these checkboxes and therefore I just ticked them all, Please close this issue)"
           required: false

.github/workflows/build_deb.yml

@@ -20,6 +20,7 @@ jobs:
           echo "COMMIT_SHORT_SHA=$calculatedSha" >> $GITHUB_ENV
           sed -i "s/<version>/${{ env.PBH_VERSION }}/g" pkg/deb/DEBIAN/control
           mkdir -p pkg/deb/usr/lib/peerbanhelper
+          mv target/libraries pkg/deb/usr/lib/peerbanhelper/
           cp target/PeerBanHelper.jar pkg/deb/usr/lib/peerbanhelper/
           cd pkg && dpkg -b deb peerbanhelper_${{ env.PBH_VERSION }}_all.deb
         # 上面那个文件名需要符合收集条件

.github/workflows/build_installers.yml

@@ -23,7 +23,7 @@ jobs:
           license: ${{ secrets.INSTALL4J_LICENSE }}
       - name: Make installers
         run: |
-          /opt/install4j/bin/install4jc -L ${{ secrets.INSTALL4J_LICENSE }} -r ${{ steps.java_info.outputs.project_version }} -g -d target/media -D jarPath=$(pwd)/target/PeerBanHelper.jar install4j/project.install4j
+          /opt/install4j/bin/install4jc -L ${{ secrets.INSTALL4J_LICENSE }} -r ${{ steps.java_info.outputs.project_version }} -g -d target/media -D librariesPath=$(pwd)/target/libraries install4j/project.install4j
       # jarPath=$(pwd) 是必须的，install4jc 不知道什么毛病，不支持相对路径，这太诡异了
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4

.github/workflows/build_maven.yml

@@ -26,11 +26,11 @@ jobs:
           cache: 'maven'
           cache-dependency-path: '**/pom.xml'
       - name: Build with Maven
-        run: mvn -B clean package --file pom.xml -P thin-sqlite-packaging
+        run: mvn -B clean package --file pom.xml
       - name: Upload build artifacts
         uses: actions/upload-artifact@v4
         with:
           name: maven-dist
           path: |
-            target/*.jar
-        id: project
+            target/libraries
+            target/*.jar

.github/workflows/build_pkg.yml

@@ -31,7 +31,9 @@ jobs:
           run: |
             mkdir -p pkg/pkg/work-dir/usr/local/lib/peerbanhelper
             mkdir -p pkg/pkg/work-dir/usr/local/var/db/peerbanhelper/
+            mv target/libraries pkg/pkg/work-dir/usr/local/lib/peerbanhelper/
             cp target/PeerBanHelper.jar pkg/pkg/work-dir/usr/local/lib/peerbanhelper/
+            (cd pkg/pkg/work-dir/ && find -d * \! -type d) | sort | sed -e "s/.*/\/&/" >> pkg/pkg/pkg-plist
             pkg create -m pkg/pkg/ -r pkg/pkg/work-dir -p pkg/pkg/pkg-plist -o pkg/ 
             pkg info -F pkg/peerbanhelper-v${{ env.PBH_VERSION }}.pkg
             mv pkg/peerbanhelper-v${{ env.PBH_VERSION }}.pkg pkg/peerbanhelper-v${{ env.PBH_VERSION }}-$(uname -o)-$(uname -r).pkg

.github/workflows/build_spk.yml

@@ -14,10 +14,6 @@ jobs:
       - uses: actions/checkout@v4
       - id: java_info
         uses: YunaBraska/java-info-action@main
-      - uses: actions/download-artifact@v4
-        with:
-          name: maven-dist
-          path: target/
       - name: Run build script
         run: sudo PBH_VERSION=${{ env.PBH_VERSION }} IMAGE=${{ env.IMAGE }} bash pkg/synopkg/build-script.sh
         env:

.github/workflows/jvm-ci.yml

@@ -71,6 +71,8 @@ jobs:
         platforms: |
           linux/amd64
           linux/arm64/v8
+          linux/riscv64
+          linux/ppc64le
         tags: ${{ steps.meta.outputs.tags }}
         labels: ${{ steps.meta.outputs.labels }}-jvm-universal
         cache-from: type=gha

.github/workflows/jvm-release.yml

@@ -78,11 +78,14 @@ jobs:
         with:
           name: freebsd-pkg-14.1-dist
           path: target/media
+      - name: "Compress libraries archive"
+        run: |
+          tar zcvf target/libraries.tar.gz target/libraries
       - uses: alexellis/upload-assets@0.4.1
         env:
           GITHUB_TOKEN: ${{ github.token }}
         with:
-          asset_paths: '["target/PeerBanHelper.jar", "target/media/PeerBanHelper_*", "target/media/peerbanhelper_*", "target/media/peerbanhelper-*"]'
+          asset_paths: '["target/libraries.tar.gz", "target/PeerBanHelper.jar", "target/media/PeerBanHelper_*", "target/media/peerbanhelper_*", "target/media/peerbanhelper-*"]'
   Build_Docker:
     permissions:
       contents: write
@@ -133,6 +136,8 @@ jobs:
           platforms: |
             linux/amd64
             linux/arm64/v8
+            linux/riscv64
+            linux/ppc64le
           tags: ${{ steps.meta.outputs.tags }}
           labels: ${{ steps.meta.outputs.labels }}-jvm-universal
           cache-from: type=gha
@@ -169,6 +174,8 @@ jobs:
           platforms: |
             linux/amd64
             linux/arm64/v8
+            linux/riscv64
+            linux/ppc64le
           tags: ${{ steps.meta-acr.outputs.tags }}
           labels: ${{ steps.meta-acr.outputs.labels }}-jvm-universal
           cache-from: type=gha