Added module based checkers! Now you can write custom checkers to check any thing.

Author: Phara0h

README.md

@@ -15,6 +15,10 @@ npm install -g sky-puppy
 sky-puppy
 ```
 
+## Checkers
+
+- request (native)
+
 ## Sample Config
 
 Sky Puppy looks for a file called `sky-puppy-config.json` in the folder it is ran at.
@@ -142,4 +146,3 @@ All notable changes to this project will be documented in this file. Dates are d
 
 - init commit config based is done REST endpoints to come [`b03ca2e`](https://github.com/Phara0h/sky-puppy/commit/b03ca2ee43ac5754f020d1963dcb9e201cd47e0d)
 - Initial commit [`b7535a3`](https://github.com/Phara0h/sky-puppy/commit/b7535a3a3990fe081f932dc6e1079a86bdf9842f)
-

README.nbs

@@ -87,14 +87,17 @@ Sky Puppy looks for a file called `sky-puppy-config.json` in the folder it is ra
     "your_service": {
       "interval": 3,
       "start_delay": 2,
-      "request": {
-        "uri": "http://127.0.0.1/a/cool/endpoint",
-        "timeout": 2,
-        "json": true,
-        "method": "PUT",
-        "body": {
-          "test": "sweet"
-        },
+      "checker": {
+          "name": "request",
+          "settings": {
+            "uri": "http://127.0.0.1/a/cool/endpoint",
+            "timeout": 2,
+            "json": true,
+            "method": "PUT",
+            "body": {
+              "test": "sweet"
+            },
+          }
       },
       "alerts": [
         {

src/checkers/request.js

@@ -0,0 +1,56 @@
+var fasquest = require('fasquest');
+const client = {
+  https: require('https'),
+  http: require('http')
+};
+
+fasquest.agent = {
+  http: new client.http.Agent({
+    keepAlive: false
+  }),
+  https: new client.https.Agent({
+    keepAlive: false
+  })
+};
+
+class Request {
+  constructor(config, service, settings) {
+    this.config = config;
+    this.service = service;
+    this.settings = settings;
+  }
+  async init() {
+    if (this.settings) {
+      this.settings.method = this.settings.method || 'GET';
+    }
+    this.settings.timeout = Math.round((this.settings.timeout || 60) * 1000);
+    this.settings.resolveWithFullResponse = true;
+    this.settings.simple = false;
+
+    this.service.config.expected_response_time =
+      this.service.expected_response_time || this.settings.timeout;
+
+    if (!this.settings.headers) {
+      this.settings.headers = {};
+    }
+    this.settings.headers[
+      'User-Agent'
+    ] = `Sky-Puppy / ${this.config.skypuppy.version} (Health Check Service)`;
+  }
+
+  async check() {
+    try {
+      var res = await fasquest.request(this.settings);
+
+      return {
+        code: res.statusCode
+      };
+    } catch (e) {
+      throw e.err;
+    }
+  }
+}
+
+module.exports = function(config, service, settings) {
+  return new Request(config, service, settings);
+};

src/config.js

@@ -17,7 +17,6 @@ class Config {
       console.log(
         'Error loading config. Creating and using default one at ' + this.path
       );
-      this.saveConfig();
     }
     if (!this.alerters) {
       this.settings.alerters = {};
@@ -27,9 +26,16 @@ class Config {
       this.settings.services = {};
     }
 
+    if (!this.checkers) {
+      this.settings.checkers = {
+        request: {}
+      };
+    }
+
     this.settings.skypuppy = this.settings.skypuppy || {
       version: this.version
     };
+    this.saveConfig();
   }
 
   addService(name, service) {
@@ -87,6 +93,13 @@ class Config {
     return this.settings.alerters;
   }
 
+  getChecker(name) {
+    return this.checkers[name];
+  }
+  get checkers() {
+    return this.settings.checkers;
+  }
+
   get skypuppy() {
     return this.settings.skypuppy;
   }

src/health-check.js

@@ -1,36 +1,50 @@
 const fs = require('fs');
-var fasquest = require('fasquest');
-const client = {
-  https: require('https'),
-  http: require('http')
-};
-
-fasquest.agent = {
-  http: new client.http.Agent({
-    keepAlive: false
-  }),
-  https: new client.https.Agent({
-    keepAlive: false
-  })
-};
 
 const Config = require('./config.js');
 var config = new Config();
 const Alerts = require('./alerts.js');
 
 class HealthCheck {
   constructor(stats, nbars) {
+    this.checkers = {};
     this.services = {};
     this.alerters = {};
     this.stats = stats;
     this.alerts = new Alerts(stats, config, nbars);
-
+    var checkersKeys = Object.keys(config.checkers);
     var servicesKeys = Object.keys(config.services);
 
+    for (var i = 0; i < checkersKeys.length; i++) {
+      var checker = {
+        ...config.getChecker(checkersKeys[i])
+      };
+
+      if (checkersKeys[i] == 'request') {
+        this.checkers[checkersKeys[i]] = {
+          mod: require('./checkers/request'),
+          settings: checker,
+          name: checkersKeys[i]
+        };
+      } else {
+        try {
+          this.checkers[checkersKeys[i]] = {
+            mod: require(checker.name),
+            settings: checker,
+            name: checkersKeys[i]
+          };
+        } catch (e) {
+          console.error(`Failed to load ${checkersKeys[i]}!`);
+          process.exit();
+        }
+      }
+    }
+
     for (var i = 0; i < servicesKeys.length; i++) {
-      this.startService(servicesKeys[i], {
+      var service = {
         ...config.getService(servicesKeys[i])
-      });
+      };
+
+      this.startService(servicesKeys[i], service);
     }
   }
 
@@ -94,13 +108,13 @@ class HealthCheck {
     return false;
   }
 
-  startService(name, service) {
+  async startService(name, service) {
     if (!this.services[name]) {
       console.log(`Starting service ${name} ...`);
       var nService = {
         name,
         enabled: true,
-        delete: false,
+        checker: {},
         config: {
           ...service,
           interval: Math.round((service.interval || 5) * 1000), // default 5 seconds
@@ -119,23 +133,22 @@ class HealthCheck {
           }
         }
       };
-
-      nService.config.request.method = nService.config.request.method || 'GET';
-      nService.config.request.timeout = Math.round(
-        (nService.config.request.timeout || 60) * 1000
-      );
-      nService.config.request.resolveWithFullResponse = true;
-      nService.config.request.simple = false;
-
-      nService.config.expected_response_time =
-        service.expected_response_time || nService.config.request.timeout;
-
-      if (!nService.config.request.headers) {
-        nService.config.request.headers = {};
+      var checker = this.checkers[nService.config.checker.name];
+      var checkerSettings = {};
+
+      if (checker.settings) {
+        checkerSettings = {
+          ...checker.settings,
+          ...nService.config.checker.settings
+        };
+      } else {
+        checkerSettings = {
+          ...nService.config.checker.settings
+        };
       }
-      nService.config.request.headers[
-        'User-Agent'
-      ] = `Sky-Puppy / ${config.skypuppy.version} (Health Check Service)`;
+
+      nService.checker = await checker.mod(config, nService, checkerSettings);
+      await nService.checker.init();
 
       this.services[name] = nService;
 
@@ -157,11 +170,11 @@ class HealthCheck {
       const oldStatus = service.status.up;
 
       try {
-        var res = await fasquest.request(service.config.request);
+        var res = await service.checker.check();
 
         service.status.time =
           Number(process.hrtime.bigint() - startTime) / 1000000;
-        service.status.code = res.statusCode;
+        service.status.code = res.code;
         service.status.up = 1;
 
         if (service.config.expected_status != service.status.code) {
@@ -193,7 +206,8 @@ class HealthCheck {
         service.status.count.down++;
         service.status.up = -1;
         service.status.code = 0;
-        console.log(service.name, e.err.message);
+
+        console.log(service.name, e.message);
       }
 
       if (service.status.last_status == null) {