examples/cmd/wsechoserver/echoserver/Makefile

@@ -1,6 +1,7 @@
 all:
 	protoc -I/usr/local/include -I. \
+		-I${GOPATH}/src \
 		-I${GOPATH}/src/github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis \
-		--go_out=Mgoogle/api/annotations.proto=github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api,plugins=grpc:. \
+		--gogo_out=Mgoogle/api/annotations.proto=github.com/grpc-ecosystem/grpc-gateway/third_party/googleapis/google/api,plugins=grpc:. \
 		--grpc-gateway_out=logtostderr=true:. \
 		echoserver.proto

examples/cmd/wsechoserver/echoserver/echoserver.proto

@@ -2,13 +2,35 @@ syntax = "proto3";
 package echoserver;
 
 import "google/api/annotations.proto";
+import "google/protobuf/timestamp.proto";
+
+import "github.com/gogo/protobuf/gogoproto/gogo.proto";
+
+// Disables some golang/protobuf behaviour
+option (gogoproto.goproto_stringer_all) = false;
+option (gogoproto.goproto_enum_stringer_all) = false;
+option (gogoproto.gostring_all) = false;
+
+// Enable gogo/protobuf features
+option (gogoproto.populate_all) = true;
+option (gogoproto.sizer_all) = true;
+option (gogoproto.stringer_all) =  true;
+option (gogoproto.equal_all) = true;
+option (gogoproto.verbose_equal_all) = true;
+option (gogoproto.marshaler_all) = true;
+option (gogoproto.unmarshaler_all) = true;
+option (gogoproto.enum_stringer_all) = true;
 
 message EchoRequest {
   string message = 1;
 }
 
 message EchoResponse {
   string message = 1;
+  google.protobuf.Timestamp timestamp = 2 [
+    (gogoproto.stdtime) = true,
+    (gogoproto.nullable) = false
+  ];
 }
 
 message Heartbeat {
@@ -32,3 +54,17 @@ service EchoService {
     option (google.api.http) = {post: "/heartbeats"};
   }
 }
+
+
+service Messaging {
+  rpc UpdateMessage(Message) returns (Message) {
+    option (google.api.http) = {
+      put: "/v1/messages/{message_id}"
+      body: "*"
+    };
+  }
+}
+message Message {
+  string message_id = 1;
+  string text = 2;
+}

examples/cmd/wsechoserver/main.go

@@ -14,6 +14,7 @@ import (
 	"github.com/grpc-ecosystem/grpc-gateway/runtime"
 	"github.com/tmc/grpc-websocket-proxy/examples/cmd/wsechoserver/echoserver"
 	"github.com/tmc/grpc-websocket-proxy/wsproxy"
+	"github.com/tmc/grpcutils"
 	"golang.org/x/net/context"
 	"google.golang.org/grpc"
 )
@@ -33,15 +34,18 @@ func run() error {
 		return err
 	}
 
-	mux := runtime.NewServeMux()
+	mux := runtime.NewServeMux(runtime.WithMarshalerOption("*", &grpcutils.JSONPb{OrigName: true}))
 	opts := []grpc.DialOption{grpc.WithInsecure()}
-	err := echoserver.RegisterEchoServiceHandlerFromEndpoint(ctx, mux, *grpcAddr, opts)
-	if err != nil {
+	if err := echoserver.RegisterEchoServiceHandlerFromEndpoint(ctx, mux, *grpcAddr, opts); err != nil {
+		return err
+	}
+	if err := echoserver.RegisterMessagingHandlerFromEndpoint(ctx, mux, *grpcAddr, opts); err != nil {
 		return err
 	}
 	go http.ListenAndServe(*debugAddr, nil)
 	fmt.Println("listening")
-	http.ListenAndServe(*httpAddr, wsproxy.WebsocketProxy(mux))
+	//log.Fatalnln(http.ListenAndServe(*httpAddr, mux))
+	log.Fatalln(http.ListenAndServe(*httpAddr, wsproxy.WebsocketProxy(mux)))
 	return nil
 }
 
@@ -52,6 +56,8 @@ func listenGRPC(listenAddr string) error {
 	}
 	grpcServer := grpc.NewServer()
 	echoserver.RegisterEchoServiceServer(grpcServer, &Server{})
+	echoserver.RegisterMessagingServer(grpcServer, &Server{})
+
 	go func() {
 		if err := grpcServer.Serve(lis); err != nil {
 			log.Println("serveGRPC err:", err)

examples/cmd/wsechoserver/server.go

@@ -5,13 +5,21 @@ import (
 	"fmt"
 	"time"
 
+	"golang.org/x/net/context"
+
 	log "github.com/Sirupsen/logrus"
+	"github.com/davecgh/go-spew/spew"
 	"github.com/golang/protobuf/jsonpb"
 	"github.com/tmc/grpc-websocket-proxy/examples/cmd/wsechoserver/echoserver"
 )
 
 type Server struct{}
 
+func (s *Server) UpdateMessage(ctx context.Context, m *echoserver.Message) (*echoserver.Message, error) {
+	spew.Dump(m)
+	return &echoserver.Message{}, nil
+}
+
 func (s *Server) Stream(_ *echoserver.Empty, stream echoserver.EchoService_StreamServer) error {
 	start := time.Now()
 	for i := 0; i < 5; i++ {
@@ -31,8 +39,16 @@ func (s *Server) Echo(srv echoserver.EchoService_EchoServer) error {
 		if err != nil {
 			return err
 		}
+		now := time.Now()
 		if err := srv.Send(&echoserver.EchoResponse{
-			Message: req.Message + "!",
+			Message:   req.Message + "!",
+			Timestamp: now,
+			/*
+				Timestamp: &timestamp.Timestamp{
+					Seconds: now.Unix(),
+					Nanos:   int32(now.Nanosecond()),
+				},
+			*/
 		}); err != nil {
 			return err
 		}