Merge pull request #123 from wechaty/linter

make linter happy

Author: dchaofei

wechaty-puppet-service/filebox.go

@@ -47,7 +47,6 @@ func (m *MessageFile) Read(p []byte) (n int, err error) {
 		recv, err := m.client.Recv()
 		if err == io.EOF {
 			m.done = true
-			err = nil
 			break
 		}
 		if err != nil {
@@ -144,7 +143,6 @@ func (m *DownloadFile) Read(p []byte) (n int, err error) {
 		recv, err := m.client.Recv()
 		if err == io.EOF {
 			m.done = true
-			err = nil
 			break
 		}
 		if err != nil {
@@ -171,7 +169,7 @@ func NewDownloadFile(client pbwechaty.Puppet_DownloadClient) *DownloadFile {
  *  for testing propose, use 20KB as the threshold
  *  after stable we should use a value between 64KB to 256KB as the threshold
  */
-const passThroughThresholdBytes = 20 * 1024 // 20KB
+const passThroughThresholdBytes = 20 * 1024 //nolint:unused, deadcode, varcheck  // TODO 未来会被用到
 
 /**
  * 1. Green:

wechaty-puppet-service/puppet_service.go

@@ -13,6 +13,7 @@ import (
 	"github.com/wechaty/go-wechaty/wechaty-puppet/schemas"
 	"google.golang.org/grpc"
 	"google.golang.org/grpc/connectivity"
+	"google.golang.org/grpc/credentials/insecure"
 	"google.golang.org/protobuf/types/known/timestamppb"
 	"io"
 	"log"
@@ -237,7 +238,9 @@ func (p *PuppetService) startGrpcClient() error {
 		}
 		endpoint = serviceEndPoint.Target()
 	}
-	conn, err := grpc.Dial(endpoint, grpc.WithInsecure(), grpc.WithAuthority(p.Token))
+
+	// TODO 支持 tls
+	conn, err := grpc.Dial(endpoint, grpc.WithTransportCredentials(insecure.NewCredentials()), grpc.WithAuthority(p.Token))
 	if err != nil {
 		return err
 	}
@@ -628,7 +631,7 @@ func (p *PuppetService) MessageRawPayload(id string) (*schemas.MessagePayload, e
 	if response.ReceiveTime != nil {
 		payload.Timestamp = grpcTimestampToGoTime(response.ReceiveTime)
 	} else {
-		payload.Timestamp = time.Unix(int64(response.TimestampDeprecated), 0)
+		payload.Timestamp = time.Unix(int64(response.TimestampDeprecated), 0) //nolint:staticcheck
 	}
 	return payload, nil
 }
@@ -786,7 +789,7 @@ func (p *PuppetService) MessageURL(messageID string) (*schemas.UrlLinkPayload, e
 	if response.UrlLink == nil {
 		// Deprecated: will be removed after Dec 31, 2022
 		payload := &schemas.UrlLinkPayload{}
-		p.unMarshal(response.UrlLinkDeprecated, payload)
+		p.unMarshal(response.UrlLinkDeprecated, payload) //nolint:staticcheck
 		return payload, nil
 	}
 

wechaty-puppet/events/events.go

@@ -76,7 +76,7 @@ type (
 
 // CopyTo copies the event listeners to an EventEmitter
 func (e Events) CopyTo(emitter EventEmitter) {
-  if e != nil && len(e) > 0 {
+  if len(e) > 0 {
     // register the events to/with their listeners
     for evt, listeners := range e {
       if len(listeners) > 0 {
@@ -143,7 +143,7 @@ func (e *emitter) Emit(evt EventName, data ...interface{}) {
   if e.evtListeners == nil {
     return // has no listeners to emit/speak yet
   }
-  if listeners := e.evtListeners[evt]; listeners != nil && len(listeners) > 0 { // len() should be just fine, but for any case on future...
+  if listeners := e.evtListeners[evt]; len(listeners) > 0 { // len() should be just fine, but for any case on future...
     for i := range listeners {
       l := listeners[i]
       if l != nil {
@@ -164,7 +164,7 @@ func (e *emitter) EventNames() []EventName {
     return nil
   }
 
-  names := make([]EventName, e.Len(), e.Len())
+  names := make([]EventName, e.Len())
   i := 0
   for k := range e.evtListeners {
     names[i] = k

wechaty-puppet/filebox/file_box_base64.go

@@ -27,7 +27,7 @@ func (fb *fileBoxBase64) toJSONMap() (map[string]interface{}, error) {
 	}, nil
 }
 
-func (fb *fileBoxBase64) toBytes() ([]byte, error) {
+func (fb *fileBoxBase64) toBytes() ([]byte, error) { //nolint:unused
 	dec, err := base64.StdEncoding.DecodeString(fb.base64Data)
 	if err != nil {
 		return nil, err

wechaty-puppet/filebox/file_box_file.go

@@ -21,15 +21,15 @@ func (fb *fileBoxFile) toJSONMap() (map[string]interface{}, error) {
 	return nil, nil
 }
 
-func (fb *fileBoxFile) toBytes() ([]byte, error) {
+func (fb *fileBoxFile) toBytes() ([]byte, error) { //nolint:unused
 	file, err := ioutil.ReadFile(fb.path)
 	if err != nil {
 		return nil, err
 	}
 	return file, nil
 }
 
-func (fb *fileBoxFile) toBase64() (string, error) {
+func (fb *fileBoxFile) toBase64() (string, error) { //nolint:unused
 	file, err := fb.toBytes()
 	if err != nil {
 		return "", err

wechaty-puppet/filebox/file_box_stream.go

@@ -18,7 +18,7 @@ func (fb *fileBoxStream) toJSONMap() (map[string]interface{}, error) {
 	return nil, nil
 }
 
-func (fb *fileBoxStream) toBytes() ([]byte, error) {
+func (fb *fileBoxStream) toBytes() ([]byte, error) { // nolint:unused
 	panic("im")
 }
 

wechaty-puppet/filebox/file_box_url.go

@@ -28,7 +28,7 @@ func (fb *fileBoxUrl) toJSONMap() (map[string]interface{}, error) {
 	}, nil
 }
 
-func (fb *fileBoxUrl) toBytes() ([]byte, error) {
+func (fb *fileBoxUrl) toBytes() ([]byte, error) { //nolint:unused
 	request, err := http.NewRequest(http.MethodGet, fb.remoteUrl, nil)
 	if err != nil {
 		return nil, err

wechaty-puppet/helper/file.go

@@ -4,11 +4,5 @@ import "os"
 
 func FileExists(path string) bool {
 	_, err := os.Stat(path)
-	if err != nil {
-		if os.IsExist(err) {
-			return true
-		}
-		return false
-	}
-	return true
+	return !os.IsNotExist(err)
 }

wechaty-puppet/helper/file_test.go

@@ -0,0 +1,24 @@
+package helper
+
+import "testing"
+
+func TestFileExists(t *testing.T) {
+	type args struct {
+		path string
+	}
+	tests := []struct {
+		name string
+		args args
+		want bool
+	}{
+		{"exists", args{path: "testdata/a.txt"}, true},
+		{"not exists", args{path: "no.txt"}, false},
+	}
+	for _, tt := range tests {
+		t.Run(tt.name, func(t *testing.T) {
+			if got := FileExists(tt.args.path); got != tt.want {
+				t.Errorf("FileExists() = %v, want %v", got, tt.want)
+			}
+		})
+	}
+}