pmcf 2.22.3 → 2.24.0

package/README.md

@@ -21,13 +21,21 @@
 ### Table of Contents
 
 *   [NetworkAddress](#networkaddress)
+    *   [Parameters](#parameters)
     *   [Properties](#properties)
+    *   [subnet](#subnet)
+    *   [networkInterface](#networkinterface)
+    *   [address](#address)
 *   [networkAddresses](#networkaddresses)
-    *   [Parameters](#parameters)
+    *   [Parameters](#parameters-1)
 
 ## NetworkAddress
 
-Type: [object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)
+### Parameters
+
+*   `networkInterface`  
+*   `address`  
+*   `subnet`  
 
 ### Properties
 
@@ -37,6 +45,18 @@ Type: [object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Globa
 *   `subnet` **Subnet** 
 *   `domainNames` **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
 
+### subnet
+
+Type: Subnet
+
+### networkInterface
+
+Type: NetworkInterface
+
+### address
+
+Type: ([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | [Uint8Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Uint8Array) | [Uint16Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Uint16Array))
+
 ## networkAddresses
 
 ### Parameters

package/package.json

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

package/src/network-interface.mjs

@@ -5,7 +5,11 @@ import {
   formatCIDR
 } from "ip-utilties";
 import { Base } from "./base.mjs";
-import { Subnet } from "./subnet.mjs";
+import {
+  Subnet,
+  SUBNET_LOCALHOST_IPV4,
+  SUBNET_LOCALHOST_IPV6
+} from "./subnet.mjs";
 import {
   networkProperties,
   networkAddressProperties
@@ -314,8 +318,8 @@ const LoopbackNetworkInterfaceTypeDefinition = {
 };
 
 const _localAddresses = new Map([
-  ["127.0.0.1", { address: "127.0.0/8", prefix: "127.0.0", prefixLength: 8 }], // TODO
-  ["::1", { address: "::1/128", prefix: "::1", prefixLength: 128 }]
+  ["127.0.0.1", SUBNET_LOCALHOST_IPV4],
+  ["::1", SUBNET_LOCALHOST_IPV6]
 ]);
 
 export class LoopbackNetworkInterface extends SkeletonNetworkInterface {

package/src/services/dhcp.mjs

@@ -1,6 +1,5 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
-import { isIPv4, isIPv6 } from "ip-utilties";
 import {
   Service,
   ServiceTypeDefinition,
@@ -73,10 +72,14 @@ export class DHCPService extends Service {
 
     console.log("kea", host.name, network.name);
 
-    const dnsServerEndpoints = serviceEndpoints(network, {
-      type: "dns",
-      priority: "<10"
-    }).filter(endpoint => endpoint.networkInterface.kind !== "loopback");
+    const dnsServerEndpoints = serviceEndpoints(
+      network,
+      {
+        type: "dns",
+        priority: "<10"
+      },
+      endpoint => endpoint.networkInterface.kind !== "loopback"
+    );
 
     const packageData = {
       dir,
@@ -147,7 +150,7 @@ export class DHCPService extends Service {
         return {
           name: domain,
           "dns-servers": dnsServerEndpoints
-            .filter(endpoint => isIPv4(endpoint.address))
+            .filter(endpoint => endpoint.family === "IPv4")
             .map(endpoint => {
               return { "ip-address": endpoint.address };
             })
@@ -191,7 +194,6 @@ export class DHCPService extends Service {
         subnets.add(subnet);
       }
     }
-    //console.log([...subnets].filter(s => s.isIPv4).map(s => s.address));
 
     const hwmap = new Map();
     const hostNames = new Set();
@@ -217,11 +219,11 @@ export class DHCPService extends Service {
       })
       .sort((a, b) => a.hostname.localeCompare(b.hostname));
 
-    const listenInterfaces = filter =>
+    const listenInterfaces = family =>
       this.endpoints(
         endpoint =>
           endpoint.type === "dhcp" &&
-          filter(endpoint.address) &&
+          endpoint.family === family &&
           endpoint.networkInterface.kind !== "loopback"
       ).map(
         endpoint => `${endpoint.networkInterface.name}/${endpoint.address}`
@@ -231,7 +233,7 @@ export class DHCPService extends Service {
       Dhcp4: {
         ...commonConfig,
         "interfaces-config": {
-          interfaces: listenInterfaces(isIPv4)
+          interfaces: listenInterfaces("IPv4")
         },
         "multi-threading": {
           "enable-multi-threading": false
@@ -244,7 +246,7 @@ export class DHCPService extends Service {
           {
             name: "domain-name-servers",
             data: dnsServerEndpoints
-              .filter(endpoint => isIPv4(endpoint.address))
+              .filter(endpoint => endpoint.family === "IPv4")
               .map(endpoint => endpoint.address)
               .join(",")
           },
@@ -254,7 +256,7 @@ export class DHCPService extends Service {
           }
         ],
         subnet4: [...subnets]
-          .filter(s => s.isIPv4)
+          .filter(s => s.family==='IPv4')
           .map((subnet, index) => {
             return {
               id: index + 1,
@@ -277,7 +279,7 @@ export class DHCPService extends Service {
       Dhcp6: {
         ...commonConfig,
         "interfaces-config": {
-          interfaces: listenInterfaces(isIPv6)
+          interfaces: listenInterfaces("IPv6")
         },
         "control-socket": {
           "socket-type": "unix",
@@ -288,7 +290,7 @@ export class DHCPService extends Service {
           {
             name: "dns-servers",
             data: dnsServerEndpoints
-              .filter(endpoint => isIPv6(endpoint.address))
+              .filter(endpoint => endpoint.family === "IPv6")
               .map(endpoint => endpoint.address)
               .join(",")
           }

package/src/services/dns.mjs

@@ -1,7 +1,7 @@
 import { join } from "node:path";
 import { createHmac } from "node:crypto";
 import { FileContentProvider } from "npm-pkgbuild";
-import { isIPv6, isLinkLocal, isLocalhost, reverseArpa } from "ip-utilties";
+import { isIPv6, isLinkLocal, reverseArpa } from "ip-utilties";
 import { writeLines } from "../utils.mjs";
 import { DNSRecord, dnsFullName } from "../dns-utils.mjs";
 import { addType } from "../types.mjs";

package/src/subnet.mjs

@@ -1,10 +1,9 @@
 import {
   normalizeCIDR,
   isLinkLocal,
-  isIPv4,
-  isIPv6,
   rangeIP,
-  decodeIP
+  decodeIP,
+  familyIP
 } from "ip-utilties";
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
@@ -45,6 +44,7 @@ export class Subnet extends Base {
     this.prefix = prefix;
     this.prefixLength = prefixLength;
     this.longPrefix = longPrefix;
+    this.family = familyIP(address);
   }
 
   get fullName() {
@@ -59,14 +59,6 @@ export class Subnet extends Base {
     return isLinkLocal(this.address);
   }
 
-  get isIPv4() {
-    return isIPv4(this.address);
-  }
-
-  get isIPv6() {
-    return isIPv6(this.address);
-  }
-
   get addressRange() {
     return rangeIP(this.prefix, this.prefixLength, 1, 1).map(a => decodeIP(a));
   }
@@ -91,6 +83,10 @@ export class Subnet extends Base {
   }
 }
 
+const _owner = { addObject() {} };
+export const SUBNET_LOCALHOST_IPV4 = new Subnet(_owner, "127.0.0.1/8");
+export const SUBNET_LOCALHOST_IPV6 = new Subnet(_owner, "::1/128");
+
 export function subnets(sources) {
   const all = new Set();
 

package/types/network-interface.d.mts

@@ -695,11 +695,7 @@ export class LoopbackNetworkInterface extends SkeletonNetworkInterface {
     get kind(): string;
     get scope(): string;
     get hostName(): string;
-    get ipAddresses(): Map<string, {
-        address: string;
-        prefix: string;
-        prefixLength: number;
-    }>;
+    get ipAddresses(): Map<string, Subnet>;
 }
 import { Subnet } from "./subnet.mjs";
 declare class SkeletonNetworkInterface extends Base {

package/types/subnet.d.mts

@@ -28,14 +28,15 @@ export class Subnet extends Base {
     prefix: any;
     prefixLength: any;
     longPrefix: any;
+    family: any;
     get fullName(): string;
     matchesAddress(address: any): any;
     get isLinkLocal(): any;
-    get isIPv4(): any;
-    get isIPv6(): any;
     get addressRange(): any;
     get address(): string;
     get longAddress(): string;
     _traverse(...args: any[]): boolean;
 }
+export const SUBNET_LOCALHOST_IPV4: Subnet;
+export const SUBNET_LOCALHOST_IPV6: Subnet;
 import { Base } from "./base.mjs";