@certik/skynet 0.10.20 → 0.10.23

package/CHANGELOG.md

@@ -1,5 +1,34 @@
 # Changelog
 
+## 0.10.23
+
+- Fixed nomad API log elapse time
+
+## 0.10.22
+
+- Fixed nomad API log elapse time
+- Fixed missing abort controller for proxy lib
+
+## 0.10.21
+
+- Enabled more customizations for indexer selector support, check https://github.com/sindresorhus/meow for available config options, an example
+
+```
+selectors: {
+  "onlyProject": {
+    type: "string",
+    alias: "only-project",
+    default: null,
+    isRequired: false
+  },
+
+  "protocol": {
+    type: "string",
+    isRequired: true
+  }
+}
+```
+
 ## 0.10.20
 
 - Used shorter lock ttl for api and producer

package/api.js

@@ -5,10 +5,18 @@ const { isProduction } = require("./env");
 const { useLock } = require("./distributed-lock");
 const { inline } = require("./log");
 
-async function logMiddleware(req, res, next) {
+async function logStartMiddleware(req, res, next) {
   const start = new Date();
+
+  res.set("x-requested-at", start.toISOString());
+
   next();
+}
+
+async function logEndMiddleware(req, res, next) {
+  const start = new Date(res.get("x-requested-at"));
   const end = new Date();
+
   const logInfo = {
     start,
     end,
@@ -21,6 +29,8 @@ async function logMiddleware(req, res, next) {
     logInfo.errorMessage = res.statusMessage;
   }
   inline.log(JSON.stringify(logInfo));
+
+  next();
 }
 
 const apiKeyMiddleware = (key) => {
@@ -94,10 +104,6 @@ ${getSelectorDesc(selector)}
     const method = route.method ? route.method.toLowerCase() : "get";
     const middlewares = route.middlewares || [];
 
-    if (route.log !== false) {
-      middlewares.unshift(logMiddleware);
-    }
-
     if (route.protected) {
       middlewares.unshift(apiKeyMiddleware(serve.apiKey));
     }
@@ -107,21 +113,29 @@ ${getSelectorDesc(selector)}
         inline.log(`registering ${method} ${route.path}`);
       }
 
-      app[method](route.path, ...middlewares, async (req, res) => {
-        try {
-          await route.handler({ req, res, ...selectorFlags });
-        } catch (routeErr) {
-          inline.log("caught route err", routeErr);
+      app[method](
+        route.path,
+        logStartMiddleware,
+        ...middlewares,
+        async (req, res, next) => {
+          try {
+            await route.handler({ req, res, ...selectorFlags });
+          } catch (routeErr) {
+            inline.log("caught route err", routeErr);
 
-          res.status(500).send(`internal server error: ${routeErr.message}`);
-        }
-      });
+            res.status(500).send(`internal server error: ${routeErr.message}`);
+          }
+
+          next();
+        },
+        logEndMiddleware
+      );
     }
   }
 
   app.listen(serve.port, () => {
     if (isProduction()) {
-      inline.log(`${name} listening at https://api.certik-skynet.com/${serve.prefix}`);
+      inline.log(`${name} listening at https://api.certik-skynet.com${serve.prefix}`);
     } else {
       inline.log(`${name} listening at http://localhost:${serve.port}`);
     }

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@certik/skynet",
-  "version": "0.10.20",
+  "version": "0.10.23",
   "description": "Skynet Shared JS library",
   "main": "index.js",
   "author": "CertiK Engineering",
@@ -14,6 +14,7 @@
   "dependencies": {
     "@slack/web-api": "^6.4.0",
     "ably": "^1.2.22",
+    "abort-controller": "^3.0.0",
     "aws-sdk": "^2.1164.0",
     "bottleneck": "^2.19.5",
     "chalk": "^4.1.2",

package/selector.js

@@ -17,18 +17,16 @@ function getSelectorDesc(selector) {
     .join("\n");
 }
 
+// check https://github.com/sindresorhus/meow for selector config options
 function getSelectorFlags(selector) {
   return Object.keys(selector).reduce((acc, name) => {
     const flag = {
       type: selector[name].type || "string",
-      isRequired: true,
+      ...selector[name]
     };
 
-    if (selector[name].default) {
-      flag.default = selector[name].default;
-    }
-
-    if (!selector[name].optional) {
+    // by default to be required
+    if (!selector[name].optional && selector[name].isRequired !== false) {
       flag.isRequired = true;
     }