@hyperwatch/hyperwatch 4.0.0 → 4.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperwatch/hyperwatch",
-  "version": "4.0.0",
+  "version": "4.2.0",
   "description": "Open Source HTTP Traffic Manager",
   "license": "Apache-2.0",
   "author": "François Hodierne <francois@hodierne.net>",
@@ -20,47 +20,47 @@
     "depcheck": "depcheck",
     "lint": "eslint '**/*.js'",
     "lint:fix": "eslint '**/*.js' --fix",
-    "start": "node start",
-    "test": "mocha --recursive",
     "prettier": "prettier \"**/*.@(js|json|md|yml)\"",
     "prettier:check": "npm run prettier -- --list-different",
-    "prettier:write": "npm run prettier -- --write"
+    "prettier:write": "npm run prettier -- --write",
+    "start": "node start",
+    "test": "mocha --recursive"
   },
   "dependencies": {
-    "@hyperwatch/useragent": "^3.9.1",
+    "@hyperwatch/useragent": "^3.9.3",
     "accept-language-parser": "^1.5.0",
-    "ajv": "^8.11.0",
+    "ajv": "^8.12.0",
     "ajv-formats": "^2.1.1",
     "chalk": "^4.1.0",
     "country-code-emoji": "^2.3.0",
     "debug": "^4.3.4",
-    "dnsbl": "^4.0.0",
+    "dnsbl": "^4.0.1",
     "express": "^4.18.2",
     "express-ws": "^5.0.2",
-    "geoip-lite": "^1.4.6",
-    "immutable": "^4.1.0",
-    "ip-cidr": "^3.0.10",
+    "geoip-lite": "^1.4.8",
+    "immutable": "^4.3.4",
+    "ip-cidr": "^3.1.0",
     "lodash": "^4.17.21",
     "lru-cache": "^10.0.1",
     "micro-strptime": "^0.2.3",
     "proxy-addr": "^2.0.7",
     "rc": "^1.2.8",
     "syslog-parse": "^1.3.1",
-    "tail": "^2.2.4",
-    "uuid": "^9.0.0",
-    "ws": "^8.9.0"
+    "tail": "^2.2.6",
+    "uuid": "^9.0.1",
+    "ws": "^8.14.2"
   },
   "devDependencies": {
-    "depcheck": "^1.4.3",
-    "eslint": "^8.25.0",
-    "eslint-plugin-import": "^2.26.0",
+    "depcheck": "^1.4.7",
+    "eslint": "^8.53.0",
+    "eslint-plugin-import": "^2.29.0",
     "eslint-plugin-node": "^11.1.0",
     "husky": "^4.3.5",
     "lint-staged": "^10.5.3",
-    "mocha": "^10.0.0",
+    "mocha": "^10.2.0",
     "node-fetch": "^2.0.0",
-    "prettier": "^3.0.3",
-    "prettier-package-json": "^2.7.0"
+    "prettier": "^3.3.3",
+    "prettier-package-json": "^2.8.0"
   },
   "engines": {
     "node": ">=14.0"

package/src/lib/formatter.js

@@ -34,8 +34,8 @@ const executionTime = (log, output) => {
   return log.get('executionTime') <= 100
     ? colorize('green', `${log.get('executionTime')}ms`, output)
     : log.get('executionTime') >= 1000
-    ? colorize('red', `${log.get('executionTime')}ms`, output)
-    : colorize('yellow', `${log.get('executionTime')}ms`, output);
+      ? colorize('red', `${log.get('executionTime')}ms`, output)
+      : colorize('yellow', `${log.get('executionTime')}ms`, output);
 };
 
 const identity = (log) => log.getIn(['identity'], '');

package/src/modules/identity.js

@@ -229,6 +229,28 @@ function augment(log) {
       return address && new IPCIDR('203.133.160.0/19').contains(address)
         ? log.set('identity', family)
         : log;
+    case 'OAI-SearchBot':
+      // https://openai.com/searchbot.json
+      return address &&
+        (new IPCIDR('20.42.10.176/28').contains(address) ||
+          new IPCIDR('172.203.190.128/28').contains(address) ||
+          new IPCIDR('51.8.102.0/24').contains(address))
+        ? log.set('identity', 'OpenAI SearchBot')
+        : log;
+    case 'GPTBot':
+      // https://openai.com/gptbot.json
+      return address &&
+        (new IPCIDR('52.230.152.0/24').contains(address) ||
+          new IPCIDR('52.233.106.0/24').contains(address) ||
+          new IPCIDR('20.171.206.0/24').contains(address) ||
+          new IPCIDR('20.171.207.0/24').contains(address) ||
+          new IPCIDR('4.227.36.0/25').contains(address))
+        ? log.set('identity', 'OpenAI GPTBot')
+        : log;
+    case 'meta-externalagent':
+      return address && new IPCIDR('2a03:2880:f800::/48').contains(address)
+        ? log.set('identity', 'Meta External Agent')
+        : log;
 
     // EC2
     case 'Raven':
@@ -266,6 +288,10 @@ function augment(log) {
         hostname.endsWith('.eu-central-1.compute.amazonaws.com')
         ? log.set('identity', 'Wise')
         : log;
+    case 'ClaudeBot':
+      return hostname && hostname.endsWith('.us-east-2.compute.amazonaws.com')
+        ? log.set('identity', 'Claude')
+        : log;
 
     // GCE
     case 'VelenPublicWebCrawler':
@@ -308,6 +334,9 @@ function augment(log) {
     if (hostname.endsWith('.us.archive.org')) {
       return log.set('identity', 'Archive.org');
     }
+    if (hostname.endsWith('.qwant.com')) {
+      return log.set('identity', 'Qwant');
+    }
   }
 
   // Signature

package/src/input/vercel.js

@@ -1,81 +0,0 @@
-const crypto = require('crypto');
-
-const { fromJS } = require('immutable');
-
-const app = require('../app/api');
-
-/**
- * Create a log from Vercel JSON log drain format
- */
-function parseVercel(request) {
-  return fromJS({
-    request: {
-      time: new Date(request.proxy.timestamp).toISOString(),
-      address: request.proxy.clientIp,
-      scheme: request.proxy.scheme,
-      method: request.proxy.method,
-      url: request.proxy.path,
-      headers: {
-        host: request.proxy.host,
-        'user-agent': request.proxy.userAgent[0],
-      },
-      captured_headers: ['host', 'user-agent'],
-    },
-    response: {
-      status: request.proxy.statusCode,
-    },
-  });
-}
-
-function verifySignature(req, secret) {
-  if (!req.headers['x-vercel-signature'] || !secret) {
-    return true;
-  }
-
-  return (
-    req.headers['x-vercel-signature'] ===
-    crypto.createHmac('sha1', secret).update(req.rawBody).digest('hex')
-  );
-}
-
-function create({
-  name = 'HTTP input (Vercel JSON log drain format)',
-  path = '/input/vercel',
-  parse = parseVercel,
-  verify,
-  secret,
-}) {
-  return {
-    name: name,
-    start: ({ success, reject, status }) => {
-      app.post(path, (req, res) => {
-        // Send back verify header (only needed to setup the drain)
-        if (verify) {
-          res.set('x-vercel-verify', verify);
-        }
-        // Verify signature
-        if (!verifySignature(req, secret)) {
-          res.statusCode = 403;
-          res.send("Signature didn't match");
-          return;
-        }
-        // No extra validation before sending the response to the client
-        res.send('Ok');
-        // Processing the message(s)
-        const messages = Array.isArray(req.body) ? req.body : [req.body];
-        messages.forEach((message) => {
-          try {
-            success(parse(message));
-          } catch (err) {
-            reject(err);
-          }
-        });
-      });
-      status(null, `Listening on http://__HOST__${path}`);
-    },
-  };
-}
-
-module.exports = {
-  create: create,
-};