@certik/skynet 0.10.3 → 0.10.6

package/.eslintrc.js

@@ -1,13 +1,13 @@
 module.exports = {
   env: {
     node: true,
-    browser: true,
+    browser: false,
     commonjs: true,
-    es2021: true
+    es2021: true,
   },
-  extends: "eslint:recommended",
+  extends: ["eslint:recommended", "plugin:import/recommended"],
   parserOptions: {
-    ecmaVersion: 12
+    ecmaVersion: 12,
   },
-  rules: {}
+  rules: {},
 };

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # Changelog
 
+## 0.10.6
+
+- Fixed producer check function
+
+## 0.10.5
+
+- BREAKING Changed the signature of `postGenieMessage` function in `opsgenie` to make it more customizable
+
+## 0.10.4
+
+- Fixed typo in coinmarketcap ids in `PROTOCOLS` in `const`
+
 ## 0.10.3
 
 - Added coinmarketcap ids to `PROTOCOLS` in `const`

package/app.js

@@ -1,9 +1,15 @@
 const { EOL } = require("os");
 const fetch = require("node-fetch");
 const { SKYNET_API_PREFIX } = require("./const");
-const { createIndexerApp, createModeIndexerApp } = require("./indexer");
+const {
+  createIndexerApp,
+  createModeIndexerApp,
+  getIndexerLatestId,
+  getIndexerValidatedId,
+  getIndexerState,
+} = require("./indexer");
 const { createDeploy, createModeDeploy } = require("./deploy");
-const { createProducerApp, createConsumerApp } = require("./kafka");
+const { createProducerApp, createConsumerApp, getProducerLatestId } = require("./kafka");
 const { startApiApp } = require("./api");
 const { createMonitor, ERROR_LEVEL } = require("./monitor");
 const { getBinaryName, detectBin, detectWorkingDirectory } = require("./cli");
@@ -326,7 +332,13 @@ function modeIndexer({ name, selector, state, build, validate, check, env = {},
       const { monitor } = createMonitor({
         binaryName: `${getBinaryName()} check`,
         name,
-        type: "stateful",
+        getState: async (nam, selectorFlags) => {
+          const latestId = await getIndexerLatestId(nam, selectorFlags);
+          const validatedId = await getIndexerValidatedId(nam, selectorFlags);
+          const buildState = await getIndexerState(nam, selectorFlags);
+
+          return { latestId, validatedId, buildState };
+        },
         selector,
         mode: true,
         check: check.func,
@@ -428,7 +440,11 @@ function producer({ name, selector, produce, check, state, env = {}, region = "u
       const { monitor } = createMonitor({
         binaryName: `${getBinaryName()} check`,
         name,
-        type: "stateful",
+        getState: async (nam, selectorFlags) => {
+          const latestId = await getProducerLatestId(nam, selectorFlags);
+
+          return { latestId };
+        },
         selector,
         check: check.func,
         maxRetry: check.maxRetry,
@@ -520,7 +536,6 @@ function consumer({ name, selector, consume, check, env = {}, region = "us-east-
       const { monitor } = createMonitor({
         binaryName: `${getBinaryName()} check`,
         name,
-        type: "stateless",
         selector,
         check: check.func,
         maxRetry: check.maxRetry,
@@ -660,7 +675,6 @@ function api({ name, routes, serve, env = {}, region = "us-east-1" }) {
       const { monitor } = createMonitor({
         binaryName: `${getBinaryName()} check`,
         name,
-        type: "stateless",
         selector,
         check: check.func,
         maxRetry: check.maxRetry,

package/deploy.js

@@ -91,7 +91,8 @@ const genConfig = ({
       port "http" {
         static = ${service.port}
       }
-    }` : ""
+    }`
+        : ""
     }
 
     task "log-shipper" {
@@ -437,6 +438,7 @@ function createModeDeploy({
           SKYNET_NOMAD_PRODUCTION_ADDR: null,
           SKYNET_SLACK_TOKEN: null,
           OPSGENIE_API_KEY: null,
+          OPSGENIE_END_POINT: null,
         },
         region,
         cmd: `${check.bin} ${args} ${production ? "--production" : ""}`,
@@ -596,6 +598,7 @@ function createDeploy({
           SKYNET_NOMAD_PRODUCTION_ADDR: null,
           SKYNET_SLACK_TOKEN: null,
           OPSGENIE_API_KEY: null,
+          OPSGENIE_END_POINT: null,
         },
         region,
         cmd: `${check.bin} ${args} ${production ? "--production" : ""}`,

package/kafka.js

@@ -439,4 +439,5 @@ module.exports = {
   createConsumerApp,
   produceMessages,
   consumeMessages,
+  getProducerLatestId,
 };

package/monitor.js

@@ -3,7 +3,6 @@ const fetch = require("node-fetch");
 const { getSelectorFlags, getSelectorDesc, toSelectorString } = require("./selector");
 const { getBinaryName } = require("./cli");
 const { exponentialRetry } = require("./availability");
-const { getIndexerLatestId, getIndexerValidatedId, getIndexerState } = require("./indexer");
 const { postGenieMessage } = require("./opsgenie");
 const { getJobName } = require("./deploy");
 
@@ -67,7 +66,7 @@ async function getMostRecentJobLaunch(name) {
   }
 }
 
-function createMonitor({ binaryName, name, type = "stateless", mode = false, selector = {}, check, maxRetry = 2 }) {
+function createMonitor({ binaryName, name, getState = null, mode = false, selector = {}, check, maxRetry = 2 }) {
   function monitor() {
     if (!binaryName) {
       binaryName = getBinaryName();
@@ -109,18 +108,16 @@ ${
       const startTime = Date.now();
       console.log(`[MONITOR] starting check, ${toSelectorString(selectorFlags, ", ")}`);
 
-      const state = {};
+      let checkState = {};
 
-      if (type === "stateful") {
-        state.latestId = await getIndexerLatestId(name, selectorFlags);
-        state.validatedId = await getIndexerValidatedId(name, selectorFlags);
-        state.buildState = await getIndexerState(name, selectorFlags);
+      if (getState) {
+        checkState = await getState(name, selectorFlags);
       }
 
       let result = await exponentialRetry(
         async () => {
           try {
-            const errors = await check({ verbose, state, mode, ...selectorFlags });
+            const errors = await check({ verbose, state: checkState, mode, ...selectorFlags });
 
             if (!Array.isArray(errors)) {
               throw new Error(`check function must return array of error messages`);
@@ -153,12 +150,14 @@ ${
 
           // alert on opsgenie
           await postGenieMessage(
-            `Failed Service Check: ${jobName}`,
-            `<p><b>Service:</b><a href="${nomadAddr}/ui/jobs/${jobName}" target="_blank">${jobName}</a></p><p><b>Issues</b></p><ul>${sortErrors(
-              result
-            )
-              .map((m) => `<li><b>${m.type}:</b> ${m.message}</li>`)
-              .join("")}</ul>`,
+            {
+              message: `Failed Service Check: ${jobName}`,
+              description: `<p><b>Service:</b><a href="${nomadAddr}/ui/jobs/${jobName}" target="_blank">${jobName}</a></p><p><b>Issues</b></p><ul>${sortErrors(
+                result
+              )
+                .map((m) => `<li><b>${m.type}:</b> ${m.message}</li>`)
+                .join("")}</ul>`,
+            },
             verbose
           );
         } else {

package/opsgenie.js

@@ -1,5 +1,5 @@
 const fetch = require("node-fetch");
-const hash = require("object-hash");
+const md5 = require("md5");
 
 function getGenieKey() {
   return process.env.OPSGENIE_API_KEY;
@@ -15,32 +15,28 @@ function getGenieEndPoint() {
   return process.env.OPSGENIE_END_POINT;
 }
 
-async function postGenieMessage(msg, desc, verbose) {
+async function postGenieMessage(body, verbose) {
   try {
     const genieKey = getGenieKey();
     const genieEndPoint = getGenieEndPoint();
 
-    const body = {
-      message: msg,
-      description: desc
-    };
-
     // Prevents duplicate alerts (See Opsgenie doc about alias)
-    const bodyHash = hash(body);
-    body.alias = bodyHash;
+    if (!body.alias) {
+      body.alias = md5(body.message);
+    }
 
     if (verbose) {
-      console.log(`Making API call to Opsgenie ${msg} (${desc}):`, JSON.stringify(body, null, 2));
+      console.log(`Making API call to Opsgenie`, JSON.stringify(body, null, 2));
     }
 
     // Makes the call using fetch and ENV variables
     const response = await fetch(genieEndPoint, {
       method: "POST",
       headers: {
-          "Content-Type": "application/json",
-          "Authorization": "GenieKey " + genieKey
+        "Content-Type": "application/json",
+        Authorization: `GenieKey ${genieKey}`,
       },
-      body: JSON.stringify(body)
+      body: JSON.stringify(body),
     });
 
     const result = await response.json();
@@ -48,8 +44,7 @@ async function postGenieMessage(msg, desc, verbose) {
       console.log(`Result of API call to Opsgenie... ${result}`);
     }
 
-    return result
-
+    return result;
   } catch (error) {
     console.error("Failed to make opsgenie API call", error);
 

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@certik/skynet",
-  "version": "0.10.3",
+  "version": "0.10.6",
   "description": "Skynet Shared JS library",
   "main": "index.js",
   "author": "CertiK Engineering",
   "scripts": {
-    "lint": "eslint . test",
+    "lint": "eslint *.js test",
     "test": "ava"
   },
   "engines": {
@@ -18,9 +18,9 @@
     "execa": "^5.0.0",
     "express": "^4.18.1",
     "kafkajs": "^1.15.0",
+    "md5": "^2.3.0",
     "meow": "^7.0.1",
     "node-fetch": "^2.6.1",
-    "object-hash": "^2.2.0",
     "snowflake-sdk": "^1.6.3",
     "web3": "^1.3.5",
     "which": "^2.0.2"
@@ -28,6 +28,7 @@
   "devDependencies": {
     "ava": "^3.13.0",
     "eslint": "^7.22.0",
+    "eslint-plugin-import": "^2.26.0",
     "sinon": "^11.1.2"
   },
   "license": "MIT"