ip-utilties 3.1.3 → 3.2.0

package/package.json

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

package/src/ip.mjs

@@ -17,7 +17,9 @@ const ipv4 = {
   segments: 4,
   segmentLength: 8,
   segmentMask: 0xffn,
-  base: 10
+  base: 10,
+  linkLocalPrefix: new Uint8Array([169, 254]),
+  linkLocalPrefixLength: 16
 };
 
 const ipv6 = {
@@ -37,7 +39,9 @@ const ipv6 = {
   segments: 8,
   segmentLength: 16,
   segmentMask: 0xffffn,
-  base: 16
+  base: 16,
+  linkLocalPrefix: new Uint16Array([0xfe80]),
+  linkLocalPrefixLength: 64
 };
 
 /**
@@ -249,19 +253,23 @@ export function normalizeCIDR(address) {
   let [prefix, prefixLength] = address.split(/\//);
   let longPrefix;
 
-  if (isUniqueLocal(address) || isLinkLocal(address)) {
-    prefixLength = 64;
-    const n = _prefix(ipv6, address, prefixLength);
-    prefix = _decode(ipv6, n, prefixLength);
-    if (!prefix.endsWith("::")) {
-      // TODO
-      prefix += prefix.endsWith(":") ? ":" : "::";
+  const family = isIPv6(prefix) ? ipv6 : ipv4;
+
+  if (isUniqueLocal(address) || _isLinkLocal(family, address)) {
+    prefixLength = family.linkLocalPrefixLength;
+    const n = _prefix(family, address, prefixLength);
+    prefix = _decode(family, n, prefixLength);
+
+    if (family == ipv6) {
+      if (!prefix.endsWith("::")) {
+        // TODO
+        prefix += prefix.endsWith(":") ? ":" : "::";
+      }
     }
     longPrefix = prefix;
   } else {
     prefixLength = prefixLength === undefined ? 0 : parseInt(prefixLength);
 
-    const family = /*_family(prefix); */ isIPv6(prefix) ? ipv6 : ipv4;
     let n;
 
     if (prefixLength) {
@@ -330,12 +338,22 @@ 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 false;
   }
+  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) {
@@ -364,6 +382,7 @@ export function hasWellKnownSubnet(address) {
   ::1             128.     local host
   127             8        local host
   172
+
 */
 
 /*

package/types/ip.d.mts

@@ -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;
 /**