diff --git a/Makefile b/Makefile index edb733c..7b5845b 100644 --- a/Makefile +++ b/Makefile @@ -150,7 +150,7 @@ rpc/example/node/gorush_*_pb.js: rpc/proto/gorush.proto protoc -I rpc/proto rpc/proto/gorush.proto --js_out=import_style=commonjs,binary:rpc/example/node/ --grpc_out=rpc/example/node/ --plugin=protoc-gen-grpc=$(NODE_PROTOC_PLUGIN) rpc/proto/gorush.pb.go: rpc/proto/gorush.proto - protoc -I rpc/proto -I ${PWD}/vendor/github.com/gogo/protobuf/proto rpc/proto/gorush.proto --gogofaster_out=plugins=grpc:rpc/proto + protoc -I rpc/proto rpc/proto/gorush.proto --go_out=plugins=grpc:rpc/proto generate_proto: rpc/proto/gorush.pb.go rpc/example/node/gorush_*_pb.js diff --git a/go.mod b/go.mod index 021b85a..4b9decb 100644 --- a/go.mod +++ b/go.mod @@ -20,7 +20,7 @@ require ( github.com/gin-contrib/logger v0.0.2 github.com/gin-gonic/gin v1.5.0 github.com/go-playground/universal-translator v0.17.0 // indirect - github.com/golang/protobuf v1.3.2 + github.com/golang/protobuf v1.3.5 github.com/golang/snappy v0.0.1 // indirect github.com/json-iterator/go v1.1.8 // indirect github.com/konsorten/go-windows-terminal-sequences v1.0.2 // indirect @@ -47,11 +47,11 @@ require ( github.com/vmihailenco/msgpack v4.0.4+incompatible // indirect go.etcd.io/bbolt v1.3.3 // indirect golang.org/x/crypto v0.0.0-20191202143827-86a70503ff7e - golang.org/x/net v0.0.0-20191204025024-5ee1b9f4859a + golang.org/x/net v0.0.0-20200301022130-244492dfa37a golang.org/x/sync v0.0.0-20190911185100-cd5d95a43a6e - golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e // indirect - google.golang.org/genproto v0.0.0-20191203220235-3fa9dbf08042 // indirect - google.golang.org/grpc v1.25.1 + golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 // indirect + google.golang.org/genproto v0.0.0-20200313141609-30c55424f95d // indirect + google.golang.org/grpc v1.28.0 gopkg.in/go-playground/validator.v9 v9.30.2 // indirect gopkg.in/redis.v5 v5.2.9 gopkg.in/yaml.v2 v2.2.7 // indirect diff --git a/go.sum b/go.sum index b1f252c..f3d7dc6 100644 --- a/go.sum +++ b/go.sum @@ -44,6 +44,7 @@ github.com/cespare/xxhash/v2 v2.1.0/go.mod h1:dgIUBU3pDso/gPgZ1osOZ0iQf77oPR28Tj github.com/cespare/xxhash/v2 v2.1.1 h1:6MnRN8NT7+YBpUIWxHtefFZOKTAPgGjpQSxqLNn0+qY= github.com/cespare/xxhash/v2 v2.1.1/go.mod h1:VGX0DQ3Q6kWi7AoAeZDth3/j3BFtOZR5XLFGgcrjCOs= github.com/client9/misspell v0.3.4/go.mod h1:qj6jICC3Q7zFZvVWo7KLAzC3yx5G7kyvSDkc90ppPyw= +github.com/cncf/udpa/go v0.0.0-20191209042840-269d4d468f6f/go.mod h1:M8M6+tZqaGXZJjfX53e64911xZQV5JYwmTeXPW+k8Sc= github.com/coreos/bbolt v1.3.2/go.mod h1:iRUV2dpdMOn7Bo10OQBFzIJO9kkE559Wcmn+qkEiiKk= github.com/coreos/etcd v3.3.10+incompatible/go.mod h1:uF7uidLiAD3TWHmW31ZFd/JWoc32PjwdhPthX9715RE= github.com/coreos/go-etcd v2.0.0+incompatible/go.mod h1:Jez6KQU2B/sWsbdaef3ED8NzMklzPG4d5KIOhIy30Tk= @@ -67,6 +68,8 @@ github.com/dgryski/go-sip13 v0.0.0-20181026042036-e10d5fee7954/go.mod h1:vAd38F8 github.com/dustin/go-humanize v1.0.0 h1:VSnTsYCnlFHaM2/igO1h6X3HA71jcobQuxemgkq4zYo= github.com/dustin/go-humanize v1.0.0/go.mod h1:HtrtbFcZ19U5GC7JDqmcUSB87Iq5E25KnS6fMYU6eOk= github.com/envoyproxy/go-control-plane v0.9.0/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.1-0.20191026205805-5f8ba28d4473/go.mod h1:YTl/9mNaCwkRvm6d1a2C3ymFceY/DCBVvsKhRF0iEA4= +github.com/envoyproxy/go-control-plane v0.9.4/go.mod h1:6rpuAdCZL397s3pYoYcLgu1mIlRU8Am5FuJP05cCM98= github.com/envoyproxy/protoc-gen-validate v0.1.0/go.mod h1:iSmxcyjqTsJpI2R4NaDN7+kN2VEUnK/pcBlmesArF7c= github.com/fsnotify/fsnotify v1.4.7 h1:IXs+QLmnXW2CcXuY+8Mzv/fWEsPGWxqefPtCP5CnV9I= github.com/fsnotify/fsnotify v1.4.7/go.mod h1:jwhsz4b93w/PPRr/qN1Yymfu8t87LnFCMoQvtojpjFo= @@ -95,6 +98,7 @@ github.com/go-playground/universal-translator v0.17.0 h1:icxd5fm+REJzpZx7ZfpaD87 github.com/go-playground/universal-translator v0.17.0/go.mod h1:UkSxE5sNxxRwHyU+Scu5vgOQjsIJAF8j9muTVoKLVtA= github.com/go-stack/stack v1.8.0/go.mod h1:v0f6uXyyMGvRgIKkXu+yp6POWl0qKG85gN/melR3HDY= github.com/gogo/protobuf v1.1.1/go.mod h1:r8qH/GZQm5c6nD/R0oafs1akxWv10x8SbQlK7atdtwQ= +github.com/gogo/protobuf v1.2.1 h1:/s5zKNz0uPFCZ5hddgPdo2TK2TVrUNMn0OOX8/aZMTE= github.com/gogo/protobuf v1.2.1/go.mod h1:hp+jE20tsWTFYpLwKvXlhS1hjn+gTNwPg2I6zVXpSg4= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b h1:VKtxabqXZkF25pY9ekfRL6a582T4P37/31XEstQ5p58= github.com/golang/glog v0.0.0-20160126235308-23def4e6c14b/go.mod h1:SBH7ygxi8pfUlaOkMMuAQtPIUF8ecWP5IEl/CR7VP2Q= @@ -105,6 +109,9 @@ github.com/golang/protobuf v1.3.1 h1:YF8+flBXS5eO826T4nzqPrxfhQThhXl0YzfuUPu4SBg github.com/golang/protobuf v1.3.1/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= github.com/golang/protobuf v1.3.2 h1:6nsPYzhq5kReh6QImI3k5qWzO4PEbvbIW2cwSfR/6xs= github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U= +github.com/golang/protobuf v1.3.3/go.mod h1:vzj43D7+SQXF/4pzW/hwtAqwc6iTitCiVSaWz5lYuqw= +github.com/golang/protobuf v1.3.5 h1:F768QJ1E9tib+q5Sc8MkdJi1RxLTbRcTf8LJV56aRls= +github.com/golang/protobuf v1.3.5/go.mod h1:6O5/vntMXwX2lRkT1hjjk0nAC1IDOTvTlVgjlRvqsdk= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db h1:woRePGFeVFfLKN/pOkfl+p/TAqKOfFu+7KPlMVpok/w= github.com/golang/snappy v0.0.0-20180518054509-2e65f85255db/go.mod h1:/XxbfmMg8lxefKM7IXC3fBNl/7bRcc72aCRzEWrmP2Q= github.com/golang/snappy v0.0.1 h1:Qgr9rKW7uDUkrbSmQeiDsGa8SjGyCOGtuasMWwvp2P4= @@ -315,8 +322,8 @@ golang.org/x/net v0.0.0-20190522155817-f3200d17e092/go.mod h1:HSz+uSET+XFnRR8LxR golang.org/x/net v0.0.0-20190613194153-d28f0bde5980/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/net v0.0.0-20190620200207-3b0461eec859 h1:R/3boaszxrf1GEUWTVDzSKVwLmSJpwZ1yqXm8j0v2QI= golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= -golang.org/x/net v0.0.0-20191204025024-5ee1b9f4859a h1:+HHJiFUXVOIS9mr1ThqkQD1N8vpFCfCShqADBM12KTc= -golang.org/x/net v0.0.0-20191204025024-5ee1b9f4859a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a h1:GuSPYbZzB5/dcLNCwLQLsg3obCJtX9IJhpXkvY7kzk0= +golang.org/x/net v0.0.0-20200301022130-244492dfa37a/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s= golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U= golang.org/x/sync v0.0.0-20180314180146-1d60e4601c6f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= golang.org/x/sync v0.0.0-20181108010431-42b317875d0f/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM= @@ -340,8 +347,8 @@ golang.org/x/sys v0.0.0-20190626221950-04f50cda93cb/go.mod h1:h1NjWce9XRLGQEsW7w golang.org/x/sys v0.0.0-20190813064441-fde4db37ae7a/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191008105621-543471e840be/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/sys v0.0.0-20191010194322-b09406accb47/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e h1:9vRrk9YW2BTzLP0VCB9ZDjU4cPqkg+IDWL7XgxA1yxQ= -golang.org/x/sys v0.0.0-20191204072324-ce4227a45e2e/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527 h1:uYVVQ9WP/Ds2ROhcaGPeIdVq0RIXVLwsHlnvJ+cT1So= +golang.org/x/sys v0.0.0-20200302150141-5c8b2ff67527/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0 h1:g61tztE5qeGQ89tm6NTjjM9VPIm088od1l6aSorWRWg= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= golang.org/x/text v0.3.2 h1:tW2bmiBqwgJj/UpqtC8EpXEZVYOwU0yG4iWbprSVAcs= @@ -362,13 +369,16 @@ google.golang.org/appengine v1.4.0/go.mod h1:xpcJRLb0r/rnEns0DIKYYv+WjYCduHsrkT7 google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8 h1:Nw54tB0rB7hY/N0NQvRW8DG4Yk3Q6T9cu9RcFQDu1tc= google.golang.org/genproto v0.0.0-20180817151627-c66870c02cf8/go.mod h1:JiN7NxoALGmiZfu7CAH4rXhgtRTLTxftemlI0sWmxmc= google.golang.org/genproto v0.0.0-20190819201941-24fa4b261c55/go.mod h1:DMBHOl98Agz4BDEuKkezgsaosCRResVns1a3J2ZsMNc= -google.golang.org/genproto v0.0.0-20191203220235-3fa9dbf08042 h1:q/wgXlL1G7gx4JkovoCNbg/YcllD+MCeQINQJzCAWSw= -google.golang.org/genproto v0.0.0-20191203220235-3fa9dbf08042/go.mod h1:n3cpQtvxv34hfy77yVDNjmbRyujviMdxYliBSkLhpCc= +google.golang.org/genproto v0.0.0-20200313141609-30c55424f95d h1:pyQjO6BnPvrPMldYxgDlXq9PLahtc0EKnUTYX1pWwXU= +google.golang.org/genproto v0.0.0-20200313141609-30c55424f95d/go.mod h1:55QSHmfGQM9UVYDPBsyGGes0y52j32PQ3BqQfXhyH3c= google.golang.org/grpc v1.19.0/go.mod h1:mqu4LbDTu4XGKhr4mRzUsmM4RtVoemTSY81AxZiDr8c= google.golang.org/grpc v1.21.0/go.mod h1:oYelfM1adQP15Ek0mdvEgi9Df8B9CZIaU1084ijfRaM= google.golang.org/grpc v1.23.0/go.mod h1:Y5yQAOtifL1yxbo5wqy6BxZv8vAUGQwXBOALyacEbxg= google.golang.org/grpc v1.25.1 h1:wdKvqQk7IttEw92GoRyKG2IDrUIpgpj6H6m81yfeMW0= google.golang.org/grpc v1.25.1/go.mod h1:c3i+UQWmh7LiEpx4sFZnkU36qjEYZ0imhYfXVyQciAY= +google.golang.org/grpc v1.27.0/go.mod h1:qbnxyOmOxrQa7FizSgH+ReBfzJrCY1pSN7KXBS8abTk= +google.golang.org/grpc v1.28.0 h1:bO/TA4OxCOummhSf10siHuG7vJOiwh7SpRpFZDkOgl4= +google.golang.org/grpc v1.28.0/go.mod h1:rpkK4SK4GF4Ach/+MFLZUBavHOvF2JJB5uozKKal+60= gopkg.in/alecthomas/kingpin.v2 v2.2.6/go.mod h1:FMv+mEhP44yOT+4EoQTLFTRgOQ1FBLkstjWtayDeSgw= gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0= gopkg.in/check.v1 v1.0.0-20180628173108-788fd7840127 h1:qIbj1fsPNlZgppZ+VLlY7N33q108Sa+fhmuc+sWQYwY= diff --git a/rpc/example/node/gorush_pb.js b/rpc/example/node/gorush_pb.js index be5bcda..9721a5d 100644 --- a/rpc/example/node/gorush_pb.js +++ b/rpc/example/node/gorush_pb.js @@ -505,7 +505,8 @@ proto.proto.NotificationRequest.toObject = function(includeInstance, msg) { contentavailable: jspb.Message.getFieldWithDefault(msg, 11, false), threadid: jspb.Message.getFieldWithDefault(msg, 12, ""), mutablecontent: jspb.Message.getFieldWithDefault(msg, 13, false), - data: (f = msg.getData()) && google_protobuf_struct_pb.Struct.toObject(includeInstance, f) + data: (f = msg.getData()) && google_protobuf_struct_pb.Struct.toObject(includeInstance, f), + image: jspb.Message.getFieldWithDefault(msg, 15, "") }; if (includeInstance) { @@ -600,6 +601,10 @@ proto.proto.NotificationRequest.deserializeBinaryFromReader = function(msg, read reader.readMessage(value,google_protobuf_struct_pb.Struct.deserializeBinaryFromReader); msg.setData(value); break; + case 15: + var value = /** @type {string} */ (reader.readString()); + msg.setImage(value); + break; default: reader.skipField(); break; @@ -729,6 +734,13 @@ proto.proto.NotificationRequest.serializeBinaryToWriter = function(message, writ google_protobuf_struct_pb.Struct.serializeBinaryToWriter ); } + f = message.getImage(); + if (f.length > 0) { + writer.writeString( + 15, + f + ); + } }; @@ -990,6 +1002,21 @@ proto.proto.NotificationRequest.prototype.hasData = function() { }; +/** + * optional string image = 15; + * @return {string} + */ +proto.proto.NotificationRequest.prototype.getImage = function() { + return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 15, "")); +}; + + +/** @param {string} value */ +proto.proto.NotificationRequest.prototype.setImage = function(value) { + jspb.Message.setProto3StringField(this, 15, value); +}; + + /** * Generated by JsPbCodeGenerator. diff --git a/rpc/proto/gorush.pb.go b/rpc/proto/gorush.pb.go index 226372b..08e30ab 100644 --- a/rpc/proto/gorush.pb.go +++ b/rpc/proto/gorush.pb.go @@ -9,6 +9,8 @@ import ( proto "github.com/golang/protobuf/proto" _struct "github.com/golang/protobuf/ptypes/struct" grpc "google.golang.org/grpc" + codes "google.golang.org/grpc/codes" + status "google.golang.org/grpc/status" math "math" ) @@ -21,7 +23,7 @@ var _ = math.Inf // is compatible with the proto package it is being compiled against. // A compilation error at this line likely means your copy of the // proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion2 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion3 // please upgrade the proto package type HealthCheckResponse_ServingStatus int32 @@ -177,6 +179,7 @@ type NotificationRequest struct { ThreadID string `protobuf:"bytes,12,opt,name=threadID,proto3" json:"threadID,omitempty"` MutableContent bool `protobuf:"varint,13,opt,name=mutableContent,proto3" json:"mutableContent,omitempty"` Data *_struct.Struct `protobuf:"bytes,14,opt,name=data,proto3" json:"data,omitempty"` + Image string `protobuf:"bytes,15,opt,name=image,proto3" json:"image,omitempty"` XXX_NoUnkeyedLiteral struct{} `json:"-"` XXX_unrecognized []byte `json:"-"` XXX_sizecache int32 `json:"-"` @@ -305,6 +308,13 @@ func (m *NotificationRequest) GetData() *_struct.Struct { return nil } +func (m *NotificationRequest) GetImage() string { + if m != nil { + return m.Image + } + return "" +} + type NotificationReply struct { Success bool `protobuf:"varint,1,opt,name=success,proto3" json:"success,omitempty"` Counts int32 `protobuf:"varint,2,opt,name=counts,proto3" json:"counts,omitempty"` @@ -439,57 +449,60 @@ func init() { proto.RegisterType((*HealthCheckResponse)(nil), "proto.HealthCheckResponse") } -func init() { proto.RegisterFile("gorush.proto", fileDescriptor_40935fa25e258221) } +func init() { + proto.RegisterFile("gorush.proto", fileDescriptor_40935fa25e258221) +} var fileDescriptor_40935fa25e258221 = []byte{ - // 607 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0x4f, 0x6f, 0xd3, 0x4e, - 0x10, 0xad, 0x9b, 0x38, 0x4d, 0x26, 0x69, 0x7f, 0xf9, 0x6d, 0x11, 0x2c, 0x11, 0x87, 0xc8, 0x07, - 0x14, 0x81, 0xe4, 0x4a, 0xe5, 0xc6, 0xa1, 0xa2, 0x2a, 0x55, 0x5b, 0x15, 0xb9, 0x92, 0xc3, 0x9f, - 0x23, 0x5a, 0xaf, 0xb7, 0x8e, 0xd5, 0x8d, 0xd7, 0x78, 0xd7, 0x95, 0xf2, 0x39, 0xf8, 0x08, 0xdc, - 0xf8, 0x94, 0x68, 0x67, 0xed, 0x90, 0x40, 0x38, 0x65, 0xdf, 0x9b, 0x99, 0xb7, 0x6f, 0x67, 0x26, - 0x86, 0x51, 0xa6, 0xaa, 0x5a, 0x2f, 0xc2, 0xb2, 0x52, 0x46, 0x11, 0x1f, 0x7f, 0x26, 0x2f, 0x32, - 0xa5, 0x32, 0x29, 0x4e, 0x10, 0x25, 0xf5, 0xfd, 0x89, 0x36, 0x55, 0xcd, 0x8d, 0x4b, 0x0a, 0x7e, - 0xec, 0x83, 0x7f, 0x2e, 0x45, 0x65, 0xc8, 0x13, 0xf0, 0x4d, 0x6e, 0xa4, 0xa0, 0xde, 0xd4, 0x9b, - 0x0d, 0x62, 0x07, 0x08, 0x81, 0x6e, 0xa2, 0xd2, 0x15, 0xdd, 0x47, 0x12, 0xcf, 0x64, 0x02, 0x7d, - 0x5d, 0x27, 0x2e, 0xb9, 0x83, 0xfc, 0x1a, 0x93, 0xa7, 0xd0, 0x63, 0xdc, 0xe4, 0xaa, 0xa0, 0x5d, - 0x8c, 0x34, 0x88, 0x04, 0x30, 0x72, 0xa7, 0x0f, 0x8a, 0xdf, 0x8a, 0x15, 0xf5, 0x31, 0xba, 0xc5, - 0x91, 0x29, 0x0c, 0x25, 0xab, 0x0b, 0xbe, 0xb8, 0x59, 0xb2, 0x4c, 0xd0, 0x1e, 0xa6, 0x6c, 0x52, - 0x56, 0x5d, 0xba, 0xfa, 0x03, 0xa7, 0x2e, 0xd7, 0x95, 0x78, 0x7d, 0x23, 0xde, 0x77, 0x95, 0x1b, - 0x14, 0xa1, 0x70, 0x20, 0x15, 0x3f, 0xaf, 0x32, 0x4d, 0x07, 0xd3, 0xce, 0x6c, 0x10, 0xb7, 0xd0, - 0x3a, 0x6b, 0x13, 0x31, 0x0c, 0x18, 0xde, 0xe2, 0x82, 0x9f, 0x1d, 0x38, 0x8e, 0x94, 0xc9, 0xef, - 0x73, 0xce, 0xac, 0xe1, 0x58, 0x7c, 0xab, 0x85, 0x36, 0xd6, 0x8f, 0x51, 0x0f, 0xa2, 0xd0, 0xd4, - 0xc3, 0xaa, 0x06, 0xd9, 0x0e, 0x95, 0x92, 0x99, 0x7b, 0x55, 0x2d, 0xb1, 0x73, 0x7e, 0xbc, 0xc6, - 0xd6, 0xc9, 0x52, 0x68, 0x6d, 0x5f, 0xe8, 0x9a, 0xd7, 0xc2, 0xdf, 0x13, 0xe8, 0x6e, 0x4e, 0xc0, - 0xb2, 0xaa, 0xcc, 0x79, 0xd3, 0x32, 0x07, 0xc8, 0x18, 0x3a, 0x0f, 0x62, 0xd5, 0xf4, 0xc8, 0x1e, - 0x6d, 0x5e, 0xc2, 0xd2, 0x4c, 0x60, 0x6b, 0xfc, 0xd8, 0x01, 0xeb, 0x84, 0x33, 0x23, 0x32, 0x55, - 0xb5, 0x6d, 0x59, 0x63, 0x12, 0x80, 0xcf, 0xec, 0xe8, 0xe9, 0x60, 0xea, 0xcd, 0x86, 0xa7, 0x23, - 0xb7, 0x12, 0x21, 0xae, 0x43, 0xec, 0x42, 0x56, 0x55, 0xab, 0xba, 0x48, 0x29, 0xb8, 0xdb, 0x11, - 0x90, 0x57, 0x30, 0xe6, 0xaa, 0x30, 0xa2, 0x30, 0xe7, 0x8f, 0x2c, 0x97, 0x2c, 0x91, 0x82, 0x0e, - 0xa7, 0xde, 0xac, 0x1f, 0xff, 0xc5, 0x5b, 0x07, 0x66, 0x51, 0x09, 0x96, 0xde, 0xbc, 0xa7, 0x23, - 0xe7, 0xa0, 0xc5, 0xe4, 0x25, 0x1c, 0x2d, 0x6b, 0x63, 0xd3, 0x2e, 0x5c, 0x19, 0x3d, 0x44, 0x95, - 0x3f, 0x58, 0xf2, 0x1a, 0xba, 0x29, 0x33, 0x8c, 0x1e, 0xa1, 0xd1, 0x67, 0xa1, 0x5b, 0xe9, 0xb0, - 0x5d, 0xe9, 0x70, 0x8e, 0x2b, 0x1d, 0x63, 0x52, 0x70, 0x09, 0xff, 0x6f, 0xcf, 0xaa, 0x94, 0x38, - 0x7f, 0x5d, 0x73, 0x2e, 0xb4, 0xc6, 0xfd, 0xee, 0xc7, 0x2d, 0xb4, 0x33, 0xe4, 0xaa, 0x2e, 0x8c, - 0x6e, 0x26, 0xd5, 0xa0, 0x20, 0x04, 0x72, 0x2d, 0x98, 0x34, 0x8b, 0x8b, 0x85, 0xe0, 0x0f, 0xed, - 0xc4, 0xad, 0x8e, 0xa8, 0x1e, 0x73, 0xde, 0xfe, 0x4f, 0x5a, 0x18, 0x7c, 0xf7, 0xe0, 0x78, 0xab, - 0x40, 0x97, 0xaa, 0xd0, 0x82, 0xbc, 0x83, 0x9e, 0x36, 0xcc, 0xd4, 0xee, 0xe2, 0xa3, 0xd3, 0x59, - 0xd3, 0xe6, 0x1d, 0xb9, 0xe1, 0xdc, 0x6a, 0x15, 0xd9, 0x1c, 0xf3, 0xe3, 0xa6, 0x2e, 0x78, 0x0b, - 0x87, 0x5b, 0x01, 0x32, 0x84, 0x83, 0x4f, 0xd1, 0x6d, 0x74, 0xf7, 0x25, 0x1a, 0xef, 0x59, 0x30, - 0xbf, 0x8c, 0x3f, 0xdf, 0x44, 0x57, 0x63, 0x8f, 0xfc, 0x07, 0xc3, 0xe8, 0xee, 0xe3, 0xd7, 0x96, - 0xd8, 0x3f, 0xbd, 0x86, 0xde, 0x15, 0x7e, 0x14, 0xc8, 0x19, 0x74, 0xe7, 0xa2, 0x48, 0xc9, 0xa4, - 0xb9, 0x7f, 0xc7, 0x3e, 0x4f, 0xe8, 0xce, 0x58, 0x29, 0x57, 0xc1, 0x9e, 0x55, 0x72, 0x96, 0xc9, - 0x19, 0xf8, 0x68, 0x9b, 0x3c, 0xdf, 0xf5, 0x14, 0xa7, 0x34, 0xf9, 0xf7, 0x2b, 0x93, 0x1e, 0x86, - 0xde, 0xfc, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x46, 0xa4, 0x16, 0xe6, 0xaf, 0x04, 0x00, 0x00, + // 614 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x54, 0xdd, 0x6e, 0xd3, 0x30, + 0x14, 0x5e, 0xd6, 0xa6, 0x6b, 0x4f, 0xbb, 0xad, 0x78, 0x08, 0x4c, 0xc5, 0x45, 0x95, 0x0b, 0x54, + 0x81, 0x94, 0x49, 0xe3, 0x8e, 0x8b, 0x89, 0x69, 0x4c, 0xdb, 0x34, 0x94, 0x49, 0x29, 0x3f, 0x97, + 0xc8, 0x71, 0xbc, 0x34, 0x9a, 0x1b, 0x87, 0xd8, 0x99, 0xd4, 0xe7, 0xe0, 0x11, 0x78, 0x11, 0x1e, + 0x0d, 0xf9, 0x38, 0x29, 0x2b, 0x94, 0xab, 0xfa, 0xfb, 0xce, 0x8f, 0x3f, 0x9f, 0xf3, 0x35, 0x30, + 0xca, 0x54, 0x55, 0xeb, 0x45, 0x58, 0x56, 0xca, 0x28, 0xe2, 0xe3, 0xcf, 0xe4, 0x65, 0xa6, 0x54, + 0x26, 0xc5, 0x31, 0xa2, 0xa4, 0xbe, 0x3b, 0xd6, 0xa6, 0xaa, 0xb9, 0x71, 0x49, 0xc1, 0xcf, 0x5d, + 0xf0, 0xcf, 0xa4, 0xa8, 0x0c, 0x79, 0x0a, 0xbe, 0xc9, 0x8d, 0x14, 0xd4, 0x9b, 0x7a, 0xb3, 0x41, + 0xec, 0x00, 0x21, 0xd0, 0x4d, 0x54, 0xba, 0xa2, 0xbb, 0x48, 0xe2, 0x99, 0x4c, 0xa0, 0xaf, 0xeb, + 0xc4, 0x25, 0x77, 0x90, 0x5f, 0x63, 0xf2, 0x0c, 0x7a, 0x8c, 0x9b, 0x5c, 0x15, 0xb4, 0x8b, 0x91, + 0x06, 0x91, 0x00, 0x46, 0xee, 0xf4, 0x51, 0xf1, 0x1b, 0xb1, 0xa2, 0x3e, 0x46, 0x37, 0x38, 0x32, + 0x85, 0xa1, 0x64, 0x75, 0xc1, 0x17, 0xd7, 0x4b, 0x96, 0x09, 0xda, 0xc3, 0x94, 0xc7, 0x94, 0xed, + 0x2e, 0x5d, 0xfd, 0x9e, 0xeb, 0x2e, 0xd7, 0x95, 0x78, 0x7d, 0xd3, 0xbc, 0xef, 0x2a, 0x1f, 0x51, + 0x84, 0xc2, 0x9e, 0x54, 0xfc, 0xac, 0xca, 0x34, 0x1d, 0x4c, 0x3b, 0xb3, 0x41, 0xdc, 0x42, 0xab, + 0xac, 0x4d, 0xc4, 0x30, 0x60, 0x78, 0x83, 0x0b, 0x7e, 0x75, 0xe0, 0x28, 0x52, 0x26, 0xbf, 0xcb, + 0x39, 0xb3, 0x82, 0x63, 0xf1, 0xbd, 0x16, 0xda, 0x58, 0x3d, 0x46, 0xdd, 0x8b, 0x42, 0x53, 0x0f, + 0xab, 0x1a, 0x64, 0x27, 0x54, 0x4a, 0x66, 0xee, 0x54, 0xb5, 0xc4, 0xc9, 0xf9, 0xf1, 0x1a, 0x5b, + 0x25, 0x4b, 0xa1, 0xb5, 0x7d, 0xa1, 0x1b, 0x5e, 0x0b, 0xff, 0x6c, 0xa0, 0xfb, 0x78, 0x03, 0x96, + 0x55, 0x65, 0xce, 0x9b, 0x91, 0x39, 0x40, 0xc6, 0xd0, 0xb9, 0x17, 0xab, 0x66, 0x46, 0xf6, 0x68, + 0xf3, 0x12, 0x96, 0x66, 0x02, 0x47, 0xe3, 0xc7, 0x0e, 0x58, 0x25, 0x9c, 0x19, 0x91, 0xa9, 0xaa, + 0x1d, 0xcb, 0x1a, 0x93, 0x00, 0x7c, 0x66, 0x57, 0x4f, 0x07, 0x53, 0x6f, 0x36, 0x3c, 0x19, 0x39, + 0x4b, 0x84, 0x68, 0x87, 0xd8, 0x85, 0x6c, 0x57, 0xad, 0xea, 0x22, 0xa5, 0xe0, 0x6e, 0x47, 0x40, + 0x5e, 0xc3, 0x98, 0xab, 0xc2, 0x88, 0xc2, 0x9c, 0x3d, 0xb0, 0x5c, 0xb2, 0x44, 0x0a, 0x3a, 0x9c, + 0x7a, 0xb3, 0x7e, 0xfc, 0x0f, 0x6f, 0x15, 0x98, 0x45, 0x25, 0x58, 0x7a, 0xfd, 0x81, 0x8e, 0x9c, + 0x82, 0x16, 0x93, 0x57, 0x70, 0xb0, 0xac, 0x8d, 0x4d, 0x3b, 0x77, 0x65, 0x74, 0x1f, 0xbb, 0xfc, + 0xc5, 0x92, 0x37, 0xd0, 0x4d, 0x99, 0x61, 0xf4, 0x00, 0x85, 0x3e, 0x0f, 0x9d, 0xa5, 0xc3, 0xd6, + 0xd2, 0xe1, 0x1c, 0x2d, 0x1d, 0x63, 0x92, 0x95, 0x9c, 0xa3, 0x81, 0x0e, 0x9d, 0x64, 0x04, 0xc1, + 0x05, 0x3c, 0xd9, 0xdc, 0x60, 0x29, 0xd1, 0x15, 0xba, 0xe6, 0x5c, 0x68, 0x8d, 0xae, 0xef, 0xc7, + 0x2d, 0xb4, 0x9b, 0xe5, 0xaa, 0x2e, 0x8c, 0x6e, 0xf6, 0xd7, 0xa0, 0x20, 0x04, 0x72, 0x25, 0x98, + 0x34, 0x8b, 0xf3, 0x85, 0xe0, 0xf7, 0xad, 0x0f, 0x6c, 0x1f, 0x51, 0x3d, 0xe4, 0xbc, 0xfd, 0xf7, + 0xb4, 0x30, 0xf8, 0xe1, 0xc1, 0xd1, 0x46, 0x81, 0x2e, 0x55, 0xa1, 0x05, 0x79, 0x0f, 0x3d, 0x6d, + 0x98, 0xa9, 0xdd, 0xc5, 0x07, 0x27, 0xb3, 0x66, 0xf8, 0x5b, 0x72, 0xc3, 0xb9, 0xed, 0x55, 0x64, + 0x73, 0xcc, 0x8f, 0x9b, 0xba, 0xe0, 0x1d, 0xec, 0x6f, 0x04, 0xc8, 0x10, 0xf6, 0x3e, 0x47, 0x37, + 0xd1, 0xed, 0xd7, 0x68, 0xbc, 0x63, 0xc1, 0xfc, 0x22, 0xfe, 0x72, 0x1d, 0x5d, 0x8e, 0x3d, 0x72, + 0x08, 0xc3, 0xe8, 0xf6, 0xd3, 0xb7, 0x96, 0xd8, 0x3d, 0xb9, 0x82, 0xde, 0x25, 0x7e, 0x2a, 0xc8, + 0x29, 0x74, 0xe7, 0xa2, 0x48, 0xc9, 0xa4, 0xb9, 0x7f, 0x8b, 0xcb, 0x27, 0x74, 0x6b, 0xac, 0x94, + 0xab, 0x60, 0xc7, 0x76, 0x72, 0x92, 0xc9, 0x29, 0xf8, 0x28, 0x9b, 0xbc, 0xd8, 0xf6, 0x14, 0xd7, + 0x69, 0xf2, 0xff, 0x57, 0x26, 0x3d, 0x0c, 0xbd, 0xfd, 0x1d, 0x00, 0x00, 0xff, 0xff, 0xa0, 0xcb, + 0xd2, 0xf3, 0xc5, 0x04, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. var _ context.Context -var _ grpc.ClientConn +var _ grpc.ClientConnInterface // This is a compile-time assertion to ensure that this generated file // is compatible with the grpc package it is being compiled against. -const _ = grpc.SupportPackageIsVersion4 +const _ = grpc.SupportPackageIsVersion6 // GorushClient is the client API for Gorush service. // @@ -499,10 +512,10 @@ type GorushClient interface { } type gorushClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewGorushClient(cc *grpc.ClientConn) GorushClient { +func NewGorushClient(cc grpc.ClientConnInterface) GorushClient { return &gorushClient{cc} } @@ -520,6 +533,14 @@ type GorushServer interface { Send(context.Context, *NotificationRequest) (*NotificationReply, error) } +// UnimplementedGorushServer can be embedded to have forward compatible implementations. +type UnimplementedGorushServer struct { +} + +func (*UnimplementedGorushServer) Send(ctx context.Context, req *NotificationRequest) (*NotificationReply, error) { + return nil, status.Errorf(codes.Unimplemented, "method Send not implemented") +} + func RegisterGorushServer(s *grpc.Server, srv GorushServer) { s.RegisterService(&_Gorush_serviceDesc, srv) } @@ -563,10 +584,10 @@ type HealthClient interface { } type healthClient struct { - cc *grpc.ClientConn + cc grpc.ClientConnInterface } -func NewHealthClient(cc *grpc.ClientConn) HealthClient { +func NewHealthClient(cc grpc.ClientConnInterface) HealthClient { return &healthClient{cc} } @@ -584,6 +605,14 @@ type HealthServer interface { Check(context.Context, *HealthCheckRequest) (*HealthCheckResponse, error) } +// UnimplementedHealthServer can be embedded to have forward compatible implementations. +type UnimplementedHealthServer struct { +} + +func (*UnimplementedHealthServer) Check(ctx context.Context, req *HealthCheckRequest) (*HealthCheckResponse, error) { + return nil, status.Errorf(codes.Unimplemented, "method Check not implemented") +} + func RegisterHealthServer(s *grpc.Server, srv HealthServer) { s.RegisterService(&_Health_serviceDesc, srv) } diff --git a/rpc/proto/gorush.proto b/rpc/proto/gorush.proto index a755eb3..fdf21a7 100644 --- a/rpc/proto/gorush.proto +++ b/rpc/proto/gorush.proto @@ -31,6 +31,7 @@ message NotificationRequest { string threadID = 12; bool mutableContent = 13; google.protobuf.Struct data = 14; + string image = 15; } message NotificationReply { diff --git a/rpc/server.go b/rpc/server.go index c675b53..a206634 100644 --- a/rpc/server.go +++ b/rpc/server.go @@ -61,6 +61,7 @@ func (s *Server) Send(ctx context.Context, in *proto.NotificationRequest) (*prot ContentAvailable: in.ContentAvailable, ThreadID: in.ThreadID, MutableContent: in.MutableContent, + Image: in.Image, } if badge > 0 {