Fixed the issue that the TCP connection was interrupted when setting a proxy #9708

Zuoqiu-Yingyi · 2023-11-21T13:05:01Z

Please commit to the dev branch
For contributing new features, please supplement and improve the corresponding user guide documents

在没有其他请求时同步调用 setProxy 函数, 避免在中断所有 TCP 连接时中断部分向内核发出的请求
Call the setProxy function synchronously when there are no other requests to avoid interrupting some requests to the kernel when all TCP connections are interrupted

TESTED

REF: https://ld246.com/article/1700548414564

…ng a proxy

github-actions · 2023-11-21T13:05:16Z

Your PR was set to target master, PRs should be target dev
The base branch of this PR has been automatically changed to dev, please check that there are no merge conflicts

…hen setting a proxy siyuan-note/siyuan#9708

app/src/config/bazaar.ts

Vanessa219 · 2023-11-22T09:34:52Z

app/src/util/serviceWorker.ts

-    if (!("serviceWorker" in navigator) || typeof (navigator.serviceWorker) === "undefined" ||
-        !("caches" in window) || !("fetch" in window)) {
-        return;
+export const registerServiceWorker = async (scriptURL: string, scope = "/", workerType: WorkerType = "module") => {


和 proxy 没有关系的代码麻烦不要提交。

和 proxy 没有关系的代码麻烦不要提交。

这里是为了避免加载 service-worker 时对现有请求造成不可预期的影响，是相关的

这个只有在浏览器端和移动端使用，和 electron 的 setProxy 无关。

这个只有在浏览器端和移动端使用，和 electron 的 setProxy 无关。

我在使用中发现在 electron 中使用 <iframe> 或 <webview> 标签访问 /stage/build/desktop/ 与 /stage/build/mobile/ 也会触发 service-worker

registerServiceWorker 这个好像还是你 PR 的，是不是这些情况排查漏了。这个问题应该从源头上改进，而不是对错误进行兼容。

registerServiceWorker 这个好像还是你 PR 的，是不是这些情况排查漏了。这个问题应该从源头上改进，而不是对错误进行兼容。

原有实现暂时也未出现问题, 这里的改进是为了消除不确定性

目前的 registerServiceWorker 为什么要在 electron 中运行？感觉是没有必要的。不是出现问题才是有 bug。

不是 registerServiceWorker 要在 electron 中运行, 而是无法完全阻止 registerServiceWorker 在 electron 中运行, 因为 <iframe> 与 <webview> 的上下文可能是完全隔离的

不过我刚刚有一个想法, 在 electron 环境中检测到 service-worker 后可以自动注销该 worker, 我先去测试一下

@Vanessa219
提交了一个解决方案: 在启动时从桌面端与移动端 App 中注销当前存在的 service-worker

详情请参考 36bad6c

能不能不要搅和在这个 issue 里面呀 😭

Vanessa219 · 2023-11-22T10:44:18Z

目前有 2 个问题需要先确认一下：

closeAllConnections 这个是不是必须的？
对于本地请求要如何跳过代理？

Zuoqiu-Yingyi · 2023-11-22T10:57:21Z

closeAllConnections 这个是不是必须的？

应该是需要的, 不然可能在遇到 TCP 长连接时会引入更加复杂的问题

对于本地请求要如何跳过代理？

electron 的 session.setProxy 参数可以使用 pacScript 指定 PAC 文件作为代理策略或者使用 proxyBypassRules 指定排除的地址
不过这里最好可以由用户自定义, 默认的配置可以设置为跳过本机地址
详情请参考 session | Electron

Vanessa219 · 2023-11-22T13:00:57Z

closeAllConnections 把长链接断开了，好像没有机制重新再次建立长链接？如果不断的话会有什么问题？

需要代理 kernel 请求的场景是？

Zuoqiu-Yingyi · 2023-11-22T13:27:09Z

closeAllConnections 把长链接断开了，好像没有机制重新再次建立长链接？

用户发起请求时可以重新建立长连接

如果不断的话会有什么问题？

可能会出现切换代理后用户的请求复用切换代理前的长连接, 与用户切换代理的期望不符

需要代理 kernel 请求的场景是？

用户在如下场景中都有绕过代理的需求

用户访问本机服务 (包括本机内核服务)
用户访问局域网内其他设备的服务
用户访问使用虚拟网卡桥接的虚拟机

Vanessa219 · 2023-11-22T13:58:50Z

代理主要用途为外网非本地的，无法保证外网的程序都有这个机制。不行的话，切换的时候就直接刷界面吧。

本机访问不太建议走代理，首先没有必要，其次会减慢速度。

/api/system/getConf 之前的请求都为本机的，代码基本可以不用动。 css 什么的还是应该优先进行加载。

Zuoqiu-Yingyi · 2023-11-22T14:06:40Z

代理主要用途为外网非本地的，无法保证外网的程序都有这个机制。不行的话，切换的时候就直接刷界面吧。

electron 的代理都是 web 服务使用, HTTP 可以保证都有这个机制, 无需刷新界面

本机访问不太建议走代理，首先没有必要，其次会减慢速度。

这里可能理解有误, 之前提到的 绕过代理 都是指 不经代理直接访问

Vanessa219 · 2023-11-22T14:16:15Z

websocket 也可以？

没有误解，一开始我问的是，而不是绕过代理的需求

需要代理 kernel 请求的场景是？

Zuoqiu-Yingyi · 2023-11-22T14:54:16Z

websocket 也可以？

我这里切换代理前后都是正常连接的

需要代理 kernel 请求的场景是？

这个场景不多
用于流量分析?

Vanessa219 · 2023-11-23T02:40:33Z

非常感谢你前期的调研和贡献。基于你前期的调研，今早和 D 研究测试了一下，现在的 PR 在某些场景下还是有问题，因此只能关闭这个 PR，非常抱歉。
为了程序的稳定和性能我们最终决定按照 @zuoez02 说的在 main.js 里面去 setProxy，设置中更新代理后对界面进行刷新。

zuoez02 · 2023-11-23T15:36:49Z

更新默认session的proxy，好像不刷新也能直接用吧？

Vanessa219 · 2023-11-24T04:47:17Z

长链接不会断开，使用不了更新后的。

🐛: Fixed the issue that the TCP connection was interrupted when setti…

90b57bf

…ng a proxy

github-actions bot changed the base branch from master to dev November 21, 2023 13:05

Zuoqiu-Yingyi added a commit to siyuan-community/siyuan that referenced this pull request Nov 21, 2023

fix(proxy): Fixed the issue that the TCP connection was interrupted w…

cb68e91

…hen setting a proxy siyuan-note/siyuan#9708

88250 requested a review from Vanessa219 November 21, 2023 13:39

This comment was marked as outdated.

Sign in to view

Zuoqiu-Yingyi force-pushed the fix/electron-set-proxy branch 2 times, most recently from 30b75a4 to 7452801 Compare November 21, 2023 19:30

Vanessa219 reviewed Nov 22, 2023

View reviewed changes

app/src/config/bazaar.ts Outdated Show resolved Hide resolved

revert: Improve plugin loading

78ccf48

Zuoqiu-Yingyi force-pushed the fix/electron-set-proxy branch from 8570b75 to 78ccf48 Compare November 22, 2023 06:35

Zuoqiu-Yingyi requested a review from Vanessa219 November 22, 2023 06:39

Vanessa219 reviewed Nov 22, 2023

View reviewed changes

Zuoqiu-Yingyi force-pushed the fix/electron-set-proxy branch from e6fedde to deb2801 Compare November 22, 2023 16:33

🎨 Improve service worker register and unregister

36bad6c

Zuoqiu-Yingyi force-pushed the fix/electron-set-proxy branch from deb2801 to 36bad6c Compare November 22, 2023 16:36

Zuoqiu-Yingyi requested a review from Vanessa219 November 22, 2023 16:39

Vanessa219 closed this Nov 23, 2023

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Fixed the issue that the TCP connection was interrupted when setting a proxy #9708

Fixed the issue that the TCP connection was interrupted when setting a proxy #9708

Zuoqiu-Yingyi commented Nov 21, 2023 •

edited

Loading

github-actions bot commented Nov 21, 2023

This comment was marked as outdated.

This comment was marked as outdated.

Vanessa219 Nov 22, 2023

Zuoqiu-Yingyi Nov 22, 2023

Vanessa219 Nov 22, 2023

Zuoqiu-Yingyi Nov 22, 2023

Vanessa219 Nov 22, 2023

Zuoqiu-Yingyi Nov 22, 2023

Vanessa219 Nov 22, 2023

Zuoqiu-Yingyi Nov 22, 2023

Zuoqiu-Yingyi Nov 22, 2023

Vanessa219 Nov 23, 2023

Vanessa219 commented Nov 22, 2023

Zuoqiu-Yingyi commented Nov 22, 2023

Vanessa219 commented Nov 22, 2023

Zuoqiu-Yingyi commented Nov 22, 2023

Vanessa219 commented Nov 22, 2023 •

edited

Loading

Zuoqiu-Yingyi commented Nov 22, 2023

Vanessa219 commented Nov 22, 2023

Zuoqiu-Yingyi commented Nov 22, 2023

Vanessa219 commented Nov 23, 2023

zuoez02 commented Nov 23, 2023

Vanessa219 commented Nov 24, 2023

Fixed the issue that the TCP connection was interrupted when setting a proxy #9708

Fixed the issue that the TCP connection was interrupted when setting a proxy #9708

Conversation

Zuoqiu-Yingyi commented Nov 21, 2023 • edited Loading

github-actions bot commented Nov 21, 2023

This comment was marked as outdated.

This comment was marked as outdated.

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Choose a reason for hiding this comment

Vanessa219 commented Nov 22, 2023

Zuoqiu-Yingyi commented Nov 22, 2023

Vanessa219 commented Nov 22, 2023

Zuoqiu-Yingyi commented Nov 22, 2023

Vanessa219 commented Nov 22, 2023 • edited Loading

Zuoqiu-Yingyi commented Nov 22, 2023

Vanessa219 commented Nov 22, 2023

Zuoqiu-Yingyi commented Nov 22, 2023

Vanessa219 commented Nov 23, 2023

zuoez02 commented Nov 23, 2023

Vanessa219 commented Nov 24, 2023

Zuoqiu-Yingyi commented Nov 21, 2023 •

edited

Loading

Vanessa219 commented Nov 22, 2023 •

edited

Loading