pmcf 1.37.0 → 1.37.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.37.0",
+  "version": "1.37.2",
   "publishConfig": {
     "access": "public"
   },
@@ -47,7 +47,7 @@
     "ava": "^6.2.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
-    "semantic-release": "^24.2.1",
+    "semantic-release": "^24.2.2",
     "typescript": "^5.7.3"
   },
   "engines": {

package/src/utils.mjs

@@ -82,17 +82,12 @@ function decodeIPv4(address, length = 32) {
 }
 
 export function encodeIPv6(address) {
-  const words = [0, 0, 0, 0, 0, 0, 0, 0];
-
-  let i = 0;
-  for (const a of normalizeIPAddress(address).split(/\:/)) {
-    words[i++] = parseInt(a,16);
-  }
-
   let res = 0n;
   let shift = 128n;
 
-  for(const word of words) {
+  for (const word of normalizeIPAddress(address)
+    .split(/\:/)
+    .map(a => parseInt(a, 16))) {
     shift -= 16n;
     res += BigInt(word) << shift;
   }
@@ -100,6 +95,18 @@ export function encodeIPv6(address) {
   return res;
 }
 
+export function decodeIPv6(address, length = 128) {
+  let words = [];
+  let shift = 128n;
+
+  for (let i = 0; i < length / 16; i++) {
+    shift -= 16n;
+    words.push(((address >> shift) & 0xffffn).toString(16).padStart(4, "0"));
+  }
+
+  return words.join(":");
+}
+
 export function normalizeCIDR(address) {
   let [prefix, prefixLength] = address.split(/\//);
 
@@ -113,9 +120,12 @@ export function normalizeCIDR(address) {
         n = n & (0xffffffff << (32 - prefixLength));
         prefix = decodeIPv4(n, prefixLength);
       } else {
-        prefix = normalizeIPAddress(prefix);
-        const parts = prefix.split(/\:/);
-        prefix = parts.slice(0, prefixLength / 16).join(":");
+        let n = encodeIPv6(prefix);
+        n =
+          n &
+          (0xffffffffffffffffffffffffffffffffn <<
+            (128n - BigInt(prefixLength)));
+        prefix = decodeIPv6(n, prefixLength);
       }
     } else {
       return {};

package/types/utils.d.mts

@@ -7,6 +7,7 @@ export function isIPv6Address(address: any): boolean;
 export function isLinkLocal(address: any): any;
 export function normalizeIPAddress(address: any): any;
 export function encodeIPv6(address: any): bigint;
+export function decodeIPv6(address: any, length?: number): string;
 export function normalizeCIDR(address: any): {
     prefix?: undefined;
     prefixLength?: undefined;