Allow multiple healthchecks

Author: pyamsoft

README.md

@@ -56,13 +56,20 @@ all channels. The `BOT_TARGET_CHANNEL_IDS` is a comma-seperated list of channel
 
 The bot will always watch and reply in individual DMs.
 
+See the `env.default` file for reference.
+
 ### Health Check
 
 You can configure the bot to periodically send HTTP requests to a "health check" endpoint of your choice.
 You can configure the HTTP Method, URL, and provide a Bearer Token for authorization if needed.
 In order for the healthcheck to be enabled you MUST provide a valid URL.
 The method should be known by `axios`, if it is not provided, it will use the `axios` defaults.
-If the bearer token is not provided, it will be ignored. See the `env.default` file for reference.
+If the bearer token is not provided, it will be ignored.
+
+The variables for `BOT_HEALTHCHECK_URLS`, `BOT_HEALTHCHECK_METHODS`, and `BOT_HEALTHCHECK_BEARER_TOKENS` are
+comma-seperated lists. The lists must ALL be the same length.
+
+See the `env.default` file for reference.
 
 # License
 

env.default

@@ -4,6 +4,6 @@ BOT_PREFIX=$
 
 BOT_TARGET_CHANNEL_IDS=
 
-BOT_HEALTHCHECK_URL=YOUR_OPTIONAL_HEALTHCHECK_URL_HERE
-BOT_HEALTHCHECK_METHOD=get
-BOT_HEALTHCHECK_BEARER_TOKEN=YOUR_OPTIONAL__BEARER_TOKEN_HERE
+BOT_HEALTHCHECK_URLS=YOUR_OPTIONAL_HEALTHCHECK_URL_HERE_1,YOUR_OPTIONAL_HEALTHCHECK_URL_HERE_2
+BOT_HEALTHCHECK_METHODS=get,post
+BOT_HEALTHCHECK_BEARER_TOKENS=YOUR_OPTIONAL_BEARER_TOKEN_HERE_1,YOUR_OPTIONAL_BEARER_TOKEN_HERE_2

package.json

@@ -1,6 +1,6 @@
 {
   "name": "stonk-bot",
-  "version": "2.3.2",
+  "version": "2.3.3",
   "main": "index.js",
   "license": "Apache-2.0",
   "scripts": {

src/config.ts

@@ -31,14 +31,18 @@ export interface BotConfig {
   targetedChannels: ReadonlyArray<string>;
 
   // Health check
-  healthCheckUrl: string;
-  healthCheckMethod: Method | undefined
-  healthCheckBearerToken: string | undefined,
+  healthCheckUrls: ReadonlyArray<string>;
+  healthCheckMethods: ReadonlyArray<Method>;
+  healthCheckBearerTokens: ReadonlyArray<string>;
 }
 
 export const sourceConfig = function (): BotConfig {
   env.config();
   const rawSpecificChannel = process.env.BOT_TARGET_CHANNEL_IDS || "";
+  const rawHealthcheckUrl = process.env.BOT_HEALTHCHECK_URLS || "";
+  const rawHealthcheckMethod = process.env.BOT_HEALTHCHECK_METHODS || "";
+  const rawHealthcheckBearerToken =
+    process.env.BOT_HEALTHCHECK_BEARER_TOKENS || "";
   const config: BotConfig = Object.freeze({
     prefix: process.env.BOT_PREFIX || "$",
 
@@ -49,9 +53,14 @@ export const sourceConfig = function (): BotConfig {
       .map((s) => s.trim())
       .filter((s) => s),
 
-    healthCheckUrl: process.env.BOT_HEALTHCHECK_URL || "",
-    healthCheckMethod: process.env.BOT_HEALTHCHECK_METHOD as Method,
-    healthCheckBearerToken: process.env.BOT_HEALTHCHECK_BEARER_TOKEN,
+    healthCheckUrls: rawHealthcheckUrl.split(",").map((s) => s.trim()),
+    healthCheckMethods: rawHealthcheckMethod
+      .split(",")
+      .map((s) => s.trim())
+      .map((s) => s as Method),
+    healthCheckBearerTokens: rawHealthcheckBearerToken
+      .split(",")
+      .map((s) => s.trim()),
   });
   logger.log("Bot Config: ", config);
   return config;

src/health.ts

@@ -23,9 +23,9 @@ const logger = newLogger("HealthCheck");
 
 const fireHealthCheck = function (
   config: BotConfig,
-  url: string,
-  method: Method | undefined,
-  bearerToken: string | undefined,
+  urls: ReadonlyArray<string>,
+  methods: ReadonlyArray<Method>,
+  bearerTokens: ReadonlyArray<string>,
 ) {
   // Check that AAPL returns some data.
   // If it does, we are live and working
@@ -42,15 +42,13 @@ const fireHealthCheck = function (
       oldCommand: undefined,
     });
 
-    try {
-      let success: boolean;
-      if (check && !check.error) {
-        logger.log(`AAPL success, attempt healthcheck: ${url}`);
-        success = true;
-      } else {
-        logger.log(`AAPL failure, attempt healthcheck: ${url}`);
-        success = false;
-      }
+    const success = !!(check && !check.error);
+
+    const work: Promise<unknown>[] = [];
+    for (let i = 0; i < urls.length; ++i) {
+      const url = urls[i];
+      const method = methods[i];
+      const bearerToken = bearerTokens[i];
 
       let headers: RawAxiosRequestHeaders | undefined = undefined;
       if (bearerToken) {
@@ -59,40 +57,49 @@ const fireHealthCheck = function (
         };
       }
 
-      await axios({
-        // If undefined, will be axios default "get"
-        method,
-        headers,
-        url: `${url}?success=${success}`,
-      });
-    } catch (e) {
-      // Health check error, try again later
-      // Maybe network is offline?
-      logger.error(`Healthcheck failed!`, e);
+      work.push(
+        Promise.resolve().then(async () => {
+          try {
+            await axios({
+              // If undefined, will be axios default "get"
+              method,
+              headers,
+              url: `${url}?success=${success}`,
+            });
+          } catch (e) {
+            // Health check error, try again later
+            // Maybe network is offline?
+            logger.error(`Healthcheck report failed!`, url, success, e);
+          }
+        }),
+      );
     }
+
+    await Promise.all(work);
   });
 };
 
 export const registerPeriodicHealthCheck = function (config: BotConfig) {
   let timer: NodeJS.Timeout | undefined = undefined;
 
-  const { healthCheckMethod, healthCheckUrl, healthCheckBearerToken } = config;
+  const { healthCheckUrls, healthCheckMethods, healthCheckBearerTokens } =
+    config;
 
-  if (healthCheckUrl) {
+  if (healthCheckUrls.length > 0) {
     timer = setInterval(() => {
       fireHealthCheck(
         config,
-        healthCheckUrl,
-        healthCheckMethod,
-        healthCheckBearerToken,
+        healthCheckUrls,
+        healthCheckMethods,
+        healthCheckBearerTokens,
       );
     }, 60 * 1000);
 
     fireHealthCheck(
       config,
-      healthCheckUrl,
-      healthCheckMethod,
-      healthCheckBearerToken,
+      healthCheckUrls,
+      healthCheckMethods,
+      healthCheckBearerTokens,
     );
   }