Merge b4474ec619bdf45190e4aaf5b55c70c25a983712 into 405969085fb6b5c8058c88ca250e930ba6092153

Makefile

@@ -2,40 +2,52 @@ export PATH := $(PATH):`go env GOPATH`/bin
 export GO111MODULE=on
 LDFLAGS := -s -w
 
+.PHONY: all
 all: env fmt build
 
+.PHONY: build
 build: frps frpc
 
+.PHONY: env
 env:
 	@go version
 
 # compile assets into binary file
+.PHONY: file
 file:
 	rm -rf ./assets/frps/static/*
 	rm -rf ./assets/frpc/static/*
 	cp -rf ./web/frps/dist/* ./assets/frps/static
 	cp -rf ./web/frpc/dist/* ./assets/frpc/static
 
+.PHONY: fmt
 fmt:
 	go fmt ./...
 
+.PHONY: fmt-more
 fmt-more:
 	gofumpt -l -w .
 
+.PHONY: gci
 gci:
 	gci write -s standard -s default -s "prefix(github.com/fatedier/frp/)" ./
 
+.PHONY: vet
 vet:
 	go vet ./...
 
+.PHONY: frps
 frps:
 	env CGO_ENABLED=0 go build -trimpath -ldflags "$(LDFLAGS)" -tags frps -o bin/frps ./cmd/frps
 
+.PHONY: frpc
 frpc:
 	env CGO_ENABLED=0 go build -trimpath -ldflags "$(LDFLAGS)" -tags frpc -o bin/frpc ./cmd/frpc
 
+.PHONY: test
 test: gotest
 
+.PHONY: gotest
 gotest:
 	go test -v --cover ./assets/...
 	go test -v --cover ./cmd/...
@@ -43,12 +55,15 @@ gotest:
 	go test -v --cover ./server/...
 	go test -v --cover ./pkg/...
 
+.PHONY: e2e
 e2e:
 	./hack/run-e2e.sh
 
+.PHONY: e2e-trace
 e2e-trace:
 	DEBUG=true LOG_LEVEL=trace ./hack/run-e2e.sh
 
+.PHONY: e2e-compatibility-last-frpc
 e2e-compatibility-last-frpc:
 	if [ ! -d "./lastversion" ]; then \
 		TARGET_DIRNAME=lastversion ./hack/download.sh; \
@@ -56,6 +71,7 @@ e2e-compatibility-last-frpc:
 	FRPC_PATH="`pwd`/lastversion/frpc" ./hack/run-e2e.sh
 	rm -r ./lastversion
 
+.PHONY: e2e-compatibility-last-frps
 e2e-compatibility-last-frps:
 	if [ ! -d "./lastversion" ]; then \
 		TARGET_DIRNAME=lastversion ./hack/download.sh; \
@@ -63,8 +79,10 @@ e2e-compatibility-last-frps:
 	FRPS_PATH="`pwd`/lastversion/frps" ./hack/run-e2e.sh
 	rm -r ./lastversion
 
+.PHONY: alltest
 alltest: vet gotest e2e
-	
+
+.PHONY: clean
 clean:
 	rm -f ./bin/frpc
 	rm -f ./bin/frps

client/service.go

@@ -380,18 +380,31 @@ func (svr *Service) stop() {
 	}
 }
 
-// TODO(fatedier): Use StatusExporter to provide query interfaces instead of directly using methods from the Service.
+func (svr *Service) getProxyStatus(name string) (*proxy.WorkingStatus, bool) {
-func (svr *Service) GetProxyStatus(name string) (*proxy.WorkingStatus, error) {
 	svr.ctlMu.RLock()
 	ctl := svr.ctl
 	svr.ctlMu.RUnlock()
 
 	if ctl == nil {
-		return nil, fmt.Errorf("control is not running")
+		return nil, false
 	}
-	ws, ok := ctl.pm.GetProxyStatus(name)
+	return ctl.pm.GetProxyStatus(name)
-	if !ok {
+}
-		return nil, fmt.Errorf("proxy [%s] is not found", name)
+
-	}
+func (svr *Service) StatusExporter() StatusExporter {
-	return ws, nil
+	return &statusExporterImpl{
+		getProxyStatusFunc: svr.getProxyStatus,
+	}
+}
+
+type StatusExporter interface {
+	GetProxyStatus(name string) (*proxy.WorkingStatus, bool)
+}
+
+type statusExporterImpl struct {
+	getProxyStatusFunc func(name string) (*proxy.WorkingStatus, bool)
+}
+
+func (s *statusExporterImpl) GetProxyStatus(name string) (*proxy.WorkingStatus, bool) {
+	return s.getProxyStatusFunc(name)
 }

pkg/ssh/server.go

@@ -363,11 +363,13 @@ func (s *TunnelServer) waitProxyStatusReady(name string, timeout time.Duration)
 	timer := time.NewTimer(timeout)
 	defer timer.Stop()
 
+	statusExporter := s.vc.Service().StatusExporter()
+
 	for {
 		select {
 		case <-ticker.C:
-			ps, err := s.vc.Service().GetProxyStatus(name)
+			ps, ok := statusExporter.GetProxyStatus(name)
-			if err != nil {
+			if !ok {
 				continue
 			}
 			switch ps.Phase {