net: improve performance of isIPv4 and isIPv6

PR-URL: #49568 Reviewed-By: Matteo Collina <[email protected]> Reviewed-By: Yagiz Nizipli <[email protected]> Reviewed-By: Paolo Insogna <[email protected]> Reviewed-By: Luigi Pinca <[email protected]>
nodejs · Sep 13, 2023 · 4e01842 · 4e01842
1 parent 7ad4c0f
commit 4e01842
Show file tree

Hide file tree

Showing 3 changed files with 58 additions and 10 deletions.
diff --git a/benchmark/net/net-is-ip-v4.js b/benchmark/net/net-is-ip-v4.js
@@ -0,0 +1,25 @@
+'use strict';
+
+const common = require('../common.js');
+const { isIPv4 } = require('net');
+
+const ips = [
+  '0.0.0.0',
+  '255.255.255.255',
+  '0.0.0.0.0',
+  '192.168.0.1',
+  '10.168.209.250',
+];
+
+const bench = common.createBenchmark(main, {
+  n: [1e7],
+});
+
+function main({ n }) {
+  bench.start();
+  for (let i = 0; i < n; ++i) {
+    for (let j = 0; j < ips.length; ++j)
+      isIPv4(ips[j]);
+  }
+  bench.end(n);
+}
diff --git a/benchmark/net/net-is-ip-v6.js b/benchmark/net/net-is-ip-v6.js
@@ -0,0 +1,23 @@
+'use strict';
+
+const common = require('../common.js');
+const { isIPv6 } = require('net');
+
+const ips = [
+  '::1',
+  'ffff:ffff:ffff:ffff:ffff:ffff:ffff:ffff',
+  '0.0.0.0',
+];
+
+const bench = common.createBenchmark(main, {
+  n: [1e7],
+});
+
+function main({ n }) {
+  bench.start();
+  for (let i = 0; i < n; ++i) {
+    for (let j = 0; j < ips.length; ++j)
+      isIPv6(ips[j]);
+  }
+  bench.end(n);
+}
diff --git a/lib/internal/net.js b/lib/internal/net.js
@@ -11,22 +11,22 @@ const { writeBuffer } = internalBinding('fs');
 const errors = require('internal/errors');
 
 // IPv4 Segment
-const v4Seg = '(?:[0-9]|[1-9][0-9]|1[0-9][0-9]|2[0-4][0-9]|25[0-5])';
-const v4Str = `(${v4Seg}[.]){3}${v4Seg}`;
+const v4Seg = '(?:25[0-5]|2[0-4][0-9]|1[0-9][0-9]|[1-9][0-9]|[0-9])';
+const v4Str = `(?:${v4Seg}\\.){3}${v4Seg}`;
 const IPv4Reg = new RegExp(`^${v4Str}$`);
 
 // IPv6 Segment
 const v6Seg = '(?:[0-9a-fA-F]{1,4})';
-const IPv6Reg = new RegExp('^(' +
+const IPv6Reg = new RegExp('^(?:' +
   `(?:${v6Seg}:){7}(?:${v6Seg}|:)|` +
   `(?:${v6Seg}:){6}(?:${v4Str}|:${v6Seg}|:)|` +
-  `(?:${v6Seg}:){5}(?::${v4Str}|(:${v6Seg}){1,2}|:)|` +
-  `(?:${v6Seg}:){4}(?:(:${v6Seg}){0,1}:${v4Str}|(:${v6Seg}){1,3}|:)|` +
-  `(?:${v6Seg}:){3}(?:(:${v6Seg}){0,2}:${v4Str}|(:${v6Seg}){1,4}|:)|` +
-  `(?:${v6Seg}:){2}(?:(:${v6Seg}){0,3}:${v4Str}|(:${v6Seg}){1,5}|:)|` +
-  `(?:${v6Seg}:){1}(?:(:${v6Seg}){0,4}:${v4Str}|(:${v6Seg}){1,6}|:)|` +
-  `(?::((?::${v6Seg}){0,5}:${v4Str}|(?::${v6Seg}){1,7}|:))` +
-')(%[0-9a-zA-Z-.:]{1,})?$');
+  `(?:${v6Seg}:){5}(?::${v4Str}|(?::${v6Seg}){1,2}|:)|` +
+  `(?:${v6Seg}:){4}(?:(?::${v6Seg}){0,1}:${v4Str}|(?::${v6Seg}){1,3}|:)|` +
+  `(?:${v6Seg}:){3}(?:(?::${v6Seg}){0,2}:${v4Str}|(?::${v6Seg}){1,4}|:)|` +
+  `(?:${v6Seg}:){2}(?:(?::${v6Seg}){0,3}:${v4Str}|(?::${v6Seg}){1,5}|:)|` +
+  `(?:${v6Seg}:){1}(?:(?::${v6Seg}){0,4}:${v4Str}|(?::${v6Seg}){1,6}|:)|` +
+  `(?::(?:(?::${v6Seg}){0,5}:${v4Str}|(?::${v6Seg}){1,7}|:))` +
+')(?:%[0-9a-zA-Z-.:]{1,})?$');
 
 function isIPv4(s) {
   // TODO(aduh95): Replace RegExpPrototypeTest with RegExpPrototypeExec when it