ip-utilties 3.5.0 → 3.5.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "ip-utilties",
-  "version": "3.5.0",
+  "version": "3.5.2",
   "publishConfig": {
     "access": "public",
     "provenance": true
@@ -41,11 +41,11 @@
   },
   "devDependencies": {
     "ava": "^8.0.1",
-    "browser-ava": "^2.3.65",
+    "browser-ava": "^2.3.66",
     "c8": "^11.0.0",
     "documentation": "^14.0.3",
     "semantic-release": "^25.0.5",
-    "typescript": "^6.0.3"
+    "typescript": "^7.0.2"
   },
   "overrides": {
     "c8": {

package/src/ip.mjs

@@ -22,7 +22,23 @@ const ipv4 = {
   linkLocalPrefixLength: 16,
   localHost: new Uint8Array([127, 0, 0, 1]),
   localHostPrefixLenth: 8,
-  wellKnownClasses: [[new Uint8Array([192, 168]), 8]]
+
+  // https://www.geeksforgeeks.org/computer-networks/subnet-cheat-sheet/
+  wellKnownAddresses: [
+    [new Uint8Array([0, 0, 0, 0]), 8], // This network
+    [new Uint8Array([10, 0, 0, 0]), 8], // Private Address Block
+    [new Uint8Array([100, 64, 0, 0]), 10], // Carrier-grade NAT
+    [new Uint8Array([127, 0, 0, 0]), 8], // Loopback
+    [new Uint8Array([127, 0, 53, 53]), 0], // Name collision occurrence
+    [new Uint8Array([169, 254, 0, 0]), 16], // Link local
+    [new Uint8Array([172, 16, 0, 0]), 12], // Private Address Block
+    [new Uint8Array([192, 0, 0, 0]), 24], // IETF protocol assignments
+    [new Uint8Array([192, 0, 2, 0]), 24], // TEST-NET-1
+    [new Uint8Array([192, 168, 0, 0]), 16], // Private Address Block
+    [new Uint8Array([198, 18, 0, 0]), 15], // Network benchmark testing
+    [new Uint8Array([198, 51, 100, 0]), 24], // TEST-NET-2
+    [new Uint8Array([255, 255, 255, 255]), 0] // Limited Broadcast address
+  ]
 };
 
 const ipv6 = {
@@ -378,28 +394,42 @@ export function hasWellKnownSubnet(address) {
 export function wellKnownSubnet(address) {
   const family = _family(address);
   if (family) {
-    const encoded = _encode(family, address);
+    return _wellKnownSubnet(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];
-    }
+export function _wellKnownSubnet(family, address) {
+  const encoded = _encode(family, address);
 
-    if (family === ipv4) {
-      for (const c of family.wellKnownClasses) {
-        if (_equal(c[0], encoded)) {
-          return c;
-        }
+  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.wellKnownAddresses) {
+      const pl = c[1];
+      if (
+        pl > 0 &&
+        _prefix(family, c[0], pl) === _prefix(family, encoded, pl)
+      ) {
+        /*console.log(
+          c,
+          encoded,
+          _prefix(family, c[0], pl),
+          _prefix(family, encoded, pl),
+          prefixIP(c[0], pl),
+          prefixIP(encoded, pl)
+        );*/
+        return c;
       }
     }
   }
-
-  return undefined;
 }
 
 /*

package/types/ip.d.mts

@@ -1,65 +1,66 @@
+/**
+ * Address familiy IPv4
+ */
+export declare const FAMILY_IPV4 = "IPv4";
+/**
+ * Address familiy IPv6
+ */
+export declare const FAMILY_IPV6 = "IPv6";
 /**
  * Encode ipv4 or ipv6 address into number array.
  * @param {string|number[]} address
  * @returns number[]
  */
-export function encodeIP(address: string | number[]): any;
+export declare function encodeIP(address: string | number[]): any;
 /**
  * Encode ipv6 address into number array.
  * @param {string|number[]|bigint} address
  * @returns number[]
  */
-export function encodeIPv6(address: string | number[] | bigint): any;
+export declare function encodeIPv6(address: string | number[] | bigint): any;
 /**
  * Encode ipv4 address into number array.
  * @param {string|number[]|bigint} address
  * @returns number[]
  */
-export function encodeIPv4(address: string | number[] | bigint): any;
-export function decodeIPv6(address: any, length: any): string;
-export function decodeIPv4(address: any, length: any): string;
-export function decodeIP(address: any, length: any): string;
-export function isIPv4(address: any): boolean;
-export function isIPv6(address: any): boolean;
+export declare function encodeIPv4(address: string | number[] | bigint): any;
+export declare function decodeIPv6(address: any, length: any): string;
+export declare function decodeIPv4(address: any, length: any): string;
+export declare function decodeIP(address: any, length: any): string;
+export declare function isIPv4(address: any): boolean;
+export declare function isIPv6(address: any): boolean;
 /**
  * IP address family for a given address.
  * @param {string|Uint8Array|Uint16Array} address
  * @return {string|undefined}
  */
-export function familyIP(address: string | Uint8Array | Uint16Array): string | undefined;
-export function asBigInt(address: any): any;
-export function prefixIP(address: any, length: any): string;
-export function rangeIP(address: any, prefix: any, lowerAdd?: number, upperReduce?: number): any[];
-export function matchPrefixIP(prefix: any, length: any, address: any): boolean;
-export function normalizeCIDR(address: any): {
+export declare function familyIP(address: string | Uint8Array | Uint16Array): string | undefined;
+export declare function asBigInt(address: any): any;
+export declare function prefixIP(address: any, length: any): string;
+export declare function rangeIP(address: any, prefix: any, lowerAdd?: number, upperReduce?: number): any[];
+export declare function matchPrefixIP(prefix: any, length: any, address: any): boolean;
+export declare function normalizeCIDR(address: any): {
     longPrefix: any;
     prefix: any;
     prefixLength: any;
     cidr: string;
 };
-export function formatCIDR(address: any, prefixLength: any): any;
-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 _isUniqueLocal(eaddr: any): boolean;
-export function hasWellKnownSubnet(address: any): boolean;
-export function wellKnownSubnet(address: any): any[] | undefined;
-/**
- * Address familiy IPv4
- */
-export const FAMILY_IPV4: "IPv4";
-/**
- * Address familiy IPv6
- */
-export const FAMILY_IPV6: "IPv6";
-export const IPV6_NODE_LOCAL_ALL_NODES: any;
-export const IPV6_NODE_LOCAL_ALL_ROUTERS: any;
-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: Uint8Array<ArrayBuffer>;
-export const IPV6_LOCALHOST: Uint16Array<ArrayBuffer>;
+export declare function formatCIDR(address: any, prefixLength: any): any;
+export declare function normalizeIP(address: any): string | undefined;
+export declare function reverseArpa(address: any): string;
+export declare function isLocalhost(address: any): boolean;
+export declare function isLinkLocal(address: any): boolean;
+export declare function _isLinkLocal(family: any, address: any): boolean;
+export declare function isUniqueLocal(address: any): boolean;
+export declare function _isUniqueLocal(eaddr: any): boolean;
+export declare function hasWellKnownSubnet(address: any): boolean;
+export declare function wellKnownSubnet(address: any): any;
+export declare function _wellKnownSubnet(family: any, address: any): any;
+export declare const IPV6_NODE_LOCAL_ALL_NODES: any;
+export declare const IPV6_NODE_LOCAL_ALL_ROUTERS: any;
+export declare const IPV6_LINK_LOCAL_ALL_NODES: any;
+export declare const IPV6_LINK_LOCAL_ALL_ROUTERS: any;
+export declare const IPV6_SITE_LOCAL_ALL_ROUTERS: any;
+export declare const IPV6_SITE_LOCAL_ALL_DHCP_SERVERS: any;
+export declare const IPV4_LOCALHOST: Uint8Array<ArrayBuffer>;
+export declare const IPV6_LOCALHOST: Uint16Array<ArrayBuffer>;