update Module v3.4.0

Author: whalechoi

.gitattributes

@@ -1,5 +1,6 @@
 # Declare files that will always have LF line endings on checkout.
 META-INF/** text eol=lf
+webroot/** text eol=lf
 xray/etc/** text eol=lf
 xray/scripts/** text eol=lf
 

README.md

@@ -4,7 +4,7 @@ English | [简体中文](README_zh_CN.md)
 
 ~~A fork from [V2ray for Android](https://github.com/Magisk-Modules-Repo/v2ray)~~
 
-This is a Magisk module for Xray/V2ray/Sing-box/Mihomo(Clash.Meta), and includes xrayhelper binaries for arm64, x64.
+This is a Magisk module for Xray/V2ray/Sing-box/Mihomo/Hysteria2, and includes xrayhelper binaries for arm64, x64.
 
 ## Disclaimer
 
@@ -20,17 +20,19 @@ Download the module zip from [Release](https://github.com/Asterisk4Magisk/Xray4M
 
 This module does not contain binaries such as [Xray-core](https://github.com/XTLS/Xray-core), When installing, the relevant files are downloaded automatically. If your network has poor access to Github, please consider using a network proxy or choose not install core online.
 
-If your device don't have volume keys, you can create file `/sdcard/xray4magisk.setup`, first line of the file will determine the core type, `xray` for Xray, `v2ray` for V2ray, `sing-box` for Sing-box and `mihomo` for Mihomo(Clash.Meta), any other content will skip core installation; second line of the file will control whether to overwrite old config files, `keep` will preserve them, otherwise will be overwritten.
+If your device don't have volume keys, you can create file `/sdcard/xray4magisk.setup`, first line of the file will determine the core type, `xray` for Xray, `v2ray` for V2ray, `sing-box` for Sing-box, `mihomo` for Mihomo and `hysteria2` for Hysteria2, any other content will skip core installation; second line of the file will control whether to overwrite old config files, `keep` will preserve them, otherwise will be overwritten.
 
 ## Config
 
 - The xrayhelper config file is stored in `/data/adb/xray/xrayhelper.yml`
 - The xray config file is stored in `/data/adb/xray/confs/*.json`
-- The v2ray config file is stored in `/data/adb/xray/v2ray.v5.json`
+- The v2ray config file is stored in `/data/adb/xray/v2rayconfs/config.json`
 - The sing-box config file is stored in `/data/adb/xray/singconfs/*.json`
-- The mihomo(clash.meta) template config file is stored in `/data/adb/xray/mihomoconfs/template.yaml`
+- The mihomo template config file is stored in `/data/adb/xray/mihomoconfs/template.yaml`
+- The hysteria2 config file is stored in `/data/adb/xray/hy2confs/config.yaml`
+- The adguardhome config file is stored in `/data/adb/xray/adghomeconfs/config.yaml`, and the default username and password are both `xray4magisk`
 
-Tip: The default config already sets the inbounds section to work with transparent proxy scripts. It is recommended that use xrayhelper to manage your proxy server, for advanced configurations please refer to the appropriate official documentation, such as [Xray](https://xtls.github.io/), [V2ray](https://www.v2fly.org/), [Sing-box](https://sing-box.sagernet.org/), [Mihomo](https://wiki.metacubex.one/)
+Tip: The default config already sets the inbounds section to work with transparent proxy scripts. It is recommended that use xrayhelper to manage your proxy server, for advanced configurations please refer to the appropriate official documentation, such as [Xray](https://xtls.github.io/), [V2ray](https://www.v2fly.org/), [Sing-box](https://sing-box.sagernet.org/), [Mihomo](https://wiki.metacubex.one/) and [Hysteria2](https://hysteria.network/)
 
 ## Usage
 

README_zh_CN.md

@@ -4,7 +4,7 @@
 
 ~~该项目 fork 自 [V2ray for Android](https://github.com/Magisk-Modules-Repo/v2ray)。~~
 
-本项目为 Xray/V2ray/Sing-box/Mihomo(Clash.Meta) 的 Magisk 模块，支持 arm64， x64 架构。
+本项目为 Xray/V2ray/Sing-box/Mihomo/Hysteria2 的 Magisk 模块，支持 arm64， x64 架构。
 
 ## 免责声明
 
@@ -18,19 +18,21 @@
 
 从 [Release](https://github.com/Asterisk4Magisk/Xray4Magisk/releases) 下载模块压缩包，然后通过 [Magisk](https://github.com/topjohnwu/Magisk) 进行安装  
 
-注意：这个模块不包含任何核心的二进制文件，安装时，联网下载相关文件，若您的网络访问Github速度不佳，建议在模块安装过程中开启网络代理或者选择不在线安装Core并在模块安装成功后手动安装Core、配置XrayHelper
+注意：这个模块不包含任何核心的二进制文件，安装时，联网下载相关文件，若您的网络访问Github速度不佳，建议在模块安装过程中开启网络代理或者选择不在线安装 Core 并在模块安装成功后手动安装 Core、配置 XrayHelper
 
-如果你的设备没有音量键，可以创建文件 `/sdcard/xray4magisk.setup`，该文件的第一行将决定在线安装的核心类型，`xray` 表示使用 Xray，`v2ray` 表示使用 V2ray，`sing-box` 表示使用 Sing-box，`mihomo` 表示使用 Mihomo(Clash.Meta)，其他任意内容将跳过核心安装；该文件的第二行将决定是否覆盖旧配置文件，`keep`表示保留旧配置文件，其他内容将会覆盖配置文件。
+如果你的设备没有音量键，可以创建文件 `/sdcard/xray4magisk.setup`，该文件的第一行将决定在线安装的核心类型，`xray` 表示使用 Xray，`v2ray` 表示使用 V2ray，`sing-box` 表示使用 Sing-box，`mihomo` 表示使用 Mihomo，`hysteria2` 表示使用 Hysteria2，其他任意内容将跳过核心安装；该文件的第二行将决定是否覆盖旧配置文件，`keep`表示保留旧配置文件，其他内容将会覆盖配置文件。
 
 ## 配置文件
 
 - XrayHelper 配置文件保存在 `/data/adb/xray/xrayhelper.yml`
 - Xray 核心的配置文件保存在 `/data/adb/xray/confs/*.json`
-- V2ray 核心的配置文件保存在 `/data/adb/xray/v2ray.v5.json`
+- V2ray 核心的配置文件保存在 `/data/adb/xray/v2rayconfs/config.json`
 - Sing-box 核心的配置文件保存在 `/data/adb/xray/singconfs/*.json`
-- Mihomo(Clash.Meta) 核心的模板配置文件保存在 `/data/adb/xray/mihomoconfs/template.yaml`
+- Mihomo 核心的模板配置文件保存在 `/data/adb/xray/mihomoconfs/template.yaml`
+- Hysteria2 核心的配置文件保存在 `/data/adb/xray/hy2confs/config.yaml`
+- AdGuardHome 的配置文件保存在 `/data/adb/xray/adghomeconfs/config.yaml`，默认 WebUI 用户名密码均为 `xray4magisk`
 
-提示：默认配置已经设置了 inbounds 部分来配合透明代理脚本工作。建议您使用 xrayhelper 管理代理服务器，进阶配置请参考相应官方文档，如 [Xray](https://xtls.github.io/)、 [V2ray](https://www.v2fly.org/) 、 [Sing-box](https://sing-box.sagernet.org/)以及 [Mihomo](https://wiki.metacubex.one/)
+提示：默认配置已经设置了 inbounds 部分来配合透明代理脚本工作。建议您使用 xrayhelper 管理代理服务器，进阶配置请参考相应官方文档，如 [Xray](https://xtls.github.io/)、 [V2ray](https://www.v2fly.org/) 、 [Sing-box](https://sing-box.sagernet.org/)、 [Mihomo](https://wiki.metacubex.one/) 以及 [Hysteria2](https://hysteria.network/)
 
 ## 使用方法
 

changelog.md

@@ -1,13 +1,16 @@
 ## Changelog
 ### Module
-- use xrayhelper v1.3.4
-- use xray4magisk-ksu-webui v0.0.1
+- use xrayhelper v1.4.0
+- use xray4magisk-ksu-webui v0.0.2
+- add hysteria2 config
+- add AdGuardHome config
 
-### XrayHelper v1.3.4
-- vmess json Unmarshal str convert fix
-- set subprocess group ID for common.External
-- console based restful api for kernelsu webui
-- some other shareurl changes
+### XrayHelper v1.4.0
+- tproxy method no longer check ipv6 connection
+- save raw data from v2rayNg subscribe when decode base64 failed
+- custom User-Agent for http requests send by xrayhelper
+- add hysteria2 support
+- add adguardhome support
 
-### xray4magisk-ksu-webui v0.0.1
-- initial version
+### xray4magisk-ksu-webui v0.0.2
+- sync XrayHelper v1.4.0

customize.sh

@@ -62,10 +62,19 @@ VKSEL=chooseport
 
 installCore() {
     case "$1" in
+    xray)
+        sed -i 's/coreType: .*/coreType: xray/g' ${module_path}/xrayhelper.yml
+        sed -i 's/corePath: .*/corePath: \/data\/adb\/xray\/bin\/xray/g' ${module_path}/xrayhelper.yml
+        sed -i 's/coreConfig: .*/coreConfig: \/data\/adb\/xray\/confs\//g' ${module_path}/xrayhelper.yml
+        ui_print "- Install geodata asset"
+        su -c ${module_path}/bin/xrayhelper -c ${module_path}/xrayhelper.yml update geodata
+        ui_print "- Install xray core"
+        su -c ${module_path}/bin/xrayhelper -c ${module_path}/xrayhelper.yml update core
+        ;;
     v2ray)
         sed -i 's/coreType: .*/coreType: v2ray/g' ${module_path}/xrayhelper.yml
         sed -i 's/corePath: .*/corePath: \/data\/adb\/xray\/bin\/v2ray/g' ${module_path}/xrayhelper.yml
-        sed -i 's/coreConfig: .*/coreConfig: \/data\/adb\/xray\/v2ray.v5.json/g' ${module_path}/xrayhelper.yml
+        sed -i 's/coreConfig: .*/coreConfig: \/data\/adb\/xray\/v2rayconfs\/config.json/g' ${module_path}/xrayhelper.yml
         ui_print "- Install geodata asset"
         su -c ${module_path}/bin/xrayhelper -c ${module_path}/xrayhelper.yml update geodata
         ui_print "- Install v2ray core"
@@ -88,13 +97,11 @@ installCore() {
         ui_print "- Install mihomo core"
         su -c ${module_path}/bin/xrayhelper -c ${module_path}/xrayhelper.yml update core
         ;;
-    xray)
-        sed -i 's/coreType: .*/coreType: xray/g' ${module_path}/xrayhelper.yml
-        sed -i 's/corePath: .*/corePath: \/data\/adb\/xray\/bin\/xray/g' ${module_path}/xrayhelper.yml
-        sed -i 's/coreConfig: .*/coreConfig: \/data\/adb\/xray\/confs\//g' ${module_path}/xrayhelper.yml
-        ui_print "- Install geodata asset"
-        su -c ${module_path}/bin/xrayhelper -c ${module_path}/xrayhelper.yml update geodata
-        ui_print "- Install xray core"
+    hysteria2)
+        sed -i 's/coreType: .*/coreType: hysteria2/g' ${module_path}/xrayhelper.yml
+        sed -i 's/corePath: .*/corePath: \/data\/adb\/xray\/bin\/hysteria2/g' ${module_path}/xrayhelper.yml
+        sed -i 's/coreConfig: .*/coreConfig: \/data\/adb\/xray\/hy2confs\/config.yaml/g' ${module_path}/xrayhelper.yml
+        ui_print "- Install hysteria2 core"
         su -c ${module_path}/bin/xrayhelper -c ${module_path}/xrayhelper.yml update core
         ;;
     *)
@@ -111,7 +118,7 @@ installCore_VK() {
     if $VKSEL; then
         ui_print
         ui_print "- Please select your core"
-        ui_print "* VOL+ = xray/v2ray, VOL- = sing-box/mihomo *"
+        ui_print "* VOL+ = xray/v2ray, VOL- = sing-box/mihomo/hysteria2 *"
         if $VKSEL; then
             ui_print
             ui_print "- Please select xray or v2ray"
@@ -123,12 +130,19 @@ installCore_VK() {
             fi
         else
             ui_print
-            ui_print "- Please select sing-box or mihomo"
-            ui_print "* VOL+ = sing-box, VOL- = mihomo *"
+            ui_print "- Please select your core"
+            ui_print "* VOL+ = sing-box/mihomo, VOL- = hysteria2 *"
             if $VKSEL; then
-                installCore sing-box
+                ui_print
+                ui_print "- Please select sing-box or mihomo"
+                ui_print "* VOL+ = sing-box, VOL- = mihomo *"
+                if $VKSEL; then
+                    installCore sing-box
+                else
+                    installCore mihomo
+                fi
             else
-                installCore mihomo
+                installCore hysteria2
             fi
         fi
     else
@@ -140,9 +154,6 @@ releaseConfig() {
     ui_print "- Release xrayhelper config"
     unzip -j -o "${ZIPFILE}" 'xray/etc/xrayhelper.yml' -d ${module_path} >&2
 
-    ui_print "- Release v2ray v5 config"
-    unzip -j -o "${ZIPFILE}" 'xray/etc/v2ray.v5.json' -d ${module_path} >&2
-
     ui_print "- Release xray configs"
     if [ ! -d ${module_path}/confs ]; then
         mkdir -p ${module_path}/confs
@@ -153,6 +164,12 @@ releaseConfig() {
     unzip -j -o "${ZIPFILE}" 'xray/etc/confs/policy.json' -d ${module_path}/confs >&2
     unzip -j -o "${ZIPFILE}" 'xray/etc/confs/routing.json' -d ${module_path}/confs >&2
 
+    ui_print "- Release v2ray v5 config"
+    if [ ! -d ${module_path}/v2rayconfs ]; then
+        mkdir -p ${module_path}/v2rayconfs
+        unzip -j -o "${ZIPFILE}" 'xray/etc/v2rayconfs/config.json' -d ${module_path}/v2rayconfs >&2
+    fi
+
     ui_print "- Release sing-box configs"
     if [ ! -d ${module_path}/singconfs ]; then
         mkdir -p ${module_path}/singconfs
@@ -167,6 +184,18 @@ releaseConfig() {
         mkdir -p ${module_path}/mihomoconfs
     fi
     unzip -j -o "${ZIPFILE}" 'xray/etc/mihomoconfs/template.yaml' -d ${module_path}/mihomoconfs >&2
+
+    ui_print "- Release hysteria2 configs"
+    if [ ! -d ${module_path}/hy2confs ]; then
+        mkdir -p ${module_path}/hy2confs
+    fi
+    unzip -j -o "${ZIPFILE}" 'xray/etc/hy2confs/config.yaml' -d ${module_path}/hy2confs >&2
+
+    ui_print "- Release adguardhome configs"
+    if [ ! -d ${module_path}/adghomeconfs ]; then
+        mkdir -p ${module_path}/adghomeconfs
+    fi
+    unzip -j -o "${ZIPFILE}" 'xray/etc/adghomeconfs/config.yaml' -d ${module_path}/adghomeconfs >&2
 }
 
 installModule() {

module.prop

@@ -1,7 +1,7 @@
 id=xray4magisk
 name=Xray4Magisk
-version=Module v3.3.4, Helper v1.3.4
-versionCode=20240602
+version=Module v3.4.0, Helper v1.4.0
+versionCode=20240617
 author=Asterisk4Magisk
 description=System Proxy
 updateJson=https://raw.githubusercontent.com/Asterisk4Magisk/Xray4Magisk/master/update.json

update.json

@@ -1,6 +1,6 @@
 {
-	"version": "Module v3.3.4",
-	"versionCode": 20240602,
-	"zipUrl": "https://github.com/Asterisk4Magisk/Xray4Magisk/releases/download/v3.3.4/Xray4Magisk-3.3.4.zip",
+	"version": "Module v3.4.0",
+	"versionCode": 20240617,
+	"zipUrl": "https://github.com/Asterisk4Magisk/Xray4Magisk/releases/download/v3.4.0/Xray4Magisk-3.4.0.zip",
 	"changelog": "https://raw.githubusercontent.com/Asterisk4Magisk/Xray4Magisk/master/changelog.md"
 }