From 98bea8eaf579f6641bc8a3dfa43639901aca7c91 Mon Sep 17 00:00:00 2001
From: Sergey Matvienko <smatvienko@thingsboard.io>
Date: Tue, 8 Jun 2021 20:14:10 +0300
Subject: [PATCH] js-executor: http livenessProbe added

---
 msa/js-executor/api/httpServer.js             | 46 +++++++++++++++++++
 .../config/custom-environment-variables.yml   |  1 +
 msa/js-executor/config/default.yml            |  1 +
 msa/js-executor/package.json                  |  1 +
 msa/js-executor/server.js                     |  2 +
 5 files changed, 51 insertions(+)
 create mode 100644 msa/js-executor/api/httpServer.js

diff --git a/msa/js-executor/api/httpServer.js b/msa/js-executor/api/httpServer.js
new file mode 100644
index 0000000000..996638c7c3
--- /dev/null
+++ b/msa/js-executor/api/httpServer.js
@@ -0,0 +1,46 @@
+/*
+ * ThingsBoard, Inc. ("COMPANY") CONFIDENTIAL
+ *
+ * Copyright © 2016-2021 ThingsBoard, Inc. All Rights Reserved.
+ *
+ * NOTICE: All information contained herein is, and remains
+ * the property of ThingsBoard, Inc. and its suppliers,
+ * if any.  The intellectual and technical concepts contained
+ * herein are proprietary to ThingsBoard, Inc.
+ * and its suppliers and may be covered by U.S. and Foreign Patents,
+ * patents in process, and are protected by trade secret or copyright law.
+ *
+ * Dissemination of this information or reproduction of this material is strictly forbidden
+ * unless prior written permission is obtained from COMPANY.
+ *
+ * Access to the source code contained herein is hereby forbidden to anyone except current COMPANY employees,
+ * managers or contractors who have executed Confidentiality and Non-disclosure agreements
+ * explicitly covering such access.
+ *
+ * The copyright notice above does not evidence any actual or intended publication
+ * or disclosure  of  this source code, which includes
+ * information that is confidential and/or proprietary, and is a trade secret, of  COMPANY.
+ * ANY REPRODUCTION, MODIFICATION, DISTRIBUTION, PUBLIC  PERFORMANCE,
+ * OR PUBLIC DISPLAY OF OR THROUGH USE  OF THIS  SOURCE CODE  WITHOUT
+ * THE EXPRESS WRITTEN CONSENT OF COMPANY IS STRICTLY PROHIBITED,
+ * AND IN VIOLATION OF APPLICABLE LAWS AND INTERNATIONAL TREATIES.
+ * THE RECEIPT OR POSSESSION OF THIS SOURCE CODE AND/OR RELATED INFORMATION
+ * DOES NOT CONVEY OR IMPLY ANY RIGHTS TO REPRODUCE, DISCLOSE OR DISTRIBUTE ITS CONTENTS,
+ * OR TO MANUFACTURE, USE, OR SELL ANYTHING THAT IT  MAY DESCRIBE, IN WHOLE OR IN PART.
+ */
+
+const config = require('config'),
+      logger = require('../config/logger')._logger('httpServer'),
+      express = require('express');
+
+const httpPort = Number(config.get('http_port'));
+
+const app = express();
+
+app.get('/livenessProbe', async (req, res) => {
+  const date = new Date();
+  const message = { now: date.toISOString() };
+  res.send(message);
+})
+
+app.listen(httpPort, () => logger.info(`Started http endpoint on port ${httpPort}. Please, use /livenessProbe !`))
\ No newline at end of file
diff --git a/msa/js-executor/config/custom-environment-variables.yml b/msa/js-executor/config/custom-environment-variables.yml
index c5eb15e8b9..7773fdaf0c 100644
--- a/msa/js-executor/config/custom-environment-variables.yml
+++ b/msa/js-executor/config/custom-environment-variables.yml
@@ -16,6 +16,7 @@
 
 queue_type: "TB_QUEUE_TYPE" #kafka (Apache Kafka) or aws-sqs (AWS SQS) or pubsub (PubSub) or service-bus (Azure Service Bus) or rabbitmq (RabbitMQ)
 request_topic: "REMOTE_JS_EVAL_REQUEST_TOPIC"
+http_port: "HTTP_PORT"      # /livenessProbe
 
 js:
   response_poll_interval: "REMOTE_JS_RESPONSE_POLL_INTERVAL_MS"
diff --git a/msa/js-executor/config/default.yml b/msa/js-executor/config/default.yml
index 5a2c47a675..bcefc1c639 100644
--- a/msa/js-executor/config/default.yml
+++ b/msa/js-executor/config/default.yml
@@ -16,6 +16,7 @@
 
 queue_type: "kafka"
 request_topic: "js_eval.requests"
+http_port: "8888" # /livenessProbe
 
 js:
   response_poll_interval: "25"
diff --git a/msa/js-executor/package.json b/msa/js-executor/package.json
index 280979afa6..ba940ee85a 100644
--- a/msa/js-executor/package.json
+++ b/msa/js-executor/package.json
@@ -18,6 +18,7 @@
     "aws-sdk": "^2.741.0",
     "azure-sb": "^0.11.1",
     "config": "^3.3.1",
+    "express": "^4.17.1",
     "js-yaml": "^3.14.0",
     "kafkajs": "^1.15.0",
     "long": "^4.0.0",
diff --git a/msa/js-executor/server.js b/msa/js-executor/server.js
index 0c415cc156..7b2e7e59b8 100644
--- a/msa/js-executor/server.js
+++ b/msa/js-executor/server.js
@@ -51,3 +51,5 @@ switch (serviceType) {
         process.exit(-1);
 }
 
+require('./api/httpServer');
+