ip-utilties 3.1.2 → 3.1.4

package/package.json

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

package/src/ip.mjs

@@ -17,7 +17,8 @@ const ipv4 = {
   segments: 4,
   segmentLength: 8,
   segmentMask: 0xffn,
-  base: 10
+  base: 10,
+  linkLocalPrefixLength: 16
 };
 
 const ipv6 = {
@@ -37,7 +38,8 @@ const ipv6 = {
   segments: 8,
   segmentLength: 16,
   segmentMask: 0xffffn,
-  base: 16
+  base: 16,
+  linkLocalPrefixLength: 64
 };
 
 /**
@@ -249,19 +251,23 @@ export function normalizeCIDR(address) {
   let [prefix, prefixLength] = address.split(/\//);
   let longPrefix;
 
+  const family = isIPv6(prefix) ? ipv6 : ipv4;
+
   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(":") ? ":" : "::";
+    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) {
@@ -331,7 +337,11 @@ export function isLocalhost(address) {
 
 export function isLinkLocal(address) {
   const eaddr = encodeIP(address);
-  return eaddr?.[0] === 0xfe80;
+  if (eaddr) {
+    return eaddr[0] === 0xfe80 || (eaddr[0] === 169 && eaddr[1] === 254);
+  }
+
+  return false;
 }
 
 export function isUniqueLocal(address) {
@@ -343,6 +353,26 @@ export function hasWellKnownSubnet(address) {
   return isLocalhost(address) || isLinkLocal(address) || isUniqueLocal(address);
 }
 
+/*
+  prefix     global subnet interface
+
+  ff01:: ff02::   1
+  ff05::          2 3
+
+  https://en.wikipedia.org/wiki/Link-local_address
+  fe80::          64       link local
+  169.254. /16             link local
+
+  https://en.wikipedia.org/wiki/Unique_local_address
+  fc00::          64       unique local
+  fd00::          64       unique local
+
+  ::1             128.     local host
+  127             8        local host
+  172
+
+*/
+
 /*
  * https://www.iana.org/assignments/ipv6-multicast-addresses/ipv6-multicast-addresses.xhtml
  */