AddMessageToQueue and ClearMessageQueue (#47)

* Added AddMessageToQueue and ClearMessageQueue RPC and regenerated python files

* Removed exe file and fixed client and server files

* Fixed merge conflict

Co-authored-by: Nanar Boursalian <nanar.boursalian01@gmail.com>

Author: nanarboursal

client/ledsign/led_sign_client.js

@@ -17,7 +17,7 @@ function healthCheck(officerName, signIp) {
     grpc.credentials.createInsecure()
   );
   const healthCheckRequest = new messages.LedSignRequest();
-  healthCheckRequest.setOfficerName(officerName);
+  healthCheckRequest.setMessage(officerName);
   return new Promise(function(resolve, reject) {
     client.healthCheck(healthCheckRequest, function(err, response) {
       if (err || !response) {

client/ledsign/led_sign_grpc_pb.js

@@ -4,37 +4,26 @@
 var grpc = require('grpc');
 var led_sign_pb = require('./led_sign_pb.js');
 
-function serialize_LedSignRecord(arg) {
-  if (!(arg instanceof led_sign_pb.LedSignRecord)) {
-    throw new Error('Expected argument of type LedSignRecord');
-  }
-  return Buffer.from(arg.serializeBinary());
-}
-
-function deserialize_LedSignRecord(buffer_arg) {
-  return led_sign_pb.LedSignRecord.deserializeBinary(new Uint8Array(buffer_arg));
-}
-
-function serialize_LedSignRequest(arg) {
-  if (!(arg instanceof led_sign_pb.LedSignRequest)) {
-    throw new Error('Expected argument of type LedSignRequest');
+function serialize_LedSignMessage(arg) {
+  if (!(arg instanceof led_sign_pb.LedSignMessage)) {
+    throw new Error('Expected argument of type LedSignMessage');
   }
   return Buffer.from(arg.serializeBinary());
 }
 
-function deserialize_LedSignRequest(buffer_arg) {
-  return led_sign_pb.LedSignRequest.deserializeBinary(new Uint8Array(buffer_arg));
+function deserialize_LedSignMessage(buffer_arg) {
+  return led_sign_pb.LedSignMessage.deserializeBinary(new Uint8Array(buffer_arg));
 }
 
-function serialize_LedSignResponse(arg) {
-  if (!(arg instanceof led_sign_pb.LedSignResponse)) {
-    throw new Error('Expected argument of type LedSignResponse');
+function serialize_LedSignRecord(arg) {
+  if (!(arg instanceof led_sign_pb.LedSignRecord)) {
+    throw new Error('Expected argument of type LedSignRecord');
   }
   return Buffer.from(arg.serializeBinary());
 }
 
-function deserialize_LedSignResponse(buffer_arg) {
-  return led_sign_pb.LedSignResponse.deserializeBinary(new Uint8Array(buffer_arg));
+function deserialize_LedSignRecord(buffer_arg) {
+  return led_sign_pb.LedSignRecord.deserializeBinary(new Uint8Array(buffer_arg));
 }
 
 
@@ -43,10 +32,10 @@ var LedSignService = exports.LedSignService = {
     path: '/LedSign/HealthCheck',
     requestStream: false,
     responseStream: false,
-    requestType: led_sign_pb.LedSignRequest,
+    requestType: led_sign_pb.LedSignMessage,
     responseType: led_sign_pb.LedSignRecord,
-    requestSerialize: serialize_LedSignRequest,
-    requestDeserialize: deserialize_LedSignRequest,
+    requestSerialize: serialize_LedSignMessage,
+    requestDeserialize: deserialize_LedSignMessage,
     responseSerialize: serialize_LedSignRecord,
     responseDeserialize: deserialize_LedSignRecord,
   },
@@ -55,11 +44,33 @@ var LedSignService = exports.LedSignService = {
     requestStream: false,
     responseStream: false,
     requestType: led_sign_pb.LedSignRecord,
-    responseType: led_sign_pb.LedSignResponse,
+    responseType: led_sign_pb.LedSignMessage,
     requestSerialize: serialize_LedSignRecord,
     requestDeserialize: deserialize_LedSignRecord,
-    responseSerialize: serialize_LedSignResponse,
-    responseDeserialize: deserialize_LedSignResponse,
+    responseSerialize: serialize_LedSignMessage,
+    responseDeserialize: deserialize_LedSignMessage,
+  },
+  addMessageToQueue: {
+    path: '/LedSign/AddMessageToQueue',
+    requestStream: false,
+    responseStream: false,
+    requestType: led_sign_pb.LedSignMessage,
+    responseType: led_sign_pb.LedSignMessage,
+    requestSerialize: serialize_LedSignMessage,
+    requestDeserialize: deserialize_LedSignMessage,
+    responseSerialize: serialize_LedSignMessage,
+    responseDeserialize: deserialize_LedSignMessage,
+  },
+  clearMessageQueue: {
+    path: '/LedSign/ClearMessageQueue',
+    requestStream: false,
+    responseStream: false,
+    requestType: led_sign_pb.LedSignMessage,
+    responseType: led_sign_pb.LedSignMessage,
+    requestSerialize: serialize_LedSignMessage,
+    requestDeserialize: deserialize_LedSignMessage,
+    responseSerialize: serialize_LedSignMessage,
+    responseDeserialize: deserialize_LedSignMessage,
   },
 };
 

client/ledsign/led_sign_pb.js

@@ -11,9 +11,8 @@ var jspb = require('google-protobuf');
 var goog = jspb;
 var global = Function('return this')();
 
+goog.exportSymbol('proto.LedSignMessage', null, global);
 goog.exportSymbol('proto.LedSignRecord', null, global);
-goog.exportSymbol('proto.LedSignRequest', null, global);
-goog.exportSymbol('proto.LedSignResponse', null, global);
 
 /**
  * Generated by JsPbCodeGenerator.
@@ -25,12 +24,12 @@ goog.exportSymbol('proto.LedSignResponse', null, global);
  * @extends {jspb.Message}
  * @constructor
  */
-proto.LedSignRequest = function(opt_data) {
+proto.LedSignMessage = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.LedSignRequest, jspb.Message);
+goog.inherits(proto.LedSignMessage, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
-  proto.LedSignRequest.displayName = 'proto.LedSignRequest';
+  proto.LedSignMessage.displayName = 'proto.LedSignMessage';
 }
 
 
@@ -45,8 +44,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.LedSignRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.LedSignRequest.toObject(opt_includeInstance, this);
+proto.LedSignMessage.prototype.toObject = function(opt_includeInstance) {
+  return proto.LedSignMessage.toObject(opt_includeInstance, this);
 };
 
 
@@ -55,153 +54,11 @@ proto.LedSignRequest.prototype.toObject = function(opt_includeInstance) {
  * @param {boolean|undefined} includeInstance Whether to include the JSPB
  *     instance for transitional soy proto support:
  *     http://goto/soy-param-migration
- * @param {!proto.LedSignRequest} msg The msg instance to transform.
+ * @param {!proto.LedSignMessage} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.LedSignRequest.toObject = function(includeInstance, msg) {
-  var f, obj = {
-    officerName: jspb.Message.getFieldWithDefault(msg, 1, "")
-  };
-
-  if (includeInstance) {
-    obj.$jspbMessageInstance = msg;
-  }
-  return obj;
-};
-}
-
-
-/**
- * Deserializes binary data (in protobuf wire format).
- * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.LedSignRequest}
- */
-proto.LedSignRequest.deserializeBinary = function(bytes) {
-  var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.LedSignRequest;
-  return proto.LedSignRequest.deserializeBinaryFromReader(msg, reader);
-};
-
-
-/**
- * Deserializes binary data (in protobuf wire format) from the
- * given reader into the given message object.
- * @param {!proto.LedSignRequest} msg The message object to deserialize into.
- * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.LedSignRequest}
- */
-proto.LedSignRequest.deserializeBinaryFromReader = function(msg, reader) {
-  while (reader.nextField()) {
-    if (reader.isEndGroup()) {
-      break;
-    }
-    var field = reader.getFieldNumber();
-    switch (field) {
-    case 1:
-      var value = /** @type {string} */ (reader.readString());
-      msg.setOfficerName(value);
-      break;
-    default:
-      reader.skipField();
-      break;
-    }
-  }
-  return msg;
-};
-
-
-/**
- * Serializes the message to binary data (in protobuf wire format).
- * @return {!Uint8Array}
- */
-proto.LedSignRequest.prototype.serializeBinary = function() {
-  var writer = new jspb.BinaryWriter();
-  proto.LedSignRequest.serializeBinaryToWriter(this, writer);
-  return writer.getResultBuffer();
-};
-
-
-/**
- * Serializes the given message to binary data (in protobuf wire
- * format), writing to the given BinaryWriter.
- * @param {!proto.LedSignRequest} message
- * @param {!jspb.BinaryWriter} writer
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.LedSignRequest.serializeBinaryToWriter = function(message, writer) {
-  var f = undefined;
-  f = message.getOfficerName();
-  if (f.length > 0) {
-    writer.writeString(
-      1,
-      f
-    );
-  }
-};
-
-
-/**
- * optional string officer_name = 1;
- * @return {string}
- */
-proto.LedSignRequest.prototype.getOfficerName = function() {
-  return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
-};
-
-
-/** @param {string} value */
-proto.LedSignRequest.prototype.setOfficerName = function(value) {
-  jspb.Message.setProto3StringField(this, 1, value);
-};
-
-
-
-/**
- * Generated by JsPbCodeGenerator.
- * @param {Array=} opt_data Optional initial data array, typically from a
- * server response, or constructed directly in Javascript. The array is used
- * in place and becomes part of the constructed object. It is not cloned.
- * If no data is provided, the constructed object will be empty, but still
- * valid.
- * @extends {jspb.Message}
- * @constructor
- */
-proto.LedSignResponse = function(opt_data) {
-  jspb.Message.initialize(this, opt_data, 0, -1, null, null);
-};
-goog.inherits(proto.LedSignResponse, jspb.Message);
-if (goog.DEBUG && !COMPILED) {
-  proto.LedSignResponse.displayName = 'proto.LedSignResponse';
-}
-
-
-if (jspb.Message.GENERATE_TO_OBJECT) {
-/**
- * Creates an object representation of this proto suitable for use in Soy templates.
- * Field names that are reserved in JavaScript and will be renamed to pb_name.
- * To access a reserved field use, foo.pb_<name>, eg, foo.pb_default.
- * For the list of reserved names please see:
- *     com.google.apps.jspb.JsClassTemplate.JS_RESERVED_WORDS.
- * @param {boolean=} opt_includeInstance Whether to include the JSPB instance
- *     for transitional soy proto support: http://goto/soy-param-migration
- * @return {!Object}
- */
-proto.LedSignResponse.prototype.toObject = function(opt_includeInstance) {
-  return proto.LedSignResponse.toObject(opt_includeInstance, this);
-};
-
-
-/**
- * Static version of the {@see toObject} method.
- * @param {boolean|undefined} includeInstance Whether to include the JSPB
- *     instance for transitional soy proto support:
- *     http://goto/soy-param-migration
- * @param {!proto.LedSignResponse} msg The msg instance to transform.
- * @return {!Object}
- * @suppress {unusedLocalVariables} f is only used for nested messages
- */
-proto.LedSignResponse.toObject = function(includeInstance, msg) {
+proto.LedSignMessage.toObject = function(includeInstance, msg) {
   var f, obj = {
     message: jspb.Message.getFieldWithDefault(msg, 1, "")
   };
@@ -217,23 +74,23 @@ proto.LedSignResponse.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.LedSignResponse}
+ * @return {!proto.LedSignMessage}
  */
-proto.LedSignResponse.deserializeBinary = function(bytes) {
+proto.LedSignMessage.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.LedSignResponse;
-  return proto.LedSignResponse.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.LedSignMessage;
+  return proto.LedSignMessage.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.LedSignResponse} msg The message object to deserialize into.
+ * @param {!proto.LedSignMessage} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.LedSignResponse}
+ * @return {!proto.LedSignMessage}
  */
-proto.LedSignResponse.deserializeBinaryFromReader = function(msg, reader) {
+proto.LedSignMessage.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -257,21 +114,21 @@ proto.LedSignResponse.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.LedSignResponse.prototype.serializeBinary = function() {
+proto.LedSignMessage.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.LedSignResponse.serializeBinaryToWriter(this, writer);
+  proto.LedSignMessage.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
 
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.LedSignResponse} message
+ * @param {!proto.LedSignMessage} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.LedSignResponse.serializeBinaryToWriter = function(message, writer) {
+proto.LedSignMessage.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getMessage();
   if (f.length > 0) {
@@ -287,13 +144,13 @@ proto.LedSignResponse.serializeBinaryToWriter = function(message, writer) {
  * optional string message = 1;
  * @return {string}
  */
-proto.LedSignResponse.prototype.getMessage = function() {
+proto.LedSignMessage.prototype.getMessage = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /** @param {string} value */
-proto.LedSignResponse.prototype.setMessage = function(value) {
+proto.LedSignMessage.prototype.setMessage = function(value) {
   jspb.Message.setProto3StringField(this, 1, value);
 };
 

proto/led_sign.proto

@@ -2,15 +2,13 @@ syntax = "proto3";
 
 
 service LedSign {
-  rpc HealthCheck (LedSignRequest) returns (LedSignRecord);
-  rpc UpdateSignText (LedSignRecord) returns (LedSignResponse);
+  rpc HealthCheck (LedSignMessage) returns (LedSignRecord);
+  rpc UpdateSignText (LedSignRecord) returns (LedSignMessage);
+  rpc AddMessageToQueue (LedSignMessage) returns (LedSignMessage);
+  rpc ClearMessageQueue (LedSignMessage) returns (LedSignMessage);
 }
 
-message LedSignRequest{
-  string officer_name = 1;
-}
-
-message LedSignResponse{
+message LedSignMessage{
   string message = 1;
 }