feat: create outline-fetch tool #45
Conversation
fortuna
changed the title
transport/split/stream_dialer.go
Outdated
| defer func() { | ||
| w.bytesCopied += written | ||
| }() | ||
| n, err := io.CopyN(w.writer, source, w.splitPoint-w.bytesCopied) |
There was a problem hiding this comment.
What is the purpose of splitting the traffic here?
There was a problem hiding this comment.
Because some bytes may had been copied already from previous writes, so you need to discount them to hit the splitPoint correctly.
transport/split/stream_dialer.go
Outdated
|
|
||
| // NewStreamDialer creates a client that splits the outgoing strean at byte splitpoint. | ||
| func NewStreamDialer(dialer transport.StreamDialer, splitPoint int64) (transport.StreamDialer, error) { | ||
| if dialer == nil { |
x/outline-fetch/main.go
Outdated
| if err != nil { | ||
| return nil, fmt.Errorf("failed to parse access key: %w", err) | ||
| } | ||
| switch accessKeyURL.Scheme { |
There was a problem hiding this comment.
Shall we include this logic into the shared ParseAccessKey? So the function could return different configs:
type Scheme uint
const (
Shadowsocks Scheme = 1 << iota
Socks5
Splitter
)
type Config interface {
}
type SSConfig interface {
Config
}
type Socks5Config interface {
Config
}
func ParseAccessKey(accessKey string, acceptedSchemes Scheme) (Scheme, Config) {
}
Also the shared NewOutlineStreamDialer(accessKey string, acceptedSchemes Scheme) may also parse to different types.
There was a problem hiding this comment.
The config parser should just output the dialer. No need for introducing intermediate configs.
x/outline-fetch/main.go
Outdated
| log.Fatalf("Could not create dialer: %v", err) | ||
| } | ||
| httpClient := &http.Client{Transport: &http.Transport{DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) { | ||
| return dialer.Dial(ctx, addr) |
There was a problem hiding this comment.
We might need to make sure network == "tcp" here.
There was a problem hiding this comment.
@jyyi1 please take another look. I've moves the examples into a subdirectory, and simplified the connectivity to be able to merge the config logic. I'll restore the extra connectivity information once we have tracing in place, but I don't want to block on that to submit the fetch tool, since it's a nice example and useful for testing strategies.
x/examples/outline-fetch/main.go
Outdated
| if err != nil { | ||
| log.Fatalf("Could not create dialer: %v", err) | ||
| } | ||
| httpClient := &http.Client{Transport: &http.Transport{DialContext: func(ctx context.Context, network, addr string) (net.Conn, error) { |
There was a problem hiding this comment.
nit can we separate this into multiple lines? It looks a little bit messy. But if go format wraps it into a single line then just leave it as it is now.
Co-authored-by: J. Yi <93548144+jyyi1@users.noreply.github.com>
Co-authored-by: J. Yi <93548144+jyyi1@users.noreply.github.com>
This PR creates a command-line tool to fetch a web page given its URL and the transport config.
It also moves outline-connectivity to
x/examplesand shares the config code.Direct fetch:
% go run ./x/examples/outline-fetch/main.go https://ipinfo.io { ... "city": "Amsterdam", "region": "North Holland", "country": "NL", ... }Using a Shadowsocks server:
Using a SOCKS5 server: