@hyperwatch/useragent 3.9.1 → 3.9.3

package/data/benchmark-results.json

@@ -0,0 +1,38 @@
+{
+  "opencollective-2020-11": {
+    "total": 1525,
+    "hyperwatch": {
+      "average": 0.0123,
+      "miss": 14,
+      "missPercentage": 0.92
+    },
+    "uap": {
+      "average": 0.0745,
+      "miss": 40,
+      "missPercentage": 2.6
+    },
+    "combined": {
+      "average": 0.0196,
+      "miss": 0,
+      "missPercentage": 0
+    }
+  },
+  "opencollective-2022-10-14": {
+    "total": 2558,
+    "hyperwatch": {
+      "average": 0.0142,
+      "miss": 71,
+      "missPercentage": 2.8
+    },
+    "uap": {
+      "average": 0.0692,
+      "miss": 111,
+      "missPercentage": 4.3
+    },
+    "combined": {
+      "average": 0.0206,
+      "miss": 10,
+      "missPercentage": 0.39
+    }
+  }
+}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hyperwatch/useragent",
-  "version": "3.9.1",
+  "version": "3.9.3",
   "description": "User Agent parser",
   "license": "Apache-2.0",
   "author": "François Hodierne <francois@hodierne.net>",

package/regexes/core.json

@@ -215,6 +215,9 @@
     {
       "regex": "^(\\w+[\\w \\-\\.:\\w]{0,50})\\-v?(\\d+)\\.?(\\d+)?\\.?(\\d+)?\\.?(\\d+)?"
     },
+    {
+      "regex": "^(\\w+[\\w \\-\\.:\\w]{0,50})\\/[A-Za-z0-9]{0,50}$"
+    },
     {
       "regex": "^(\\w+[\\w \\-\\.]{0,50})\\/?(\\d+)?\\.?(\\d+)? \\- \\(\\+?https?:\\/\\/[A-Za-z0-9\\-\\.\\/]{0,50}\\)"
     },
@@ -228,6 +231,9 @@
       "regex": "^(Pingdom).com_bot_version_(\\d+)\\.(\\d+)",
       "family_replacement": "PingdomBot"
     },
+    {
+      "regex": "^([A-Za-z0-9\\-\\.\\/]{0,50})_bot_(\\d+)\\.(\\d+)"
+    },
     {
       "regex": "^^(\\w+[\\w \\-\\.]{0,50}) \\- https?:\\/\\/[\\w]+[\\w \\-\\.]{0,50}"
     },
@@ -276,7 +282,7 @@
   ],
   "mozilla5": [
     {
-      "regex": "Mozilla/5.0 ([\\w]+[\\w \\-\\.[\\w]+]{0,50})\\/(\\d+)\\.?(\\d+)?"
+      "regex": "Mozilla/5.0 ([\\w]+[\\w \\-\\.[\\w]+]{0,50})\\/?(\\d+)?\\.?(\\d+)?"
     },
     {
       "regex": "^(Mozilla)/(\\d+)\\.(\\d+)$"

package/regexes/core.yml

@@ -228,6 +228,9 @@ generic:
   # Example: mattermost-5.26.0
   - regex: '^(\w+[\w \-\.:\w]{0,50})\-v?(\d+)\.?(\d+)?\.?(\d+)?\.?(\d+)?'
 
+  # Example: GitHub-Hookshot/c02375a
+  - regex: '^(\w+[\w \-\.:\w]{0,50})\/[A-Za-z0-9]{0,50}$'
+
   # Example: ltx71 - (http://ltx71.com/)
   - regex: '^(\w+[\w \-\.]{0,50})\/?(\d+)?\.?(\d+)? \- \(\+?https?:\/\/[A-Za-z0-9\-\.\/]{0,50}\)'
 
@@ -244,6 +247,9 @@ generic:
   - regex: '^(Pingdom).com_bot_version_(\d+)\.(\d+)'
     family_replacement: 'PingdomBot'
 
+  # Example: OnlineOrNot.com_bot_1.0_(https://onlineornot.com):
+  - regex: '^([A-Za-z0-9\-\.\/]{0,50})_bot_(\d+)\.(\d+)'
+
   # Example: colly - https://github.com/gocolly/colly/v2
   - regex: '^^(\w+[\w \-\.]{0,50}) \- https?:\/\/[\w]+[\w \-\.]{0,50}'
 
@@ -294,7 +300,8 @@ mozilla5_compatible:
 
 mozilla5:
   # Example: Mozilla/5.0 zgrab/0.x
-  - regex: 'Mozilla/5.0 ([\w]+[\w \-\.[\w]+]{0,50})\/(\d+)\.?(\d+)?'
+  # Example: Mozilla/5.0 scpitspi-rs
+  - regex: 'Mozilla/5.0 ([\w]+[\w \-\.[\w]+]{0,50})\/?(\d+)?\.?(\d+)?'
 
   # Example: Mozilla/5.0
   - regex: '^(Mozilla)/(\d+)\.(\d+)$'

package/scripts/sample-benchmark.js

@@ -45,6 +45,7 @@ function benchmarkSample(filename) {
     const combinedEnd = process.hrtime.bigint();
     if (!combinedResult.family) {
       combinedMisses.push(ua);
+      console.warn(`combined miss: ${ua}`);
     }
     combinedBenchmark[ua] = Number(combinedEnd - combinedStart) / 1000 / 1000;
 
@@ -52,6 +53,7 @@ function benchmarkSample(filename) {
     const hyperwatchResult = useragent.parse(ua, true, true, false);
     const hyperwatchEnd = process.hrtime.bigint();
     if (!hyperwatchResult.family) {
+      // console.log(`hyperwatch miss: ${ua}`);
       hyperwatchMisses.push(ua);
     }
     hyperwatchBenchmark[ua] =
@@ -61,6 +63,7 @@ function benchmarkSample(filename) {
     const uapResult = useragent.parse(ua, false, false, true);
     const uapEnd = process.hrtime.bigint();
     if (!uapResult.family) {
+      // console.log(`uap miss: ${ua}`);
       uapMisses.push(ua);
     }
     uapBenchmark[ua] = Number(uapEnd - uapStart) / 1000 / 1000;

package/test/lib/useragent-core.json

@@ -998,5 +998,35 @@
       "patch": null,
       "patch_minor": null
     }
+  ],
+  [
+    "Mozilla/5.0 scpitspi-rs",
+    {
+      "family": "scpitspi-rs",
+      "major": null,
+      "minor": null,
+      "patch": null,
+      "patch_minor": null
+    }
+  ],
+  [
+    "GitHub-Hookshot/c02375a",
+    {
+      "family": "GitHub-Hookshot",
+      "major": null,
+      "minor": null,
+      "patch": null,
+      "patch_minor": null
+    }
+  ],
+  [
+    "OnlineOrNot.com_bot_1.0_(https://onlineornot.com)",
+    {
+      "family": "OnlineOrNot.com",
+      "major": "1",
+      "minor": "0",
+      "patch": null,
+      "patch_minor": null
+    }
   ]
 ]