ip-utilties 3.2.0 → 3.4.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ip-utilties",
-  "version": "3.2.0",
+  "version": "3.4.0",
   "publishConfig": {
     "access": "public",
     "provenance": true

package/src/ip.mjs

@@ -19,7 +19,9 @@ const ipv4 = {
   segmentMask: 0xffn,
   base: 10,
   linkLocalPrefix: new Uint8Array([169, 254]),
-  linkLocalPrefixLength: 16
+  linkLocalPrefixLength: 16,
+  localHost: new Uint8Array([127, 0, 0, 1]),
+  localHostPrefixLenth: 8
 };
 
 const ipv6 = {
@@ -41,9 +43,13 @@ const ipv6 = {
   segmentMask: 0xffffn,
   base: 16,
   linkLocalPrefix: new Uint16Array([0xfe80]),
-  linkLocalPrefixLength: 64
+  linkLocalPrefixLength: 64,
+  localHost: new Uint16Array([0, 0, 0, 0, 0, 0, 0, 1]),
+  localHostPrefixLenth: 128
 };
 
+const families = [ipv4, ipv6];
+
 /**
  * Encode ipv4 or ipv6 address into number array.
  * @param {string|number[]} address
@@ -64,7 +70,7 @@ export function encodeIPv6(address) {
 }
 
 /**
- * Encode ipv6 address into number array.
+ * Encode ipv4 address into number array.
  * @param {string|number[]|bigint} address
  * @returns number[]
  */
@@ -177,7 +183,7 @@ export function familyIP(address) {
 }
 
 function _family(address) {
-  return [ipv4, ipv6].find(d => _is(d, address));
+  return families.find(d => _is(d, address));
 }
 
 function _is(family, address) {
@@ -278,7 +284,7 @@ export function normalizeCIDR(address) {
       n = _encode(family, prefix);
 
       if (isLocalhost(n)) {
-        prefixLength = family === ipv6 ? 128 : 8;
+        prefixLength = family.localHostPrefixLenth;
       }
     }
     prefix = _decode(family, n, prefixLength);
@@ -325,35 +331,35 @@ 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();
+export function isLocalhost(address) {
+  const family = _family(address);
+  if (family) {
+    return _equal(family.localHost, _encode(family, address));
+  }
 
-  return str === IPV4_LOCALHOST.toString() || str === IPV6_LOCALHOST.toString();
+  return false;
 }
 
 export function isLinkLocal(address) {
   const family = _family(address);
-  if (!family) {
-    return false;
+  if (family) {
+    return _isLinkLocal(family, address);
   }
-  return _isLinkLocal(family, address);
+  return false;
 }
 
 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) {
@@ -382,7 +388,6 @@ export function hasWellKnownSubnet(address) {
   ::1             128.     local host
   127             8        local host
   172
-
 */
 
 /*
@@ -395,5 +400,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

@@ -11,7 +11,7 @@ export function encodeIP(address: string | number[]): any;
  */
 export function encodeIPv6(address: string | number[] | bigint): any;
 /**
- * Encode ipv6 address into number array.
+ * Encode ipv4 address into number array.
  * @param {string|number[]|bigint} address
  * @returns number[]
  */
@@ -59,5 +59,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>;