pmcf 2.49.1 → 2.51.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.49.1",
+  "version": "2.51.0",
   "publishConfig": {
     "access": "public"
   },
@@ -46,7 +46,7 @@
   },
   "dependencies": {
     "ip-utilties": "^1.3.3",
-    "npm-pkgbuild": "^18.1.2",
+    "npm-pkgbuild": "^18.2.3",
     "pacc": "^3.4.2",
     "pkg-dir": "^8.0.0"
   },
@@ -55,11 +55,11 @@
     "ava": "^6.3.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",
-    "semantic-release": "^24.2.3",
+    "semantic-release": "^24.2.4",
     "typescript": "^5.8.3"
   },
   "engines": {
-    "node": ">=22.15.0"
+    "node": ">=22.15.1"
   },
   "repository": {
     "type": "git",

package/src/endpoint.mjs

@@ -90,9 +90,21 @@ export class DomainNameEndpoint extends PortEndpoint {
 }
 
 export class HTTPEndpoint extends PortEndpoint {
-  constructor(service, url, data) {
+  constructor(service, address, data) {
     super(service, data);
-    this.url = url;
+
+    for (const name of ["path"]) {
+      if (data[name] !== undefined) {
+        this[name] = data[name];
+      }
+    }
+
+    if (typeof address === "string") {
+      this.url = address;
+    } else {
+      this.url = "http://" + address.address + ":" + data.port + data.path;
+      this.host = address.address;
+    }
   }
 
   get address() {

package/src/services/dhcp.mjs

@@ -5,6 +5,7 @@ import {
   ServiceTypeDefinition,
   Endpoint,
   UnixEndpoint,
+  HTTPEndpoint,
   serviceEndpoints,
   SUBNET_LOCALHOST_IPV4,
   SUBNET_LOCALHOST_IPV6
@@ -24,6 +25,8 @@ const DHCPServiceTypeDefinition = {
 const controlAgentEndpoint = {
   type: "kea-control-agent",
   port: 8000,
+  path: "/",
+  method: "get",
   protocol: "tcp",
   tls: false
 };
@@ -75,10 +78,12 @@ export class DHCPService extends Service {
     const endpoints = super.endpoints(filter);
 
     for (const na of this.host.networkAddresses(
-      na => na.networkInterface.kind === "localhost"
+      na => na.networkInterface.kind === "loopback"
     )) {
-      endpoints.push(new Endpoint(this, na, controlAgentEndpoint));
-      endpoints.push(new Endpoint(this, na, ddnsEndpoint));
+      endpoints.push(
+        new HTTPEndpoint(this, na, controlAgentEndpoint),
+        new Endpoint(this, na, ddnsEndpoint)
+      );
     }
 
     endpoints.push(
@@ -117,6 +122,10 @@ export class DHCPService extends Service {
       }
     };
 
+        const ctrlAgentEndpoint = this.endpoint(
+      e => e.type === "kea-control-agent"
+    );
+
     const commonConfig = {
       "lease-database": {
         type: "memfile",
@@ -135,7 +144,35 @@ export class DHCPService extends Service {
       },
       "renew-timer": 900,
       "rebind-timer": 1800,
-      "valid-lifetime": 3600
+      "valid-lifetime": 3600,
+      "hooks-libraries": [
+        {
+          library: "/usr/lib/kea/hooks/libdhcp_lease_cmds.so"
+        },
+        {
+          library: "/usr/lib/kea/hooks/libdhcp_ha.so",
+          parameters: {
+            "high-availability": [
+              {
+                "this-server-name": name,
+                mode: "hot-standby",
+                peers: [
+                  {
+                    name: name,
+                    url: ctrlAgentEndpoint.url,
+                    role: "primary"
+                  } /*,
+                  {
+                    name: "server2",
+                    url: "http://172.28.0.254:8000/",
+                    role: "standby"
+                  }*/
+                ]
+              }
+            ]
+          }
+        }
+      ]
     };
 
     const loggers = [
@@ -159,8 +196,8 @@ export class DHCPService extends Service {
 
     const ctrlAgent = {
       "Control-agent": {
-        "http-host": "127.0.0.1",
-        "http-port": 8000,
+        "http-host": ctrlAgentEndpoint?.host,
+        "http-port": ctrlAgentEndpoint?.port,
         "control-sockets": {
           dhcp4: toUnix(this.endpoint(e => e.type === "kea-control-dhcp4")),
           dhcp6: toUnix(this.endpoint(e => e.type === "kea-control-dhcp6")),
@@ -189,10 +226,7 @@ export class DHCPService extends Service {
         "control-socket": toUnix(
           this.endpoint(e => e.type === "kea-control-ddns")
         ),
-        /* {
-          "socket-type": "unix",
-          "socket-name": "/run/kea/ddns-ctrl-socket"
-        } */ "tsig-keys": [],
+        "tsig-keys": [],
         "forward-ddns": {
           "ddns-domains": dnsServersSlot([...this.domains])
         },
@@ -249,10 +283,8 @@ export class DHCPService extends Service {
       );
 
     const subnets = [...this.subnets].filter(
-      s =>
-        s !== SUBNET_LOCALHOST_IPV4 &&
-        s !== SUBNET_LOCALHOST_IPV6 /* s.address !== "127/8"*/
-    ); // TODO no localhost
+      s => s !== SUBNET_LOCALHOST_IPV4 && s !== SUBNET_LOCALHOST_IPV6
+    );
     const dhcp4 = {
       Dhcp4: {
         ...commonConfig,
@@ -282,7 +314,7 @@ export class DHCPService extends Service {
             return {
               id: index + 1,
               subnet: subnet.longAddress,
-              pools: [{ pool: subnet.addressRange.join(" - ") }],
+              pools: [{ pool: subnet.dhcpUsableAddressRange.join(" - ") }],
               "option-data": [
                 {
                   name: "routers",

package/src/subnet.mjs

@@ -64,6 +64,12 @@ export class Subnet extends Base {
     return rangeIP(this.prefix, this.prefixLength, 1, 1).map(a => decodeIP(a));
   }
 
+  get dhcpUsableAddressRange()
+  {
+    /* TODO where to take values from ? */
+    return rangeIP(this.prefix, this.prefixLength, 51, 6).map(a => decodeIP(a));
+  }
+
   get address() {
     return this.name;
   }

package/types/cluster.d.mts

@@ -350,7 +350,7 @@ export class Cluster extends Host {
     get backups(): Set<any>;
     get members(): Set<any>;
     preparePackages(stagingDir: any): AsyncGenerator<{
-        sources: AsyncIterable<import("content-entry").ContentEntry>[];
+        sources: AsyncIterable<import("content-entry").ContentEntry | import("content-entry").CollectionEntry>[];
         outputs: any;
         properties: {
             name: string;

package/types/endpoint.d.mts

@@ -15,9 +15,10 @@ export class DomainNameEndpoint extends PortEndpoint {
     get address(): any;
 }
 export class HTTPEndpoint extends PortEndpoint {
-    constructor(service: any, url: any, data: any);
-    url: any;
-    get address(): any;
+    constructor(service: any, address: any, data: any);
+    url: string;
+    host: any;
+    get address(): string;
 }
 export class UnixEndpoint extends BaseEndpoint {
     constructor(service: any, path: any, data: any);

package/types/subnet.d.mts

@@ -33,6 +33,7 @@ export class Subnet extends Base {
     matchesAddress(address: any): any;
     get isLinkLocal(): any;
     get addressRange(): any;
+    get dhcpUsableAddressRange(): any;
     get address(): string;
     get longAddress(): string;
     _traverse(...args: any[]): boolean;