Update references to the SDK

fortuna · fortuna · commit b07941979f3e · 2023-08-07T18:21:37.000-04:00
diff --git a/client/client.go b/client/client.go
@@ -20,8 +20,8 @@ import (
 	"fmt"
 	"net"
 
-	"github.com/Jigsaw-Code/outline-internal-sdk/transport"
-	"github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks"
+	"github.com/Jigsaw-Code/outline-sdk/transport"
+	"github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"
 	onet "github.com/Jigsaw-Code/outline-ss-server/net"
 )
 
diff --git a/client/salt.go b/client/salt.go
@@ -15,7 +15,7 @@
 package client
 
 import (
-	"github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks"
+	"github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"
 )
 
 // Deprecated: Prefer github.com/Jigsaw-Code/outline-ss-server/shadowsocks/client.NewPrefixSaltGenerator
diff --git a/cmd/outline-ss-server/main.go b/cmd/outline-ss-server/main.go
@@ -26,8 +26,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/Jigsaw-Code/outline-internal-sdk/transport"
-	"github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks"
+	"github.com/Jigsaw-Code/outline-sdk/transport"
+	"github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"
 	"github.com/Jigsaw-Code/outline-ss-server/ipinfo"
 	"github.com/Jigsaw-Code/outline-ss-server/service"
 	"github.com/op/go-logging"
diff --git a/go.mod b/go.mod
@@ -1,7 +1,7 @@
 module github.com/Jigsaw-Code/outline-ss-server
 
 require (
-	github.com/Jigsaw-Code/outline-internal-sdk v0.0.0-20230522235223-1b323ea1d667
+	github.com/Jigsaw-Code/outline-sdk v0.0.2
 	github.com/goreleaser/goreleaser v1.18.2
 	github.com/op/go-logging v0.0.0-20160315200505-970db520ece7
 	github.com/oschwald/geoip2-golang v1.8.0
diff --git a/go.sum b/go.sum
@@ -508,8 +508,8 @@ github.com/DataDog/zstd v1.4.5 h1:EndNeuB0l9syBZhut0wns3gV1hL8zX8LIu6ZiVHWLIQ=
 github.com/GoogleCloudPlatform/cloudsql-proxy v1.33.2/go.mod h1:uqoR4sJc63p7ugW8a/vsEspOsNuehbi7ptS2CHCyOnY=
 github.com/HdrHistogram/hdrhistogram-go v1.1.0/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
 github.com/HdrHistogram/hdrhistogram-go v1.1.2/go.mod h1:yDgFjdqOqDEKOvasDdhWNXYg9BVp4O+o5f6V/ehm6Oo=
-github.com/Jigsaw-Code/outline-internal-sdk v0.0.0-20230522235223-1b323ea1d667 h1:msZNpaFAjRTvVi5q2yW1PJ4MmU4/7anob2IZYtDZQJw=
-github.com/Jigsaw-Code/outline-internal-sdk v0.0.0-20230522235223-1b323ea1d667/go.mod h1:vxtE3esaFy5UG6TnipLyWx0esUQBy9LBXHLQx+SoER8=
+github.com/Jigsaw-Code/outline-sdk v0.0.2 h1:uCuyJMaWj57IYEG/Hdml8YMdk9chU60ZkSxJXBhyGHU=
+github.com/Jigsaw-Code/outline-sdk v0.0.2/go.mod h1:hhlKz0+r9wSDFT8usvN8Zv/BFToCIFAUn1P2Qk8G2CM=
 github.com/Knetic/govaluate v3.0.1-0.20171022003610-9aa49832a739+incompatible/go.mod h1:r7JcOSlj0wfOMncg0iLm8Leh48TZaKVeNIfJntJ2wa0=
 github.com/Masterminds/goutils v1.1.1 h1:5nUrii3FMTL5diU80unEVvNevw1nH4+ZV4DSLVJLSYI=
 github.com/Masterminds/goutils v1.1.1/go.mod h1:8cTjp+g8YejhMuvIA5y2vz3BpJxksy863GQaJW2MFNU=
diff --git a/internal/integration_test/integration_test.go b/internal/integration_test/integration_test.go
@@ -23,8 +23,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Jigsaw-Code/outline-internal-sdk/transport"
-	"github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks"
+	"github.com/Jigsaw-Code/outline-sdk/transport"
+	"github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"
 	"github.com/Jigsaw-Code/outline-ss-server/ipinfo"
 	onet "github.com/Jigsaw-Code/outline-ss-server/net"
 	"github.com/Jigsaw-Code/outline-ss-server/service"
diff --git a/net/stream.go b/net/stream.go
@@ -17,7 +17,7 @@ package net
 import (
 	"io"
 
-	"github.com/Jigsaw-Code/outline-internal-sdk/transport"
+	"github.com/Jigsaw-Code/outline-sdk/transport"
 )
 
 type DuplexConn = transport.StreamConn
diff --git a/service/cipher_list.go b/service/cipher_list.go
@@ -19,7 +19,7 @@ import (
 	"net"
 	"sync"
 
-	"github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks"
+	"github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"
 )
 
 // Don't add a tag if it would reduce the salt entropy below this amount.
diff --git a/service/cipher_list_testing.go b/service/cipher_list_testing.go
@@ -18,7 +18,7 @@ import (
 	"container/list"
 	"fmt"
 
-	"github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks"
+	"github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"
 )
 
 // MakeTestCiphers creates a CipherList containing one fresh AEAD cipher
diff --git a/service/metrics/metrics.go b/service/metrics/metrics.go
@@ -17,7 +17,7 @@ package metrics
 import (
 	"io"
 
-	"github.com/Jigsaw-Code/outline-internal-sdk/transport"
+	"github.com/Jigsaw-Code/outline-sdk/transport"
 )
 
 type ProxyMetrics struct {
diff --git a/service/tcp.go b/service/tcp.go
@@ -26,8 +26,8 @@ import (
 	"syscall"
 	"time"
 
-	"github.com/Jigsaw-Code/outline-internal-sdk/transport"
-	"github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks"
+	"github.com/Jigsaw-Code/outline-sdk/transport"
+	"github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"
 	"github.com/Jigsaw-Code/outline-ss-server/ipinfo"
 	onet "github.com/Jigsaw-Code/outline-ss-server/net"
 	"github.com/Jigsaw-Code/outline-ss-server/service/metrics"
diff --git a/service/tcp_test.go b/service/tcp_test.go
@@ -25,8 +25,8 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Jigsaw-Code/outline-internal-sdk/transport"
-	"github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks"
+	"github.com/Jigsaw-Code/outline-sdk/transport"
+	"github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"
 	"github.com/Jigsaw-Code/outline-ss-server/ipinfo"
 	onet "github.com/Jigsaw-Code/outline-ss-server/net"
 	"github.com/Jigsaw-Code/outline-ss-server/service/metrics"
diff --git a/service/udp.go b/service/udp.go
@@ -22,7 +22,7 @@ import (
 	"sync"
 	"time"
 
-	"github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks"
+	"github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"
 	"github.com/Jigsaw-Code/outline-ss-server/ipinfo"
 	onet "github.com/Jigsaw-Code/outline-ss-server/net"
 	logging "github.com/op/go-logging"
diff --git a/service/udp_test.go b/service/udp_test.go
@@ -22,7 +22,7 @@ import (
 	"testing"
 	"time"
 
-	"github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks"
+	"github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"
 	"github.com/Jigsaw-Code/outline-ss-server/ipinfo"
 	onet "github.com/Jigsaw-Code/outline-ss-server/net"
 	logging "github.com/op/go-logging"

Original file line number	Diff line number	Diff line change
`@@ -20,8 +20,8 @@ import (`
`20`	`20`	`"fmt"`
`21`	`21`	`"net"`
`22`	`22`
`23`		`- "github.com/Jigsaw-Code/outline-internal-sdk/transport"`
`24`		`- "github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks"`
	`23`	`+ "github.com/Jigsaw-Code/outline-sdk/transport"`
	`24`	`+ "github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"`
`25`	`25`	`onet "github.com/Jigsaw-Code/outline-ss-server/net"`
`26`	`26`	`)`
`27`	`27`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`package client`
`16`	`16`
`17`	`17`	`import (`
`18`		`- "github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks"`
	`18`	`+ "github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"`
`19`	`19`	`)`
`20`	`20`
`21`	`21`	`// Deprecated: Prefer github.com/Jigsaw-Code/outline-ss-server/shadowsocks/client.NewPrefixSaltGenerator`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ package net`
`17`	`17`	`import (`
`18`	`18`	`"io"`
`19`	`19`
`20`		`- "github.com/Jigsaw-Code/outline-internal-sdk/transport"`
	`20`	`+ "github.com/Jigsaw-Code/outline-sdk/transport"`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`type DuplexConn = transport.StreamConn`
Original file line number	Diff line number	Diff line change
`@@ -19,7 +19,7 @@ import (`
`19`	`19`	`"net"`
`20`	`20`	`"sync"`
`21`	`21`
`22`		`- "github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks"`
	`22`	`+ "github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"`
`23`	`23`	`)`
`24`	`24`
`25`	`25`	`// Don't add a tag if it would reduce the salt entropy below this amount.`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ import (`
`18`	`18`	`"container/list"`
`19`	`19`	`"fmt"`
`20`	`20`
`21`		`- "github.com/Jigsaw-Code/outline-internal-sdk/transport/shadowsocks"`
	`21`	`+ "github.com/Jigsaw-Code/outline-sdk/transport/shadowsocks"`
`22`	`22`	`)`
`23`	`23`
`24`	`24`	`// MakeTestCiphers creates a CipherList containing one fresh AEAD cipher`
Original file line number	Diff line number	Diff line change
`@@ -17,7 +17,7 @@ package metrics`
`17`	`17`	`import (`
`18`	`18`	`"io"`
`19`	`19`
`20`		`- "github.com/Jigsaw-Code/outline-internal-sdk/transport"`
	`20`	`+ "github.com/Jigsaw-Code/outline-sdk/transport"`
`21`	`21`	`)`
`22`	`22`
`23`	`23`	`type ProxyMetrics struct {`