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

Adding WATER reverse listener #622

Merged

WendelHime merged 30 commits into main from feat/1437

Jul 24, 2024

Contributor

WendelHime commented Jun 17, 2024

No description provided.

WendelHime added 7 commits

June 17, 2024 11:24


          feat: adding WATER dependencies

8815ecc


          feat: WATER reverse listener along with wasm directory for local test…

48a5011

…ing purposes


          feat: adding WATER listener and parameters

7c8a42a


          feat: updating reverse connection handler to copy connection pipe so …

312b6b7

…we can proxy the connection data to the listener above


          feat: updating reverse connection handler to handlr client/target err…

41d5cf5

…ors (in the same way as outline shadowsocks does)


          chore: making water reverse handler to accept connection and send it …

f37f21a

…to connections directly


          Merge branch 'main' of github.com:getlantern/http-proxy into feat/1437

a340009

WendelHime marked this pull request as ready for review

June 18, 2024 14:30

WendelHime requested review from garmr-ulfr and hwh33

June 19, 2024 20:56

Contributor

garmr-ulfr commented Jun 20, 2024

Are we still going to add this or are we scrapping it and just going to use the shadowsocks listener?

Contributor Author

WendelHime commented Jun 20, 2024

Let's keep it for now since we still might add other protocols with WASM as discussed at slack. I'll merge lantern-cloud tomorrow and test it. But yeah for shadowsocks we probably don't need to make any changes (unless we want to try implementing it)


          fix: receiving WASM as base64 and decoding before using it

5d88f5c

hwh33 reviewed

View reviewed changes

water/reverse.go Outdated Show resolved Hide resolved

hwh33 reviewed

View reviewed changes

http_proxy.go Outdated Show resolved Hide resolved

hwh33 reviewed

View reviewed changes

water/reverse.go Outdated Show resolved Hide resolved

hwh33 reviewed

View reviewed changes

wasm/plain.go.wasm Outdated Show resolved Hide resolved

hwh33 reviewed

View reviewed changes

Contributor

hwh33 left a comment

Done with my first pass - nice work so far!

WendelHime added 4 commits

June 26, 2024 11:00


          feat: moving wasm files to testdata directory inside water package

ab0da0f


          fix: removing local listeners from water and just use the generated w…

78c4417

…ater listener


          fix: renaming function calls to refer to WATER listener instead of sp…

89c8823

…ecifically reverse


          fix: renaming reverse files to listener

4fb3a82

WendelHime requested a review from hwh33

June 26, 2024 14:24

hwh33 approved these changes

View reviewed changes

Contributor

hwh33 left a comment

One last name change needed, but otherwise looks great!

protoListeners.go Outdated Show resolved Hide resolved

http_proxy.go Outdated Show resolved Hide resolved

http_proxy.go Outdated Show resolved Hide resolved

WendelHime added 6 commits

June 26, 2024 12:47


          fix: update WATER version to 0.7.0-alpha for supporting transport v1

80ac30a


          fix: adding reverse_v1.wasm

828ecdf


          chore: removing unused WASM files

c167102


          feat: update WATER package for using transport v1 and wrap listener

cad117e


          feat: use v1 NewListenerWithContext instead of directly calling from …

ff58803

…water


          fix: updating test for dialing to the base listener instead of direct…

a850e2d

…ly referring to the water listener address

WendelHime added 3 commits

June 26, 2024 13:15


          fix: updating go.mod required version to 1.22 (just to see if it pass…

0a353f4

…es on github tests)


          Revert "fix: updating go.mod required version to 1.22 (just to see if…

59e856d

… it passes on github tests)"

This reverts commit 0a353f4.


          fix: keep using water instead of directly referring to v1

8a52fd2

hwh33 approved these changes

View reviewed changes

WendelHime added 9 commits

June 27, 2024 15:00


          fix: removing wrapped listener and starting WATER listener directly w…

1b44bc4

…ithout base listener


          fix: re-wrap water listener as a multiplexed transport

091fc5f


          chore: removing old version water

b06da11


          feat: overriding WATER logger

e61f6f5


          fix: removing golog.Logger reference since it's a interface

be75ded


          fix: removing golog.Logger reference when creating slog logger

690ec0d


          feat: adding WATER transport field

ccbc458


          fix: adding missing transport parameter

533717a


          chore: removing multiplex from water

d25d660

WendelHime merged commit b107550 into main

1 check passed

WendelHime deleted the feat/1437 branch

July 24, 2024 14:56

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

Labels

None yet