pmcf 2.16.0 → 2.17.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.16.0",
+  "version": "2.17.1",
   "publishConfig": {
     "access": "public"
   },

package/src/ip.mjs

@@ -21,8 +21,7 @@ const ipv6 = {
     if (i >= 0) {
       parts.splice(i, 1, ..."0".repeat(9 - parts.length));
     }
-    return parts /*.map(s => s.padStart(4, "0"))*/
-      .join(":");
+    return parts.join(":");
   },
   separator: ":",
   compressor: "::",
@@ -51,7 +50,8 @@ function _create(definition, ...args) {
 }
 
 export function encodeIP(address) {
-  return _encode(isIPv4(address) ? ipv4 : ipv6, address);
+  const d = _definition(address);
+  return d && _encode(d, address);
 }
 
 export function encodeIPv6(address) {
@@ -76,6 +76,9 @@ export function _encode(definition, address) {
 
       return res;
 
+    case "bigint":
+      return _encodeBigInt(definition, address);
+
     case "object":
       if (
         address instanceof definition.factory &&
@@ -156,6 +159,14 @@ export function isIPv6(address) {
   return _is(ipv6, address);
 }
 
+function _definition(address) {
+  for (const defintion of [ipv4, ipv6]) {
+    if (_is(defintion, address)) {
+      return defintion;
+    }
+  }
+}
+
 export function _is(definition, address) {
   switch (typeof address) {
     case "string":
@@ -215,6 +226,24 @@ export function _prefix(definition, address, length) {
   );
 }
 
+export function rangeIP(address, prefix, lowerAdd = 0, upperReduce = 0) {
+  const definition = isIPv4(address) ? ipv4 : ipv6;
+
+  const from = _prefix(definition, address, prefix);
+  const to = _encode(definition, from); // /*from ||*/ definition.mask >> BigInt(prefix);
+
+  for (
+    let i = prefix / definition.segmentLength;
+    i < definition.segments;
+    i++
+  ) {
+    to[i] = 0xffff;
+  }
+
+  //console.log(from, to);
+  return [_encode(definition, from + BigInt(lowerAdd)), to];
+}
+
 export function normalizeCIDR(address) {
   let [prefix, prefixLength] = address.split(/\//);
   let longPrefix;
@@ -244,7 +273,12 @@ export function normalizeCIDR(address) {
     longPrefix = _decode(definition, n);
   }
 
-  return { longPrefix, prefix, prefixLength, cidr: `${prefix}/${prefixLength}` };
+  return {
+    longPrefix,
+    prefix,
+    prefixLength,
+    cidr: `${prefix}/${prefixLength}`
+  };
 }
 
 export function formatCIDR(address, subnet) {
@@ -285,7 +319,7 @@ export function isLocalhost(address) {
 
 export function isLinkLocal(address) {
   const eaddr = encodeIP(address);
-  return eaddr[0] === 0xfe80;
+  return eaddr?.[0] === 0xfe80;
 }
 
 export function hasWellKnownSubnet(address) {

package/src/services/dns.mjs

@@ -170,10 +170,10 @@ export class DNSService extends ExtraSourceService {
   async *preparePackages(dir) {
     const location = this.owner.owner;
     const name = location.name;
-    const p1 = join(dir, "p1");
+    const p1 = join(dir, "p1") + "/";
     const packageData = {
       dir: p1,
-      sources: [new FileContentProvider(p1 + "/")],
+      sources: [new FileContentProvider(p1)],
       outputs: this.outputs,
       properties: {
         name: `named-${name}`,
@@ -207,10 +207,10 @@ export class DNSService extends ExtraSourceService {
       yield packageData;
     }
 
-    const p2 = join(dir, "p2");
+    const p2 = join(dir, "p2") + "/";
 
+    packageData.dir = p2;
     packageData.properties = {
-      dir: p2,
       name: `named-zones-${name}`,
       description: `zone definitions for ${location.fullName}`,
       dependencies: ["mf-named"],
@@ -221,7 +221,7 @@ export class DNSService extends ExtraSourceService {
 
     packageData.sources = [
       new FileContentProvider(
-        p2 + "/",
+        p2,
         {
           mode: 0o644,
           owner: "named",

package/src/subnet.mjs

@@ -1,4 +1,11 @@
-import { normalizeCIDR, isLinkLocal, isIPv4, isIPv6, prefixIP } from "./ip.mjs";
+import {
+  normalizeCIDR,
+  isLinkLocal,
+  isIPv4,
+  isIPv6,
+  rangeIP,
+  decodeIP
+} from "./ip.mjs";
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
 
@@ -61,10 +68,7 @@ export class Subnet extends Base {
   }
 
   get addressRange() {
-    return [
-      prefixIP(this.prefix, this.prefixLength),
-      this.prefix + ".255".repeat((32 - this.prefixLength) / 8)
-    ];
+    return rangeIP(this.prefix, this.prefixLength, 0, 0).map(a => decodeIP(a));
   }
 
   get address() {

package/types/ip.d.mts

@@ -13,6 +13,7 @@ export function _is(definition: any, address: any): boolean;
 export function asBigInt(address: any): bigint;
 export function prefixIP(address: any, length: any): string;
 export function _prefix(definition: any, address: any, length: any): bigint;
+export function rangeIP(address: any, prefix: any, lowerAdd?: number, upperReduce?: number): any[];
 export function normalizeCIDR(address: any): {
     longPrefix?: undefined;
     prefix?: undefined;