Skip to content

Dependabot/gorilla/websocket #1420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
leild wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Dependabot/gorilla/websocket #1420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
c9cb86a
first commit
leild Jun 19, 2023
9e19505
sec commit
leild Jun 19, 2023
e2fab28
更新/x/net
Konrlld Jul 11, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
16 changes: 4 additions & 12 deletions client/watch.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@ package client

import (
"context"
"encoding/json"
"fmt"
"log"

pb "github.com/go-chassis/cari/discovery"
"github.com/go-chassis/cari/pkg/errsvc"
"github.com/gorilla/websocket"
"golang/x/net/websocket"
)

const (
Expand All @@ -42,20 +41,13 @@ func (c *Client) Watch(ctx context.Context, domain, project, selfServiceID strin
}

for {
messageType, message, err := conn.ReadMessage()
var message string
err := websocket.JSON.Receive(conn, &message)
if err != nil {
log.Println(err)
break
}
if messageType == websocket.TextMessage {
data := &pb.WatchInstanceResponse{}
err := json.Unmarshal(message, data)
if err != nil {
log.Println(err)
break
}
callback(data)
}
callback(message)
}
return pb.NewError(pb.ErrInternal, err.Error())
}
7 changes: 4 additions & 3 deletions client/websocket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,13 +24,14 @@ import (
"net/http"
"net/url"

"github.com/gorilla/websocket"
"golang.org/x/net/websocket"

"github.com/apache/servicecomb-service-center/pkg/util"
)

func (c *LBClient) WebsocketDial(ctx context.Context, api string, headers http.Header) (conn *websocket.Conn, err error) {
dialer := &websocket.Dialer{TLSClientConfig: c.TLS}
func (c *LBClient) WebsocketDial(ctx context.Context, api string, headers http.Header) (conn websocket.Conn, err error) {
dialer := &websocket.DialConfig{TLSClientConfig: c.TLS}

var errs []string
for i := 0; i < c.Retries; i++ {
var addr *url.URL
Expand Down
2 changes: 1 addition & 1 deletion eventbase/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ require (
github.com/little-cui/etcdadpt v0.4.0
github.com/stretchr/testify v1.7.2
go.mongodb.org/mongo-driver v1.5.1
golang.org/x/net/websocket v0.7.0
)

require (
Expand All @@ -29,7 +30,6 @@ require (
github.com/golang/protobuf v1.5.2 // indirect
github.com/golang/snappy v0.0.1 // indirect
github.com/google/btree v1.0.1 // indirect
github.com/gorilla/websocket v1.4.3-0.20210424162022-e8629af678b7 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
Expand Down
13 changes: 7 additions & 6 deletions go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,7 @@ replace (
go.opentelemetry.io/otel => go.opentelemetry.io/otel v0.20.0
go.opentelemetry.io/otel/sdk => go.opentelemetry.io/otel/sdk v0.20.0
go.opentelemetry.io/otel/trace => go.opentelemetry.io/otel/trace v0.20.0
golang.org/x/net/websocket => golang.org/x/net/websocket v0.7.0
)

require (
Expand All @@ -32,7 +33,6 @@ require (
github.com/gofiber/fiber/v2 v2.36.0
github.com/gofrs/uuid v4.0.0+incompatible
github.com/golang-jwt/jwt v3.2.2+incompatible
github.com/gorilla/websocket v1.4.3-0.20210424162022-e8629af678b7
github.com/iancoleman/strcase v0.2.0
github.com/jinzhu/copier v0.3.5
github.com/karlseguin/ccache v2.0.3-0.20170217060820-3ba9789cfd2c+incompatible
Expand Down Expand Up @@ -60,7 +60,7 @@ require (
go.etcd.io/etcd/client/v3 v3.5.4
go.mongodb.org/mongo-driver v1.5.1
go.uber.org/zap v1.20.0
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d
golang.org/x/crypto v0.11.0
golang.org/x/time v0.0.0-20210220033141-f8bda1e9f3ba
google.golang.org/grpc v1.46.0
google.golang.org/protobuf v1.28.1
Expand All @@ -75,6 +75,7 @@ require (
require (
github.com/ghodss/yaml v1.0.0
github.com/go-chassis/go-chassis-extension/protocol/fiber4r v0.0.0-20220825091211-99d5e9810fd7
golang.org/x/net v0.12.0
)

require (
Expand Down Expand Up @@ -119,6 +120,7 @@ require (
github.com/google/go-cmp v0.5.8 // indirect
github.com/google/gofuzz v1.1.0 // indirect
github.com/googleapis/gnostic v0.5.1 // indirect
github.com/gorilla/websocket v1.4.3-0.20210424162022-e8629af678b7 // indirect
github.com/grpc-ecosystem/go-grpc-middleware v1.3.0 // indirect
github.com/grpc-ecosystem/go-grpc-prometheus v1.2.0 // indirect
github.com/grpc-ecosystem/grpc-gateway v1.16.0 // indirect
Expand Down Expand Up @@ -179,12 +181,11 @@ require (
go.opentelemetry.io/proto/otlp v0.7.0 // indirect
go.uber.org/atomic v1.7.0 // indirect
go.uber.org/multierr v1.6.0 // indirect
golang.org/x/net v0.0.0-20220225172249-27dd8689420f // indirect
golang.org/x/oauth2 v0.0.0-20220223155221-ee480838109b // indirect
golang.org/x/sync v0.0.0-20220601150217-0de741cfad7f // indirect
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab // indirect
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 // indirect
golang.org/x/text v0.3.7 // indirect
golang.org/x/sys v0.10.0 // indirect
golang.org/x/term v0.10.0 // indirect
golang.org/x/text v0.11.0 // indirect
google.golang.org/appengine v1.6.7 // indirect
google.golang.org/genproto v0.0.0-20211208223120-3a66f561d7aa // indirect
gopkg.in/cheggaaa/pb.v1 v1.0.28 // indirect
Expand Down
16 changes: 10 additions & 6 deletions go.sum
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -913,8 +913,9 @@ golang.org/x/crypto v0.0.0-20201002170205-7f63de1d35b0/go.mod h1:LzIPMQfyMNhhGPh
golang.org/x/crypto v0.0.0-20210817164053-32db794688a5/go.mod h1:GvvjBRRGRdwPK5ydBHafDWAxML/pGHZbMvKqRZ5+Abc=
golang.org/x/crypto v0.0.0-20220131195533-30dcbda58838/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220214200702-86341886e292/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d h1:sK3txAijHtOK88l68nt020reeT1ZdKLIYetKl95FzVY=
golang.org/x/crypto v0.0.0-20220622213112-05595931fe9d/go.mod h1:IxCIyHEi3zRg3s0A5j5BB6A9Jmi73HwBIUl50j+osU4=
golang.org/x/crypto v0.11.0 h1:6Ewdq3tDic1mg5xRO4milcWCfMVQhI4NkqWWvqejpuA=
golang.org/x/crypto v0.11.0/go.mod h1:xgJhtzW8F9jGdVFWZESrid1U1bjeNy4zgy5cRr/CIio=
golang.org/x/exp v0.0.0-20190121172915-509febef88a4/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190306152737-a1d7652674e8/go.mod h1:CJ0aWSM057203Lf6IL+f9T1iT9GByDxfZKAQTCR3kQA=
golang.org/x/exp v0.0.0-20190510132918-efd6b22b2522/go.mod h1:ZjyILWgesfNpC6sMxTJOJm9Kp84zZh5NQWvqDGG3Qr8=
Expand Down Expand Up @@ -1003,8 +1004,9 @@ golang.org/x/net v0.0.0-20210525063256-abc453219eb5/go.mod h1:9nx3DQGgdP8bBQD5qx
golang.org/x/net v0.0.0-20210813160813-60bc85c4be6d/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20211112202133-69e39bad7dc2/go.mod h1:9nx3DQGgdP8bBQD5qxJ1jj9UTztislL4KSBs9R2vV5Y=
golang.org/x/net v0.0.0-20220127200216-cd36cc0744dd/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.0.0-20220225172249-27dd8689420f h1:oA4XRj0qtSt8Yo1Zms0CUlsT3KG69V2UGQWPBxujDmc=
golang.org/x/net v0.0.0-20220225172249-27dd8689420f/go.mod h1:CfG3xpIq0wQ8r1q4Su4UZFWDARRcnwPjda9FqA0JpMk=
golang.org/x/net v0.12.0 h1:cfawfvKITfUsFCeJIHJrbSxpeu/E81khclypR0GVT50=
golang.org/x/net v0.12.0/go.mod h1:zEVYFnQC7m/vmpQFELhcD1EWkZlX69l4oqgmer6hfKA=
golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
golang.org/x/oauth2 v0.0.0-20190226205417-e64efc72b421/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
golang.org/x/oauth2 v0.0.0-20190604053449-0f29369cfe45/go.mod h1:gOpvHmFTYa4IltrdGE7lF6nIHvwfUNPOp7c8zoXwtLw=
Expand Down Expand Up @@ -1126,11 +1128,12 @@ golang.org/x/sys v0.0.0-20211205182925-97ca703d548d/go.mod h1:oPkhp1MJrh7nUepCBc
golang.org/x/sys v0.0.0-20211216021012-1d35b9e2eb4e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220114195835-da31bd327af9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220227234510-4e6760a101f9/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab h1:2QkjZIsXupsJbJIdSjjUOgWK3aEtzyuh2mPt3l/CkeU=
golang.org/x/sys v0.0.0-20220811171246-fbc7d0a398ab/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/sys v0.10.0 h1:SqMFp9UcQJZa+pmYuAKjd9xq1f0j5rLcDIk0mj4qAsA=
golang.org/x/sys v0.10.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211 h1:JGgROgKl9N8DuW20oFS5gxc+lE67/N3FcwmBPMe7ArY=
golang.org/x/term v0.0.0-20210927222741-03fcf44c2211/go.mod h1:jbD1KX2456YbFQfuXm/mYQcufACuNUgVhRMnK/tPxf8=
golang.org/x/term v0.10.0 h1:3R7pNqamzBraeqj/Tj8qt1aQ2HpmlC+Cx/qL/7hn4/c=
golang.org/x/term v0.10.0/go.mod h1:lpqdcUyK/oCiQxvxVrppt5ggO2KCZ5QblwqPnfZ6d5o=
golang.org/x/text v0.0.0-20160726164857-2910a502d2bf/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.0.0-20170915032832-14c0d48ead0c/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
Expand All @@ -1140,8 +1143,9 @@ golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.4/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.5/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.6/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
golang.org/x/text v0.3.7 h1:olpwvP2KacW1ZWvsR7uQhoyTYvKAupfQrRGBFM352Gk=
golang.org/x/text v0.3.7/go.mod h1:u+2+/6zg+i71rQMx5EYifcz6MCKuco9NR6JIITiCfzQ=
golang.org/x/text v0.11.0 h1:LAntKIrcmeSKERyiOh0XMV39LXS8IE9UL2yP7+f5ij4=
golang.org/x/text v0.11.0/go.mod h1:TvPlkZtksWOMsz7fbANvkp4WM8x/WCo/om8BMLbz+aE=
golang.org/x/time v0.0.0-20181108054448-85acf8d2951c/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20190308202827-9d24e82272b4/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
golang.org/x/time v0.0.0-20191024005414-555d28b269f0/go.mod h1:tRJNPiyCQ0inRvYxbN9jk5I+vvW/OXSQhTDSoE431IQ=
Expand Down
2 changes: 1 addition & 1 deletion integration/instances_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,9 +34,9 @@ import (

. "github.com/apache/servicecomb-service-center/integration"
"github.com/go-chassis/cari/discovery"
"github.com/gorilla/websocket"
"github.com/stretchr/testify/assert"
"github.com/widuu/gojson"
"golang.org/x/net/websocket"
)

var _ = Describe("MicroService Api Test", func() {
Expand Down
2 changes: 1 addition & 1 deletion istio/examples/consumer-provider/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,7 @@ require (
github.com/go-chassis/openlog v1.1.3
github.com/gorilla/mux v1.8.0
github.com/rs/cors v1.8.2
golang.org/x/net/websocket v0.7.0
)

require (
Expand All @@ -24,7 +25,6 @@ require (
github.com/go-chassis/seclog v1.3.1-0.20210917082355-52c40864f240 // indirect
github.com/gogo/protobuf v1.3.2 // indirect
github.com/golang/protobuf v1.4.3 // indirect
github.com/gorilla/websocket v1.4.3-0.20210424162022-e8629af678b7 // indirect
github.com/hashicorp/go-version v1.0.0 // indirect
github.com/json-iterator/go v1.1.10 // indirect
github.com/matttproud/golang_protobuf_extensions v1.0.1 // indirect
Expand Down
2 changes: 1 addition & 1 deletion istio/go.mod
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,7 @@ require (
k8s.io/apimachinery v0.24.2
k8s.io/client-go v0.24.2
sigs.k8s.io/controller-runtime v0.12.2

)

require (
Expand Down Expand Up @@ -50,7 +51,6 @@ require (
github.com/google/gofuzz v1.2.0 // indirect
github.com/googleapis/enterprise-certificate-proxy v0.1.0 // indirect
github.com/googleapis/gax-go/v2 v2.4.0 // indirect
github.com/gorilla/websocket v1.5.0 // indirect
github.com/hashicorp/go-version v1.5.0 // indirect
github.com/imdario/mergo v0.3.12 // indirect
github.com/inconshreveable/mousetrap v1.0.0 // indirect
Expand Down
6 changes: 3 additions & 3 deletions scripts/release/LICENSE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -297,11 +297,11 @@ For details, see https://github.com/golang/protobuf
You can find a copy of the License at licenses/LICENSE-golang-protobuf

================================================================
For gorilla/websocket (ea4d1f681babbce9545c9c5f3d5194a789c89f5b)
For golang.org/x/net/websocket (v0.7.0)
================================================================
This product bundles gorilla/websocket which is licensed under
This product bundles golang.org/x/net/websocket which is licensed under
the 2-Clause BSD License.
For details, see https://github.com/gorilla/websocket
For details, see https://golang.org/x/net/websocket
You can find a copy of the License at licenses/LICENSE-gorilla-websocket

================================================================
Expand Down
2 changes: 1 addition & 1 deletion server/pubsub/pubsub.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ import (
"fmt"

pb "github.com/go-chassis/cari/discovery"
"github.com/gorilla/websocket"
"golang.org/x/net/websocket"

"github.com/apache/servicecomb-service-center/datasource"
"github.com/apache/servicecomb-service-center/pkg/log"
Expand Down
4 changes: 2 additions & 2 deletions server/pubsub/ws/common.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,10 +27,10 @@ import (
"github.com/apache/servicecomb-service-center/server/event"
"github.com/apache/servicecomb-service-center/server/metrics"
"github.com/go-chassis/foundation/gopool"
"github.com/gorilla/websocket"
"golang.org/x/net/websocket"
)

func Watch(ctx context.Context, serviceID string, conn *websocket.Conn) {
func Watch(ctx context.Context, serviceID string, conn websocket.Conn) {
domainProject := util.ParseDomainProject(ctx)
domain := util.ParseDomain(ctx)

Expand Down
6 changes: 3 additions & 3 deletions server/pubsub/ws/websocket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@ import (
"github.com/apache/servicecomb-service-center/pkg/log"
"github.com/apache/servicecomb-service-center/pkg/util"
pb "github.com/go-chassis/cari/discovery"
"github.com/gorilla/websocket"
"golang.org/x/net/websocket"
)

const Websocket = "Websocket"
Expand All @@ -36,7 +36,7 @@ var errServiceNotExist = errors.New("service does not exist")

type WebSocket struct {
Options
Conn *websocket.Conn
Conn websocket.Conn
RemoteAddr string
DomainProject string
ConsumerID string
Expand Down Expand Up @@ -196,7 +196,7 @@ func (wh *WebSocket) SetIdle() {
}
}

func NewWebSocket(domainProject, serviceID string, conn *websocket.Conn) *WebSocket {
func NewWebSocket(domainProject, serviceID string, conn websocket.Conn) *WebSocket {
ws := &WebSocket{
Options: ToOptions(),
DomainProject: domainProject,
Expand Down
6 changes: 3 additions & 3 deletions server/pubsub/ws/websocket_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,8 +29,8 @@ import (
"github.com/apache/servicecomb-service-center/server/core"
"github.com/apache/servicecomb-service-center/server/event"
"github.com/apache/servicecomb-service-center/server/pubsub/ws"
"github.com/gorilla/websocket"
"github.com/stretchr/testify/assert"
"golang.org/x/net/websocket"
)

var closeCh = make(chan struct{})
Expand All @@ -42,8 +42,8 @@ func init() {

type watcherConn struct {
MockServer *httptest.Server
ClientConn *websocket.Conn
ServerConn *websocket.Conn
ClientConn websocket.Conn
ServerConn websocket.Conn
}

func (h *watcherConn) Test() {
Expand Down
4 changes: 2 additions & 2 deletions server/rest/controller/v4/instance_watcher.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (
"github.com/apache/servicecomb-service-center/server/pubsub"
"github.com/apache/servicecomb-service-center/server/service/heartbeat"
pb "github.com/go-chassis/cari/discovery"
"github.com/gorilla/websocket"
"golang.org/x/net/websocket"
)

const (
Expand All @@ -50,7 +50,7 @@ func (s *WatchService) URLPatterns() []rest.Route {
}
}

func upgrade(w http.ResponseWriter, r *http.Request) (*websocket.Conn, error) {
func upgrade(w http.ResponseWriter, r *http.Request) (websocket.Conn, error) {
var upgrader = websocket.Upgrader{
CheckOrigin: func(r *http.Request) bool {
return true
Expand Down
12 changes: 6 additions & 6 deletions server/service/heartbeat/websocket.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ import (

pb "github.com/go-chassis/cari/discovery"
"github.com/go-chassis/cari/pkg/errsvc"
"github.com/gorilla/websocket"
"golang.org/x/net/websocket"

"github.com/apache/servicecomb-service-center/datasource"
"github.com/apache/servicecomb-service-center/pkg/log"
Expand All @@ -51,7 +51,7 @@ var (

type client struct {
cxt context.Context
conn *websocket.Conn
conn websocket.Conn
serviceID string
instanceID string
}
Expand All @@ -65,7 +65,7 @@ func configuration() {
})
}

func newClient(ctx context.Context, conn *websocket.Conn, serviceID string, instanceID string) *client {
func newClient(ctx context.Context, conn websocket.Conn, serviceID string, instanceID string) *client {
configuration()
return &client{
cxt: ctx,
Expand Down Expand Up @@ -153,7 +153,7 @@ func (c *client) handleMessage() {
}
}

func SendEstablishError(conn *websocket.Conn, err error) {
func SendEstablishError(conn websocket.Conn, err error) {
remoteAddr := conn.RemoteAddr().String()
log.Error(fmt.Sprintf("establish[%s] websocket failed.", remoteAddr), err)
if err := conn.WriteControl(websocket.CloseMessage, websocket.FormatCloseMessage(pb.ErrWebsocketInstanceNotExists,
Expand All @@ -162,7 +162,7 @@ func SendEstablishError(conn *websocket.Conn, err error) {
}
}

func Heartbeat(ctx context.Context, conn *websocket.Conn, serviceID string, instanceID string) {
func Heartbeat(ctx context.Context, conn websocket.Conn, serviceID string, instanceID string) {
domain := util.ParseDomain(ctx)
client := newClient(ctx, conn, serviceID, instanceID)
metrics.ReportSubscriber(domain, Websocket, 1)
Expand All @@ -175,7 +175,7 @@ func process(client *client) {
client.handleMessage()
}

func WatchHeartbeat(ctx context.Context, in *pb.HeartbeatRequest, conn *websocket.Conn) {
func WatchHeartbeat(ctx context.Context, in *pb.HeartbeatRequest, conn websocket.Conn) {
log.Info(fmt.Sprintf("new a web socket with service[%s] ,instance[%s]", in.ServiceId, in.InstanceId))
if err := preOp(ctx, in); err != nil {
SendEstablishError(conn, err)
Expand Down
6 changes: 3 additions & 3 deletions server/service/heartbeat/websocket_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ import (

"github.com/apache/servicecomb-service-center/server/service/heartbeat"

"github.com/gorilla/websocket"
"github.com/stretchr/testify/assert"
"golang.org/x/net/websocket"

"github.com/apache/servicecomb-service-center/server/core"
)
Expand All @@ -41,8 +41,8 @@ func init() {
}

type watcherConn struct {
clientConn *websocket.Conn
serverConn *websocket.Conn
clientConn websocket.Conn
serverConn websocket.Conn
}

func (h *watcherConn) Test() {
Expand Down