@certik/skynet 0.10.5 → 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,9 @@
 # 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

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/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`);

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "@certik/skynet",
-  "version": "0.10.5",
+  "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": {
@@ -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"