ip-utilties 3.1.4 → 3.3.0

package/package.json

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

package/src/ip.mjs

@@ -18,7 +18,9 @@ const ipv4 = {
   segmentLength: 8,
   segmentMask: 0xffn,
   base: 10,
-  linkLocalPrefixLength: 16
+  linkLocalPrefix: new Uint8Array([169, 254]),
+  linkLocalPrefixLength: 16,
+  localHostPrefixLenth: 8
 };
 
 const ipv6 = {
@@ -39,9 +41,13 @@ const ipv6 = {
   segmentLength: 16,
   segmentMask: 0xffffn,
   base: 16,
-  linkLocalPrefixLength: 64
+  linkLocalPrefix: new Uint16Array([0xfe80]),
+  linkLocalPrefixLength: 64,
+  localHostPrefixLenth: 128
 };
 
+const families = [ipv4, ipv6];
+
 /**
  * Encode ipv4 or ipv6 address into number array.
  * @param {string|number[]} address
@@ -62,7 +68,7 @@ export function encodeIPv6(address) {
 }
 
 /**
- * Encode ipv6 address into number array.
+ * Encode ipv4 address into number array.
  * @param {string|number[]|bigint} address
  * @returns number[]
  */
@@ -175,7 +181,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) {
@@ -253,7 +259,7 @@ export function normalizeCIDR(address) {
 
   const family = isIPv6(prefix) ? ipv6 : ipv4;
 
-  if (isUniqueLocal(address) || isLinkLocal(address)) {
+  if (isUniqueLocal(address) || _isLinkLocal(family, address)) {
     prefixLength = family.linkLocalPrefixLength;
     const n = _prefix(family, address, prefixLength);
     prefix = _decode(family, n, prefixLength);
@@ -276,7 +282,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);
@@ -336,14 +342,24 @@ export function isLocalhost(address) {
 }
 
 export function isLinkLocal(address) {
-  const eaddr = encodeIP(address);
-  if (eaddr) {
-    return eaddr[0] === 0xfe80 || (eaddr[0] === 169 && eaddr[1] === 254);
+  const family = _family(address);
+  if (family) {
+    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;
+}
+
 export function isUniqueLocal(address) {
   const eaddr = encodeIP(address);
   return eaddr?.[0] >> 9 === 126 ? true : false;

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[]
  */
@@ -42,6 +42,7 @@ export function normalizeIP(address: any): string | undefined;
 export function reverseArpa(address: any): string;
 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 hasWellKnownSubnet(address: any): boolean;
 /**