Skip to content

luci: Xray XHTTP#682

Merged
handsomeji merged 4 commits intoOpenwrt-Passwall:mainfrom
Pacalini:xmux
Nov 17, 2024
Merged

luci: Xray XHTTP#682
handsomeji merged 4 commits intoOpenwrt-Passwall:mainfrom
Pacalini:xmux

Conversation

@Pacalini
Copy link
Contributor

@Pacalini Pacalini commented Nov 2, 2024

Client only

SplitHTTP 出站需要手动改成 XHTTP

@Pacalini Pacalini changed the title luci: Xray splitHTTP XMUX luci: Xray SplitHTTP XMUX Nov 2, 2024
@Pacalini Pacalini changed the title luci: Xray SplitHTTP XMUX luci: Xray XHTTP Nov 3, 2024
@Graveyard9988
Copy link

Thanks for great job

Is it compatible with latest changes of xray core? (I mean today's release)

@Pacalini
Copy link
Contributor Author

Pacalini commented Nov 5, 2024

Thanks for great job

Is it compatible with latest changes of xray core? (I mean today's release)

Today's release has nothing to do with user configs, as far as I know.
Works for me, test it yourself.

@lwb1978
Copy link
Contributor

lwb1978 commented Nov 9, 2024

楼主要是有空的话顺便把RAW也一起加上呗

@Pacalini
Copy link
Contributor Author

楼主要是有空的话顺便把RAW也一起加上呗

稍微有点问题 又改了下
RAW 现在只是 TCP 的别名吧,具体要加什么呢?

@Pacalini
Copy link
Contributor Author

SplitHTTP 配置里还有些条目 不太清楚是否适合加到 passwall 里。
Xray 近期动作比较多,等后面发完版 文档更新了再看看。

@lwb1978
Copy link
Contributor

lwb1978 commented Nov 10, 2024

楼主要是有空的话顺便把RAW也一起加上呗

稍微有点问题 又改了下 RAW 现在只是 TCP 的别名吧,具体要加什么呢?

实际上就是TCP的别名,传输设置列表里增加RAW,其他的如控件和处理程序与TCP共用都行

@lwb1978
Copy link
Contributor

lwb1978 commented Nov 11, 2024

最近xray改动过于激进,双11正式把SplitHTTP更名为xhttp,不知道它的json配置会不会一同也改了节点名。

@Graveyard9988
Copy link

Graveyard9988 commented Nov 11, 2024

after upgrading xray core to:
https://github.com/XTLS/Xray-core/releases/tag/v24.11.11
xhttp config disconnected and does not work

@Pacalini

@Pacalini
Copy link
Contributor Author

最近xray改动过于激进,双11正式把SplitHTTP更名为xhttp,不知道它的json配置会不会一同也改了节点名。

已经改了
splithttp xhttp
tcp raw
dest target

改变 luci 的选项值可能导致修改节点时读不出旧的配置,不知道以前这种是怎么处理的。
XTLS/Xray-core#3994 (comment) 总之先等他们改完文档。

@lwb1978
Copy link
Contributor

lwb1978 commented Nov 12, 2024

最近xray改动过于激进,双11正式把SplitHTTP更名为xhttp,不知道它的json配置会不会一同也改了节点名。

已经改了 splithttp xhttp tcp raw dest target

改变 luci 的选项值可能导致修改节点时读不出旧的配置,不知道以前这种是怎么处理的。 XTLS/Xray-core#3994 (comment) 总之先等他们改完文档。

这个还真有点两难,如果改选项值,工程量比较大而且会影响原有设置,但可以增加今后代码维护时的可读性;不改选项值的话工程量相对小些,可以兼容用户旧的设置。

@lwb1978
Copy link
Contributor

lwb1978 commented Nov 15, 2024

我建议还是直接改为xhttp吧,然后配置部分模式可以参照v2rayN的
1

@Graveyard9988
Copy link

{
"log": {
"loglevel": "warning"
},
"routing": {
"rules": [
{
"ip": [
"geoip:private"
],
"outboundTag": "direct"
}
]
},
"inbounds": [
{
"listen": "127.0.0.1",
"port": 10808,
"protocol": "socks"
},
{
"listen": "127.0.0.1",
"port": 10809,
"protocol": "http"
}
],
"outbounds": [
{
"protocol": "vless",
"settings": {
"vnext": [
{
"address": "6.75.300.69",
"port": 443,
"users": [
{
"id": "71756baf-2110-4292-9372-d696ace89f9c",
"encryption": "none"
}
]
}
]
},
"streamSettings": {
"network": "xhttp",
"xhttpSettings": {
"mode": "auto",
"path": "/yourpath",
"downloadSettings": {
"address": "www.speedtest.net",
"port": 443,
"network": "xhttp",
"xhttpSettings": {
"path": "/yourpath",
"host": "split.gladiator.gb",
"mode": "auto"
},
"security": "tls",
"tlsSettings": {
"allowInsecure": false,
"serverName": "www.gladiator.gb",
"alpn": [
"h2"
],
"fingerprint": "chrome"
}
}
},
"security": "reality",
"realitySettings": {
"fingerprint": "chrome",
"serverName": "www.speedtest.net",
"publicKey": "Zplz0pWAz0UlXHpono8BX9PSoH2QzfV66jQ-XCEQTSE",
"shortId": "c8fh"
}
}
},
{
"protocol": "freedom",
"tag": "direct"
}
]
}

@Pacalini here's newest xhttp config based on last release of xray core ☝️☝️

Please make some changes on PassWall2 to add new parameter.

Regards

@ilafz
Copy link

ilafz commented Nov 16, 2024

能不能添加extra的选项

@Pacalini
Copy link
Contributor Author

@lwb1978 alpn 补上了,麻烦你搬过去
客户端节点的 SplitHTTP => XHTTP 和 TCP => RAW 更名后
现有的 SplitHTTP host、path 配置能够继续运行,但在编辑保存时必须手动改成 XHTTP 重新输入
其他 如前面新增的 XMUX、下行相关 现在依赖 XHTTP,各位之前编译测试过的话也得重新输入下

@Pacalini
Copy link
Contributor Author

另外,Xray 的文档迟迟不更新,他们有些问题自己都还没达成一致
其他 XHTTP 的参数我认为现在不应该加进 passwall 里来

@lwb1978
Copy link
Contributor

lwb1978 commented Nov 17, 2024

@Pacalini 辛苦了,不过你漏掉了服务端、url导入导出、订阅部分的修改,我搬运到PW1时顺便补全了。

@handsomeji
Copy link
Collaborator

可以merge了嘛 ?

@Pacalini
Copy link
Contributor Author

可以merge了嘛 ?

我觉得可以了,先用起来

@handsomeji handsomeji merged commit d61359f into Openwrt-Passwall:main Nov 17, 2024
@Pacalini Pacalini deleted the xmux branch November 17, 2024 08:44
@Graveyard9988
Copy link

Graveyard9988 commented Nov 21, 2024

XTLS/Xray-core@817fa72

XTLS/Xray-core@0a252ac

New changes of xray core

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

5 participants