Skip to content

Commit

Permalink
Switch to jsnjack/fhttp
Browse files Browse the repository at this point in the history
  • Loading branch information
jsnjack committed Apr 17, 2023
1 parent eb8fe79 commit 70a3364
Show file tree
Hide file tree
Showing 21 changed files with 32 additions and 32 deletions.
2 changes: 1 addition & 1 deletion Readme.md
Original file line number Diff line number Diff line change
Expand Up @@ -50,7 +50,7 @@ import (
"io"
"log"

http "github.com/bogdanfinn/fhttp"
http "github.com/jsnjack/fhttp"
tls_client "github.com/jsnjack/tls-client"
)

Expand Down
2 changes: 1 addition & 1 deletion cffi_dist/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ import (
"sync"
"unsafe"

http "github.com/bogdanfinn/fhttp"
"github.com/google/uuid"
http "github.com/jsnjack/fhttp"
tls_client_cffi_src "github.com/jsnjack/tls-client/cffi_src"
)

Expand Down
8 changes: 4 additions & 4 deletions cffi_src/factory.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@ import (
"os"
"sync"

http "github.com/bogdanfinn/fhttp"
"github.com/bogdanfinn/fhttp/cookiejar"
"github.com/bogdanfinn/fhttp/http2"
tls "github.com/bogdanfinn/utls"
"github.com/google/uuid"
"github.com/jsnjack/tls-client"
http "github.com/jsnjack/fhttp"
"github.com/jsnjack/fhttp/cookiejar"
"github.com/jsnjack/fhttp/http2"
tls_client "github.com/jsnjack/tls-client"
)

var clientsLock = sync.Mutex{}
Expand Down
2 changes: 1 addition & 1 deletion cffi_src/types.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"fmt"
"time"

http "github.com/bogdanfinn/fhttp"
http "github.com/jsnjack/fhttp"
)

type TLSClientError struct {
Expand Down
4 changes: 2 additions & 2 deletions client.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,8 +12,8 @@ import (
"sync"
"time"

http "github.com/bogdanfinn/fhttp"
"github.com/bogdanfinn/fhttp/httputil"
http "github.com/jsnjack/fhttp"
"github.com/jsnjack/fhttp/httputil"
"golang.org/x/net/proxy"
)

Expand Down
2 changes: 1 addition & 1 deletion client_options.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ import (
"fmt"
"time"

http "github.com/bogdanfinn/fhttp"
http "github.com/jsnjack/fhttp"
)

type HttpClientOption func(config *httpClientConfig)
Expand Down
4 changes: 2 additions & 2 deletions connect.go
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,10 @@ import (
"sync"
"time"

http "github.com/bogdanfinn/fhttp"
http "github.com/jsnjack/fhttp"
"golang.org/x/net/proxy"

"github.com/bogdanfinn/fhttp/http2"
"github.com/jsnjack/fhttp/http2"
)

type directDialer struct {
Expand Down
2 changes: 1 addition & 1 deletion custom_profiles.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,8 +3,8 @@ package tls_client
import (
"math"

"github.com/bogdanfinn/fhttp/http2"
tls "github.com/bogdanfinn/utls"
"github.com/jsnjack/fhttp/http2"
)

var ZalandoAndroidMobile = ClientProfile{
Expand Down
4 changes: 2 additions & 2 deletions example/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,9 +11,9 @@ import (
"path/filepath"
"strings"

http "github.com/bogdanfinn/fhttp"
"github.com/bogdanfinn/fhttp/http2"
tls "github.com/bogdanfinn/utls"
http "github.com/jsnjack/fhttp"
"github.com/jsnjack/fhttp/http2"
tls_client "github.com/jsnjack/tls-client"
"github.com/jsnjack/tls-client/shared"
)
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
Expand Up @@ -3,9 +3,9 @@ module github.com/jsnjack/tls-client
go 1.18

require (
github.com/bogdanfinn/fhttp v0.5.20
github.com/bogdanfinn/utls v1.5.16
github.com/google/uuid v1.3.0
github.com/jsnjack/fhttp v0.0.0-20230417132824-bc330ec44090
github.com/stretchr/testify v1.8.0
github.com/tam7t/hpkp v0.0.0-20160821193359-2b70b4024ed5
golang.org/x/net v0.1.0
Expand All @@ -24,4 +24,4 @@ require (

// replace github.com/bogdanfinn/utls => ../utls

// replace github.com/bogdanfinn/fhttp => ../fhttp
// replace github.com/jsnjack/fhttp => ../fhttp
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,14 +1,14 @@
github.com/andybalholm/brotli v1.0.4 h1:V7DdXeJtZscaqfNuAdSRuRFzuiKlHSC/Zh3zl9qY3JY=
github.com/andybalholm/brotli v1.0.4/go.mod h1:fO7iG3H7G2nSZ7m0zPUDn85XEX2GTukHGRSepvi9Eig=
github.com/bogdanfinn/fhttp v0.5.20 h1:joQrA0tVFBQNQ8BbKRmIM972GfawXA+qbCRQlX6dauQ=
github.com/bogdanfinn/fhttp v0.5.20/go.mod h1:brqi5woc5eSCVHdKYBV8aZLbO7HGqpwyDLeXW+fT18I=
github.com/bogdanfinn/utls v1.5.16 h1:NhhWkegEcYETBMj9nvgO4lwvc6NcLH+znrXzO3gnw4M=
github.com/bogdanfinn/utls v1.5.16/go.mod h1:mHeRCi69cUiEyVBkKONB1cAbLjRcZnlJbGzttmiuK4o=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/google/uuid v1.3.0 h1:t6JiXgmwXMjEs8VusXIJk2BXHsn+wx8BZdTaoZ5fu7I=
github.com/google/uuid v1.3.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
github.com/jsnjack/fhttp v0.0.0-20230417132824-bc330ec44090 h1:kV9f8tQwvVbqzhISVq+bjYL2B3JiyXPVBABSzOY3h3g=
github.com/jsnjack/fhttp v0.0.0-20230417132824-bc330ec44090/go.mod h1:aexubTMMb3ZqgGFzMNOJdCYkgRmO31S95jTU+kVAoO8=
github.com/klauspost/compress v1.15.12 h1:YClS/PImqYbn+UILDnqxQCZ3RehC9N318SU3kElDUEM=
github.com/klauspost/compress v1.15.12/go.mod h1:QPwzmACJjUTFsnSHH934V6woptycfrDDJnH7hvFVbGM=
github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
Expand Down
4 changes: 2 additions & 2 deletions jar.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"strings"
"sync"

http "github.com/bogdanfinn/fhttp"
"github.com/bogdanfinn/fhttp/cookiejar"
http "github.com/jsnjack/fhttp"
"github.com/jsnjack/fhttp/cookiejar"
)

type CookieJarOption func(config *cookieJarConfig)
Expand Down
2 changes: 1 addition & 1 deletion mapper.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package tls_client

import (
"github.com/bogdanfinn/fhttp/http2"
tls "github.com/bogdanfinn/utls"
"github.com/jsnjack/fhttp/http2"
)

var H2SettingsMap = map[string]http2.SettingID{
Expand Down
2 changes: 1 addition & 1 deletion pinner.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,8 @@ import (
"errors"
"fmt"

http "github.com/bogdanfinn/fhttp"
tls "github.com/bogdanfinn/utls"
http "github.com/jsnjack/fhttp"
"github.com/tam7t/hpkp"
)

Expand Down
2 changes: 1 addition & 1 deletion profiles.go
Original file line number Diff line number Diff line change
@@ -1,8 +1,8 @@
package tls_client

import (
"github.com/bogdanfinn/fhttp/http2"
tls "github.com/bogdanfinn/utls"
"github.com/jsnjack/fhttp/http2"
)

var DefaultClientProfile = Chrome_112
Expand Down
4 changes: 2 additions & 2 deletions roundtripper.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,8 +8,8 @@ import (
"strings"
"sync"

http "github.com/bogdanfinn/fhttp"
"github.com/bogdanfinn/fhttp/http2"
http "github.com/jsnjack/fhttp"
"github.com/jsnjack/fhttp/http2"
"golang.org/x/net/proxy"

utls "github.com/bogdanfinn/utls"
Expand Down
2 changes: 1 addition & 1 deletion tests/client_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,8 @@ import (
"testing"
"time"

http "github.com/bogdanfinn/fhttp"
tls "github.com/bogdanfinn/utls"
http "github.com/jsnjack/fhttp"
tls_client "github.com/jsnjack/tls-client"
"github.com/jsnjack/tls-client/shared"
)
Expand Down
2 changes: 1 addition & 1 deletion tests/cookie_jar_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"net/url"
"testing"

http "github.com/bogdanfinn/fhttp"
http "github.com/jsnjack/fhttp"
tls_client "github.com/jsnjack/tls-client"
"github.com/stretchr/testify/assert"
)
Expand Down
2 changes: 1 addition & 1 deletion tests/header_order_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@ import (
"io"
"testing"

http "github.com/bogdanfinn/fhttp"
http "github.com/jsnjack/fhttp"
tls_client "github.com/jsnjack/tls-client"
"github.com/jsnjack/tls-client/shared"
"github.com/stretchr/testify/assert"
Expand Down
2 changes: 1 addition & 1 deletion tests/random_extension_order_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@ import (
"strings"
"testing"

http "github.com/bogdanfinn/fhttp"
http "github.com/jsnjack/fhttp"
tls_client "github.com/jsnjack/tls-client"
"github.com/jsnjack/tls-client/shared"
"github.com/stretchr/testify/assert"
Expand Down
4 changes: 2 additions & 2 deletions tests/redirect_and_timeout_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@ import (
"testing"
"time"

http "github.com/bogdanfinn/fhttp"
"github.com/bogdanfinn/fhttp/httptest"
http "github.com/jsnjack/fhttp"
"github.com/jsnjack/fhttp/httptest"
tls_client "github.com/jsnjack/tls-client"
"github.com/stretchr/testify/assert"
)
Expand Down

0 comments on commit 70a3364

Please sign in to comment.