Merge branch 'v4'

Author: hiddify-com

.fpm_openwrt

@@ -0,0 +1,27 @@
+-s dir
+--name hiddify-core
+--category net
+--license GPL-3.0-or-later
+--description "The universal proxy platform."
+--url "https://hiddify.com/"
+--maintainer "hiddify <wrt@hiddify.com>"
+--no-deb-generate-changes
+
+--config-files /etc/config/hiddify
+--config-files /etc/hiddify/config.json
+
+--depends ca-bundle
+--depends kmod-inet-diag
+--depends kmod-tun
+--depends firewall4
+--depends kmod-nft-queue
+
+--before-remove release/config/openwrt.prerm
+
+release/config/config.json=/etc/hiddify/config.json
+
+release/config/openwrt.conf=/etc/config/hiddify
+release/config/openwrt.init=/etc/init.d/hiddify
+release/config/openwrt.keep=/lib/upgrade/keep.d/hiddify 
+
+LICENSE.md=/usr/share/licenses/hiddify-core/LICENSE.md

.fpm_systemd

@@ -0,0 +1,21 @@
+-s dir
+--name hiddify-core
+--category net
+--license GPL-3.0-or-later
+--description "The universal proxy platform."
+--url "https://hiddify.com/"
+--maintainer "hiddify <core@hiddify.com>"
+--deb-field "Bug: https://github.com/hiddify/hiddify-core/issues"
+--no-deb-generate-changes
+--config-files /etc/hiddify-core/config.json
+--after-install release/config/hiddify-core.postinst
+
+release/config/config.json=/etc/hiddify-core/config.json
+
+release/config/hiddify-core.service=/usr/lib/systemd/system/hiddify-core.service
+release/config/hiddify-core@.service=/usr/lib/systemd/system/hiddify-core@.service
+release/config/hiddify-core.sysusers=/usr/lib/sysusers.d/hiddify-core.conf
+release/config/hiddify-core.rules=usr/share/polkit-1/rules.d/hiddify-core.rules
+release/config/hiddify-core-split-dns.xml=/usr/share/dbus-1/system.d/hiddify-core-split-dns.conf
+
+LICENSE.md=/usr/share/licenses/hiddify-core/LICENSE.md

.gitchangelog.rc

@@ -0,0 +1 @@
+tag_filter_regexp = r'^v\d+\.\d+\.\d+$'

.github/change_version.sh

@@ -14,10 +14,10 @@ echo "version: ${VERSION_STR}+${BUILD_NUMBER}"
 SED -e "s|<key>CFBundleVersion</key>\s*<string>[^<]*</string>|<key>CFBundleVersion</key><string>${VERSION_STR}</string>|" Info.plist 
 SED -e "s|<key>CFBundleShortVersionString</key>\s*<string>[^<]*</string>|<key>CFBundleShortVersionString</key><string>${VERSION_STR}</string>|" Info.plist 
 SED "s|ENV VERSION=.*|ENV VERSION=v${TAG}|g" docker/Dockerfile 
-git add Info.plist docker/Dockerfile 
+git add Info.plist platform/docker/Dockerfile 
 git commit -m "release: version ${TAG}" 
 echo "creating git tag : v${TAG}" 
 git push 
 git tag v${TAG} 
-git push -u origin HEAD --tags 
+git push --tags 
 echo "Github Actions will detect the new tag and release the new version."

.github/workflows/build.yml

@@ -10,7 +10,8 @@ on:
     branches:
        - main
        - dev
-       - android-fix-action-bug
+       - v3
+       - v4
     paths-ignore:
       - '**.md'
       - 'docs/**'

.github/workflows/ci.yml

@@ -1,8 +1,14 @@
+*.dylib
+*.dll
+*.so
+
+*cronet*
 /bin/*
 !/bin/.gitkeep
 .build
 .idea
 cert
+data
 **/*.log
 .DS_Store
 

.gitignore

@@ -0,0 +1,6 @@
+[submodule "hiddify-sing-box"]
+	path = hiddify-sing-box
+	url = https://github.com/hiddify/hiddify-sing-box
+[submodule "ray2sing"]
+	path = ray2sing
+	url = git@github.com:hiddify/ray2sing.git

.gitmodules

@@ -12,15 +12,15 @@ go version go1.21.1 darwin/arm64
 
 > if you're not interested in building/contributing to the Go code, you can skip this section
 
-The Go code for Hiddify can be found in the `libcore` folder, as a [git submodule](https://git-scm.com/book/en/v2/Git-Tools-Submodules) and in [core repository](https://github.com/hiddify/hiddify-next-core). The entrypoints for the desktop version are available in the [`libcore/custom`](https://github.com/hiddify/hiddify-next-core/tree/main/custom) folder and for the mobile version they can be found in the [`libcore/mobile`](https://github.com/hiddify/hiddify-next-core/tree/main/mobile) folder.
+The Go code for Hiddify can be found in the `hiddify-core` folder, as a [git submodule](https://git-scm.com/book/en/v2/Git-Tools-Submodules) and in [core repository](https://github.com/hiddify/hiddify-next-core). The entrypoints for the desktop version are available in the [`hiddify-core/custom`](https://github.com/hiddify/hiddify-next-core/tree/main/custom) folder and for the mobile version they can be found in the [`hiddify-core/mobile`](https://github.com/hiddify/hiddify-next-core/tree/main/mobile) folder.
 
-For the desktop version, we have to compile the Go code into a C shared library. We are providing a Makefile to generate the C shared libraries for all operating systems. The following Make commands will build libcore and copy the resulting output in [`libcore/bin`](https://github.com/hiddify/hiddify-next-core/tree/main/bin):
+For the desktop version, we have to compile the Go code into a C shared library. We are providing a Makefile to generate the C shared libraries for all operating systems. The following Make commands will build hiddify-core and copy the resulting output in [`hiddify-core/bin`](https://github.com/hiddify/hiddify-next-core/tree/main/bin):
 
 - `make windows-amd64`
 - `make linux-amd64`
 - `make macos-universal`
 
-For the mobile version, we are using the [`gomobile`](https://github.com/golang/go/wiki/Mobile) tools. The following Make commands will build libcore for Android and iOS and copy the resulting output in [`libcore/bin`](https://github.com/hiddify/hiddify-next-core/tree/main/bin):
+For the mobile version, we are using the [`gomobile`](https://github.com/golang/go/wiki/Mobile) tools. The following Make commands will build hiddify-core for Android and iOS and copy the resulting output in [`hiddify-core/bin`](https://github.com/hiddify/hiddify-next-core/tree/main/bin):
 
 - `make android`
 - `make ios`