Merge pull request #1 from polatouche6/tdl_dev

modify endpoint.gotemplate to implementing service discovery and load balancing on the client side

cmd/_integration-tests/Makefile

@@ -13,6 +13,7 @@ SHA := $(shell git rev-parse --short=10 HEAD)
 
 MAKEFILE_PATH := $(dir $(abspath $(lastword $(MAKEFILE_LIST))))
 VERSION_DATE := $(shell $(MAKEFILE_PATH)/../../commit_date.sh)
+BRANCH := $(shell git branch --show-current)
 
 export PATH := $(CURDIR):$(PATH)
 
@@ -21,7 +22,10 @@ all: test
 test: clean test-transport test-middlewares test-server
 
 truss:
-	go install -ldflags '-X "main.version=$(SHA)" -X "main.date=$(VERSION_DATE)"' github.com/metaverse/truss/cmd/truss
+	go install -ldflags '-X "main.version=$(BRANCH).$(SHA)" -X "main.date=$(VERSION_DATE)"' github.com/metaverse/truss/cmd/truss
+
+mytruss:
+	go build -o mytruss  -ldflags '-X "main.version=$(BRANCH).$(SHA)" -X "main.date=$(VERSION_DATE)"' github.com/metaverse/truss/cmd/truss
 
 test-transport: truss
 	@which truss

gengokit/generator/gen.go

@@ -8,8 +8,8 @@ import (
 	"io/ioutil"
 	"strings"
 
-	log "github.com/sirupsen/logrus"
 	"github.com/pkg/errors"
+	log "github.com/sirupsen/logrus"
 
 	"github.com/metaverse/truss/gengokit"
 	"github.com/metaverse/truss/gengokit/handlers"

gengokit/generator/gen_test.go

@@ -1,6 +1,10 @@
 package generator
 
 import (
+	"bytes"
+	"compress/gzip"
+	"encoding/hex"
+	"fmt"
 	"go/format"
 	"io"
 	"io/ioutil"
@@ -96,7 +100,6 @@ func TestApplyTemplateFromPath(t *testing.T) {
 	if err != nil {
 		t.Fatal(err)
 	}
-
 	_, err = testFormat(string(endCode))
 	if err != nil {
 		t.Fatal(err)
@@ -313,3 +316,51 @@ func testFormat(code string) (string, error) {
 
 	return string(formatted), nil
 }
+
+func compressFile(filePath string) ([]byte, error) {
+	data, err := ioutil.ReadFile(filePath)
+	if err != nil {
+		return nil, fmt.Errorf("read file: %w", err)
+	}
+
+	var buf bytes.Buffer
+
+	gzWriter := gzip.NewWriter(&buf)
+	_, err = gzWriter.Write(data)
+	if err != nil {
+		return nil, fmt.Errorf("compress data: %w", err)
+	}
+
+	err = gzWriter.Close()
+	if err != nil {
+		return nil, fmt.Errorf("close gzip writer: %w", err)
+	}
+
+	return buf.Bytes(), nil
+}
+
+func Test_gzipTemplateContent(t *testing.T) {
+	// filePath := "../template/NAME-service/svc/client/grpc/client.gotemplate"
+	filePath := "../template/NAME-service/svc/endpoints.gotemplate"
+	// filePath := "../template/NAME-service/svc/server/run.gotemplate"
+	compressedData, err := compressFile(filePath)
+	if err != nil {
+		log.Fatal("Compression error:", err)
+	}
+
+	// 将压缩后的数据转换为16进制表示
+	hexEncoded := hex.EncodeToString(compressedData)
+	fmt.Println("Compressed data:", hexEncoded)
+
+	hexStr := strings.Builder{}
+	for index := 0; index < len(hexEncoded); index += 2 {
+		hexStr.WriteString("\\x")
+		end := index + 2
+		if end > len(hexEncoded) {
+			end = len(hexEncoded)
+		}
+		hexStr.WriteString(hexEncoded[index:end])
+	}
+	fmt.Println("Compressed data2:", hexStr.String())
+
+}

gengokit/generator/transport_grpc.gotemplate

@@ -0,0 +1,94 @@
+// Code generated by truss. DO NOT EDIT.
+// Rerunning truss will overwrite this file.
+// Version: {{.Version}}
+// Version Date: {{.VersionDate}}
+
+package svc
+
+// This file provides server-side bindings for the gRPC transport.
+// It utilizes the transport/grpc.Server.
+
+import (
+	"net/http"
+	"context"
+
+	"google.golang.org/grpc/metadata"
+
+	grpctransport "github.com/go-kit/kit/transport/grpc"
+
+	// This Service
+	pb "{{.PBImportPath -}}"
+)
+
+// MakeGRPCServer makes a set of endpoints available as a gRPC {{.Service.Name}}Server.
+func MakeGRPCServer(endpoints Endpoints, options ...grpctransport.ServerOption) pb.{{.Service.Name}}Server {
+	serverOptions := []grpctransport.ServerOption{
+		grpctransport.ServerBefore(metadataToContext),
+	}
+	serverOptions = append(serverOptions, options...)
+	return &grpcServer{
+	// {{ ToLower .Service.Name }}
+	{{range $i := .Service.Methods}}
+		{{ToLower $i.Name}}: grpctransport.NewServer(
+			endpoints.{{$i.Name}}Endpoint,
+			DecodeGRPC{{$i.Name}}Request,
+			EncodeGRPC{{$i.Name}}Response,
+			serverOptions...,
+		),
+	{{- end}}
+	}
+}
+
+// grpcServer implements the {{GoName .Service.Name}}Server interface
+type grpcServer struct {
+{{range $i := .Service.Methods}}
+	{{ToLower $i.Name}}   grpctransport.Handler
+{{- end}}
+}
+
+// Methods for grpcServer to implement {{GoName .Service.Name}}Server interface
+{{range $i := .Service.Methods}}
+func (s *grpcServer) {{GoName $i.Name}}(ctx context.Context, req *pb.{{GoName $i.RequestType.Name}}) (*pb.{{GoName $i.ResponseType.Name}}, error) {
+	_, rep, err := s.{{ToLower $i.Name}}.ServeGRPC(ctx, req)
+	if err != nil {
+		return nil, err
+	}
+	return rep.(*pb.{{GoName $i.ResponseType.Name}}), nil
+}
+{{end}}
+
+// Server Decode
+{{range $i := .Service.Methods}}
+// DecodeGRPC{{$i.Name}}Request is a transport/grpc.DecodeRequestFunc that converts a
+// gRPC {{ToLower $i.Name}} request to a user-domain {{ToLower $i.Name}} request. Primarily useful in a server.
+func DecodeGRPC{{$i.Name}}Request(_ context.Context, grpcReq interface{}) (interface{}, error) {
+	req := grpcReq.(*pb.{{GoName $i.RequestType.Name}})
+	return req, nil
+}
+{{end}}
+
+// Server Encode
+{{range $i := .Service.Methods}}
+// EncodeGRPC{{$i.Name}}Response is a transport/grpc.EncodeResponseFunc that converts a
+// user-domain {{ToLower $i.Name}} response to a gRPC {{ToLower $i.Name}} reply. Primarily useful in a server.
+func EncodeGRPC{{$i.Name}}Response(_ context.Context, response interface{}) (interface{}, error) {
+	resp := response.(*pb.{{GoName $i.ResponseType.Name}})
+	return resp, nil
+}
+{{end}}
+
+// Helpers
+
+func metadataToContext(ctx context.Context, md metadata.MD) context.Context {
+	for k, v := range md {
+		if v != nil {
+			// The key is added both in metadata format (k) which is all lower
+			// and the http.CanonicalHeaderKey of the key so that it can be
+			// accessed in either format
+			ctx = context.WithValue(ctx, k, v[0])
+			ctx = context.WithValue(ctx, http.CanonicalHeaderKey(k), v[0])
+		}
+	}
+
+	return ctx
+}

gengokit/template/NAME-service/svc/endpoints.gotemplate

@@ -1,3 +1,4 @@
+// tdl
 // Code generated by truss. DO NOT EDIT.
 // Rerunning truss will overwrite this file.
 // Version: {{.Version}}
@@ -17,6 +18,7 @@ import (
 	"github.com/go-kit/kit/endpoint"
 
 	pb "{{.PBImportPath -}}"
+
 )
 
 // Endpoints collects all of the endpoints that compose an add service. It's
@@ -49,6 +51,21 @@ type Endpoints struct {
 	}
 {{end}}
 
+//wrap Make Endpoints
+type EndpointMakerWrap interface {
+	Wrap(service pb.{{.Service.Name}}Server, endpointMakerName string, endpointMaker func(pb.{{.Service.Name}}Server) endpoint.Endpoint) endpoint.Endpoint
+}
+func NewEndpointMakerWrap() EndpointMakerWrap {
+	return &endpointMakerWrap{}
+}
+type endpointMakerWrap struct {
+}
+
+func (wrap *endpointMakerWrap) Wrap(service pb.{{.Service.Name}}Server, endpointMakerName string, endpointMaker func(pb.{{.Service.Name}}Server) endpoint.Endpoint) endpoint.Endpoint {
+	return endpointMaker(service)
+}
+
+
 // Make Endpoints
 {{with $te := .}}
 	{{range $i := $te.Service.Methods}}
@@ -124,3 +141,36 @@ func (e *Endpoints) WrapAllLabeledExcept(middleware func(string, endpoint.Endpoi
 		{{- end}}
 	}
 }
+
+
+
+// Reserved configuration,
+// In order to generate endpoints,they can be expanded in the future
+type NewEndpointsOptions struct {
+	//wrap Endpoint maker(such as Make**Endpoint style) , To achieve service discovery and load balancing in go-kit client.
+	//service discovery and load balancing example is in https://github.com/go-kit/examples/blob/master/apigateway/main.go:93
+	EndpointeMakerWrap EndpointMakerWrap
+}
+
+func NewEndpoints(service pb.{{.Service.Name}}Server, opts ...func(*NewEndpointsOptions)) Endpoints {
+	defaultOpts := NewEndpointsOptions{
+		EndpointeMakerWrap: NewEndpointMakerWrap(),
+	}
+	for _, f := range opts {
+		f(&defaultOpts)
+	}
+
+	// Endpoint domain.
+	var (
+	{{range $i := .Service.Methods -}}
+		{{ToLower $i.Name}}Endpoint = defaultOpts.EndpointeMakerWrap.Wrap(service, "Make{{$i.Name}}Endpoint" ,Make{{$i.Name}}Endpoint)
+	{{end}}
+	)
+	endpoints := Endpoints{
+	{{range $i := .Service.Methods -}}
+		{{$i.Name}}Endpoint:    {{ToLower $i.Name}}Endpoint,
+	{{end}}
+	}
+
+	return endpoints
+}

gengokit/template/NAME-service/svc/server/run.gotemplate

@@ -52,17 +52,7 @@ func NewEndpoints(service pb.{{.Service.Name}}Server) svc.Endpoints {
 	service = handlers.WrapService(service)
 
 	// Endpoint domain.
-	var (
-	{{range $i := .Service.Methods -}}
-		{{ToLower $i.Name}}Endpoint = svc.Make{{$i.Name}}Endpoint(service)
-	{{end}}
-	)
-
-	endpoints := svc.Endpoints{
-	{{range $i := .Service.Methods -}}
-		{{$i.Name}}Endpoint:    {{ToLower $i.Name}}Endpoint,
-	{{end}}
-	}
+	endpoints := svc.NewEndpoints(service)
 
 	// Wrap selected Endpoints with middlewares. See handlers/middlewares.go
 	endpoints = handlers.WrapEndpoints(endpoints)