Skip to content

Commit

Permalink
Remove Websocket
Browse files Browse the repository at this point in the history
  • Loading branch information
fortuna committed Jan 6, 2025
1 parent 79c0a73 commit 24f0544
Show file tree
Hide file tree
Showing 7 changed files with 13 additions and 556 deletions.
7 changes: 5 additions & 2 deletions client/go/outline/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -187,19 +187,21 @@ udp:
require.Equal(t, "example.com:53", result.Client.PacketListener.FirstHop)
}

/*
TODO: Add Websocket support
func Test_NewTransport_Websocket(t *testing.T) {
config := `
$parser: tcpudp
tcp: &base
$parser: shadowsocks
endpoint:
endpoint:
$parser: websocket
url: https://entrypoint.cdn.example.com/tcp
cipher: chacha20-ietf-poly1305
secret: SECRET
udp:
<<: *base
endpoint:
endpoint:
$parser: websocket
url: https://entrypoint.cdn.example.com/udp`
firstHop := "entrypoint.cdn.example.com:443"
Expand All @@ -209,6 +211,7 @@ udp:
require.Equal(t, firstHop, result.Client.Dialer.FirstHop)
require.Equal(t, firstHop, result.Client.PacketListener.FirstHop)
}
*/

func Test_NewClientFromJSON_Errors(t *testing.T) {
tests := []struct {
Expand Down
17 changes: 8 additions & 9 deletions client/go/outline/config/module.go
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,6 @@ import (
"context"
"errors"
"net"
"net/http"

"github.com/Jigsaw-Code/outline-sdk/transport"
)
Expand Down Expand Up @@ -144,14 +143,14 @@ func NewDefaultTransportProvider() *TypeParser[*TransportPair] {
return parseShadowsocksPacketListener(ctx, input, packetEndpoints.Parse)
})

// Websocket support.
httpClient := http.DefaultClient
streamEndpoints.RegisterSubParser("websocket", func(ctx context.Context, input map[string]any) (*Endpoint[transport.StreamConn], error) {
return parseWebsocketStreamEndpoint(ctx, input, httpClient)
})
packetEndpoints.RegisterSubParser("websocket", func(ctx context.Context, input map[string]any) (*Endpoint[net.Conn], error) {
return parseWebsocketPacketEndpoint(ctx, input, httpClient)
})
// TODO: Websocket support.
// httpClient := http.DefaultClient
// streamEndpoints.RegisterSubParser("websocket", func(ctx context.Context, input map[string]any) (*Endpoint[transport.StreamConn], error) {
// return parseWebsocketStreamEndpoint(ctx, input, httpClient)
// })
// packetEndpoints.RegisterSubParser("websocket", func(ctx context.Context, input map[string]any) (*Endpoint[net.Conn], error) {
// return parseWebsocketPacketEndpoint(ctx, input, httpClient)
// })

// Support distinct TCP and UDP configuration.
transports.RegisterSubParser("tcpudp", func(ctx context.Context, config map[string]any) (*TransportPair, error) {
Expand Down
100 changes: 0 additions & 100 deletions client/go/outline/config/websocket.go

This file was deleted.

179 changes: 0 additions & 179 deletions client/go/outline/config/websocket_coder.go

This file was deleted.

Loading

0 comments on commit 24f0544

Please sign in to comment.