coopgo-platform
/
gorush
7
0
Fork 0
Code Issues Pull Requests Projects Releases 1 Wiki Activity

feat(grpc): support ThreadID and ContentAvailable (#328)

This commit is contained in:
Bo-Yi Wu 2018-01-10 09:36:27 +08:00 committed by GitHub
parent ffd78ffaec
commit 4c203c9829
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 135 additions and 52 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
README.md
View File

@ -811,6 +811,8 @@ function main() {
request.setSound("sound")
alert.setTitle("title");
request.setAlert(alert);
request.setThreadid("threadID");
request.setContentavailable(false);
client.send(request, function (err, response) {
if(err) {
console.log(err);

2
rpc/example/node/client.js
View File

@ -17,6 +17,8 @@ function main() {
request.setSound("sound")
alert.setTitle("title");
request.setAlert(alert);
request.setThreadid("threadID");
request.setContentavailable(false);
client.send(request, function (err, response) {
if(err) {
console.log(err);

58
rpc/example/node/gorush_pb.js
View File

@ -499,7 +499,9 @@ proto.proto.NotificationRequest.toObject = function(includeInstance, msg) {
badge: jspb.Message.getFieldWithDefault(msg, 7, 0),
category: jspb.Message.getFieldWithDefault(msg, 8, ""),
alert: (f = msg.getAlert()) && proto.proto.Alert.toObject(includeInstance, f),
sound: jspb.Message.getFieldWithDefault(msg, 10, "")
sound: jspb.Message.getFieldWithDefault(msg, 10, ""),
contentavailable: jspb.Message.getFieldWithDefault(msg, 11, false),
threadid: jspb.Message.getFieldWithDefault(msg, 12, "")
};
if (includeInstance) {
@ -577,6 +579,14 @@ proto.proto.NotificationRequest.deserializeBinaryFromReader = function(msg, read
var value = /** @type {string} */ (reader.readString());
msg.setSound(value);
break;
case 11:
var value = /** @type {boolean} */ (reader.readBool());
msg.setContentavailable(value);
break;
case 12:
var value = /** @type {string} */ (reader.readString());
msg.setThreadid(value);
break;
default:
reader.skipField();
break;
@ -676,6 +686,20 @@ proto.proto.NotificationRequest.serializeBinaryToWriter = function(message, writ
f
);
}
f = message.getContentavailable();
if (f) {
writer.writeBool(
11,
f
);
}
f = message.getThreadid();
if (f.length > 0) {
writer.writeString(
12,
f
);
}
};
@ -860,6 +884,38 @@ proto.proto.NotificationRequest.prototype.setSound = function(value) {
};
/**
* optional bool contentAvailable = 11;
* Note that Boolean fields may be set to 0/1 when serialized from a Java server.
* You should avoid comparisons like {@code val === true/false} in those cases.
* @return {boolean}
*/
proto.proto.NotificationRequest.prototype.getContentavailable = function() {
return /** @type {boolean} */ (jspb.Message.getFieldWithDefault(this, 11, false));
};
/** @param {boolean} value */
proto.proto.NotificationRequest.prototype.setContentavailable = function(value) {
jspb.Message.setField(this, 11, value);
};
/**
* optional string threadID = 12;
* @return {string}
*/
proto.proto.NotificationRequest.prototype.getThreadid = function() {
return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 12, ""));
};
/** @param {string} value */
proto.proto.NotificationRequest.prototype.setThreadid = function(value) {
jspb.Message.setField(this, 12, value);
};
/**
* Generated by JsPbCodeGenerator.

105
rpc/proto/gorush.pb.go
View File

@ -151,16 +151,18 @@ func (m *Alert) GetTitleLocArgs() []string {
}
type NotificationRequest struct {
Tokens []string `protobuf:"bytes,1,rep,name=tokens" json:"tokens,omitempty"`
Platform int32 `protobuf:"varint,2,opt,name=platform" json:"platform,omitempty"`
Message string `protobuf:"bytes,3,opt,name=message" json:"message,omitempty"`
Title string `protobuf:"bytes,4,opt,name=title" json:"title,omitempty"`
Topic string `protobuf:"bytes,5,opt,name=topic" json:"topic,omitempty"`
Key string `protobuf:"bytes,6,opt,name=key" json:"key,omitempty"`
Badge int32 `protobuf:"varint,7,opt,name=badge" json:"badge,omitempty"`
Category string `protobuf:"bytes,8,opt,name=category" json:"category,omitempty"`
Alert *Alert `protobuf:"bytes,9,opt,name=alert" json:"alert,omitempty"`
Sound string `protobuf:"bytes,10,opt,name=sound" json:"sound,omitempty"`
Tokens []string `protobuf:"bytes,1,rep,name=tokens" json:"tokens,omitempty"`
Platform int32 `protobuf:"varint,2,opt,name=platform" json:"platform,omitempty"`
Message string `protobuf:"bytes,3,opt,name=message" json:"message,omitempty"`
Title string `protobuf:"bytes,4,opt,name=title" json:"title,omitempty"`
Topic string `protobuf:"bytes,5,opt,name=topic" json:"topic,omitempty"`
Key string `protobuf:"bytes,6,opt,name=key" json:"key,omitempty"`
Badge int32 `protobuf:"varint,7,opt,name=badge" json:"badge,omitempty"`
Category string `protobuf:"bytes,8,opt,name=category" json:"category,omitempty"`
Alert *Alert `protobuf:"bytes,9,opt,name=alert" json:"alert,omitempty"`
Sound string `protobuf:"bytes,10,opt,name=sound" json:"sound,omitempty"`
ContentAvailable bool `protobuf:"varint,11,opt,name=contentAvailable" json:"contentAvailable,omitempty"`
ThreadID string `protobuf:"bytes,12,opt,name=threadID" json:"threadID,omitempty"`
}
func (m *NotificationRequest) Reset() { *m = NotificationRequest{} }
@ -238,6 +240,20 @@ func (m *NotificationRequest) GetSound() string {
return ""
}
func (m *NotificationRequest) GetContentAvailable() bool {
if m != nil {
return m.ContentAvailable
}
return false
}
func (m *NotificationRequest) GetThreadID() string {
if m != nil {
return m.ThreadID
}
return ""
}
type NotificationReply struct {
Success bool `protobuf:"varint,1,opt,name=success" json:"success,omitempty"`
Counts int32 `protobuf:"varint,2,opt,name=counts" json:"counts,omitempty"`
@ -442,37 +458,40 @@ var _Health_serviceDesc = grpc.ServiceDesc{
func init() { proto1.RegisterFile("gorush.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{
// 510 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0x4d, 0x8f, 0xda, 0x30,
0x10, 0xdd, 0x00, 0x09, 0x30, 0xd0, 0x96, 0x7a, 0xab, 0xca, 0xe5, 0x84, 0x72, 0xe2, 0xc4, 0x81,
0xde, 0x7a, 0x58, 0x75, 0x55, 0xad, 0x76, 0x57, 0x5b, 0x65, 0xa5, 0xd0, 0x8f, 0x63, 0x65, 0x8c,
0x37, 0x44, 0x98, 0x38, 0x8d, 0x9d, 0x4a, 0xfc, 0x88, 0x9e, 0xfa, 0x13, 0xfa, 0x47, 0x2b, 0x8f,
0x1d, 0x4a, 0x24, 0xf6, 0x14, 0xbf, 0x79, 0x33, 0xcf, 0x33, 0xcf, 0x13, 0x18, 0x67, 0xaa, 0xaa,
0xf5, 0x76, 0x51, 0x56, 0xca, 0x28, 0x12, 0xe2, 0x27, 0xfe, 0xdb, 0x81, 0xf0, 0x5a, 0x8a, 0xca,
0x90, 0x37, 0x10, 0x9a, 0xdc, 0x48, 0x41, 0x83, 0x59, 0x30, 0x1f, 0xa6, 0x0e, 0x10, 0x02, 0xbd,
0xb5, 0xda, 0x1c, 0x68, 0x07, 0x83, 0x78, 0x26, 0x53, 0x18, 0xe8, 0x7a, 0xed, 0x92, 0xbb, 0x18,
0x3f, 0x62, 0xf2, 0x16, 0x22, 0xc6, 0x4d, 0xae, 0x0a, 0xda, 0x43, 0xc6, 0x23, 0x12, 0xc3, 0xd8,
0x9d, 0x3e, 0x2b, 0xfe, 0x20, 0x0e, 0x34, 0x44, 0xb6, 0x15, 0x23, 0x33, 0x18, 0x49, 0x56, 0x17,
0x7c, 0x7b, 0xbf, 0x67, 0x99, 0xa0, 0x11, 0xa6, 0x9c, 0x86, 0xac, 0xba, 0x74, 0xf5, 0x7d, 0xa7,
0x2e, 0x8f, 0x95, 0x78, 0xbd, 0x17, 0x1f, 0xb8, 0xca, 0x93, 0x10, 0xa1, 0xd0, 0x97, 0x8a, 0x5f,
0x57, 0x99, 0xa6, 0xc3, 0x59, 0x77, 0x3e, 0x4c, 0x1b, 0x68, 0x3b, 0x6b, 0x12, 0x91, 0x06, 0xa4,
0x5b, 0xb1, 0xf8, 0x77, 0x07, 0x2e, 0x13, 0x65, 0xf2, 0xa7, 0x9c, 0x33, 0xdb, 0x70, 0x2a, 0x7e,
0xd6, 0x42, 0x1b, 0xdb, 0x8f, 0x51, 0x3b, 0x51, 0x68, 0x1a, 0x60, 0x95, 0x47, 0xd6, 0xa1, 0x52,
0x32, 0xf3, 0xa4, 0xaa, 0x3d, 0x3a, 0x17, 0xa6, 0x47, 0x6c, 0x3b, 0xd9, 0x0b, 0xad, 0xed, 0x84,
0xce, 0xbc, 0x06, 0xfe, 0x7f, 0x81, 0xde, 0xe9, 0x0b, 0xd8, 0xa8, 0x2a, 0x73, 0xee, 0x2d, 0x73,
0x80, 0x4c, 0xa0, 0xbb, 0x13, 0x07, 0xef, 0x91, 0x3d, 0xda, 0xbc, 0x35, 0xdb, 0x64, 0x02, 0xad,
0x09, 0x53, 0x07, 0x6c, 0x27, 0x9c, 0x19, 0x91, 0xa9, 0xaa, 0xb1, 0xe5, 0x88, 0x49, 0x0c, 0x21,
0xb3, 0x4f, 0x4f, 0x87, 0xb3, 0x60, 0x3e, 0x5a, 0x8e, 0xdd, 0x66, 0x2c, 0x70, 0x1d, 0x52, 0x47,
0x59, 0x55, 0xad, 0xea, 0x62, 0x43, 0xc1, 0xdd, 0x8e, 0x20, 0xbe, 0x81, 0xd7, 0x6d, 0x3b, 0x4a,
0x89, 0x16, 0xeb, 0x9a, 0x73, 0xa1, 0x35, 0xae, 0xd0, 0x20, 0x6d, 0xa0, 0xb5, 0x89, 0xab, 0xba,
0x30, 0xda, 0x9b, 0xe1, 0x51, 0xbc, 0x00, 0x72, 0x27, 0x98, 0x34, 0xdb, 0x4f, 0x5b, 0xc1, 0x77,
0x8d, 0xa9, 0x56, 0x47, 0x54, 0xbf, 0x72, 0xde, 0xac, 0x62, 0x03, 0xe3, 0x3f, 0x01, 0x5c, 0xb6,
0x0a, 0x74, 0xa9, 0x0a, 0x2d, 0xc8, 0x47, 0x88, 0xb4, 0x61, 0xa6, 0x76, 0x17, 0xbf, 0x5c, 0xce,
0xfd, 0x24, 0x67, 0x72, 0x17, 0x2b, 0xab, 0x55, 0x64, 0x2b, 0xcc, 0x4f, 0x7d, 0x5d, 0xfc, 0x01,
0x5e, 0xb4, 0x08, 0x32, 0x82, 0xfe, 0xd7, 0xe4, 0x21, 0x79, 0xfc, 0x9e, 0x4c, 0x2e, 0x2c, 0x58,
0xdd, 0xa4, 0xdf, 0xee, 0x93, 0xdb, 0x49, 0x40, 0x5e, 0xc1, 0x28, 0x79, 0xfc, 0xf2, 0xa3, 0x09,
0x74, 0x96, 0x77, 0x10, 0xdd, 0xe2, 0x9f, 0x45, 0xae, 0xa0, 0xb7, 0x12, 0xc5, 0x86, 0x4c, 0xfd,
0xfd, 0x67, 0x56, 0x66, 0x4a, 0xcf, 0x72, 0xa5, 0x3c, 0xc4, 0x17, 0x56, 0xc9, 0xb5, 0x4c, 0xae,
0x20, 0xc4, 0xb6, 0xc9, 0xbb, 0x73, 0xa3, 0x38, 0xa5, 0xe9, 0xf3, 0x53, 0xae, 0x23, 0xa4, 0xde,
0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x48, 0x9a, 0x50, 0x65, 0xf4, 0x03, 0x00, 0x00,
// 546 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x74, 0x53, 0xcb, 0x8e, 0xda, 0x30,
0x14, 0x9d, 0x00, 0xe1, 0x71, 0xa1, 0x2d, 0xf5, 0x54, 0x95, 0xcb, 0x0a, 0x65, 0x85, 0xba, 0x60,
0x41, 0x77, 0x5d, 0x8c, 0x8a, 0xda, 0xd1, 0x0c, 0x9a, 0x2a, 0x23, 0x85, 0x3e, 0x96, 0x95, 0x31,
0x9e, 0x10, 0x61, 0xe2, 0x34, 0x76, 0x46, 0xe2, 0x3b, 0xfa, 0x09, 0xfd, 0xa6, 0xfe, 0x4f, 0xe5,
0xeb, 0x98, 0x82, 0xca, 0xac, 0xe2, 0x73, 0xee, 0xc3, 0xc7, 0xe7, 0xde, 0xc0, 0x20, 0x55, 0x65,
0xa5, 0x37, 0xd3, 0xa2, 0x54, 0x46, 0x91, 0x10, 0x3f, 0xd1, 0xef, 0x06, 0x84, 0x73, 0x29, 0x4a,
0x43, 0x5e, 0x41, 0x68, 0x32, 0x23, 0x05, 0x0d, 0xc6, 0xc1, 0xa4, 0x97, 0x38, 0x40, 0x08, 0xb4,
0x56, 0x6a, 0xbd, 0xa7, 0x0d, 0x24, 0xf1, 0x4c, 0x46, 0xd0, 0xd5, 0xd5, 0xca, 0x25, 0x37, 0x91,
0x3f, 0x60, 0xf2, 0x1a, 0xda, 0x8c, 0x9b, 0x4c, 0xe5, 0xb4, 0x85, 0x91, 0x1a, 0x91, 0x08, 0x06,
0xee, 0xf4, 0x59, 0xf1, 0x3b, 0xb1, 0xa7, 0x21, 0x46, 0x4f, 0x38, 0x32, 0x86, 0xbe, 0x64, 0x55,
0xce, 0x37, 0x8b, 0x1d, 0x4b, 0x05, 0x6d, 0x63, 0xca, 0x31, 0x65, 0xbb, 0x4b, 0x57, 0xdf, 0x71,
0xdd, 0xe5, 0xa1, 0x12, 0xaf, 0xaf, 0x9b, 0x77, 0x5d, 0xe5, 0x11, 0x45, 0x28, 0x74, 0xa4, 0xe2,
0xf3, 0x32, 0xd5, 0xb4, 0x37, 0x6e, 0x4e, 0x7a, 0x89, 0x87, 0x56, 0x99, 0x4f, 0xc4, 0x30, 0x60,
0xf8, 0x84, 0x8b, 0xfe, 0x34, 0xe0, 0x32, 0x56, 0x26, 0x7b, 0xc8, 0x38, 0xb3, 0x82, 0x13, 0xf1,
0xb3, 0x12, 0xda, 0x58, 0x3d, 0x46, 0x6d, 0x45, 0xae, 0x69, 0x80, 0x55, 0x35, 0xb2, 0x0e, 0x15,
0x92, 0x99, 0x07, 0x55, 0xee, 0xd0, 0xb9, 0x30, 0x39, 0x60, 0xab, 0x64, 0x27, 0xb4, 0xb6, 0x2f,
0x74, 0xe6, 0x79, 0xf8, 0x6f, 0x02, 0xad, 0xe3, 0x09, 0x58, 0x56, 0x15, 0x19, 0xaf, 0x2d, 0x73,
0x80, 0x0c, 0xa1, 0xb9, 0x15, 0xfb, 0xda, 0x23, 0x7b, 0xb4, 0x79, 0x2b, 0xb6, 0x4e, 0x05, 0x5a,
0x13, 0x26, 0x0e, 0x58, 0x25, 0x9c, 0x19, 0x91, 0xaa, 0xd2, 0xdb, 0x72, 0xc0, 0x24, 0x82, 0x90,
0xd9, 0xd1, 0xd3, 0xde, 0x38, 0x98, 0xf4, 0x67, 0x03, 0xb7, 0x19, 0x53, 0x5c, 0x87, 0xc4, 0x85,
0x6c, 0x57, 0xad, 0xaa, 0x7c, 0x4d, 0xc1, 0xdd, 0x8e, 0x80, 0xbc, 0x85, 0x21, 0x57, 0xb9, 0x11,
0xb9, 0x99, 0x3f, 0xb2, 0x4c, 0xb2, 0x95, 0x14, 0xb4, 0x3f, 0x0e, 0x26, 0xdd, 0xe4, 0x3f, 0xde,
0x2a, 0x30, 0x9b, 0x52, 0xb0, 0xf5, 0xe2, 0x13, 0x1d, 0x38, 0x05, 0x1e, 0x47, 0xd7, 0xf0, 0xf2,
0xd4, 0xd6, 0x42, 0xe2, 0xa8, 0x74, 0xc5, 0xb9, 0xd0, 0x1a, 0x57, 0xb1, 0x9b, 0x78, 0x68, 0xed,
0xe6, 0xaa, 0xca, 0x8d, 0xae, 0x4d, 0xad, 0x51, 0x34, 0x05, 0x72, 0x2b, 0x98, 0x34, 0x9b, 0x8f,
0x1b, 0xc1, 0xb7, 0x7e, 0x38, 0xb6, 0x8f, 0x28, 0x1f, 0x33, 0xee, 0x57, 0xda, 0xc3, 0xe8, 0x57,
0x00, 0x97, 0x27, 0x05, 0xba, 0x50, 0xb9, 0x16, 0xe4, 0x03, 0xb4, 0xb5, 0x61, 0xa6, 0x72, 0x17,
0x3f, 0x9f, 0x4d, 0x6a, 0x47, 0xce, 0xe4, 0x4e, 0x97, 0xb6, 0x57, 0x9e, 0x2e, 0x31, 0x3f, 0xa9,
0xeb, 0xa2, 0xf7, 0xf0, 0xec, 0x24, 0x40, 0xfa, 0xd0, 0xf9, 0x1a, 0xdf, 0xc5, 0xf7, 0xdf, 0xe3,
0xe1, 0x85, 0x05, 0xcb, 0xeb, 0xe4, 0xdb, 0x22, 0xbe, 0x19, 0x06, 0xe4, 0x05, 0xf4, 0xe3, 0xfb,
0x2f, 0x3f, 0x3c, 0xd1, 0x98, 0xdd, 0x42, 0xfb, 0x06, 0xff, 0x50, 0x72, 0x05, 0xad, 0xa5, 0xc8,
0xd7, 0x64, 0x54, 0xdf, 0x7f, 0x66, 0xf5, 0x46, 0xf4, 0x6c, 0xac, 0x90, 0xfb, 0xe8, 0xc2, 0x76,
0x72, 0x92, 0xc9, 0x15, 0x84, 0x28, 0x9b, 0xbc, 0x39, 0xf7, 0x14, 0xd7, 0x69, 0xf4, 0xf4, 0x2b,
0x57, 0x6d, 0x0c, 0xbd, 0xfb, 0x1b, 0x00, 0x00, 0xff, 0xff, 0xce, 0xb3, 0x89, 0xca, 0x3c, 0x04,
0x00, 0x00,
}

2
rpc/proto/gorush.proto
View File

@ -26,6 +26,8 @@ message NotificationRequest {
string category = 8;
Alert alert = 9;
string sound = 10;
bool contentAvailable = 11;
string threadID = 12;
}
message NotificationReply {

18
rpc/server.go
View File

@ -50,14 +50,16 @@ func (s *Server) Check(ctx context.Context, in *proto.HealthCheckRequest) (*prot
func (s *Server) Send(ctx context.Context, in *proto.NotificationRequest) (*proto.NotificationReply, error) {
var badge = int(in.Badge)
notification := gorush.PushNotification{
Platform: int(in.Platform),
Tokens: in.Tokens,
Message: in.Message,
Title: in.Title,
Topic: in.Topic,
APIKey: in.Key,
Category: in.Category,
Sound: in.Sound,
Platform: int(in.Platform),
Tokens: in.Tokens,
Message: in.Message,
Title: in.Title,
Topic: in.Topic,
APIKey: in.Key,
Category: in.Category,
Sound: in.Sound,
ContentAvailable: in.ContentAvailable,
ThreadID: in.ThreadID,
}
if badge > 0 {