Skip to content

Commit c7e1700

Browse files
hiddify-comhiddify-com
committed
release: version 10.85.0b2 🚀
1 parent 4305ccb commit c7e1700

File tree

4 files changed

+219
-8
lines changed

4 files changed

+219
-8
lines changed

‎HISTORY.md‎

Lines changed: 198 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,15 +5,213 @@
55

66
### Fix
77

8+
* Fixed location. [hiddify-com]
9+
10+
* Docker issue, disable auto update by env variable. [hiddify-com]
11+
12+
* Installation bug. [hiddify-com]
13+
14+
* Bug. [hiddify-com]
15+
16+
* Systemd issue. [hiddify-com]
17+
18+
* Docker installation. [hiddify-com]
19+
20+
* Docker installation. [hiddify-com]
21+
22+
* Installer issue. [hiddify-com]
23+
24+
* Bug. [hiddify-com]
25+
26+
* Bug. [hiddify-com]
27+
28+
* Python installation multiuser. [hiddify-com]
29+
30+
* Bug. [hiddify-com]
31+
832
* Correct timezone for Russia in script. [Tesla]
933

1034
The timezone for Russia was previously set to 'Asia/Moscow', which is incorrect.
1135
Updated the script to use 'Europe/Moscow' to correctly reflect the timezone.
1236

1337
### Other
1438

39+
* Merge pull request #4869 from tesilaaliset/update/update-docker-installation. [Hiddify]
40+
41+
if it's dev or development, clone the project, build it and deploy it…
42+
43+
* If it's dev or development, clone the project, build it and deploy it using docker compose. else, use the default way. [tesla]
44+
45+
* Merge pull request #4868 from tesilaaliset/update/update_docker_image. [Hiddify]
46+
47+
Update Docker image ubuntu from 22 to 24
48+
49+
* Update Docker image ubuntu from 22 to 24. [tesla]
50+
51+
* Merge pull request #4867 from tesilaaliset/fix/fix-ha-proxy-installation. [Hiddify]
52+
53+
Fix installation of haproxy based on ubuntu version.
54+
55+
* Fix installation of haproxy based on ubuntu version. [tesla]
56+
57+
* Merge pull request #4866 from tesilaaliset/fix/fix-docker. [Hiddify]
58+
59+
Using version 313 when we are on dev or docker
60+
61+
* Using version 313 when we are on dev or docker. [tesla]
62+
63+
* Merge pull request #4865 from tesilaaliset/fix/fix_docker. [Hiddify]
64+
65+
Fixing systemctl problem
66+
67+
* Fix install.sh to install xray if mode is docker-install. [tesla]
68+
69+
* Changes: 1. copy docker.env to .env for docker-compose compatibility. 2. Do not use systemctl and run things when we are building docker image. 3. remove apply config when we are building image. [tesla]
70+
71+
* Fixing systemctl problem. [root]
72+
73+
* Merge pull request #4864 from tesilaaliset/update/update_ha_proxy. [Hiddify]
74+
75+
Upgrade HAProxy from 3.0 to 3.1
76+
77+
* Upgrade HAProxy from 3.0 to 3.1. [root]
78+
79+
- Updated installation to target HAProxy 3.1 via vbernat/haproxy-3.1 PPA
80+
81+
* Imporved docker installation. [hiddify-com]
82+
83+
* Revert changes. [hiddify-com]
84+
85+
* Fix bug. [hiddify-com]
86+
87+
* Fix bug. [hiddify-com]
88+
89+
* Fix bug. [hiddify-com]
90+
91+
* Update python to 3.13. [hiddify-com]
92+
93+
* Improve haproxy performance by using map. [hiddify-com]
94+
95+
* Improve h2 support. [hiddify-com]
96+
97+
* Merge pull request #4849 from tesilaaliset/fix/fix_relase_bugs. [lymanjre]
98+
99+
* Merge branch 'main' into fix/fix_relase_bugs. [Tesla]
100+
101+
* Merge pull request #4848 from tesilaaliset/fix/fix_relase_bugs. [lymanjre]
102+
103+
* Update. [Tesla]
104+
105+
* Merge branch 'main' into fix/fix_relase_bugs. [Tesla]
106+
107+
* Reduce workers in celery. [hiddify-com]
108+
15109
* Merge pull request #4842 from tesilaaliset/fix/fix_relase_bugs. [lymanjre]
16110

111+
* 1. **VLESS gRPC (h2-vless-grpc-new)** ``` Migrate h2-vless-grpc-new from gRPC to XHTTP stream-up H2. [Tesla]
112+
113+
Replace network: "grpc" with network: "xhttp" and update to xhttpSettings with mode: "stream-up" to address gRPC deprecation warning. Preserve Unix socket and VLESS settings. Ref: Xray-core v24.11.21 release notes, issue #4113.
114+
```
115+
116+
2. **VLESS gRPC Proxy (h2-vless-grpc-proxy)**
117+
```
118+
Migrate h2-vless-grpc-proxy from gRPC to XHTTP stream-up H2
119+
120+
Switch network: "grpc" to network: "xhttp", replace grpcSettings with xhttpSettings (mode: "stream-up"), and retain tcpSettings with acceptProxyProtocol. Ref: Xray-core v24.11.21 release notes, issue #4113.
121+
```
122+
123+
3. **VMess gRPC (h2-vmess-grpc-new)**
124+
```
125+
Migrate h2-vmess-grpc-new from gRPC to XHTTP stream-up H2
126+
127+
Update network: "grpc" to network: "xhttp", replace grpcSettings with xhttpSettings (mode: "stream-up"), and keep VMess settings intact. Ref: Xray-core v24.11.21 release notes, issue #4113.
128+
```
129+
130+
4. **VMess gRPC Proxy (h2-vmess-grpc-proxy)**
131+
```
132+
Migrate h2-vmess-grpc-proxy from gRPC to XHTTP stream-up H2
133+
134+
Change network: "grpc" to network: "xhttp", replace grpcSettings with xhttpSettings (mode: "stream-up"), and preserve tcpSettings with acceptProxyProtocol. Ref: Xray-core v24.11.21 release notes, issue #4113.
135+
```
136+
137+
---
138+
139+
5. **VLESS WS (vless-ws-new)**
140+
```
141+
Migrate vless-ws-new from WebSocket to XHTTP stream-up H2
142+
143+
Replace network: "ws" with network: "xhttp", update to xhttpSettings (mode: "stream-up"), move acceptProxyProtocol to tcpSettings, and retain sniffing. Ref: Xray-core v24.11.21 release notes, issue #4113.
144+
```
145+
146+
6. **Trojan WS (trojan-ws-new)**
147+
```
148+
Migrate trojan-ws-new from WebSocket to XHTTP stream-up H2
149+
150+
Switch network: "ws" to network: "xhttp", replace wsSettings with xhttpSettings (mode: "stream-up"), move acceptProxyProtocol to tcpSettings, and keep Trojan settings. Ref: Xray-core v24.11.21 release notes, issue #4113.
151+
```
152+
153+
7. **VMess WS (vmess-ws-new)**
154+
```
155+
Migrate vmess-ws-new from WebSocket to XHTTP stream-up H2
156+
157+
Update network: "ws" to network: "xhttp", replace wsSettings with xhttpSettings (mode: "stream-up"), move acceptProxyProtocol to tcpSettings, and preserve VMess settings. Ref: Xray-core v24.11.21 release notes, issue #4113.
158+
```
159+
160+
8. **Shadowsocks WS (h2-ss-ws-new-proxy)**
161+
```
162+
Migrate h2-ss-ws-new-proxy from WebSocket to XHTTP stream-up H2
163+
164+
Change network: "ws" to network: "xhttp", replace wsSettings with xhttpSettings (mode: "stream-up"), move acceptProxyProtocol to tcpSettings, and retain Shadowsocks settings. Ref: Xray-core v24.11.21 release notes, issue #4113.
165+
```
166+
167+
9. **Trojan WS (h2-trojan-ws-new)**
168+
```
169+
Migrate h2-trojan-ws-new from WebSocket to XHTTP stream-up H2
170+
171+
Replace network: "ws" with network: "xhttp", update to xhttpSettings (mode: "stream-up"), and keep Trojan settings with Unix socket. Ref: Xray-core v24.11.21 release notes, issue #4113.
172+
```
173+
174+
10. **Trojan WS Proxy (h2-trojan-ws-new-proxy)**
175+
```
176+
Migrate h2-trojan-ws-new-proxy from WebSocket to XHTTP stream-up H2
177+
178+
Switch network: "ws" to network: "xhttp", replace wsSettings with xhttpSettings (mode: "stream-up"), move acceptProxyProtocol to tcpSettings, and preserve sniffing. Ref: Xray-core v24.11.21 release notes, issue #4113.
179+
```
180+
181+
11. **VLESS WS (h2-vless-ws-new)**
182+
```
183+
Migrate h2-vless-ws-new from WebSocket to XHTTP stream-up H2
184+
185+
Update network: "ws" to network: "xhttp", replace wsSettings with xhttpSettings (mode: "stream-up"), and retain VLESS settings with Unix socket. Ref: Xray-core v24.11.21 release notes, issue #4113.
186+
```
187+
188+
12. **VLESS WS Proxy (h2-vless-ws-new-proxy)**
189+
```
190+
Migrate h2-vless-ws-new-proxy from WebSocket to XHTTP stream-up H2
191+
192+
Change network: "ws" to network: "xhttp", replace wsSettings with xhttpSettings (mode: "stream-up"), move acceptProxyProtocol to tcpSettings, and keep sniffing. Ref: Xray-core v24.11.21 release notes, issue #4113.
193+
```
194+
195+
13. **VMess WS (h2-vmess-ws-new)**
196+
```
197+
Migrate h2-vmess-ws-new from WebSocket to XHTTP stream-up H2
198+
199+
Replace network: "ws" with network: "xhttp", update to xhttpSettings (mode: "stream-up"), and preserve VMess settings with Unix socket. Ref: Xray-core v24.11.21 release notes, issue #4113.
200+
```
201+
202+
14. **VMess WS Proxy (h2-vmess-ws-new-proxy)**
203+
```
204+
Migrate h2-vmess-ws-new-proxy from WebSocket to XHTTP stream-up H2
205+
206+
Switch network: "ws" to network: "xhttp", replace wsSettings with xhttpSettings (mode: "stream-up"), move acceptProxyProtocol to tcpSettings, and retain sniffing. Ref: Xray-core v24.11.21 release notes, issue #4113.
207+
```
208+
209+
---
210+
211+
- **Consistency**: Each message follows a pattern: it identifies the config, describes the migration (gRPC or WS to XHTTP), details key changes, and references the Xray-core documentation.
212+
- **References**: The v24.11.21 release notes and issue #4113 are cited as they discuss the deprecation of gRPC and WebSocket in favor of XHTTP, providing context for these changes.
213+
- **Flexibility**: If you’re using a different versioning system or need adjustments (e.g., adding ticket numbers), let me know!
214+
17215
* Fix trojan and h2 vless problems on rendering. [Tesla]
18216
19217
* Fix trojan and h2 vless problems on rendering. [Tesla]

‎Makefile‎

Lines changed: 19 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,19 +32,32 @@ build: apply
3232
# @bash -c '\
3333
# cd hiddify-panel/src && \
3434
# git pull'
35+
latest-tags:
36+
@tags=$$(git for-each-ref --sort=-creatordate --format='%(refname:short)' refs/tags); \
37+
stable=""; beta=""; \
38+
for tag in $$tags; do \
39+
echo $$tag | grep -qE '^v[0-9]+\.[0-9]+\.[0-9]+$$' && [ -z "$$stable" ] && stable=$$tag; \
40+
echo $$tag | grep -qE '^v[0-9]+\.[0-9]+\.[0-9]+(b|\.dev)[0-9]+$$' && [ -z "$$beta" ] && beta=$$tag; \
41+
[ "$$beta" != "" ] && [ "$$stable" != "" ] && break; \
42+
done; \
43+
echo "Stable: $${stable:-❌} | Beta: $${beta:-❌}"
3544

3645

46+
dev:
47+
@echo "dev" > VERSION
48+
@gitchangelog > HISTORY.md || { git tag -d $${TAG}; echo "Please run pip install gitchangelog pystache mustache markdown"; exit 2; }
49+
@make -C ./hiddify-panel/src dev
50+
@git add VERSION HISTORY.md hiddify-panel/src
51+
@git commit -m "release: switch to develop"
52+
3753
.PHONY: release
38-
release:
54+
release: latest-tags
3955
ifeq ($(TAG),)
40-
@echo "previous tag was $$(git describe --tags $$(git rev-list --tags --max-count=1))"
41-
#@echo "release last version $$(lastversion Hiddify-Manager) "
42-
#@echo "beta last version $$(lastversion --pre Hiddify-Manager) "
4356
@echo "WARNING: This operation will create s version tag and push to github"
4457
@read -p "Version? (provide the next x.y.z semver) : " TAG
4558
endif
46-
@VERSION_STR=$$(echo $$TAG | grep -Eo '^[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}(\.dev[0-9]{1,2})?')
47-
[ ! -z "$$VERSION_STR" ] || { echo "Incorrect tag. e.g., 1.2.3 or 1.2.3.dev1"; exit 1; }
59+
@VERSION_STR=$$(echo $$TAG | grep -Eo '^[0-9]{1,2}\.[0-9]{1,2}\.[0-9]{1,2}((b|\.dev)[0-9]{1,2})?')
60+
[ ! -z "$$VERSION_STR" ] || { echo "Incorrect tag. e.g., 1.2.3 or 1.2.3b1"; exit 1; }
4861
@echo "$${TAG}" > VERSION
4962
@make -C ./hiddify-panel/src release TAG=$${TAG}
5063
@git tag $${TAG} > /dev/null

‎VERSION‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
10.85.0.dev8
1+
10.85.0b2

‎hiddify-panel/src‎

Submodule src updated from 2717961 to 4d00b73

0 commit comments

Comments
 (0)