Printer Health Check RPC (routes and tests) (#56)

* Adds routes and tests for PrinterHealthCheck

* Regenerated client and server files for Printer Health Check RPC

Author: Annabel1054

client/api/2DPrinting.js

@@ -1,13 +1,21 @@
 const express = require('express');
 const router = express.Router();
-const { healthCheck, updateSignText } = require('../ledsign/led_sign_client');
-const { sendPrintRequest } = require('../printing/print_client');
-const { send3dPrintRequest } = require('../printing_3d/print_3d_client');
+const { healthCheck, sendPrintRequest } = require('../printing/print_client');
 const {
-  OK, BAD_REQUEST, NOT_FOUND, LED_SIGN_IP
+  OK, BAD_REQUEST, NOT_FOUND
 } = require('../config/config');
 const { addSignLog } = require('../util/logging-helpers');
 
+router.post('/Printer/healthCheck', (req, res) => {
+  healthCheck()
+    .then(response => {
+      return res.status(OK).send({ ...response });
+    })
+    .catch(error => {
+      return res.status(NOT_FOUND).send({ ...error });
+    });
+});
+
 router.post('/Printer/sendPrintRequest', (req, res) => {
   const { raw, copies, sides, pageRanges, destination } = req.body;
   sendPrintRequest(raw, copies, sides, pageRanges, destination)

client/api/LedSign.js

@@ -1,8 +1,6 @@
 const express = require('express');
 const router = express.Router();
 const { healthCheck, updateSignText } = require('../ledsign/led_sign_client');
-const { sendPrintRequest } = require('../printing/print_client');
-const { send3dPrintRequest } = require('../printing_3d/print_3d_client');
 const {
   OK, BAD_REQUEST, NOT_FOUND, LED_SIGN_IP
 } = require('../config/config');

client/printing/print_client.js

@@ -7,7 +7,7 @@ function healthCheck() {
   const client = new services.PrinterClient(
     'localhost:50051', grpc.credentials.createInsecure()
   );
-  const healthCheckRequest = new messages.PrintRequest();
+  const healthCheckRequest = new messages.PrinterHealthCheckUpRequest();
   return new Promise(function(resolve, reject) {
     client.healthCheck(healthCheckRequest, function(err, response) {
       if (err || !response) {

client/printing/print_grpc_pb.js

@@ -4,17 +4,6 @@
 var grpc = require('grpc');
 var print_pb = require('./print_pb.js');
 
-function serialize_HealthCheckUpRequest(arg) {
-  if (!(arg instanceof print_pb.HealthCheckUpRequest)) {
-    throw new Error('Expected argument of type HealthCheckUpRequest');
-  }
-  return Buffer.from(arg.serializeBinary());
-}
-
-function deserialize_HealthCheckUpRequest(buffer_arg) {
-  return print_pb.HealthCheckUpRequest.deserializeBinary(new Uint8Array(buffer_arg));
-}
-
 function serialize_PrintRequest(arg) {
   if (!(arg instanceof print_pb.PrintRequest)) {
     throw new Error('Expected argument of type PrintRequest');
@@ -37,6 +26,17 @@ function deserialize_PrintResponse(buffer_arg) {
   return print_pb.PrintResponse.deserializeBinary(new Uint8Array(buffer_arg));
 }
 
+function serialize_PrinterHealthCheckUpRequest(arg) {
+  if (!(arg instanceof print_pb.PrinterHealthCheckUpRequest)) {
+    throw new Error('Expected argument of type PrinterHealthCheckUpRequest');
+  }
+  return Buffer.from(arg.serializeBinary());
+}
+
+function deserialize_PrinterHealthCheckUpRequest(buffer_arg) {
+  return print_pb.PrinterHealthCheckUpRequest.deserializeBinary(new Uint8Array(buffer_arg));
+}
+
 function serialize_PrinterHealthStatus(arg) {
   if (!(arg instanceof print_pb.PrinterHealthStatus)) {
     throw new Error('Expected argument of type PrinterHealthStatus');
@@ -65,10 +65,10 @@ var PrinterService = exports.PrinterService = {
     path: '/Printer/HealthCheck',
     requestStream: false,
     responseStream: false,
-    requestType: print_pb.HealthCheckUpRequest,
+    requestType: print_pb.PrinterHealthCheckUpRequest,
     responseType: print_pb.PrinterHealthStatus,
-    requestSerialize: serialize_HealthCheckUpRequest,
-    requestDeserialize: deserialize_HealthCheckUpRequest,
+    requestSerialize: serialize_PrinterHealthCheckUpRequest,
+    requestDeserialize: deserialize_PrinterHealthCheckUpRequest,
     responseSerialize: serialize_PrinterHealthStatus,
     responseDeserialize: deserialize_PrinterHealthStatus,
   },

client/printing/print_pb.js

@@ -11,9 +11,9 @@ var jspb = require('google-protobuf');
 var goog = jspb;
 var global = Function('return this')();
 
-goog.exportSymbol('proto.HealthCheckUpRequest', null, global);
 goog.exportSymbol('proto.PrintRequest', null, global);
 goog.exportSymbol('proto.PrintResponse', null, global);
+goog.exportSymbol('proto.PrinterHealthCheckUpRequest', null, global);
 goog.exportSymbol('proto.PrinterHealthStatus', null, global);
 
 /**
@@ -417,12 +417,12 @@ proto.PrintResponse.prototype.setMessage = function(value) {
  * @extends {jspb.Message}
  * @constructor
  */
-proto.HealthCheckUpRequest = function(opt_data) {
+proto.PrinterHealthCheckUpRequest = function(opt_data) {
   jspb.Message.initialize(this, opt_data, 0, -1, null, null);
 };
-goog.inherits(proto.HealthCheckUpRequest, jspb.Message);
+goog.inherits(proto.PrinterHealthCheckUpRequest, jspb.Message);
 if (goog.DEBUG && !COMPILED) {
-  proto.HealthCheckUpRequest.displayName = 'proto.HealthCheckUpRequest';
+  proto.PrinterHealthCheckUpRequest.displayName = 'proto.PrinterHealthCheckUpRequest';
 }
 
 
@@ -437,8 +437,8 @@ if (jspb.Message.GENERATE_TO_OBJECT) {
  *     for transitional soy proto support: http://goto/soy-param-migration
  * @return {!Object}
  */
-proto.HealthCheckUpRequest.prototype.toObject = function(opt_includeInstance) {
-  return proto.HealthCheckUpRequest.toObject(opt_includeInstance, this);
+proto.PrinterHealthCheckUpRequest.prototype.toObject = function(opt_includeInstance) {
+  return proto.PrinterHealthCheckUpRequest.toObject(opt_includeInstance, this);
 };
 
 
@@ -447,11 +447,11 @@ proto.HealthCheckUpRequest.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.HealthCheckUpRequest} msg The msg instance to transform.
+ * @param {!proto.PrinterHealthCheckUpRequest} msg The msg instance to transform.
  * @return {!Object}
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.HealthCheckUpRequest.toObject = function(includeInstance, msg) {
+proto.PrinterHealthCheckUpRequest.toObject = function(includeInstance, msg) {
   var f, obj = {
     memberName: jspb.Message.getFieldWithDefault(msg, 1, "")
   };
@@ -467,23 +467,23 @@ proto.HealthCheckUpRequest.toObject = function(includeInstance, msg) {
 /**
  * Deserializes binary data (in protobuf wire format).
  * @param {jspb.ByteSource} bytes The bytes to deserialize.
- * @return {!proto.HealthCheckUpRequest}
+ * @return {!proto.PrinterHealthCheckUpRequest}
  */
-proto.HealthCheckUpRequest.deserializeBinary = function(bytes) {
+proto.PrinterHealthCheckUpRequest.deserializeBinary = function(bytes) {
   var reader = new jspb.BinaryReader(bytes);
-  var msg = new proto.HealthCheckUpRequest;
-  return proto.HealthCheckUpRequest.deserializeBinaryFromReader(msg, reader);
+  var msg = new proto.PrinterHealthCheckUpRequest;
+  return proto.PrinterHealthCheckUpRequest.deserializeBinaryFromReader(msg, reader);
 };
 
 
 /**
  * Deserializes binary data (in protobuf wire format) from the
  * given reader into the given message object.
- * @param {!proto.HealthCheckUpRequest} msg The message object to deserialize into.
+ * @param {!proto.PrinterHealthCheckUpRequest} msg The message object to deserialize into.
  * @param {!jspb.BinaryReader} reader The BinaryReader to use.
- * @return {!proto.HealthCheckUpRequest}
+ * @return {!proto.PrinterHealthCheckUpRequest}
  */
-proto.HealthCheckUpRequest.deserializeBinaryFromReader = function(msg, reader) {
+proto.PrinterHealthCheckUpRequest.deserializeBinaryFromReader = function(msg, reader) {
   while (reader.nextField()) {
     if (reader.isEndGroup()) {
       break;
@@ -507,21 +507,21 @@ proto.HealthCheckUpRequest.deserializeBinaryFromReader = function(msg, reader) {
  * Serializes the message to binary data (in protobuf wire format).
  * @return {!Uint8Array}
  */
-proto.HealthCheckUpRequest.prototype.serializeBinary = function() {
+proto.PrinterHealthCheckUpRequest.prototype.serializeBinary = function() {
   var writer = new jspb.BinaryWriter();
-  proto.HealthCheckUpRequest.serializeBinaryToWriter(this, writer);
+  proto.PrinterHealthCheckUpRequest.serializeBinaryToWriter(this, writer);
   return writer.getResultBuffer();
 };
 
 
 /**
  * Serializes the given message to binary data (in protobuf wire
  * format), writing to the given BinaryWriter.
- * @param {!proto.HealthCheckUpRequest} message
+ * @param {!proto.PrinterHealthCheckUpRequest} message
  * @param {!jspb.BinaryWriter} writer
  * @suppress {unusedLocalVariables} f is only used for nested messages
  */
-proto.HealthCheckUpRequest.serializeBinaryToWriter = function(message, writer) {
+proto.PrinterHealthCheckUpRequest.serializeBinaryToWriter = function(message, writer) {
   var f = undefined;
   f = message.getMemberName();
   if (f.length > 0) {
@@ -537,13 +537,13 @@ proto.HealthCheckUpRequest.serializeBinaryToWriter = function(message, writer) {
  * optional string member_name = 1;
  * @return {string}
  */
-proto.HealthCheckUpRequest.prototype.getMemberName = function() {
+proto.PrinterHealthCheckUpRequest.prototype.getMemberName = function() {
   return /** @type {string} */ (jspb.Message.getFieldWithDefault(this, 1, ""));
 };
 
 
 /** @param {string} value */
-proto.HealthCheckUpRequest.prototype.setMemberName = function(value) {
+proto.PrinterHealthCheckUpRequest.prototype.setMemberName = function(value) {
   jspb.Message.setProto3StringField(this, 1, value);
 };
 

proto/print.proto

@@ -1,9 +1,8 @@
 syntax = "proto3";
 
-
 service Printer {
     rpc PrintPage (PrintRequest) returns (PrintResponse);
-    rpc HealthCheck (HealthCheckUpRequest) returns (PrinterHealthStatus);
+    rpc HealthCheck (PrinterHealthCheckUpRequest) returns (PrinterHealthStatus);
 }
 
 message PrintRequest {
@@ -17,10 +16,10 @@ message PrintResponse {
     string message = 1;
 }
 
-message HealthCheckUpRequest {
+message PrinterHealthCheckUpRequest {
     string member_name = 1;
 }
 
 message PrinterHealthStatus {
     string message = 1;
-}
+}

server/printing/print_pb2.py

@@ -20,7 +20,7 @@ def __init__(self, channel):
                 )
         self.HealthCheck = channel.unary_unary(
                 '/Printer/HealthCheck',
-                request_serializer=print__pb2.HealthCheckUpRequest.SerializeToString,
+                request_serializer=print__pb2.PrinterHealthCheckUpRequest.SerializeToString,
                 response_deserializer=print__pb2.PrinterHealthStatus.FromString,
                 )
 
@@ -50,7 +50,7 @@ def add_PrinterServicer_to_server(servicer, server):
             ),
             'HealthCheck': grpc.unary_unary_rpc_method_handler(
                     servicer.HealthCheck,
-                    request_deserializer=print__pb2.HealthCheckUpRequest.FromString,
+                    request_deserializer=print__pb2.PrinterHealthCheckUpRequest.FromString,
                     response_serializer=print__pb2.PrinterHealthStatus.SerializeToString,
             ),
     }
@@ -90,7 +90,7 @@ def HealthCheck(request,
             timeout=None,
             metadata=None):
         return grpc.experimental.unary_unary(request, target, '/Printer/HealthCheck',
-            print__pb2.HealthCheckUpRequest.SerializeToString,
+            print__pb2.PrinterHealthCheckUpRequest.SerializeToString,
             print__pb2.PrinterHealthStatus.FromString,
             options, channel_credentials,
             call_credentials, compression, wait_for_ready, timeout, metadata)