@hyperwatch/hyperwatch 3.8.2 → 3.9.0

package/package.json

@@ -1,5 +1,6 @@
 {
   "name": "@hyperwatch/hyperwatch",
+  "version": "3.9.0",
   "description": "Open Source HTTP Traffic Manager",
   "license": "Apache-2.0",
   "author": "François Hodierne <francois@hodierne.net>",
@@ -11,7 +12,6 @@
     "type": "git",
     "url": "https://github.com/hyperwatch/hyperwatch.git"
   },
-  "version": "3.8.2",
   "main": "hyperwatch.js",
   "bin": {
     "hyperwatch": "./bin/hyperwatch"
@@ -27,39 +27,39 @@
     "prettier:write": "npm run prettier -- --write"
   },
   "dependencies": {
-    "@hyperwatch/useragent": "^3.7.4",
+    "@hyperwatch/useragent": "^3.9.1",
     "accept-language-parser": "^1.5.0",
-    "ajv": "^8.6.2",
-    "ajv-formats": "^2.1.0",
+    "ajv": "^8.11.0",
+    "ajv-formats": "^2.1.1",
     "chalk": "^4.1.0",
-    "country-code-emoji": "^2.1.0",
-    "debug": "^4.3.1",
+    "country-code-emoji": "^2.3.0",
+    "debug": "^4.3.4",
     "dnsbl": "^3.2.0",
-    "express": "^4.17.1",
+    "express": "^4.18.2",
     "express-ws": "^5.0.2",
-    "geoip-lite": "^1.4.2",
-    "immutable": "^4.0.0-rc.12",
-    "ip-cidr": "^3.0.3",
-    "lodash": "^4.17.20",
-    "lru-cache": "^6.0.0",
+    "geoip-lite": "^1.4.6",
+    "immutable": "^4.1.0",
+    "ip-cidr": "^3.0.10",
+    "lodash": "^4.17.21",
+    "lru-cache": "^7.14.0",
     "micro-strptime": "^0.2.3",
-    "proxy-addr": "^2.0.6",
+    "proxy-addr": "^2.0.7",
     "rc": "^1.2.8",
     "syslog-parse": "^1.3.1",
-    "tail": "^2.0.4",
-    "uuid": "^8.3.2",
-    "ws": "^8.0.0"
+    "tail": "^2.2.4",
+    "uuid": "^9.0.0",
+    "ws": "^8.9.0"
   },
   "devDependencies": {
-    "depcheck": "^1.3.1",
-    "eslint": "^7.15.0",
-    "eslint-plugin-import": "^2.22.1",
+    "depcheck": "^1.4.3",
+    "eslint": "^8.25.0",
+    "eslint-plugin-import": "^2.26.0",
     "eslint-plugin-node": "^11.1.0",
     "husky": "^4.3.5",
     "lint-staged": "^10.5.3",
-    "mocha": "^9.0.2",
-    "prettier": "^2.2.1",
-    "prettier-package-json": "^2.1.3"
+    "mocha": "^10.0.0",
+    "prettier": "^2.7.1",
+    "prettier-package-json": "^2.7.0"
   },
   "engines": {
     "node": ">=12.0"

package/src/index.js

@@ -18,7 +18,7 @@ function init(config = {}) {
     return;
   }
   merge(constants, config);
-  modules.load();
+  modules.init();
   initialized = true;
 }
 
@@ -27,7 +27,7 @@ function start() {
     console.warn(`Can't start, Hyperwatch was not initialized.`);
     return;
   }
-  modules.beforeStart();
+  modules.start();
   return Promise.all([app.start(), pipeline.start()]);
 }
 

package/src/modules/address.js

@@ -11,11 +11,11 @@ function fill(log) {
   return log;
 }
 
-function load() {
+function init() {
   pipeline.getNode('main').map(fill).registerNode('main');
 }
 
-function beforeStart() {
+function start() {
   const aggregator = new Aggregator();
 
   aggregator.setIdentifier(identifier);
@@ -26,6 +26,6 @@ function beforeStart() {
 }
 
 module.exports = {
-  load,
-  beforeStart,
+  init,
+  start,
 };

package/src/modules/agent.js

@@ -66,7 +66,7 @@ const osFormat = (log) => {
   return agentOs.get('family');
 };
 
-function load() {
+function init() {
   pipeline.getNode('main').map(augment).registerNode('main');
 
   aggregator.defaultFormatter.insertFormat('agent', agentFormat, {
@@ -84,7 +84,7 @@ function load() {
 module.exports = {
   lookup,
   augment,
-  load,
+  init,
   agentFormat,
   osFormat,
 };

package/src/modules/cloudflare.js

@@ -35,11 +35,11 @@ function augment(log) {
   return log;
 }
 
-function load() {
+function init() {
   pipeline.getNode('main').map(augment).registerNode('main');
 }
 
 module.exports = {
   augment,
-  load,
+  init,
 };

package/src/modules/dnsbl.js

@@ -33,7 +33,7 @@ const xblFormat = (log, output) => {
   }
 };
 
-function load() {
+function init() {
   pipeline.getNode('main').map(augment).registerNode('main');
 
   aggregator.defaultFormatter.insertFormat('xbl', xblFormat, {
@@ -44,5 +44,5 @@ function load() {
 
 module.exports = {
   augment,
-  load,
+  init,
 };

package/src/modules/geoip.js

@@ -34,7 +34,7 @@ const country = (log, output) => {
   }
 };
 
-function load() {
+function init() {
   pipeline.getNode('main').map(augment).registerNode('main');
 
   aggregator.defaultFormatter.insertFormat('country', country, {
@@ -53,6 +53,6 @@ function load() {
 
 module.exports = {
   lookup,
-  load,
+  init,
   augment,
 };

package/src/modules/hostname.js

@@ -78,12 +78,12 @@ async function augment(log, { fast = false } = {}) {
   return log;
 }
 
-function load() {
+function init() {
   pipeline.getNode('main').map(augment).registerNode('main');
 }
 
 module.exports = {
   lookup,
   augment,
-  load,
+  init,
 };

package/src/modules/identity.js

@@ -174,6 +174,10 @@ function augment(log) {
       return hostname && hostname.endsWith('.arquivo.pt')
         ? log.set('identity', 'Arquivo')
         : log;
+    case 'SeekportBot':
+      return hostname && hostname.endsWith('.007ac9.net')
+        ? log.set('identity', 'Seekport')
+        : log;
 
     // Per hostname + CIDR
     case 'Twitterbot':
@@ -310,11 +314,11 @@ const identifier = (log) =>
   log.getIn(['address', 'value']) ||
   log.getIn(['request', 'address']);
 
-function load() {
+function init() {
   pipeline.getNode('main').map(augment).registerNode('main');
 }
 
-function beforeStart() {
+function start() {
   const aggregator = new Aggregator();
 
   aggregator.setIdentifier(identifier);
@@ -326,6 +330,6 @@ function beforeStart() {
 
 module.exports = {
   augment,
-  load,
-  beforeStart,
+  init,
+  start,
 };

package/src/modules/index.js

@@ -45,25 +45,25 @@ function activeModules() {
     .filter((m) => m);
 }
 
-function load() {
+function init() {
   for (const module of activeModules()) {
-    if (module && module.load) {
-      module.load();
+    if (module && module.init) {
+      module.init();
     }
   }
 }
 
-function beforeStart() {
+function start() {
   for (const module of activeModules()) {
-    if (module && module.beforeStart) {
-      module.beforeStart();
+    if (module && module.start) {
+      module.start();
     }
   }
 }
 
 module.exports = {
   get,
-  load,
-  beforeStart,
+  init,
+  start,
   activeModules,
 };

package/src/modules/language.js

@@ -29,7 +29,7 @@ const language = (log) => {
   }
 };
 
-function load() {
+function init() {
   pipeline.getNode('main').map(augment).registerNode('main');
 
   aggregator.defaultFormatter.insertFormat('language', language, {
@@ -40,5 +40,5 @@ function load() {
 
 module.exports = {
   augment,
-  load,
+  init,
 };

package/src/modules/logs.js

@@ -2,7 +2,7 @@ const { api, websocket } = require('../app');
 const { defaultFormatter } = require('../lib/logger');
 const pipeline = require('../lib/pipeline');
 
-function beforeStart() {
+function start() {
   for (const [name, stream] of Object.entries(pipeline.nodes)) {
     websocket.streamToWebsocket(`/logs/${name}`, stream, {
       name: `WebSocket (${name} logs)`,
@@ -16,4 +16,4 @@ function beforeStart() {
   }
 }
 
-module.exports = { beforeStart };
+module.exports = { start };

package/src/modules/signature.js

@@ -56,11 +56,11 @@ function augment(log) {
   return log;
 }
 
-function load() {
+function init() {
   pipeline.getNode('main').map(augment).registerNode('main');
 }
 
-function beforeStart() {
+function start() {
   const aggregator = new Aggregator();
 
   aggregator.setIdentifier((log) => log.getIn(['signature', 'id']));
@@ -127,6 +127,6 @@ function beforeStart() {
 }
 
 module.exports = {
-  load,
-  beforeStart,
+  init,
+  start,
 };

package/src/modules/sparkline.js

@@ -21,12 +21,12 @@ sparkline ('${id}', ${JSON.stringify(points)}, '#797979', 14, 5);
 </script>`;
 };
 
-function load() {
+function init() {
   aggregator.defaultFormatter.insertFormat('activity', (entry) =>
     sparkline(entry, 'per_minute')
   );
 }
 
 module.exports = {
-  load,
+  init,
 };

package/src/modules/status.js

@@ -22,7 +22,7 @@ function mapper(entry, format) {
   };
 }
 
-function beforeStart() {
+function start() {
   api.get('/status(.:format(txt|json))?', (req, res) => {
     const raw = req.query.raw ? true : false;
     const format = req.params.format || (raw ? 'json' : null);
@@ -48,4 +48,4 @@ function beforeStart() {
   });
 }
 
-module.exports = { beforeStart };
+module.exports = { start };

package/PARSER

@@ -1,59 +0,0 @@
-
-
-
-
-Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/73.0.3683.86 Safari/537.36
-
-
-Mozilla/5.0
-    AppleWebKit/537.36 -> Generic Webkit
-        Safari/537.36
-            HeadlessChrome/
-
-            Chrome/
-                UCBrowser/11.3.5.908 -> UC Browser
-                Edg/80.0.361.66
-                Edge/18.19041 -> Edge
-                OPR/68.0.3618.125 -> Opera
-                QQBrowser/9.0.2524.400
-                coc_coc_browser/86.0.172
-                YaBrowser/20.6.0.905
-                SamsungBrowser/11.2
-
-                Chrome/83.0.4103.83 Mobile -> Chrome Mobile
-
-     AppleWebKit/ -> Other Webkits
-               FxiOS
-               CriOS/83.0.4103.88 -> Chrome Mobile iOS
-               Version/5.1.9 Safari/534.59.8 -> Safari
-
-Mozilla/5.0 (X11; Ubuntu; Linux x86_64; rv:76.0)
-    Gecko/20100101
-
-         FlipboardProxy/1.2
-
-         Firefox/76.0 -> Firefox
-
-
-Generic compatible
-
-
-Mozilla/5.0 (compatible; AhrefsBot/6.1; +http://ahrefs.com/robot/)
-Mozilla/5.0 (compatible; SemrushBot/6~bl; +http://www.semrush.com/bot.html)
-(compatible; bingbot/2.0; +http://www.bing.com/bingbot.htm)
-
-(compatible; Googlebot/2.1; +http://www.google.com/bot.html)
-
-Other
-
- BarkRowler/0.9 (+https://babbar.tech/crawler)
- Scrapy/1.6.0 (+https://scrapy.org) -> Generic Robot
- bitlybot/3.0 (+http://bit.ly/)
-
- Riddler (http://riddler.io/about)
-
- sentry/20.7.0.dev0 (https://sentry.io) -> Generic Robot
-
- AwarioSmartBot/1.0 (+https://awario.com/bots.html; bots@awario.com) -> Generic Robot
-
- python-requests/2.22.0  Generic Agent

package/TODO

@@ -1,7 +0,0 @@
-
-- Cloudflare blocking
--
-
-
-
-- Live bot detection

package/USERAGENT

@@ -1,96 +0,0 @@
-  if (
-    !result.family ||
-    ![
-      // Browser
-      'Firefox',
-      'Firefox Mobile',
-      'Firefox iOS',
-      'Chrome',
-      'Chrome Mobile',
-      'Chrome Mobile iOS',
-      'Chrome Mobile WebView',
-      'Edge',
-      'Edge Mobile',
-      'Safari',
-      'Mobile Safari',
-      'Opera',
-      'Opera Mobile',
-      'Chromium',
-      'SeaMonkey',
-      'Samsung Internet',
-      'Epiphany',
-      'Yandex Browser',
-      'MiuiBrowser',
-      'UC Browser',
-      'Vivaldi',
-      'Pale Moon',
-      'QQ Browser',
-      'QQ Browser Mobile',
-      // App
-      'Atom',
-      'VS Code',
-      'Facebook',
-      // Mail
-      'Apple Mail',
-      'Outlook',
-    ].includes(result.family)
-  ) {
-    // console.log(result);
-  } else {
-    // console.log(`-> ${result.family}`);
-  }
-
-  // console.log(`-> ${result.family}`);
-
-
-
-
-Mozilla/5.0 (iPhone; CPU iPhone OS 13_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 [FBAN/FBIOS;FBDV/iPhone10,4;FBMD/iPhone;FBSN/iOS;FBSV/13.4.1;FBSS/2;FBID/phone;FBLC/en_GB;FBOP/5]
-
-Facebook App
-
-  family: 'Mobile Safari UI/WKWebView',
-  major: '13',
-
-
-
-Package Control Default Channel Server
-
-
-
-
-text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9
-text/html,application/xhtml+xml,application/xml;q=0.9,image/webp,image/apng,*/*;q=0.8,application/signed-exchange;v=b3;q=0.9
-
-
-ther Accept-Language header en
-
-Mozilla/5.0 (iPhone; CPU iPhone OS 13_4_1 like Mac OS X) AppleWebKit/605.1.15 (KHTML, like Gecko) Mobile/15E148 SP-engine/2.19.0 main%2F1.0 baiduboxapp/11.23.5.16 (Baidu; P2 13.4.1) NABar/1.0
-
-Mozilla/5.0 (Linux; Android 4.2.1; en-us; Nexus 5 Build/JOP40D) AppleWebKit/535.19 (KHTML, like Gecko; googleweblight) Chrome/38.0.1025.166 Mobile Safari/535.19
-
-
-    n41-09-02.opera-mini.net+                                               ZA                                   Opera Mini 4
-
-
-
-
-DomainStatsBot/1.0 (https://domainstats.com/pages/our-bot)
-{
-  family: 'DomainStatsBot',
-  major: '1',
-  minor: '0',
-  patch: undefined,
-  patch_minor: undefined,
-  device: { family: 'Spider', brand: 'Spider', model: 'Desktop' }
-}
-
-
-
-Accept:*/*
-Accept-Encoding:gzip
-Accept-Language:en;q=0.9
-User-Agent:Mozilla/5.0 (Macintosh; Intel Mac OS X 10_13_6) AppleWebKit/605.1.15 (KHTML, like Gecko) Version/12.0.1 Safari/605.1.15
-User-Agent:Mozilla/5.0 (X11; Linux x86_64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/69.0.3497.100 Safari/537.36
-
-

package/check-ips.js

@@ -1,15 +0,0 @@
-const ips = require('./ips');
-const modules = require('./src/modules');
-
-async function run() {
-  for (const ip of ips) {
-    const lookup = await modules.get('hostname').lookup(ip);
-    if (lookup) {
-      console.log(ip, lookup.value);
-    } else {
-      console.log(ip, 'No');
-    }
-  }
-}
-
-run();