docstring_tokens stringlengths 0 76.5k | code_tokens stringlengths 75 1.81M | label_window listlengths 4 2.12k | html_url stringlengths 74 116 | file_name stringlengths 3 311 |
|---|---|---|---|---|
<mask> // Rule
<mask> default:
<mask> var err error
<mask> proxy, rule, err = match(metadata)
<mask> if err != nil {
<mask> return nil, nil, err
<mask> }
<mask> }
<mask> return proxy, rule, nil
<mask> }
<mask>
<mask> func handleUDPConn(packet *inbound.PacketAdapter) {
</s> Refactor: make inbound request contextual </s> remove var err error
</s> add </s> remove return proxy, rule, nil
</s> add return </s> remove proxy, rule, err := resolveMetadata(metadata)
</s> add proxy, rule, err := resolveMetadata(ctx, metadata) </s> remove proxy, rule, err := resolveMetadata(metadata)
</s> add ctx := context.NewPacketConnContext(metadata)
proxy, rule, err := resolveMetadata(ctx, metadata) </s> remove ips := r.msgToIP(msg)
</s> add ips := msgToIP(msg) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/tunnel.go | |
return | <mask> if err != nil {
<mask> return nil, nil, err
<mask> }
<mask> }
<mask> return proxy, rule, nil
<mask> }
<mask>
<mask> func handleUDPConn(packet *inbound.PacketAdapter) {
<mask> metadata := packet.Metadata()
<mask> if !metadata.Valid() {
</s> Refactor: make inbound request contextual </s> remove if err != nil {
return nil, nil, err
}
</s> add </s> remove var err error
</s> add </s> remove ips := r.msgToIP(msg)
</s> add ips := msgToIP(msg) </s> remove proxy, rule, err := resolveMetadata(metadata)
</s> add ctx := context.NewPacketConnContext(metadata)
proxy, rule, err := resolveMetadata(ctx, metadata) </s> remove proxy, rule, err := resolveMetadata(metadata)
</s> add proxy, rule, err := resolveMetadata(ctx, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/tunnel.go |
ctx := context.NewPacketConnContext(metadata)
proxy, rule, err := resolveMetadata(ctx, metadata) | <mask> natTable.Delete(lockKey)
<mask> cond.Broadcast()
<mask> }()
<mask>
<mask> proxy, rule, err := resolveMetadata(metadata)
<mask> if err != nil {
<mask> log.Warnln("[UDP] Parse metadata failed: %s", err.Error())
<mask> return
<mask> }
<mask>
</s> Refactor: make inbound request contextual </s> remove proxy, rule, err := resolveMetadata(metadata)
</s> add proxy, rule, err := resolveMetadata(ctx, metadata) </s> remove return proxy, rule, nil
</s> add return </s> remove if err != nil {
return nil, nil, err
}
</s> add </s> remove var err error
</s> add </s> remove pc := newUDPTracker(rawPc, DefaultManager, metadata, rule)
</s> add ctx.InjectPacketConn(rawPc)
pc := statistic.NewUDPTracker(rawPc, statistic.DefaultManager, metadata, rule) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/tunnel.go |
ctx.InjectPacketConn(rawPc)
pc := statistic.NewUDPTracker(rawPc, statistic.DefaultManager, metadata, rule) | <mask> log.Warnln("[UDP] dial %s (match %s/%s) to %s error: %s", proxy.Name(), rule.RuleType().String(), rule.Payload(), metadata.String(), err.Error())
<mask> }
<mask> return
<mask> }
<mask> pc := newUDPTracker(rawPc, DefaultManager, metadata, rule)
<mask>
<mask> switch true {
<mask> case rule != nil:
<mask> log.Infoln("[UDP] %s --> %v match %s(%s) using %s", metadata.SourceAddress(), metadata.String(), rule.RuleType().String(), rule.Payload(), rawPc.Chains().String())
<mask> case mode == Global:
</s> Refactor: make inbound request contextual </s> remove remoteConn = newTCPTracker(remoteConn, DefaultManager, metadata, rule)
</s> add remoteConn = statistic.NewTCPTracker(remoteConn, statistic.DefaultManager, metadata, rule) </s> remove switch adapter := localConn.(type) {
case *inbound.HTTPAdapter:
handleHTTP(adapter, remoteConn)
case *inbound.SocketAdapter:
handleSocket(adapter, remoteConn)
</s> add switch c := ctx.(type) {
case *context.HTTPContext:
handleHTTP(c, remoteConn)
default:
handleSocket(ctx, remoteConn) </s> remove proxy, rule, err := resolveMetadata(metadata)
</s> add proxy, rule, err := resolveMetadata(ctx, metadata) </s> remove func resolveMetadata(metadata *C.Metadata) (C.Proxy, C.Rule, error) {
var proxy C.Proxy
var rule C.Rule
</s> add func resolveMetadata(ctx C.PlainContext, metadata *C.Metadata) (proxy C.Proxy, rule C.Rule, err error) { </s> remove proxy, rule, err := resolveMetadata(metadata)
</s> add ctx := context.NewPacketConnContext(metadata)
proxy, rule, err := resolveMetadata(ctx, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/tunnel.go |
func handleTCPConn(ctx C.ConnContext) {
defer ctx.Conn().Close() | <mask> handle()
<mask> }()
<mask> }
<mask>
<mask> func handleTCPConn(localConn C.ServerAdapter) {
<mask> defer localConn.Close()
<mask>
<mask> metadata := localConn.Metadata()
<mask> if !metadata.Valid() {
<mask> log.Warnln("[Metadata] not valid: %#v", metadata)
<mask> return
</s> Refactor: make inbound request contextual </s> remove metadata := localConn.Metadata()
</s> add metadata := ctx.Metadata() </s> remove return proxy, rule, nil
</s> add return </s> remove proxy, rule, err := resolveMetadata(metadata)
</s> add ctx := context.NewPacketConnContext(metadata)
proxy, rule, err := resolveMetadata(ctx, metadata) </s> remove proxy, rule, err := resolveMetadata(metadata)
</s> add proxy, rule, err := resolveMetadata(ctx, metadata) </s> remove return &SocketAdapter{
metadata: metadata,
Conn: conn,
}
</s> add return context.NewConnContext(conn, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/tunnel.go |
metadata := ctx.Metadata() | <mask>
<mask> func handleTCPConn(localConn C.ServerAdapter) {
<mask> defer localConn.Close()
<mask>
<mask> metadata := localConn.Metadata()
<mask> if !metadata.Valid() {
<mask> log.Warnln("[Metadata] not valid: %#v", metadata)
<mask> return
<mask> }
<mask>
</s> Refactor: make inbound request contextual </s> remove func handleTCPConn(localConn C.ServerAdapter) {
defer localConn.Close()
</s> add func handleTCPConn(ctx C.ConnContext) {
defer ctx.Conn().Close() </s> remove return proxy, rule, nil
</s> add return </s> remove proxy, rule, err := resolveMetadata(metadata)
</s> add proxy, rule, err := resolveMetadata(ctx, metadata) </s> remove proxy, rule, err := resolveMetadata(metadata)
</s> add ctx := context.NewPacketConnContext(metadata)
proxy, rule, err := resolveMetadata(ctx, metadata) </s> remove return &SocketAdapter{
metadata: metadata,
Conn: conn,
}
</s> add return context.NewConnContext(conn, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/tunnel.go |
proxy, rule, err := resolveMetadata(ctx, metadata) | <mask> log.Debugln("[Metadata PreHandle] error: %s", err)
<mask> return
<mask> }
<mask>
<mask> proxy, rule, err := resolveMetadata(metadata)
<mask> if err != nil {
<mask> log.Warnln("[Metadata] parse failed: %s", err.Error())
<mask> return
<mask> }
<mask>
</s> Refactor: make inbound request contextual </s> remove proxy, rule, err := resolveMetadata(metadata)
</s> add ctx := context.NewPacketConnContext(metadata)
proxy, rule, err := resolveMetadata(ctx, metadata) </s> remove return proxy, rule, nil
</s> add return </s> remove if err != nil {
return nil, nil, err
}
</s> add </s> remove pc := newUDPTracker(rawPc, DefaultManager, metadata, rule)
</s> add ctx.InjectPacketConn(rawPc)
pc := statistic.NewUDPTracker(rawPc, statistic.DefaultManager, metadata, rule) </s> remove remoteConn = newTCPTracker(remoteConn, DefaultManager, metadata, rule)
</s> add remoteConn = statistic.NewTCPTracker(remoteConn, statistic.DefaultManager, metadata, rule) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/tunnel.go |
remoteConn = statistic.NewTCPTracker(remoteConn, statistic.DefaultManager, metadata, rule) | <mask> log.Warnln("[TCP] dial %s (match %s/%s) to %s error: %s", proxy.Name(), rule.RuleType().String(), rule.Payload(), metadata.String(), err.Error())
<mask> }
<mask> return
<mask> }
<mask> remoteConn = newTCPTracker(remoteConn, DefaultManager, metadata, rule)
<mask> defer remoteConn.Close()
<mask>
<mask> switch true {
<mask> case rule != nil:
<mask> log.Infoln("[TCP] %s --> %v match %s(%s) using %s", metadata.SourceAddress(), metadata.String(), rule.RuleType().String(), rule.Payload(), remoteConn.Chains().String())
</s> Refactor: make inbound request contextual </s> remove pc := newUDPTracker(rawPc, DefaultManager, metadata, rule)
</s> add ctx.InjectPacketConn(rawPc)
pc := statistic.NewUDPTracker(rawPc, statistic.DefaultManager, metadata, rule) </s> remove switch adapter := localConn.(type) {
case *inbound.HTTPAdapter:
handleHTTP(adapter, remoteConn)
case *inbound.SocketAdapter:
handleSocket(adapter, remoteConn)
</s> add switch c := ctx.(type) {
case *context.HTTPContext:
handleHTTP(c, remoteConn)
default:
handleSocket(ctx, remoteConn) </s> remove proxy, rule, err := resolveMetadata(metadata)
</s> add proxy, rule, err := resolveMetadata(ctx, metadata) </s> remove proxy, rule, err := resolveMetadata(metadata)
</s> add ctx := context.NewPacketConnContext(metadata)
proxy, rule, err := resolveMetadata(ctx, metadata) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/tunnel.go |
switch c := ctx.(type) {
case *context.HTTPContext:
handleHTTP(c, remoteConn)
default:
handleSocket(ctx, remoteConn) | <mask> default:
<mask> log.Infoln("[TCP] %s --> %v doesn't match any rule using DIRECT", metadata.SourceAddress(), metadata.String())
<mask> }
<mask>
<mask> switch adapter := localConn.(type) {
<mask> case *inbound.HTTPAdapter:
<mask> handleHTTP(adapter, remoteConn)
<mask> case *inbound.SocketAdapter:
<mask> handleSocket(adapter, remoteConn)
<mask> }
<mask> }
<mask>
<mask> func shouldResolveIP(rule C.Rule, metadata *C.Metadata) bool {
<mask> return rule.ShouldResolveIP() && metadata.Host != "" && metadata.DstIP == nil
</s> Refactor: make inbound request contextual </s> remove remoteConn = newTCPTracker(remoteConn, DefaultManager, metadata, rule)
</s> add remoteConn = statistic.NewTCPTracker(remoteConn, statistic.DefaultManager, metadata, rule) </s> remove pc := newUDPTracker(rawPc, DefaultManager, metadata, rule)
</s> add ctx.InjectPacketConn(rawPc)
pc := statistic.NewUDPTracker(rawPc, statistic.DefaultManager, metadata, rule) </s> remove func resolveMetadata(metadata *C.Metadata) (C.Proxy, C.Rule, error) {
var proxy C.Proxy
var rule C.Rule
</s> add func resolveMetadata(ctx C.PlainContext, metadata *C.Metadata) (proxy C.Proxy, rule C.Rule, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f4de055aa174000024d439e00a1301b99d476478 | tunnel/tunnel.go |
name: CodeQL | <mask> name: "CodeQL"
<mask>
<mask> on:
<mask> push:
<mask> branches: [ master, dev ]
<mask>
</s> Chore: update github action workflow </s> remove branches: [ master, dev ]
</s> add branches: [master, dev] </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove language: [ 'go' ]
</s> add language: ['go'] </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 | [
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f6c7281bb71d8e08547fad1395f26bf4549111a9 | .github/workflows/codeql-analysis.yml |
branches: [master, dev] | <mask> name: "CodeQL"
<mask>
<mask> on:
<mask> push:
<mask> branches: [ master, dev ]
<mask>
<mask> jobs:
<mask> analyze:
<mask> name: Analyze
<mask> runs-on: ubuntu-latest
</s> Chore: update github action workflow </s> remove name: "CodeQL"
</s> add name: CodeQL </s> remove - uses: actions/checkout@v2
</s> add - uses: actions/checkout@v3
- name: Get latest go version
id: version
run: |
echo ::set-output name=go_version::$(curl -s https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g')
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: ${{ steps.version.outputs.go_version }}
</s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove language: [ 'go' ]
</s> add language: ['go'] </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f6c7281bb71d8e08547fad1395f26bf4549111a9 | .github/workflows/codeql-analysis.yml |
language: ['go'] | <mask>
<mask> strategy:
<mask> fail-fast: false
<mask> matrix:
<mask> language: [ 'go' ]
<mask>
<mask> steps:
<mask> - name: Checkout repository
<mask> uses: actions/checkout@v2
<mask>
</s> Chore: update github action workflow </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove uses: golangci/golangci-lint-action@v2
</s> add uses: golangci/golangci-lint-action@v3 </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove - uses: actions/checkout@v2
</s> add - uses: actions/checkout@v3
- name: Get latest go version
id: version
run: |
echo ::set-output name=go_version::$(curl -s https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g')
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: ${{ steps.version.outputs.go_version }}
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f6c7281bb71d8e08547fad1395f26bf4549111a9 | .github/workflows/codeql-analysis.yml |
uses: actions/checkout@v3 | <mask> language: [ 'go' ]
<mask>
<mask> steps:
<mask> - name: Checkout repository
<mask> uses: actions/checkout@v2
<mask>
<mask> - name: Initialize CodeQL
<mask> uses: github/codeql-action/init@v1
<mask> with:
<mask> languages: ${{ matrix.language }}
</s> Chore: update github action workflow </s> remove language: [ 'go' ]
</s> add language: ['go'] </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove - uses: actions/checkout@v2
</s> add - uses: actions/checkout@v3
- name: Get latest go version
id: version
run: |
echo ::set-output name=go_version::$(curl -s https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g')
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: ${{ steps.version.outputs.go_version }}
</s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove uses: golangci/golangci-lint-action@v2
</s> add uses: golangci/golangci-lint-action@v3 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f6c7281bb71d8e08547fad1395f26bf4549111a9 | .github/workflows/codeql-analysis.yml |
uses: actions/checkout@v3 | <mask> runs-on: ubuntu-latest
<mask> steps:
<mask>
<mask> - name: Check out code into the Go module directory
<mask> uses: actions/checkout@v2
<mask> with:
<mask> fetch-depth: 0
<mask>
<mask> - name: Set up QEMU
<mask> uses: docker/setup-qemu-action@v1
</s> Chore: update github action workflow </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove uses: golangci/golangci-lint-action@v2
</s> add uses: golangci/golangci-lint-action@v3 </s> remove - uses: actions/checkout@v2
</s> add - uses: actions/checkout@v3
- name: Get latest go version
id: version
run: |
echo ::set-output name=go_version::$(curl -s https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g')
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: ${{ steps.version.outputs.go_version }}
</s> remove language: [ 'go' ]
</s> add language: ['go'] | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f6c7281bb71d8e08547fad1395f26bf4549111a9 | .github/workflows/docker.yml |
uses: actions/github-script@v6 | <mask> tags: 'dreamacro/clash:dev,ghcr.io/dreamacro/clash:dev'
<mask>
<mask> - name: Get all docker tags
<mask> if: startsWith(github.ref, 'refs/tags/')
<mask> uses: actions/github-script@v4
<mask> id: tags
<mask> with:
<mask> script: |
<mask> const ref = `${context.payload.ref.replace(/\/?refs\/tags\//, '')}`
<mask> const tags = [
</s> Chore: update github action workflow </s> remove - uses: actions/checkout@v2
</s> add - uses: actions/checkout@v3
- name: Get latest go version
id: version
run: |
echo ::set-output name=go_version::$(curl -s https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g')
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: ${{ steps.version.outputs.go_version }}
</s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove uses: golangci/golangci-lint-action@v2
</s> add uses: golangci/golangci-lint-action@v3 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f6c7281bb71d8e08547fad1395f26bf4549111a9 | .github/workflows/docker.yml |
- uses: actions/checkout@v3
- name: Get latest go version
id: version
run: |
echo ::set-output name=go_version::$(curl -s https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g')
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: ${{ steps.version.outputs.go_version }}
| <mask> jobs:
<mask> lint:
<mask> runs-on: ubuntu-latest
<mask> steps:
<mask> - uses: actions/checkout@v2
<mask> - name: golangci-lint
<mask> uses: golangci/golangci-lint-action@v2
<mask> with:
<mask> version: latest
<mask> args: --disable-all -E govet -E gofumpt -E megacheck ./...
</s> Chore: update github action workflow </s> remove args: --disable-all -E govet -E gofumpt -E megacheck ./...
</s> add </s> remove uses: golangci/golangci-lint-action@v2
</s> add uses: golangci/golangci-lint-action@v3 </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f6c7281bb71d8e08547fad1395f26bf4549111a9 | .github/workflows/linter.yml |
uses: golangci/golangci-lint-action@v3 | <mask> runs-on: ubuntu-latest
<mask> steps:
<mask> - uses: actions/checkout@v2
<mask> - name: golangci-lint
<mask> uses: golangci/golangci-lint-action@v2
<mask> with:
<mask> version: latest
<mask> args: --disable-all -E govet -E gofumpt -E megacheck ./...
</s> Chore: update github action workflow </s> remove args: --disable-all -E govet -E gofumpt -E megacheck ./...
</s> add </s> remove - uses: actions/checkout@v2
</s> add - uses: actions/checkout@v3
- name: Get latest go version
id: version
run: |
echo ::set-output name=go_version::$(curl -s https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g')
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: ${{ steps.version.outputs.go_version }}
</s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f6c7281bb71d8e08547fad1395f26bf4549111a9 | .github/workflows/linter.yml |
<mask> - name: golangci-lint
<mask> uses: golangci/golangci-lint-action@v2
<mask> with:
<mask> version: latest
<mask> args: --disable-all -E govet -E gofumpt -E megacheck ./...
</s> Chore: update github action workflow </s> remove uses: golangci/golangci-lint-action@v2
</s> add uses: golangci/golangci-lint-action@v3 </s> remove - uses: actions/checkout@v2
</s> add - uses: actions/checkout@v3
- name: Get latest go version
id: version
run: |
echo ::set-output name=go_version::$(curl -s https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g')
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: ${{ steps.version.outputs.go_version }}
</s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 | [
"keep",
"keep",
"keep",
"keep",
"replace"
] | https://github.com/Dreamacro/clash/commit/f6c7281bb71d8e08547fad1395f26bf4549111a9 | .github/workflows/linter.yml | |
uses: actions/checkout@v3 | <mask> with:
<mask> go-version: ${{ steps.version.outputs.go_version }}
<mask>
<mask> - name: Check out code into the Go module directory
<mask> uses: actions/checkout@v2
<mask>
<mask> - name: Cache go module
<mask> uses: actions/cache@v2
<mask> with:
<mask> path: ~/go/pkg/mod
</s> Chore: update github action workflow </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove - uses: actions/checkout@v2
</s> add - uses: actions/checkout@v3
- name: Get latest go version
id: version
run: |
echo ::set-output name=go_version::$(curl -s https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g')
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: ${{ steps.version.outputs.go_version }}
</s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove uses: golangci/golangci-lint-action@v2
</s> add uses: golangci/golangci-lint-action@v3 </s> remove args: --disable-all -E govet -E gofumpt -E megacheck ./...
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f6c7281bb71d8e08547fad1395f26bf4549111a9 | .github/workflows/release.yml |
- uses: actions/stale@v5 | <mask>
<mask> runs-on: ubuntu-latest
<mask>
<mask> steps:
<mask> - uses: actions/stale@v4
<mask> with:
<mask> stale-issue-message: 'This issue is stale because it has been open 60 days with no activity. Remove stale label or comment or this will be closed in 5 days'
<mask> days-before-stale: 60
<mask> days-before-close: 5
</s> Chore: update github action workflow </s> remove uses: golangci/golangci-lint-action@v2
</s> add uses: golangci/golangci-lint-action@v3 </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 </s> remove - uses: actions/checkout@v2
</s> add - uses: actions/checkout@v3
- name: Get latest go version
id: version
run: |
echo ::set-output name=go_version::$(curl -s https://raw.githubusercontent.com/actions/go-versions/main/versions-manifest.json | grep -oE '"version": "[0-9]{1}.[0-9]{1,}(.[0-9]{1,})?"' | head -1 | cut -d':' -f2 | sed 's/ //g; s/"//g')
- name: Setup Go
uses: actions/setup-go@v2
with:
go-version: ${{ steps.version.outputs.go_version }}
</s> remove uses: actions/checkout@v2
</s> add uses: actions/checkout@v3 | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f6c7281bb71d8e08547fad1395f26bf4549111a9 | .github/workflows/stale.yml |
func (p *Proxy) URLTest(ctx context.Context, url string) (delay, meanDelay uint16, err error) { | <mask> }
<mask>
<mask> // URLTest get the delay for the specified URL
<mask> // implements C.Proxy
<mask> func (p *Proxy) URLTest(ctx context.Context, url string) (t uint16, err error) {
<mask> defer func() {
<mask> p.alive.Store(err == nil)
<mask> record := C.DelayHistory{Time: time.Now()}
<mask> if err == nil {
<mask> record.Delay = t
</s> Feature: add meanDelay on URLTest </s> remove record.Delay = t
</s> add record.Delay = delay
record.MeanDelay = meanDelay </s> remove URLTest(ctx context.Context, url string) (uint16, error)
</s> add URLTest(ctx context.Context, url string) (uint16, uint16, error) </s> remove t = uint16(time.Since(start) / time.Millisecond)
</s> add delay = uint16(time.Since(start) / time.Millisecond)
resp, err = client.Do(req)
if err != nil {
return
}
resp.Body.Close()
meanDelay = uint16(time.Since(start) / time.Millisecond / 2)
</s> remove delay, err := proxy.URLTest(ctx, url)
</s> add delay, meanDelay, err := proxy.URLTest(ctx, url) </s> remove Time time.Time `json:"time"`
Delay uint16 `json:"delay"`
</s> add Time time.Time `json:"time"`
Delay uint16 `json:"delay"`
MeanDelay uint16 `json:"meanDelay"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f78a7cb2cbe34bae15505053cb640016aa30027d | adapter/adapter.go |
record.Delay = delay
record.MeanDelay = meanDelay | <mask> defer func() {
<mask> p.alive.Store(err == nil)
<mask> record := C.DelayHistory{Time: time.Now()}
<mask> if err == nil {
<mask> record.Delay = t
<mask> }
<mask> p.history.Put(record)
<mask> if p.history.Len() > 10 {
<mask> p.history.Pop()
<mask> }
</s> Feature: add meanDelay on URLTest </s> remove func (p *Proxy) URLTest(ctx context.Context, url string) (t uint16, err error) {
</s> add func (p *Proxy) URLTest(ctx context.Context, url string) (delay, meanDelay uint16, err error) { </s> remove t = uint16(time.Since(start) / time.Millisecond)
</s> add delay = uint16(time.Since(start) / time.Millisecond)
resp, err = client.Do(req)
if err != nil {
return
}
resp.Body.Close()
meanDelay = uint16(time.Since(start) / time.Millisecond / 2)
</s> remove delay, err := proxy.URLTest(ctx, url)
</s> add delay, meanDelay, err := proxy.URLTest(ctx, url) </s> remove Time time.Time `json:"time"`
Delay uint16 `json:"delay"`
</s> add Time time.Time `json:"time"`
Delay uint16 `json:"delay"`
MeanDelay uint16 `json:"meanDelay"` </s> remove "delay": delay,
</s> add "delay": delay,
"meanDelay": meanDelay, | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f78a7cb2cbe34bae15505053cb640016aa30027d | adapter/adapter.go |
delay = uint16(time.Since(start) / time.Millisecond)
resp, err = client.Do(req)
if err != nil {
return
}
resp.Body.Close()
meanDelay = uint16(time.Since(start) / time.Millisecond / 2)
| <mask> if err != nil {
<mask> return
<mask> }
<mask> resp.Body.Close()
<mask> t = uint16(time.Since(start) / time.Millisecond)
<mask> return
<mask> }
<mask>
<mask> func NewProxy(adapter C.ProxyAdapter) *Proxy {
<mask> return &Proxy{adapter, queue.New(10), atomic.NewBool(true)}
</s> Feature: add meanDelay on URLTest </s> remove delay, err := proxy.URLTest(ctx, url)
</s> add delay, meanDelay, err := proxy.URLTest(ctx, url) </s> remove func (p *Proxy) URLTest(ctx context.Context, url string) (t uint16, err error) {
</s> add func (p *Proxy) URLTest(ctx context.Context, url string) (delay, meanDelay uint16, err error) { </s> remove record.Delay = t
</s> add record.Delay = delay
record.MeanDelay = meanDelay </s> remove "delay": delay,
</s> add "delay": delay,
"meanDelay": meanDelay, </s> remove Time time.Time `json:"time"`
Delay uint16 `json:"delay"`
</s> add Time time.Time `json:"time"`
Delay uint16 `json:"delay"`
MeanDelay uint16 `json:"meanDelay"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f78a7cb2cbe34bae15505053cb640016aa30027d | adapter/adapter.go |
Time time.Time `json:"time"`
Delay uint16 `json:"delay"`
MeanDelay uint16 `json:"meanDelay"` | <mask> Unwrap(metadata *Metadata) Proxy
<mask> }
<mask>
<mask> type DelayHistory struct {
<mask> Time time.Time `json:"time"`
<mask> Delay uint16 `json:"delay"`
<mask> }
<mask>
<mask> type Proxy interface {
<mask> ProxyAdapter
<mask> Alive() bool
</s> Feature: add meanDelay on URLTest </s> remove URLTest(ctx context.Context, url string) (uint16, error)
</s> add URLTest(ctx context.Context, url string) (uint16, uint16, error) </s> remove record.Delay = t
</s> add record.Delay = delay
record.MeanDelay = meanDelay </s> remove t = uint16(time.Since(start) / time.Millisecond)
</s> add delay = uint16(time.Since(start) / time.Millisecond)
resp, err = client.Do(req)
if err != nil {
return
}
resp.Body.Close()
meanDelay = uint16(time.Since(start) / time.Millisecond / 2)
</s> remove func (p *Proxy) URLTest(ctx context.Context, url string) (t uint16, err error) {
</s> add func (p *Proxy) URLTest(ctx context.Context, url string) (delay, meanDelay uint16, err error) { </s> remove delay, err := proxy.URLTest(ctx, url)
</s> add delay, meanDelay, err := proxy.URLTest(ctx, url) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f78a7cb2cbe34bae15505053cb640016aa30027d | constant/adapters.go |
URLTest(ctx context.Context, url string) (uint16, uint16, error) | <mask> ProxyAdapter
<mask> Alive() bool
<mask> DelayHistory() []DelayHistory
<mask> LastDelay() uint16
<mask> URLTest(ctx context.Context, url string) (uint16, error)
<mask>
<mask> // Deprecated: use DialContext instead.
<mask> Dial(metadata *Metadata) (Conn, error)
<mask>
<mask> // Deprecated: use DialPacketConn instead.
</s> Feature: add meanDelay on URLTest </s> remove func (p *Proxy) URLTest(ctx context.Context, url string) (t uint16, err error) {
</s> add func (p *Proxy) URLTest(ctx context.Context, url string) (delay, meanDelay uint16, err error) { </s> remove Time time.Time `json:"time"`
Delay uint16 `json:"delay"`
</s> add Time time.Time `json:"time"`
Delay uint16 `json:"delay"`
MeanDelay uint16 `json:"meanDelay"` </s> remove "delay": delay,
</s> add "delay": delay,
"meanDelay": meanDelay, </s> remove delay, err := proxy.URLTest(ctx, url)
</s> add delay, meanDelay, err := proxy.URLTest(ctx, url) </s> remove t = uint16(time.Since(start) / time.Millisecond)
</s> add delay = uint16(time.Since(start) / time.Millisecond)
resp, err = client.Do(req)
if err != nil {
return
}
resp.Body.Close()
meanDelay = uint16(time.Since(start) / time.Millisecond / 2)
| [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f78a7cb2cbe34bae15505053cb640016aa30027d | constant/adapters.go |
delay, meanDelay, err := proxy.URLTest(ctx, url) | <mask>
<mask> ctx, cancel := context.WithTimeout(context.Background(), time.Millisecond*time.Duration(timeout))
<mask> defer cancel()
<mask>
<mask> delay, err := proxy.URLTest(ctx, url)
<mask> if ctx.Err() != nil {
<mask> render.Status(r, http.StatusGatewayTimeout)
<mask> render.JSON(w, r, ErrRequestTimeout)
<mask> return
<mask> }
</s> Feature: add meanDelay on URLTest </s> remove "delay": delay,
</s> add "delay": delay,
"meanDelay": meanDelay, </s> remove t = uint16(time.Since(start) / time.Millisecond)
</s> add delay = uint16(time.Since(start) / time.Millisecond)
resp, err = client.Do(req)
if err != nil {
return
}
resp.Body.Close()
meanDelay = uint16(time.Since(start) / time.Millisecond / 2)
</s> remove record.Delay = t
</s> add record.Delay = delay
record.MeanDelay = meanDelay </s> remove func (p *Proxy) URLTest(ctx context.Context, url string) (t uint16, err error) {
</s> add func (p *Proxy) URLTest(ctx context.Context, url string) (delay, meanDelay uint16, err error) { </s> remove Time time.Time `json:"time"`
Delay uint16 `json:"delay"`
</s> add Time time.Time `json:"time"`
Delay uint16 `json:"delay"`
MeanDelay uint16 `json:"meanDelay"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f78a7cb2cbe34bae15505053cb640016aa30027d | hub/route/proxies.go |
"delay": delay,
"meanDelay": meanDelay, | <mask> return
<mask> }
<mask>
<mask> render.JSON(w, r, render.M{
<mask> "delay": delay,
<mask> })
<mask> }
</s> Feature: add meanDelay on URLTest </s> remove delay, err := proxy.URLTest(ctx, url)
</s> add delay, meanDelay, err := proxy.URLTest(ctx, url) </s> remove t = uint16(time.Since(start) / time.Millisecond)
</s> add delay = uint16(time.Since(start) / time.Millisecond)
resp, err = client.Do(req)
if err != nil {
return
}
resp.Body.Close()
meanDelay = uint16(time.Since(start) / time.Millisecond / 2)
</s> remove Time time.Time `json:"time"`
Delay uint16 `json:"delay"`
</s> add Time time.Time `json:"time"`
Delay uint16 `json:"delay"`
MeanDelay uint16 `json:"meanDelay"` </s> remove record.Delay = t
</s> add record.Delay = delay
record.MeanDelay = meanDelay </s> remove func (p *Proxy) URLTest(ctx context.Context, url string) (t uint16, err error) {
</s> add func (p *Proxy) URLTest(ctx context.Context, url string) (delay, meanDelay uint16, err error) { | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f78a7cb2cbe34bae15505053cb640016aa30027d | hub/route/proxies.go |
<mask>
<mask> func handleHTTP(ctx *context.HTTPContext, outbound net.Conn) {
<mask> req := ctx.Request()
<mask> conn := ctx.Conn()
<mask> host := req.Host
<mask>
<mask> inboundReader := bufio.NewReader(conn)
<mask> outboundReader := bufio.NewReader(outbound)
<mask>
<mask> for {
</s> Fix: some HTTP proxy request broken | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f7f97ef625a3e504e4550f9399ddff7f4429798d | tunnel/connection.go | |
inbound.RemoveExtraHTTPHostPort(req)
host := req.Host | <mask> inboundReader := bufio.NewReader(conn)
<mask> outboundReader := bufio.NewReader(outbound)
<mask>
<mask> for {
<mask> keepAlive := strings.TrimSpace(strings.ToLower(req.Header.Get("Proxy-Connection"))) == "keep-alive"
<mask>
<mask> req.Header.Set("Connection", "close")
<mask> req.RequestURI = ""
</s> Fix: some HTTP proxy request broken </s> remove host := req.Host
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f7f97ef625a3e504e4550f9399ddff7f4429798d | tunnel/connection.go |
inbound.RemoveExtraHTTPHostPort(req) | <mask> break
<mask> }
<mask>
<mask> // Sometimes firefox just open a socket to process multiple domains in HTTP
<mask> // The temporary solution is close connection when encountering different HOST
<mask> if req.Host != host {
<mask> break
<mask> }
<mask> }
</s> Fix: some HTTP proxy request broken </s> remove host := req.Host
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f7f97ef625a3e504e4550f9399ddff7f4429798d | tunnel/connection.go |
"bytes" | <mask> package route
<mask>
<mask> import (
<mask> "encoding/json"
<mask> "net/http"
<mask> "strings"
<mask> "time"
</s> Feature(API): logs and traffic support websocket </s> remove root := chi.NewRouter().With(jsonContentType)
root.Get("/traffic", traffic)
root.Get("/logs", getLogs)
</s> add </s> remove r.Mount("/", root)
</s> add r.Get("/logs", getLogs)
r.Get("/traffic", traffic) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f867f0254678342113d06e47f8f5951626b37f59 | hub/route/server.go |
"github.com/gorilla/websocket" | <mask> "github.com/go-chi/cors"
<mask> "github.com/go-chi/render"
<mask> )
<mask>
<mask> var (
<mask> serverSecret = ""
<mask> serverAddr = ""
</s> Feature(API): logs and traffic support websocket </s> remove w.(http.Flusher).Flush()
</s> add if wsConn == nil {
_, err = w.Write(buf.Bytes())
w.(http.Flusher).Flush()
} else {
err = wsConn.WriteMessage(websocket.TextMessage, buf.Bytes())
}
if err != nil {
break
} </s> remove w.(http.Flusher).Flush()
</s> add if wsConn == nil {
_, err = w.Write(buf.Bytes())
w.(http.Flusher).Flush()
} else {
err = wsConn.WriteMessage(websocket.TextMessage, buf.Bytes())
}
if err != nil {
break
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f867f0254678342113d06e47f8f5951626b37f59 | hub/route/server.go |
upgrader = websocket.Upgrader{} | <mask> serverSecret = ""
<mask> serverAddr = ""
<mask>
<mask> uiPath = ""
<mask> )
<mask>
<mask> type Traffic struct {
<mask> Up int64 `json:"up"`
<mask> Down int64 `json:"down"`
<mask> }
</s> Feature(API): logs and traffic support websocket </s> remove w.(http.Flusher).Flush()
</s> add if wsConn == nil {
_, err = w.Write(buf.Bytes())
w.(http.Flusher).Flush()
} else {
err = wsConn.WriteMessage(websocket.TextMessage, buf.Bytes())
}
if err != nil {
break
} </s> remove w.(http.Flusher).Flush()
</s> add if wsConn == nil {
_, err = w.Write(buf.Bytes())
w.(http.Flusher).Flush()
} else {
err = wsConn.WriteMessage(websocket.TextMessage, buf.Bytes())
}
if err != nil {
break
} </s> remove render.Status(r, http.StatusOK)
</s> add var wsConn *websocket.Conn
if websocket.IsWebSocketUpgrade(r) {
var err error
wsConn, err = upgrader.Upgrade(w, r, nil)
if err != nil {
return
}
}
if wsConn == nil {
w.Header().Set("Content-Type", "application/json")
render.Status(r, http.StatusOK)
} | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f867f0254678342113d06e47f8f5951626b37f59 | hub/route/server.go |
<mask> AllowedHeaders: []string{"Content-Type", "Authorization"},
<mask> MaxAge: 300,
<mask> })
<mask>
<mask> root := chi.NewRouter().With(jsonContentType)
<mask> root.Get("/traffic", traffic)
<mask> root.Get("/logs", getLogs)
<mask>
<mask> r.Get("/", hello)
<mask> r.Group(func(r chi.Router) {
<mask> r.Use(cors.Handler, authentication)
<mask>
<mask> r.Mount("/", root)
</s> Feature(API): logs and traffic support websocket </s> remove r.Mount("/", root)
</s> add r.Get("/logs", getLogs)
r.Get("/traffic", traffic) </s> remove if err := json.NewEncoder(w).Encode(Traffic{
</s> add if err := json.NewEncoder(buf).Encode(Traffic{ </s> remove func jsonContentType(next http.Handler) http.Handler {
fn := func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json")
next.ServeHTTP(w, r)
}
return http.HandlerFunc(fn)
}
</s> add </s> remove render.Status(r, http.StatusOK)
</s> add defer log.UnSubscribe(sub)
buf := &bytes.Buffer{}
var err error | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f867f0254678342113d06e47f8f5951626b37f59 | hub/route/server.go | |
r.Get("/logs", getLogs)
r.Get("/traffic", traffic) | <mask> r.Get("/", hello)
<mask> r.Group(func(r chi.Router) {
<mask> r.Use(cors.Handler, authentication)
<mask>
<mask> r.Mount("/", root)
<mask> r.Mount("/configs", configRouter())
<mask> r.Mount("/proxies", proxyRouter())
<mask> r.Mount("/rules", ruleRouter())
<mask> })
<mask>
</s> Feature(API): logs and traffic support websocket </s> remove root := chi.NewRouter().With(jsonContentType)
root.Get("/traffic", traffic)
root.Get("/logs", getLogs)
</s> add </s> remove w.(http.Flusher).Flush()
</s> add if wsConn == nil {
_, err = w.Write(buf.Bytes())
w.(http.Flusher).Flush()
} else {
err = wsConn.WriteMessage(websocket.TextMessage, buf.Bytes())
}
if err != nil {
break
} </s> remove w.(http.Flusher).Flush()
</s> add if wsConn == nil {
_, err = w.Write(buf.Bytes())
w.(http.Flusher).Flush()
} else {
err = wsConn.WriteMessage(websocket.TextMessage, buf.Bytes())
}
if err != nil {
break
} </s> remove render.Status(r, http.StatusOK)
</s> add var wsConn *websocket.Conn
if websocket.IsWebSocketUpgrade(r) {
var err error
wsConn, err = upgrader.Upgrade(w, r, nil)
if err != nil {
return
}
}
if wsConn == nil {
w.Header().Set("Content-Type", "application/json")
render.Status(r, http.StatusOK)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f867f0254678342113d06e47f8f5951626b37f59 | hub/route/server.go |
<mask> log.Errorln("External controller error: %s", err.Error())
<mask> }
<mask> }
<mask>
<mask> func jsonContentType(next http.Handler) http.Handler {
<mask> fn := func(w http.ResponseWriter, r *http.Request) {
<mask> w.Header().Set("Content-Type", "application/json")
<mask> next.ServeHTTP(w, r)
<mask> }
<mask> return http.HandlerFunc(fn)
<mask> }
<mask>
<mask> func authentication(next http.Handler) http.Handler {
<mask> fn := func(w http.ResponseWriter, r *http.Request) {
<mask> header := r.Header.Get("Authorization")
<mask> text := strings.SplitN(header, " ", 2)
<mask>
</s> Feature(API): logs and traffic support websocket </s> remove render.Status(r, http.StatusOK)
</s> add var wsConn *websocket.Conn
if websocket.IsWebSocketUpgrade(r) {
var err error
wsConn, err = upgrader.Upgrade(w, r, nil)
if err != nil {
return
}
}
if wsConn == nil {
w.Header().Set("Content-Type", "application/json")
render.Status(r, http.StatusOK)
} </s> remove render.Status(r, http.StatusOK)
</s> add defer log.UnSubscribe(sub)
buf := &bytes.Buffer{}
var err error </s> remove if err := json.NewEncoder(w).Encode(Log{
</s> add if err := json.NewEncoder(buf).Encode(Log{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f867f0254678342113d06e47f8f5951626b37f59 | hub/route/server.go | |
var wsConn *websocket.Conn
if websocket.IsWebSocketUpgrade(r) {
var err error
wsConn, err = upgrader.Upgrade(w, r, nil)
if err != nil {
return
}
}
if wsConn == nil {
w.Header().Set("Content-Type", "application/json")
render.Status(r, http.StatusOK)
} | <mask> render.JSON(w, r, render.M{"hello": "clash"})
<mask> }
<mask>
<mask> func traffic(w http.ResponseWriter, r *http.Request) {
<mask> render.Status(r, http.StatusOK)
<mask>
<mask> tick := time.NewTicker(time.Second)
<mask> t := T.Instance().Traffic()
<mask> for range tick.C {
<mask> up, down := t.Now()
</s> Feature(API): logs and traffic support websocket </s> remove if err := json.NewEncoder(w).Encode(Traffic{
</s> add if err := json.NewEncoder(buf).Encode(Traffic{ </s> remove func jsonContentType(next http.Handler) http.Handler {
fn := func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json")
next.ServeHTTP(w, r)
}
return http.HandlerFunc(fn)
}
</s> add </s> remove render.Status(r, http.StatusOK)
</s> add defer log.UnSubscribe(sub)
buf := &bytes.Buffer{}
var err error | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f867f0254678342113d06e47f8f5951626b37f59 | hub/route/server.go |
buf := &bytes.Buffer{}
var err error | <mask> tick := time.NewTicker(time.Second)
<mask> t := T.Instance().Traffic()
<mask> for range tick.C {
<mask> buf.Reset()
<mask> up, down := t.Now()
<mask> if err := json.NewEncoder(buf).Encode(Traffic{
<mask> Up: up,
<mask> Down: down,
</s> Feature(API): logs and traffic support websocket </s> remove if err := json.NewEncoder(w).Encode(Traffic{
</s> add if err := json.NewEncoder(buf).Encode(Traffic{ </s> remove render.Status(r, http.StatusOK)
</s> add var wsConn *websocket.Conn
if websocket.IsWebSocketUpgrade(r) {
var err error
wsConn, err = upgrader.Upgrade(w, r, nil)
if err != nil {
return
}
}
if wsConn == nil {
w.Header().Set("Content-Type", "application/json")
render.Status(r, http.StatusOK)
} </s> remove render.Status(r, http.StatusOK)
</s> add defer log.UnSubscribe(sub)
buf := &bytes.Buffer{}
var err error | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f867f0254678342113d06e47f8f5951626b37f59 | hub/route/server.go |
buf.Reset() | <mask> var err error
<mask> for range tick.C {
<mask> up, down := t.Now()
<mask> if err := json.NewEncoder(buf).Encode(Traffic{
<mask> Up: up,
<mask> Down: down,
</s> Feature(API): logs and traffic support websocket </s> remove if err := json.NewEncoder(w).Encode(Traffic{
</s> add if err := json.NewEncoder(buf).Encode(Traffic{ </s> remove render.Status(r, http.StatusOK)
</s> add var wsConn *websocket.Conn
if websocket.IsWebSocketUpgrade(r) {
var err error
wsConn, err = upgrader.Upgrade(w, r, nil)
if err != nil {
return
}
}
if wsConn == nil {
w.Header().Set("Content-Type", "application/json")
render.Status(r, http.StatusOK)
} </s> remove render.Status(r, http.StatusOK)
</s> add defer log.UnSubscribe(sub)
buf := &bytes.Buffer{}
var err error | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f867f0254678342113d06e47f8f5951626b37f59 | hub/route/server.go |
if err := json.NewEncoder(buf).Encode(Traffic{ | <mask> tick := time.NewTicker(time.Second)
<mask> t := T.Instance().Traffic()
<mask> for range tick.C {
<mask> up, down := t.Now()
<mask> if err := json.NewEncoder(w).Encode(Traffic{
<mask> Up: up,
<mask> Down: down,
<mask> }); err != nil {
<mask> break
<mask> }
</s> Feature(API): logs and traffic support websocket </s> remove render.Status(r, http.StatusOK)
</s> add var wsConn *websocket.Conn
if websocket.IsWebSocketUpgrade(r) {
var err error
wsConn, err = upgrader.Upgrade(w, r, nil)
if err != nil {
return
}
}
if wsConn == nil {
w.Header().Set("Content-Type", "application/json")
render.Status(r, http.StatusOK)
} </s> remove if err := json.NewEncoder(w).Encode(Log{
</s> add if err := json.NewEncoder(buf).Encode(Log{ </s> remove w.(http.Flusher).Flush()
</s> add if wsConn == nil {
_, err = w.Write(buf.Bytes())
w.(http.Flusher).Flush()
} else {
err = wsConn.WriteMessage(websocket.TextMessage, buf.Bytes())
}
if err != nil {
break
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f867f0254678342113d06e47f8f5951626b37f59 | hub/route/server.go |
if wsConn == nil {
_, err = w.Write(buf.Bytes())
w.(http.Flusher).Flush()
} else {
err = wsConn.WriteMessage(websocket.TextMessage, buf.Bytes())
}
if err != nil {
break
} | <mask> Down: down,
<mask> }); err != nil {
<mask> break
<mask> }
<mask> w.(http.Flusher).Flush()
<mask> }
<mask> }
<mask>
<mask> type Log struct {
<mask> Type string `json:"type"`
</s> Feature(API): logs and traffic support websocket </s> remove w.(http.Flusher).Flush()
</s> add if wsConn == nil {
_, err = w.Write(buf.Bytes())
w.(http.Flusher).Flush()
} else {
err = wsConn.WriteMessage(websocket.TextMessage, buf.Bytes())
}
if err != nil {
break
} </s> remove if err := json.NewEncoder(w).Encode(Traffic{
</s> add if err := json.NewEncoder(buf).Encode(Traffic{ </s> remove if err := json.NewEncoder(w).Encode(Log{
</s> add if err := json.NewEncoder(buf).Encode(Log{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f867f0254678342113d06e47f8f5951626b37f59 | hub/route/server.go |
var wsConn *websocket.Conn
if websocket.IsWebSocketUpgrade(r) {
var err error
wsConn, err = upgrader.Upgrade(w, r, nil)
if err != nil {
return
}
}
if wsConn == nil {
w.Header().Set("Content-Type", "application/json")
render.Status(r, http.StatusOK)
}
| <mask> }
<mask>
<mask> sub := log.Subscribe()
<mask> defer log.UnSubscribe(sub)
<mask> buf := &bytes.Buffer{}
<mask> var err error
</s> Feature(API): logs and traffic support websocket </s> remove render.Status(r, http.StatusOK)
</s> add defer log.UnSubscribe(sub)
buf := &bytes.Buffer{}
var err error </s> remove render.Status(r, http.StatusOK)
</s> add var wsConn *websocket.Conn
if websocket.IsWebSocketUpgrade(r) {
var err error
wsConn, err = upgrader.Upgrade(w, r, nil)
if err != nil {
return
}
}
if wsConn == nil {
w.Header().Set("Content-Type", "application/json")
render.Status(r, http.StatusOK)
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f867f0254678342113d06e47f8f5951626b37f59 | hub/route/server.go |
defer log.UnSubscribe(sub)
buf := &bytes.Buffer{}
var err error | <mask> return
<mask> }
<mask>
<mask> sub := log.Subscribe()
<mask> render.Status(r, http.StatusOK)
<mask> for elm := range sub {
<mask> log := elm.(*log.Event)
<mask> if log.LogLevel < level {
<mask> continue
<mask> }
</s> Feature(API): logs and traffic support websocket </s> remove if err := json.NewEncoder(w).Encode(Log{
</s> add if err := json.NewEncoder(buf).Encode(Log{ </s> remove render.Status(r, http.StatusOK)
</s> add var wsConn *websocket.Conn
if websocket.IsWebSocketUpgrade(r) {
var err error
wsConn, err = upgrader.Upgrade(w, r, nil)
if err != nil {
return
}
}
if wsConn == nil {
w.Header().Set("Content-Type", "application/json")
render.Status(r, http.StatusOK)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f867f0254678342113d06e47f8f5951626b37f59 | hub/route/server.go |
buf.Reset() | <mask> var err error
<mask> for elm := range sub {
<mask> log := elm.(*log.Event)
<mask> if log.LogLevel < level {
<mask> continue
<mask> }
</s> Feature(API): logs and traffic support websocket </s> remove render.Status(r, http.StatusOK)
</s> add defer log.UnSubscribe(sub)
buf := &bytes.Buffer{}
var err error </s> remove if err := json.NewEncoder(w).Encode(Log{
</s> add if err := json.NewEncoder(buf).Encode(Log{ </s> remove render.Status(r, http.StatusOK)
</s> add var wsConn *websocket.Conn
if websocket.IsWebSocketUpgrade(r) {
var err error
wsConn, err = upgrader.Upgrade(w, r, nil)
if err != nil {
return
}
}
if wsConn == nil {
w.Header().Set("Content-Type", "application/json")
render.Status(r, http.StatusOK)
} | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f867f0254678342113d06e47f8f5951626b37f59 | hub/route/server.go |
if err := json.NewEncoder(buf).Encode(Log{ | <mask> if log.LogLevel < level {
<mask> continue
<mask> }
<mask>
<mask> if err := json.NewEncoder(w).Encode(Log{
<mask> Type: log.Type(),
<mask> Payload: log.Payload,
<mask> }); err != nil {
<mask> break
<mask> }
</s> Feature(API): logs and traffic support websocket </s> remove w.(http.Flusher).Flush()
</s> add if wsConn == nil {
_, err = w.Write(buf.Bytes())
w.(http.Flusher).Flush()
} else {
err = wsConn.WriteMessage(websocket.TextMessage, buf.Bytes())
}
if err != nil {
break
} </s> remove render.Status(r, http.StatusOK)
</s> add defer log.UnSubscribe(sub)
buf := &bytes.Buffer{}
var err error </s> remove w.(http.Flusher).Flush()
</s> add if wsConn == nil {
_, err = w.Write(buf.Bytes())
w.(http.Flusher).Flush()
} else {
err = wsConn.WriteMessage(websocket.TextMessage, buf.Bytes())
}
if err != nil {
break
} </s> remove if err := json.NewEncoder(w).Encode(Traffic{
</s> add if err := json.NewEncoder(buf).Encode(Traffic{ | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f867f0254678342113d06e47f8f5951626b37f59 | hub/route/server.go |
if wsConn == nil {
_, err = w.Write(buf.Bytes())
w.(http.Flusher).Flush()
} else {
err = wsConn.WriteMessage(websocket.TextMessage, buf.Bytes())
}
if err != nil {
break
} | <mask> Payload: log.Payload,
<mask> }); err != nil {
<mask> break
<mask> }
<mask> w.(http.Flusher).Flush()
<mask> }
<mask> }
</s> Feature(API): logs and traffic support websocket </s> remove if err := json.NewEncoder(w).Encode(Log{
</s> add if err := json.NewEncoder(buf).Encode(Log{ </s> remove w.(http.Flusher).Flush()
</s> add if wsConn == nil {
_, err = w.Write(buf.Bytes())
w.(http.Flusher).Flush()
} else {
err = wsConn.WriteMessage(websocket.TextMessage, buf.Bytes())
}
if err != nil {
break
} </s> remove if err := json.NewEncoder(w).Encode(Traffic{
</s> add if err := json.NewEncoder(buf).Encode(Traffic{ </s> remove render.Status(r, http.StatusOK)
</s> add var wsConn *websocket.Conn
if websocket.IsWebSocketUpgrade(r) {
var err error
wsConn, err = upgrader.Upgrade(w, r, nil)
if err != nil {
return
}
}
if wsConn == nil {
w.Header().Set("Content-Type", "application/json")
render.Status(r, http.StatusOK)
} | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f867f0254678342113d06e47f8f5951626b37f59 | hub/route/server.go |
func UnSubscribe(sub observable.Subscription) {
source.UnSubscribe(sub)
return
}
| <mask> return sub
<mask> }
<mask>
<mask> func Level() LogLevel {
<mask> return level
<mask> }
<mask>
<mask> func SetLevel(newLevel LogLevel) {
</s> Feature(API): logs and traffic support websocket </s> remove func jsonContentType(next http.Handler) http.Handler {
fn := func(w http.ResponseWriter, r *http.Request) {
w.Header().Set("Content-Type", "application/json")
next.ServeHTTP(w, r)
}
return http.HandlerFunc(fn)
}
</s> add </s> remove render.Status(r, http.StatusOK)
</s> add defer log.UnSubscribe(sub)
buf := &bytes.Buffer{}
var err error </s> remove render.Status(r, http.StatusOK)
</s> add var wsConn *websocket.Conn
if websocket.IsWebSocketUpgrade(r) {
var err error
wsConn, err = upgrader.Upgrade(w, r, nil)
if err != nil {
return
}
}
if wsConn == nil {
w.Header().Set("Content-Type", "application/json")
render.Status(r, http.StatusOK)
} | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f867f0254678342113d06e47f8f5951626b37f59 | log/log.go |
<mask> package inbound
<mask>
<mask> import (
<mask> "github.com/Dreamacro/clash/component/socks5"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> // PacketAdapter is a UDP Packet adapter for socks/redir/tun
<mask> type PacketAdapter struct {
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add "github.com/Dreamacro/clash/transport/socks5" | [
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/inbound/packet.go | |
"github.com/Dreamacro/clash/transport/socks5" | <mask> package inbound
<mask>
<mask> import (
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> // PacketAdapter is a UDP Packet adapter for socks/redir/tun
<mask> type PacketAdapter struct {
<mask> C.UDPPacket
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add "github.com/Dreamacro/clash/transport/socks5" | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/inbound/packet.go |
<mask>
<mask> import (
<mask> "net"
<mask>
<mask> "github.com/Dreamacro/clash/component/socks5"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/context"
<mask> )
<mask>
<mask> // NewSocket receive TCP inbound and return ConnContext
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add "github.com/Dreamacro/clash/transport/socks5" | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/inbound/socket.go | |
"github.com/Dreamacro/clash/transport/socks5" | <mask> "net"
<mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/context"
<mask> )
<mask>
<mask> // NewSocket receive TCP inbound and return ConnContext
<mask> func NewSocket(target socks5.Addr, conn net.Conn, source C.Type) *context.ConnContext {
<mask> metadata := parseSocksAddr(target)
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/inbound/socket.go |
<mask> "net/http"
<mask> "strconv"
<mask> "strings"
<mask>
<mask> "github.com/Dreamacro/clash/component/socks5"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> func parseSocksAddr(target socks5.Addr) *C.Metadata {
<mask> metadata := &C.Metadata{
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/gun"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove obfs "github.com/Dreamacro/clash/component/simple-obfs"
"github.com/Dreamacro/clash/component/socks5"
v2rayObfs "github.com/Dreamacro/clash/component/v2ray-plugin"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/inbound/util.go | |
"github.com/Dreamacro/clash/transport/socks5" | <mask>
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> func parseSocksAddr(target socks5.Addr) *C.Metadata {
<mask> metadata := &C.Metadata{
<mask> AddrType: int(target[0]),
<mask> }
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add "github.com/Dreamacro/clash/transport/socks5" </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/inbound/util.go |
<mask> "strconv"
<mask>
<mask> "github.com/Dreamacro/clash/common/structure"
<mask> "github.com/Dreamacro/clash/component/dialer"
<mask> obfs "github.com/Dreamacro/clash/component/simple-obfs"
<mask> "github.com/Dreamacro/clash/component/socks5"
<mask> v2rayObfs "github.com/Dreamacro/clash/component/v2ray-plugin"
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> "github.com/Dreamacro/go-shadowsocks2/core"
<mask> )
<mask>
</s> Chore: split component to transport </s> remove obfs "github.com/Dreamacro/clash/component/simple-obfs"
"github.com/Dreamacro/clash/component/snell"
</s> add </s> remove "github.com/Dreamacro/clash/component/ssr/obfs"
"github.com/Dreamacro/clash/component/ssr/protocol"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/outbound/shadowsocks.go | |
obfs "github.com/Dreamacro/clash/transport/simple-obfs"
"github.com/Dreamacro/clash/transport/socks5"
v2rayObfs "github.com/Dreamacro/clash/transport/v2ray-plugin" | <mask> "github.com/Dreamacro/clash/component/dialer"
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> "github.com/Dreamacro/go-shadowsocks2/core"
<mask> )
<mask>
<mask> type ShadowSocks struct {
</s> Chore: split component to transport </s> remove obfs "github.com/Dreamacro/clash/component/simple-obfs"
"github.com/Dreamacro/clash/component/socks5"
v2rayObfs "github.com/Dreamacro/clash/component/v2ray-plugin"
</s> add </s> remove "github.com/Dreamacro/clash/component/ssr/obfs"
"github.com/Dreamacro/clash/component/ssr/protocol"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/outbound/shadowsocks.go |
<mask> "net"
<mask> "strconv"
<mask>
<mask> "github.com/Dreamacro/clash/component/dialer"
<mask> "github.com/Dreamacro/clash/component/ssr/obfs"
<mask> "github.com/Dreamacro/clash/component/ssr/protocol"
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> "github.com/Dreamacro/go-shadowsocks2/core"
<mask> "github.com/Dreamacro/go-shadowsocks2/shadowaead"
<mask> "github.com/Dreamacro/go-shadowsocks2/shadowstream"
</s> Chore: split component to transport </s> remove obfs "github.com/Dreamacro/clash/component/simple-obfs"
"github.com/Dreamacro/clash/component/socks5"
v2rayObfs "github.com/Dreamacro/clash/component/v2ray-plugin"
</s> add </s> remove "github.com/Dreamacro/clash/component/gun"
"github.com/Dreamacro/clash/component/trojan"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/outbound/shadowsocksr.go | |
"github.com/Dreamacro/clash/transport/ssr/obfs"
"github.com/Dreamacro/clash/transport/ssr/protocol" | <mask> "strconv"
<mask>
<mask> "github.com/Dreamacro/clash/component/dialer"
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> "github.com/Dreamacro/go-shadowsocks2/core"
<mask> "github.com/Dreamacro/go-shadowsocks2/shadowaead"
<mask> "github.com/Dreamacro/go-shadowsocks2/shadowstream"
<mask> )
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/ssr/obfs"
"github.com/Dreamacro/clash/component/ssr/protocol"
</s> add </s> remove obfs "github.com/Dreamacro/clash/component/simple-obfs"
"github.com/Dreamacro/clash/component/socks5"
v2rayObfs "github.com/Dreamacro/clash/component/v2ray-plugin"
</s> add </s> remove "github.com/Dreamacro/clash/component/gun"
"github.com/Dreamacro/clash/component/trojan"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/outbound/shadowsocksr.go |
<mask> "strconv"
<mask>
<mask> "github.com/Dreamacro/clash/common/structure"
<mask> "github.com/Dreamacro/clash/component/dialer"
<mask> obfs "github.com/Dreamacro/clash/component/simple-obfs"
<mask> "github.com/Dreamacro/clash/component/snell"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> type Snell struct {
<mask> *Base
</s> Chore: split component to transport </s> remove obfs "github.com/Dreamacro/clash/component/simple-obfs"
"github.com/Dreamacro/clash/component/socks5"
v2rayObfs "github.com/Dreamacro/clash/component/v2ray-plugin"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/outbound/snell.go | |
obfs "github.com/Dreamacro/clash/transport/simple-obfs"
"github.com/Dreamacro/clash/transport/snell" | <mask>
<mask> "github.com/Dreamacro/clash/common/structure"
<mask> "github.com/Dreamacro/clash/component/dialer"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> type Snell struct {
<mask> *Base
<mask> psk []byte
<mask> pool *snell.Pool
</s> Chore: split component to transport </s> remove obfs "github.com/Dreamacro/clash/component/simple-obfs"
"github.com/Dreamacro/clash/component/snell"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove obfs "github.com/Dreamacro/clash/component/simple-obfs"
"github.com/Dreamacro/clash/component/socks5"
v2rayObfs "github.com/Dreamacro/clash/component/v2ray-plugin"
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/outbound/snell.go |
<mask> "net"
<mask> "strconv"
<mask>
<mask> "github.com/Dreamacro/clash/component/dialer"
<mask> "github.com/Dreamacro/clash/component/socks5"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> type Socks5 struct {
<mask> *Base
</s> Chore: split component to transport </s> remove obfs "github.com/Dreamacro/clash/component/simple-obfs"
"github.com/Dreamacro/clash/component/snell"
</s> add </s> remove "github.com/Dreamacro/clash/component/gun"
"github.com/Dreamacro/clash/component/trojan"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/outbound/socks5.go | |
"github.com/Dreamacro/clash/transport/socks5" | <mask> "github.com/Dreamacro/clash/component/dialer"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> type Socks5 struct {
<mask> *Base
<mask> user string
<mask> pass string
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/outbound/socks5.go |
<mask> "net"
<mask> "strconv"
<mask>
<mask> "github.com/Dreamacro/clash/component/dialer"
<mask> "github.com/Dreamacro/clash/component/gun"
<mask> "github.com/Dreamacro/clash/component/trojan"
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> "golang.org/x/net/http2"
<mask> )
<mask>
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/gun"
</s> add </s> remove "github.com/Dreamacro/clash/component/vmess"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/outbound/trojan.go | |
"github.com/Dreamacro/clash/transport/gun"
"github.com/Dreamacro/clash/transport/trojan" | <mask>
<mask> "github.com/Dreamacro/clash/component/dialer"
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> "golang.org/x/net/http2"
<mask> )
<mask>
<mask> type Trojan struct {
<mask> *Base
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/vmess"
</s> add </s> remove obfs "github.com/Dreamacro/clash/component/simple-obfs"
"github.com/Dreamacro/clash/component/snell"
</s> add </s> remove "github.com/Dreamacro/clash/component/gun"
"github.com/Dreamacro/clash/component/trojan"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/outbound/trojan.go |
<mask> "sync"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/component/resolver"
<mask> "github.com/Dreamacro/clash/component/socks5"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> const (
<mask> tcpTimeout = 5 * time.Second
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add "github.com/Dreamacro/clash/transport/socks5" </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/vmess"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/outbound/util.go | |
"github.com/Dreamacro/clash/transport/socks5" | <mask>
<mask> "github.com/Dreamacro/clash/component/resolver"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> )
<mask>
<mask> const (
<mask> tcpTimeout = 5 * time.Second
<mask> )
<mask>
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add "github.com/Dreamacro/clash/transport/socks5" </s> remove "github.com/Dreamacro/clash/component/vmess"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/outbound/util.go |
<mask> "strconv"
<mask> "strings"
<mask>
<mask> "github.com/Dreamacro/clash/component/dialer"
<mask> "github.com/Dreamacro/clash/component/gun"
<mask> "github.com/Dreamacro/clash/component/resolver"
<mask> "github.com/Dreamacro/clash/component/vmess"
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> "golang.org/x/net/http2"
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/vmess"
</s> add </s> remove "github.com/Dreamacro/clash/component/gun"
"github.com/Dreamacro/clash/component/trojan"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/outbound/vmess.go | |
<mask>
<mask> "github.com/Dreamacro/clash/component/dialer"
<mask> "github.com/Dreamacro/clash/component/gun"
<mask> "github.com/Dreamacro/clash/component/resolver"
<mask> "github.com/Dreamacro/clash/component/vmess"
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> "golang.org/x/net/http2"
<mask> )
<mask>
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/gun"
</s> add </s> remove "github.com/Dreamacro/clash/component/gun"
"github.com/Dreamacro/clash/component/trojan"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/outbound/vmess.go | |
"github.com/Dreamacro/clash/transport/gun"
"github.com/Dreamacro/clash/transport/vmess" | <mask> "github.com/Dreamacro/clash/component/resolver"
<mask> C "github.com/Dreamacro/clash/constant"
<mask>
<mask> "golang.org/x/net/http2"
<mask> )
<mask>
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/vmess"
</s> add </s> remove "github.com/Dreamacro/clash/component/gun"
</s> add </s> remove "github.com/Dreamacro/clash/component/gun"
"github.com/Dreamacro/clash/component/trojan"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | adapters/outbound/vmess.go |
<mask> "net"
<mask> "time"
<mask>
<mask> "github.com/Dreamacro/clash/common/cache"
<mask> "github.com/Dreamacro/clash/component/socks5"
<mask> "github.com/Dreamacro/clash/log"
<mask>
<mask> "github.com/Dreamacro/clash/proxy/http"
<mask> "github.com/Dreamacro/clash/proxy/socks"
<mask> )
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | proxy/mixed/mixed.go | |
"github.com/Dreamacro/clash/transport/socks5" | <mask> "github.com/Dreamacro/clash/proxy/http"
<mask> "github.com/Dreamacro/clash/proxy/socks"
<mask> )
<mask>
<mask> type MixedListener struct {
<mask> net.Listener
<mask> address string
<mask> closed bool
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | proxy/mixed/mixed.go |
"github.com/Dreamacro/clash/transport/socks5" | <mask> "net"
<mask> "syscall"
<mask> "unsafe"
<mask>
<mask> "github.com/Dreamacro/clash/component/socks5"
<mask> )
<mask>
<mask> func parserPacket(c net.Conn) (socks5.Addr, error) {
<mask> const (
<mask> PfInout = 0
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add "github.com/Dreamacro/clash/transport/socks5" </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | proxy/redir/tcp_darwin.go |
<mask> import (
<mask> "net"
<mask>
<mask> "github.com/Dreamacro/clash/adapters/inbound"
<mask> "github.com/Dreamacro/clash/component/socks5"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/log"
<mask> "github.com/Dreamacro/clash/tunnel"
<mask> )
<mask>
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | proxy/redir/tproxy.go | |
"github.com/Dreamacro/clash/transport/socks5" | <mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/log"
<mask> "github.com/Dreamacro/clash/tunnel"
<mask> )
<mask>
<mask> type TProxyListener struct {
<mask> net.Listener
<mask> address string
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | proxy/redir/tproxy.go |
<mask> "net"
<mask>
<mask> adapters "github.com/Dreamacro/clash/adapters/inbound"
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> "github.com/Dreamacro/clash/component/socks5"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/tunnel"
<mask> )
<mask>
<mask> type RedirUDPListener struct {
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | proxy/redir/udp.go | |
"github.com/Dreamacro/clash/transport/socks5" | <mask> adapters "github.com/Dreamacro/clash/adapters/inbound"
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/tunnel"
<mask> )
<mask>
<mask> type RedirUDPListener struct {
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | proxy/redir/udp.go |
<mask> "io/ioutil"
<mask> "net"
<mask>
<mask> adapters "github.com/Dreamacro/clash/adapters/inbound"
<mask> "github.com/Dreamacro/clash/component/socks5"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/log"
<mask> authStore "github.com/Dreamacro/clash/proxy/auth"
<mask> "github.com/Dreamacro/clash/tunnel"
<mask> )
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | proxy/socks/tcp.go | |
"github.com/Dreamacro/clash/transport/socks5" | <mask> adapters "github.com/Dreamacro/clash/adapters/inbound"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/log"
<mask> authStore "github.com/Dreamacro/clash/proxy/auth"
<mask> "github.com/Dreamacro/clash/tunnel"
<mask> )
<mask>
<mask> type SockListener struct {
<mask> net.Listener
<mask> address string
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | proxy/socks/tcp.go |
<mask>
<mask> adapters "github.com/Dreamacro/clash/adapters/inbound"
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> "github.com/Dreamacro/clash/common/sockopt"
<mask> "github.com/Dreamacro/clash/component/socks5"
<mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/log"
<mask> "github.com/Dreamacro/clash/tunnel"
<mask> )
<mask>
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | proxy/socks/udp.go | |
"github.com/Dreamacro/clash/transport/socks5" | <mask> C "github.com/Dreamacro/clash/constant"
<mask> "github.com/Dreamacro/clash/log"
<mask> "github.com/Dreamacro/clash/tunnel"
<mask> )
<mask>
<mask> type SockUDPListener struct {
<mask> net.PacketConn
<mask> address string
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | proxy/socks/udp.go |
"github.com/Dreamacro/clash/transport/socks5" | <mask> import (
<mask> "net"
<mask>
<mask> "github.com/Dreamacro/clash/common/pool"
<mask> "github.com/Dreamacro/clash/component/socks5"
<mask> )
<mask>
<mask> type packet struct {
<mask> pc net.PacketConn
<mask> rAddr net.Addr
</s> Chore: split component to transport </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add </s> remove "github.com/Dreamacro/clash/component/socks5"
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f96ebab99f21004c0f4d2e723ce2be23a8e326f7 | proxy/socks/utils.go |
// LastDelay return last history record. if proxy is not alive, return the max value of int16. | <mask> return histories
<mask> }
<mask>
<mask> func (p *Proxy) LastDelay() (delay uint16) {
<mask> var max uint16 = 0xffff
<mask> if !p.alive {
<mask> return max
<mask> }
</s> Fix: fallback & url-test lose efficacy </s> remove delay--
return
</s> add return max </s> remove delay--
return
</s> add return max </s> remove instance, err := p.ProxyAdapter.Dial(&addr)
</s> add instance, err := p.Dial(&addr) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f99da37168ac2662d4294e391fe9d8db4a5e55fc | adapters/outbound/base.go |
var max uint16 = 0xffff
if !p.alive {
return max
}
| <mask> }
<mask>
<mask> // LastDelay return last history record. if proxy is not alive, return the max value of int16.
<mask> func (p *Proxy) LastDelay() (delay uint16) {
<mask> head := p.history.First()
<mask> if head == nil {
<mask> return max
<mask> }
<mask> history := head.(C.DelayHistory)
<mask> if history.Delay == 0 {
</s> Fix: fallback & url-test lose efficacy </s> remove delay--
return
</s> add return max </s> remove delay--
return
</s> add return max </s> remove instance, err := p.ProxyAdapter.Dial(&addr)
</s> add instance, err := p.Dial(&addr) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f99da37168ac2662d4294e391fe9d8db4a5e55fc | adapters/outbound/base.go |
return max | <mask>
<mask> func (p *Proxy) LastDelay() (delay uint16) {
<mask> head := p.history.First()
<mask> if head == nil {
<mask> delay--
<mask> return
<mask> }
<mask> history := head.(C.DelayHistory)
<mask> if history.Delay == 0 {
<mask> delay--
<mask> return
</s> Fix: fallback & url-test lose efficacy </s> remove delay--
return
</s> add return max </s> remove instance, err := p.ProxyAdapter.Dial(&addr)
</s> add instance, err := p.Dial(&addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f99da37168ac2662d4294e391fe9d8db4a5e55fc | adapters/outbound/base.go |
return max | <mask> return
<mask> }
<mask> history := head.(C.DelayHistory)
<mask> if history.Delay == 0 {
<mask> delay--
<mask> return
<mask> }
<mask> return history.Delay
<mask> }
<mask>
<mask> func (p *Proxy) MarshalJSON() ([]byte, error) {
</s> Fix: fallback & url-test lose efficacy </s> remove delay--
return
</s> add return max </s> remove instance, err := p.ProxyAdapter.Dial(&addr)
</s> add instance, err := p.Dial(&addr) | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f99da37168ac2662d4294e391fe9d8db4a5e55fc | adapters/outbound/base.go |
instance, err := p.Dial(&addr) | <mask> return
<mask> }
<mask>
<mask> start := time.Now()
<mask> instance, err := p.ProxyAdapter.Dial(&addr)
<mask> if err != nil {
<mask> return
<mask> }
<mask> defer instance.Close()
<mask> transport := &http.Transport{
</s> Fix: fallback & url-test lose efficacy </s> remove delay--
return
</s> add return max </s> remove delay--
return
</s> add return max | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f99da37168ac2662d4294e391fe9d8db4a5e55fc | adapters/outbound/base.go |
rmark: option.RoutingMark, | <mask> addr: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
<mask> tp: C.Http,
<mask> iface: option.Interface,
<mask> },
<mask> user: option.UserName,
<mask> pass: option.Password,
<mask> tlsConfig: tlsConfig,
</s> Fix: routing-mark option doesn't work on proxies (#2028) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f9cc1cc3630015687a3a3fa5a6d07d1d7700bbc3 | adapter/outbound/http.go |
rmark: option.RoutingMark, | <mask> addr: addr,
<mask> tp: C.Shadowsocks,
<mask> udp: option.UDP,
<mask> iface: option.Interface,
<mask> },
<mask> cipher: ciph,
<mask>
<mask> obfsMode: obfsMode,
</s> Fix: routing-mark option doesn't work on proxies (#2028) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f9cc1cc3630015687a3a3fa5a6d07d1d7700bbc3 | adapter/outbound/shadowsocks.go |
rmark: option.RoutingMark, | <mask> addr: addr,
<mask> tp: C.ShadowsocksR,
<mask> udp: option.UDP,
<mask> iface: option.Interface,
<mask> },
<mask> cipher: coreCiph,
<mask> obfs: obfs,
<mask> protocol: protocol,
</s> Fix: routing-mark option doesn't work on proxies (#2028) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f9cc1cc3630015687a3a3fa5a6d07d1d7700bbc3 | adapter/outbound/shadowsocksr.go |
rmark: option.RoutingMark, | <mask> tp: C.Snell,
<mask> udp: option.UDP,
<mask> iface: option.Interface,
<mask> },
<mask> psk: psk,
<mask> obfsOption: obfsOption,
<mask> version: option.Version,
</s> Fix: routing-mark option doesn't work on proxies (#2028) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f9cc1cc3630015687a3a3fa5a6d07d1d7700bbc3 | adapter/outbound/snell.go |
rmark: option.RoutingMark, | <mask> tp: C.Socks5,
<mask> udp: option.UDP,
<mask> iface: option.Interface,
<mask> },
<mask> user: option.UserName,
<mask> pass: option.Password,
<mask> tls: option.TLS,
<mask> skipCertVerify: option.SkipCertVerify,
</s> Fix: routing-mark option doesn't work on proxies (#2028) | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f9cc1cc3630015687a3a3fa5a6d07d1d7700bbc3 | adapter/outbound/socks5.go |
rmark: option.RoutingMark, | <mask> addr: addr,
<mask> tp: C.Trojan,
<mask> udp: option.UDP,
<mask> iface: option.Interface,
<mask> },
<mask> instance: trojan.New(tOption),
<mask> option: &option,
<mask> }
<mask>
<mask> if option.Network == "grpc" {
</s> Fix: routing-mark option doesn't work on proxies (#2028) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f9cc1cc3630015687a3a3fa5a6d07d1d7700bbc3 | adapter/outbound/trojan.go |
rmark: option.RoutingMark, | <mask> addr: net.JoinHostPort(option.Server, strconv.Itoa(option.Port)),
<mask> tp: C.Vmess,
<mask> udp: option.UDP,
<mask> iface: option.Interface,
<mask> },
<mask> client: client,
<mask> option: &option,
<mask> }
<mask>
</s> Fix: routing-mark option doesn't work on proxies (#2028) | [
"keep",
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/f9cc1cc3630015687a3a3fa5a6d07d1d7700bbc3 | adapter/outbound/vmess.go |
DNS rawDNS `yaml:"dns"` | <mask> LogLevel log.LogLevel `yaml:"log-level"`
<mask> ExternalController string `yaml:"external-controller"`
<mask> Secret string `yaml:"secret"`
<mask>
<mask> DNS *rawDNS `yaml:"dns"`
<mask> Proxy []map[string]interface{} `yaml:"Proxy"`
<mask> ProxyGroup []map[string]interface{} `yaml:"Proxy Group"`
<mask> Rule []string `yaml:"Rule"`
<mask> }
<mask>
</s> Fix: dns crash & remove unused debug log </s> remove func parseDNS(cfg *rawDNS) (*DNS, error) {
</s> add func parseDNS(cfg rawDNS) (*DNS, error) { </s> remove } else {
log.Debugln("[DNS] unknown%#v", metadata)
</s> add </s> remove DNS: &rawDNS{
</s> add DNS: rawDNS{ </s> remove log.Debugln("%#v", servers)
</s> add </s> remove println(config.EnhancedMode)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/fa9077969c917c5d1f753d5b1e831ea29451cdf3 | config/config.go |
DNS: rawDNS{ | <mask> LogLevel: log.INFO,
<mask> Rule: []string{},
<mask> Proxy: []map[string]interface{}{},
<mask> ProxyGroup: []map[string]interface{}{},
<mask> DNS: &rawDNS{
<mask> Enable: false,
<mask> },
<mask> }
<mask> err = yaml.Unmarshal([]byte(data), &rawConfig)
<mask> return rawConfig, err
</s> Fix: dns crash & remove unused debug log </s> remove log.Debugln("%#v", servers)
</s> add </s> remove func parseDNS(cfg *rawDNS) (*DNS, error) {
</s> add func parseDNS(cfg rawDNS) (*DNS, error) { </s> remove } else {
log.Debugln("[DNS] unknown%#v", metadata)
</s> add </s> remove println(config.EnhancedMode)
</s> add </s> remove DNS *rawDNS `yaml:"dns"`
</s> add DNS rawDNS `yaml:"dns"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/fa9077969c917c5d1f753d5b1e831ea29451cdf3 | config/config.go |
<mask> }
<mask>
<mask> func parseNameServer(servers []string) ([]dns.NameServer, error) {
<mask> nameservers := []dns.NameServer{}
<mask> log.Debugln("%#v", servers)
<mask>
<mask> for idx, server := range servers {
<mask> // parse without scheme .e.g 8.8.8.8:53
<mask> if host, err := hostWithDefaultPort(server, "53"); err == nil {
<mask> nameservers = append(
</s> Fix: dns crash & remove unused debug log </s> remove func parseDNS(cfg *rawDNS) (*DNS, error) {
</s> add func parseDNS(cfg rawDNS) (*DNS, error) { </s> remove DNS: &rawDNS{
</s> add DNS: rawDNS{ </s> remove } else {
log.Debugln("[DNS] unknown%#v", metadata)
</s> add </s> remove println(config.EnhancedMode)
</s> add </s> remove DNS *rawDNS `yaml:"dns"`
</s> add DNS rawDNS `yaml:"dns"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/fa9077969c917c5d1f753d5b1e831ea29451cdf3 | config/config.go | |
func parseDNS(cfg rawDNS) (*DNS, error) { | <mask>
<mask> return nameservers, nil
<mask> }
<mask>
<mask> func parseDNS(cfg *rawDNS) (*DNS, error) {
<mask> if cfg.Enable && len(cfg.NameServer) == 0 {
<mask> return nil, fmt.Errorf("If DNS configuration is turned on, NameServer cannot be empty")
<mask> }
<mask>
<mask> dnsCfg := &DNS{
</s> Fix: dns crash & remove unused debug log </s> remove log.Debugln("%#v", servers)
</s> add </s> remove } else {
log.Debugln("[DNS] unknown%#v", metadata)
</s> add </s> remove DNS: &rawDNS{
</s> add DNS: rawDNS{ </s> remove DNS *rawDNS `yaml:"dns"`
</s> add DNS rawDNS `yaml:"dns"` </s> remove println(config.EnhancedMode)
</s> add | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/fa9077969c917c5d1f753d5b1e831ea29451cdf3 | config/config.go |
<mask> once.Do(func() {
<mask> mmdb, _ = geoip2.Open(C.Path.MMDB())
<mask> })
<mask>
<mask> println(config.EnhancedMode)
<mask>
<mask> r := &Resolver{
<mask> main: transform(config.Main),
<mask> ipv6: config.IPv6,
<mask> cache: cache.New(time.Second * 60),
<mask> mapping: config.EnhancedMode == MAPPING,
</s> Fix: dns crash & remove unused debug log </s> remove } else {
log.Debugln("[DNS] unknown%#v", metadata)
</s> add </s> remove log.Debugln("%#v", servers)
</s> add </s> remove func parseDNS(cfg *rawDNS) (*DNS, error) {
</s> add func parseDNS(cfg rawDNS) (*DNS, error) { </s> remove DNS: &rawDNS{
</s> add DNS: rawDNS{ </s> remove DNS *rawDNS `yaml:"dns"`
</s> add DNS rawDNS `yaml:"dns"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/fa9077969c917c5d1f753d5b1e831ea29451cdf3 | dns/client.go | |
<mask> } else {
<mask> log.Debugln("[DNS] %s --> %s", metadata.Host, ip.String())
<mask> metadata.IP = &ip
<mask> }
<mask> } else {
<mask> log.Debugln("[DNS] unknown%#v", metadata)
<mask> }
<mask>
<mask> var proxy C.Proxy
<mask> switch t.mode {
<mask> case Direct:
</s> Fix: dns crash & remove unused debug log </s> remove func parseDNS(cfg *rawDNS) (*DNS, error) {
</s> add func parseDNS(cfg rawDNS) (*DNS, error) { </s> remove log.Debugln("%#v", servers)
</s> add </s> remove DNS: &rawDNS{
</s> add DNS: rawDNS{ </s> remove println(config.EnhancedMode)
</s> add </s> remove DNS *rawDNS `yaml:"dns"`
</s> add DNS rawDNS `yaml:"dns"` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/fa9077969c917c5d1f753d5b1e831ea29451cdf3 | tunnel/tunnel.go | |
if parts[0] == "" {
return nil, false
}
return parts, true | <mask> }
<mask>
<mask> parts := strings.Split(domain, domainStep)
<mask> if len(parts) == 1 {
<mask> return nil, false
<mask> }
<mask>
<mask> for _, part := range parts[1:] {
<mask> if part == "" {
<mask> return nil, false
</s> Feature: add default hosts `localhost` | [
"keep",
"keep",
"keep",
"keep",
"replace",
"keep",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/fb628e9c62d2576aff3643d4ff30610a0a92c76f | component/trie/domain.go |
"localhost", | <mask> domains := []string{
<mask> "example.com",
<mask> "google.com",
<mask> }
<mask>
<mask> for _, domain := range domains {
<mask> tree.Insert(domain, localIP)
</s> Feature: add default hosts `localhost` </s> remove return nil, false
</s> add if parts[0] == "" {
return nil, false
}
return parts, true | [
"keep",
"keep",
"add",
"keep",
"keep",
"keep",
"keep"
] | https://github.com/Dreamacro/clash/commit/fb628e9c62d2576aff3643d4ff30610a0a92c76f | component/trie/domain_test.go |
Subsets and Splits
No community queries yet
The top public SQL queries from the community will appear here once available.