ip-utilties 3.3.0 → 3.5.0

package/package.json

@@ -1,11 +1,11 @@
 {
   "name": "ip-utilties",
-  "version": "3.3.0",
+  "version": "3.5.0",
   "publishConfig": {
     "access": "public",
     "provenance": true
   },
-  "packageManager": "npm@11.16.0",
+  "packageManager": "npm@11.18.0",
   "exports": {
     ".": {
       "default": "./src/ip.mjs"
@@ -41,7 +41,7 @@
   },
   "devDependencies": {
     "ava": "^8.0.1",
-    "browser-ava": "^2.3.64",
+    "browser-ava": "^2.3.65",
     "c8": "^11.0.0",
     "documentation": "^14.0.3",
     "semantic-release": "^25.0.5",

package/src/ip.mjs

@@ -20,7 +20,9 @@ const ipv4 = {
   base: 10,
   linkLocalPrefix: new Uint8Array([169, 254]),
   linkLocalPrefixLength: 16,
-  localHostPrefixLenth: 8
+  localHost: new Uint8Array([127, 0, 0, 1]),
+  localHostPrefixLenth: 8,
+  wellKnownClasses: [[new Uint8Array([192, 168]), 8]]
 };
 
 const ipv6 = {
@@ -43,6 +45,7 @@ const ipv6 = {
   base: 16,
   linkLocalPrefix: new Uint16Array([0xfe80]),
   linkLocalPrefixLength: 64,
+  localHost: new Uint16Array([0, 0, 0, 0, 0, 0, 0, 1]),
   localHostPrefixLenth: 128
 };
 
@@ -264,7 +267,7 @@ export function normalizeCIDR(address) {
     const n = _prefix(family, address, prefixLength);
     prefix = _decode(family, n, prefixLength);
 
-    if (family == ipv6) {
+    if (family === ipv6) {
       if (!prefix.endsWith("::")) {
         // TODO
         prefix += prefix.endsWith(":") ? ":" : "::";
@@ -329,16 +332,22 @@ export function reverseArpa(address) {
   return address.split(".").reverse().join(".") + ".in-addr.arpa";
 }
 
-export function isLocalhost(address) {
-  const eaddr = encodeIP(address);
-
-  if (!eaddr) {
-    return false;
+function _equal(a, b) {
+  let i = 0;
+  for (const slot of a) {
+    if (slot !== b[i++]) {
+      return false;
+    }
   }
+  return true;
+}
 
-  const str = eaddr.toString();
-
-  return str === IPV4_LOCALHOST.toString() || str === IPV6_LOCALHOST.toString();
+export function isLocalhost(address) {
+  const family = _family(address);
+  if (family) {
+    return _equal(family.localHost, _encode(family, address));
+  }
+  return false;
 }
 
 export function isLinkLocal(address) {
@@ -350,14 +359,7 @@ export function isLinkLocal(address) {
 }
 
 export function _isLinkLocal(family, address) {
-  const eaddr = _encode(family, address);
-  let i = 0;
-  for (const slot of family.linkLocalPrefix) {
-    if (slot !== eaddr[i++]) {
-      return false;
-    }
-  }
-  return true;
+  return _equal(family.linkLocalPrefix, _encode(family, address));
 }
 
 export function isUniqueLocal(address) {
@@ -365,8 +367,39 @@ export function isUniqueLocal(address) {
   return eaddr?.[0] >> 9 === 126 ? true : false;
 }
 
+export function _isUniqueLocal(eaddr) {
+  return eaddr?.[0] >> 9 === 126 ? true : false;
+}
+
 export function hasWellKnownSubnet(address) {
-  return isLocalhost(address) || isLinkLocal(address) || isUniqueLocal(address);
+  return wellKnownSubnet(address) !== undefined;
+}
+
+export function wellKnownSubnet(address) {
+  const family = _family(address);
+  if (family) {
+    const encoded = _encode(family, address);
+
+    if (_equal(family.localHost, encoded)) {
+      return [family.localHost, family.localHostPrefixLenth];
+    }
+    if (_equal(family.linkLocalPrefix, encoded)) {
+      return [family.linkLocalPrefix, family.linkLocalPrefixLength];
+    }
+    if (_isUniqueLocal(encoded)) {
+      return [encoded[0], 64];
+    }
+
+    if (family === ipv4) {
+      for (const c of family.wellKnownClasses) {
+        if (_equal(c[0], encoded)) {
+          return c;
+        }
+      }
+    }
+  }
+
+  return undefined;
 }
 
 /*
@@ -386,7 +419,6 @@ export function hasWellKnownSubnet(address) {
   ::1             128.     local host
   127             8        local host
   172
-
 */
 
 /*
@@ -399,5 +431,5 @@ export const IPV6_LINK_LOCAL_ALL_ROUTERS = _encode(ipv6, "ff02::2");
 export const IPV6_SITE_LOCAL_ALL_ROUTERS = _encode(ipv6, "ff05::2");
 export const IPV6_SITE_LOCAL_ALL_DHCP_SERVERS = _encode(ipv6, "ff05::1:3");
 
-export const IPV4_LOCALHOST = _encode(ipv4, "127.0.0.1");
-export const IPV6_LOCALHOST = _encode(ipv6, "::1");
+export const IPV4_LOCALHOST = ipv4.localHost;
+export const IPV6_LOCALHOST = ipv6.localHost;

package/types/ip.d.mts

@@ -44,7 +44,9 @@ export function isLocalhost(address: any): boolean;
 export function isLinkLocal(address: any): boolean;
 export function _isLinkLocal(family: any, address: any): boolean;
 export function isUniqueLocal(address: any): boolean;
+export function _isUniqueLocal(eaddr: any): boolean;
 export function hasWellKnownSubnet(address: any): boolean;
+export function wellKnownSubnet(address: any): any[] | undefined;
 /**
  * Address familiy IPv4
  */
@@ -59,5 +61,5 @@ export const IPV6_LINK_LOCAL_ALL_NODES: any;
 export const IPV6_LINK_LOCAL_ALL_ROUTERS: any;
 export const IPV6_SITE_LOCAL_ALL_ROUTERS: any;
 export const IPV6_SITE_LOCAL_ALL_DHCP_SERVERS: any;
-export const IPV4_LOCALHOST: any;
-export const IPV6_LOCALHOST: any;
+export const IPV4_LOCALHOST: Uint8Array<ArrayBuffer>;
+export const IPV6_LOCALHOST: Uint16Array<ArrayBuffer>;