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: add WebSocket support to the existing outline-ss-server #225

Merged
merged 100 commits into from
Jan 30, 2025
Merged

feat: add WebSocket support to the existing outline-ss-server #225

merged 100 commits into from
Jan 30, 2025

Conversation

sbruens
Copy link

@sbruens sbruens commented Nov 28, 2024 •
edited
Loading

This PR enables Shadowsocks-over-WebSockets functionality in the existing v1 server, allowing clients to connect to Shadowsocks via WebSockets.

This is the counterpart to the Caddy-backed v2 version introduced in #216.

sbruens added 18 commits November 19, 2024 11:49
@sbruens
refactor: split UDP serving from handling of packets
b2aa859 
This will allow us to re-use the handling of packets in the Caddy
server where serving is handled separately.
@sbruens
Use a read channel.
c0c0e9f
@sbruens
Rename wrappedPacketConn to just packetConn.
8d95309
@sbruens
Update shadowsocks_handler.
51d5c88
@sbruens
Change the HandlePacket API to not require the pkt.
422542b
@sbruens
Remove the NAT map from the Handle() function.
c10176f 
Instead, make the connection an association by wrapping it with the
client address and pass that to the `Handle()` function. Each connection
will call `Handle()` only once.
@sbruens
Rework the metrics now that the NAT is no longer done by the handler.
004c6c3
@sbruens
Move the metrics AddClosed() call to after the timedCopy returns.
a91d55b
@sbruens
Remove the explicit targetConn.Close() and let it expire on its own.
1d7200b
@sbruens
Add the NAT metrics back in at the server level.
4b8eeae
@sbruens
Use buffer pool on packetHandler instead of global.
1e89e85
@sbruens
Revert wrapping the clientConn with shadowsocks encryption/decryption.
b4e7dbb
@sbruens
Rename packet to association.
63c2cff
@sbruens
Fix tests.
1eeb4d6
@sbruens
Update the docstring for PacketServe.
08e8bba
@sbruens
Fix comment to refer to "associations".
34a01d7
@sbruens
feat: add WebSocket support to the existing outline-ss-server
dd5f439
@sbruens
Fix config reloads.
e769585
@sbruens sbruens marked this pull request as ready for review December 3, 2024 06:07
@sbruens sbruens requested a review from a team as a code owner December 3, 2024 06:07
@sbruens sbruens requested a review from fortuna December 3, 2024 06:07
fortuna
fortuna reviewed Dec 5, 2024
View reviewed changes
cmd/outline-ss-server/config_example.yml Outdated Show resolved Hide resolved
cmd/outline-ss-server/main.go Outdated Show resolved Hide resolved
@sbruens sbruens requested a review from fortuna December 10, 2024 18:09
@sbruens sbruens force-pushed the sbruens/udp-split-serving branch from 6c5c99f to bcac22b Compare January 21, 2025 22:05
@sbruens sbruens mentioned this pull request Jan 22, 2025
Open
Base automatically changed from sbruens/udp-split-serving to master January 24, 2025 22:31
@sbruens sbruens requested a review from fortuna January 29, 2025 05:22
fortuna
fortuna reviewed Jan 29, 2025
View reviewed changes
Copy link

@fortuna fortuna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good. I have some minor comments

go.mod Show resolved Hide resolved
cmd/outline-ss-server/main.go Show resolved Hide resolved
cmd/outline-ss-server/main.go Outdated Show resolved Hide resolved
cmd/outline-ss-server/main.go Outdated Show resolved Hide resolved
cmd/outline-ss-server/main.go Outdated Show resolved Hide resolved
cmd/outline-ss-server/main.go Outdated Show resolved Hide resolved
cmd/outline-ss-server/main.go Outdated Show resolved Hide resolved
cmd/outline-ss-server/main.go Outdated Show resolved Hide resolved
cmd/outline-ss-server/main.go Outdated Show resolved Hide resolved
cmd/outline-ss-server/main.go Show resolved Hide resolved
@sbruens sbruens requested a review from fortuna January 29, 2025 17:54
fortuna
fortuna reviewed Jan 29, 2025
View reviewed changes
Copy link

@fortuna fortuna left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

We need to address a possible panic

cmd/outline-ss-server/config.go Outdated Show resolved Hide resolved
cmd/outline-ss-server/config.go Outdated Show resolved Hide resolved
cmd/outline-ss-server/config.go Outdated Show resolved Hide resolved
@sbruens sbruens requested a review from fortuna January 29, 2025 22:34
fortuna
fortuna approved these changes Jan 29, 2025
View reviewed changes
cmd/outline-ss-server/config.go Outdated Show resolved Hide resolved
@sbruens sbruens merged commit 13bdb23 into master Jan 30, 2025
5 checks passed
@sbruens sbruens deleted the sbruens/websocket branch January 30, 2025 00:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@fortuna fortuna fortuna 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.
2 participants
@sbruens @fortuna