Skip to content

Conversation

@Meo597
Copy link
Contributor

@Meo597 Meo597 commented Dec 17, 2025

旧版的问题:

  • CI 挂了
  • mermaid 有问题
  • 语言切换一次后有问题得刷新才正常
  • 不支持模糊全文搜索相当于残废
  • yarn npm pnpm 大乱斗
  • 菜单太乱了,本页菜单放右边,并且有更多深度的话会更清晰
  • 图片不能放大

迁移到 VitePress

image image image

@Meo597
Copy link
Contributor Author

Meo597 commented Dec 17, 2025

样式还需要调整
CI 和 lint 没弄

@Meo597
Copy link
Contributor Author

Meo597 commented Dec 17, 2025

image image

@Meo597 Meo597 marked this pull request as ready for review December 17, 2025 08:31
@Meo597
Copy link
Contributor Author

Meo597 commented Dec 21, 2025

freedom-domainStrategy 不是冗余的,文档中错了,已经修复,但出于某些原因无法正常显示

fd.ds 不能被删除的原因恰恰是你为了 “Fix” UDP target 为 Domain 做了一些 HackFix
导致它和 happyEyeBalls 冲突 (See: #781)

@Fangliding 维护所有文档不同
我只会为我 review 过的代码编写或补充中文文档

@patterniha
Copy link
Contributor

patterniha commented Dec 21, 2025

you did some hackfix for the Domain in order to "Fix" the UDP target,
which caused it to conflict with happyEyeBalls

??? What are you talking about? I think you misunderstood.

@Fangliding
Copy link
Member

Fangliding commented Dec 21, 2025

I will translate the 2 fragment fields. And I think that conflict is not very important(these UDP dirty work were poorly designed from the very beginning years go), please don't argue that.

@Meo597
Copy link
Contributor Author

Meo597 commented Dec 21, 2025

??? What are you talking about? I think you misunderstood.

#781 (comment)
#781 (comment)

@patterniha
Copy link
Contributor

patterniha commented Dec 21, 2025

WriteMultiBuffer 没有 freedom.domainStrategy 的时候走的 golang 解析了就

也就是说 freedom 设 sockopt.domainStrategy 的时候
dial 解析让内核做,后面的 udp 包解析让 golang 做
行为不一致

This problem has already been solved, when map-cache was used for IP of udp-domains.

https://github.com/XTLS/Xray-core/blob/74df63add2cd7f11afb5b30a269156aecf4d1b17/proxy/freedom/freedom.go#L325:

if DialDest.Address.Family().IsDomain() {
			resolvedUDPAddr.Store(DialDest.Address.Domain(), net.DestinationFromAddr(conn.RemoteAddr()).Address)
		}

https://github.com/XTLS/Xray-core/blob/74df63add2cd7f11afb5b30a269156aecf4d1b17/proxy/freedom/freedom.go#L372:

if ip, ok := w.ResolvedUDPAddr.Load(b.UDP.Address.Domain()); ok {
					b.UDP.Address = ip

https://github.com/XTLS/Xray-core/blob/74df63add2cd7f11afb5b30a269156aecf4d1b17/proxy/freedom/freedom.go#L402:
destAddr := b.UDP.RawNetAddr()

https://github.com/XTLS/Xray-core/blob/74df63add2cd7f11afb5b30a269156aecf4d1b17/proxy/freedom/freedom.go#L407:
n, err = w.PacketConnWrapper.WriteTo(b.Bytes(), destAddr)

///

because we use final conn.RemoteAddr() for IP, There is no difference between sockopt-domainStrategy and freedom-domainStrategy.

@Fangliding Did you forget this?

@patterniha
Copy link
Contributor

@Meo597 @Fangliding

In short, WriteMultiBuffer use final conn.RemoteAddr() IP, and there is no difference between freedom/outbound-domainStrategy and sockopt-domainStrategy for UDP.

and the only difference is supporting happyEyeballs for TCP.

so please remove:

Freedom 在发送 UDP 时出于一些原因无视两个 domainStrategy 强制偏好 IPv4.

from the Chinese doc, thx.

@Meo597
Copy link
Contributor Author

Meo597 commented Dec 21, 2025

sockopt.domainStrategy 如何影响到 freedom.domainStrategy ???

@patterniha
Copy link
Contributor

How does sockopt.domainStrategy affect freedom.domainStrategy?

?

we just need:

  1. Add outbound-targetStrategy to the doc
  2. Remove freedom-domainStrategy from the doc (only remains in the code for compatibility)
  3. Add two tips just for freedom:
    3.1. don't use outbound-targetStrategy and sockopt-domainStrategy at the same time.
    3.2. only sockopt-domainStrategy support happyEyeballs

That's all.

@Meo597
Copy link
Contributor Author

Meo597 commented Dec 21, 2025

你在改动出站相关代码时,是否完整的理解了所有逻辑??

@patterniha
Copy link
Contributor

When you modified the outbound code, did you fully understand all the logic?

Please tell me exactly which code you are referring to.

@yuhan6665
Copy link
Member

感谢 @Meo597 重写了文档!我之前尝试升级 vuepress 就发现有不少坑 而且 mermaid 有渲染问题

页面过时检测 我们专门fork了一个 vuepress-plugin-i18n 来支持它 但是我对需要fork这一点不太满意

我看大家都在这个 thread 里了 如果无人反对我将用保留完整历史的方式合并新框架 我们可以试用一段时间 如果碰到解决不了的问题可以再议

@yuhan6665 yuhan6665 merged commit 5062410 into XTLS:main Dec 22, 2025
@yuhan6665
Copy link
Member

@Meo597 麻烦看一下 CI,自动格式可以用以前的 prettier,dependabot

@Fangliding
Copy link
Member

这几十个commit也不压吗

@yuhan6665
Copy link
Member

这几十个commit也不压吗

之前说的就是这个情况 :P
分开比较好懂

@Fangliding
Copy link
Member

CI好像还直接被扬了没有写新的 压根没开始编译
测试这一块

@Fangliding
Copy link
Member

说到CI 之前有一次好像被改成定死页面到 xtls.github.io 了 我不太喜欢那个改动 因为旧版可以在自己的fork上自行depoly到的github page 这样pr也可以测试CI观察部署情况

@Meo597
Copy link
Contributor Author

Meo597 commented Dec 22, 2025

是的 CI 和 lint 我没有做
现在既然接受了,我会在这几天补上

之前没弄主要是懒得自己仓库搭建 CI 还得弄 Token 啥的麻烦

在这个 PR 之前,CI 就莫名坏了

@Fangliding
Copy link
Member

以前还有本地分支推送的时候是不用的(action不需要token推到本仓库)
image
还有上面说的contributor的那个

@Meo597
Copy link
Contributor Author

Meo597 commented Dec 22, 2025

是的以前在一个仓库就不需要 token
现在跨库必须,我就是因为这个没折腾 ci 的

我晚上写 ci 脚本试试看能不能自适应
如果不行的话我改成在这个仓库发布页面?还是保持分库?

构建者这个我想的是显示的详细点提高大家编辑文档的积极性,等弄好你看看效果不行再改

@Fangliding
Copy link
Member

我见过的绝大多数协作式文档或者各种wiki站全都是只在小地方显示个名字或者头像就好了 wikipedia甚至还没有 而且一堆github默认noreply邮箱很难绷

@Meo597
Copy link
Contributor Author

Meo597 commented Dec 22, 2025

没问题,这些小细节的东西很好改

我现在手机不方便
人在缅甸见几个掏心掏肺的朋友
今天晚点弄

@Fangliding
Copy link
Member

至于之前push本仓库分支被删掉是因为编译结果太大又被git完全保留导致clone很慢 可以考虑fp一个只有一条历史的分支上去 不知道action有没有这个权限

@Meo597
Copy link
Contributor Author

Meo597 commented Dec 22, 2025

摸鱼的时候先把 CI 弄上了
目前已经可以正常编辑文档并部署了

上面提到的贡献者、合到一个库
或者其它要改进的地方可以在这里留言
我这几天抽空一起弄

@Meo597 Meo597 deleted the vlite branch December 22, 2025 07:41
@iambabyninja
Copy link
Member

@Meo597 Good afternoon, my dear friend! Could we please avoid ignoring the Russian language in
140e721?

@Meo597
Copy link
Contributor Author

Meo597 commented Dec 22, 2025

Could we please avoid ignoring the Russian language in

如果你可以保证俄语最新,我很乐意调整它,但其实没有太大必要。因为这些是给 llm 理解的
它们会自动翻译,并始终用俄语输出给用户

@Meo597
Copy link
Contributor Author

Meo597 commented Dec 22, 2025

@iambabyninja 对了,一些俄语的菜单文本、提示文本等,我都是用 AI 翻译的,如有需要请随意调整
它们大多在 .vitepress 目录中

@RPRX
Copy link
Member

RPRX commented Dec 23, 2025

新的文档挺好看的,辛苦了已 star,大史记没人更新了用捐款赞助替换吧

@Meo597
Copy link
Contributor Author

Meo597 commented Dec 23, 2025

好的

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.

7 participants