Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

feat: support webview proxy #1006

Merged
merged 17 commits into from
Aug 28, 2023
Merged

feat: support webview proxy #1006

merged 17 commits into from
Aug 28, 2023

Conversation

pewsheen
Copy link
Contributor

@pewsheen pewsheen commented Aug 15, 2023 •
edited
Loading

What kind of change does this PR introduce?

  • Bugfix
  • Feature
  • Docs
  • Code style update
  • Refactor
  • Build-related changes
  • Other, please describe:

Does this PR introduce a breaking change?

  • Yes
  • No

Checklist

Other information

Status: Draft

Todo:

  • macOS (requires 14.0+)
  • Linux
  • Windows

Support proxy types

  • HTTP CONNECT
  • SOCKSv5

We're not ready to support authentications and custom TLS configuration for proxy at this stage

Also, the API provided by wkwebview is still in Beta, which means it requires macOS 14.0+

@wusyong
Copy link
Member

wusyong commented Aug 16, 2023

Are we able to check macos version during runtime?
So if it's beneath the version we just perform nop.

@pewsheen
Copy link
Contributor Author

pewsheen commented Aug 16, 2023 •
edited
Loading

Are we able to check macos version during runtime? So if it's beneath the version we just perform nop.

For runtime os version check, we can use isOperatingSystemAtLeastVersion

@pewsheen pewsheen marked this pull request as ready for review August 16, 2023 04:25
@pewsheen pewsheen requested a review from a team as a code owner August 16, 2023 04:25
amrbashir
amrbashir requested changes Aug 16, 2023
View reviewed changes
src/webview/mod.rs Outdated Show resolved Hide resolved
src/webview/proxy.rs Outdated Show resolved Hide resolved
src/webview/webview2/mod.rs Outdated Show resolved Hide resolved
src/webview/webview2/mod.rs Outdated Show resolved Hide resolved
pewsheen
pewsheen commented Aug 17, 2023
View reviewed changes
src/webview/webview2/mod.rs Outdated Show resolved Hide resolved
amrbashir
amrbashir previously approved these changes Aug 17, 2023
View reviewed changes
src/webview/mod.rs Outdated Show resolved Hide resolved
@wusyong wusyong merged commit 3cc4d79 into tauri-apps:dev Aug 28, 2023
7 checks passed
@pewsheen pewsheen deleted the proxy branch August 28, 2023 07:29
@FabianLars FabianLars mentioned this pull request Dec 18, 2023
Closed
2 tasks
time-river added a commit to time-river/tauri that referenced this pull request Dec 20, 2023
@time-river
feat(wry): support proxy in wry runtime
0b79296 
wry has been supported http/socks5 proxy in
[tauri-apps#1006](tauri-apps/wry#1006), which has been
merged in [commit
3cc4d79](tauri-apps/wry@3cc4d79).

This patch aims to support its feature.

Signed-off-by: lin fu <river@vvl.me>
@time-river time-river mentioned this pull request Dec 20, 2023
Merged
time-river added a commit to time-river/tauri that referenced this pull request Dec 20, 2023
@time-river
feat(wry): support proxy in wry runtime
706eb1e 
wry has been supported http/socks5 proxy in
[tauri-apps#1006](tauri-apps/wry#1006), which has been
merged in [commit
3cc4d79](tauri-apps/wry@3cc4d79).

This patch aims to support its feature.

Signed-off-by: lin fu <river@vvl.me>
time-river added a commit to time-river/tauri that referenced this pull request Dec 20, 2023
@time-river
feat(wry): support proxy in wry runtime
6780bf4 
wry has been supported http/socks5 proxy in
[tauri-apps#1006](tauri-apps/wry#1006), which has been
merged in [commit
3cc4d79](tauri-apps/wry@3cc4d79).

This patch aims to support its feature.

Signed-off-by: lin fu <river@vvl.me>
time-river added a commit to time-river/tauri that referenced this pull request Dec 21, 2023
@time-river
feat(wry): support proxy in wry runtime
1137603 
wry has been supported http/socks5 proxy in
[tauri-apps#1006](tauri-apps/wry#1006), which has been
merged in [commit
3cc4d79](tauri-apps/wry@3cc4d79).

This patch aims to support its feature.

Signed-off-by: lin fu <river@vvl.me>
time-river added a commit to time-river/tauri that referenced this pull request Dec 21, 2023
@time-river
feat(wry): support proxy in wry runtime
a6bbe35 
wry has been supported http/socks5 proxy in
[tauri-apps#1006](tauri-apps/wry#1006), which has been
merged in [commit
3cc4d79](tauri-apps/wry@3cc4d79).

This patch aims to support its feature.

Signed-off-by: lin fu <river@vvl.me>
time-river added a commit to time-river/tauri that referenced this pull request Dec 21, 2023
@time-river
feat(wry): support proxy in wry runtime
1192074 
wry has been supported http/socks5 proxy in
[tauri-apps#1006](tauri-apps/wry#1006), which has been
merged in [commit
3cc4d79](tauri-apps/wry@3cc4d79).

This patch aims to support its feature.

Signed-off-by: lin fu <river@vvl.me>
time-river added a commit to time-river/tauri that referenced this pull request Dec 25, 2023
@time-river
feat(wry): support proxy in wry runtime
fb76018 
wry has been supported http/socks5 proxy in
[tauri-apps#1006](tauri-apps/wry#1006), which has been
merged in [commit
3cc4d79](tauri-apps/wry@3cc4d79).

This patch aims to support its feature.

Signed-off-by: lin fu <river@vvl.me>
time-river added a commit to time-river/tauri that referenced this pull request Dec 29, 2023
@time-river
feat(wry): support proxy in wry runtime
7566d16 
wry has been supported http/socks5 proxy in
[tauri-apps#1006](tauri-apps/wry#1006), which has been
merged in [commit
3cc4d79](tauri-apps/wry@3cc4d79).

This patch aims to support its feature.

Signed-off-by: lin fu <river@vvl.me>
time-river added a commit to time-river/tauri that referenced this pull request Jan 3, 2024
@time-river
feat(wry): support proxy in wry runtime
601d5cf 
wry has been supported http/socks5 proxy in
[tauri-apps#1006](tauri-apps/wry#1006), which has been
merged in [commit
3cc4d79](tauri-apps/wry@3cc4d79).

This patch aims to support its feature.

Signed-off-by: lin fu <river@vvl.me>
time-river added a commit to time-river/tauri that referenced this pull request Jan 3, 2024
@time-river
feat(wry): support proxy in wry runtime
62895db 
wry has been supported http/socks5 proxy in
[tauri-apps#1006](tauri-apps/wry#1006), which has been
merged in [commit
3cc4d79](tauri-apps/wry@3cc4d79).

This patch aims to support its feature.

Signed-off-by: lin fu <river@vvl.me>
time-river added a commit to time-river/tauri that referenced this pull request Jan 3, 2024
@time-river
feat(wry): support proxy in wry runtime
76a36f3 
wry has been supported http/socks5 proxy in
[tauri-apps#1006](tauri-apps/wry#1006), which has been
merged in [commit
3cc4d79](tauri-apps/wry@3cc4d79).

This patch aims to support its feature.

Signed-off-by: lin fu <river@vvl.me>
time-river added a commit to time-river/tauri that referenced this pull request Jan 5, 2024
@time-river
feat(wry): support proxy in wry runtime
a6143be 
wry has been supported http/socks5 proxy in
[tauri-apps#1006](tauri-apps/wry#1006), which has been
merged in [commit
3cc4d79](tauri-apps/wry@3cc4d79).

This patch aims to support its feature.

Signed-off-by: lin fu <river@vvl.me>
lucasfernog added a commit to tauri-apps/tauri that referenced this pull request Feb 1, 2024
@time-river @amrbashir @lucasfernog
feat(core): add support to setting a webview proxy, closes #4263 (#8441)
6639a57 
* feat(wry): support proxy in wry runtime

wry has been supported http/socks5 proxy in
[#1006](tauri-apps/wry#1006), which has been
merged in [commit
3cc4d79](tauri-apps/wry@3cc4d79).

This patch aims to support its feature.

Signed-off-by: lin fu <river@vvl.me>

* Apply suggestions from code review

* Apply suggestions from code review

* Update core/tauri-runtime-wry/src/lib.rs

* Update core/tauri/src/window/mod.rs

* add macos-proxy flag

* add change file

* delete file

* update change file

* use macos-14 runner to test core

---------

Signed-off-by: lin fu <river@vvl.me>
Co-authored-by: Amr Bashir <amr.bashir2015@gmail.com>
Co-authored-by: Lucas Nogueira <lucas@tauri.studio>
Co-authored-by: Lucas Nogueira <lucas@tauri.app>
@lindongchen lindongchen mentioned this pull request Jun 12, 2024
Open
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@wusyong wusyong wusyong left review comments

@dklassic dklassic dklassic left review comments

@amrbashir amrbashir amrbashir approved these changes

Assignees
No one assigned
Labels
None yet
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Expose WebkitGTK Proxy Feature on Linux
4 participants
@pewsheen @wusyong @dklassic @amrbashir