pmcf 2.51.7 → 2.52.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "2.51.7",
+  "version": "2.52.0",
   "publishConfig": {
     "access": "public"
   },
@@ -51,7 +51,7 @@
     "pkg-dir": "^8.0.0"
   },
   "devDependencies": {
-    "@types/node": "^22.15.19",
+    "@types/node": "^22.15.20",
     "ava": "^6.3.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/service.mjs

@@ -334,6 +334,7 @@ export class Service extends Base {
 }
 
 export const sortByPriority = (a, b) => a.priority - b.priority;
+export const sortInverseByPriority = (a, b) => b.priority - a.priority;
 
 /**
  *

package/src/services/dhcp.mjs

@@ -2,6 +2,7 @@ import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import {
   Service,
+  sortInverseByPriority,
   ServiceTypeDefinition,
   Endpoint,
   UnixEndpoint,
@@ -22,18 +23,33 @@ const DHCPServiceTypeDefinition = {
   properties: {}
 };
 
+const ddnsEndpoint = {
+  type: "kea-ddns",
+  port: 53001,
+  protocol: "tcp",
+  tls: false
+};
+
 const controlAgentEndpoint = {
   type: "kea-control-agent",
   port: 53002,
   pathname: "/",
-  method: "get",
   protocol: "tcp",
   tls: false
 };
 
-const ddnsEndpoint = {
-  type: "kea-ddns",
-  port: 53001,
+const ha4Endpoint = {
+  type: "kea-ha-4",
+  port: 53003,
+  pathname: "/",
+  protocol: "tcp",
+  tls: false
+};
+
+const ha6Endpoint = {
+  type: "kea-ha-6",
+  port: 53004,
+  pathname: "/",
   protocol: "tcp",
   tls: false
 };
@@ -79,6 +95,7 @@ export class DHCPService extends Service {
 
     for (const na of this.host.networkAddresses()) {
       endpoints.push(new HTTPEndpoint(this, na, controlAgentEndpoint));
+      endpoints.push(new HTTPEndpoint(this, na, na.family === 'IPv4' ? ha4Endpoint : ha6Endpoint));
 
       if (na.networkInterface.kind === "loopback") {
         endpoints.push(new Endpoint(this, na, ddnsEndpoint));
@@ -125,26 +142,25 @@ export class DHCPService extends Service {
       e => e.type === "kea-control-agent"
     );
 
-    const peers = (
+    const peers = async (family) => (
       await Array.fromAsync(
-        network.findServices({ type: "dhcp", priority: ">10" })
+        network.findServices({ type: "dhcp", priority: "<20" })
       )
     )
-      .sort((a, b) => (a.host === host ? -1 : 1))
+      .sort(sortInverseByPriority)
       .map((dhcp, i) => {
         const ctrlAgentEndpoint = dhcp.endpoint(
-          e => e.type === "kea-control-agent"
+          e => e.type === `kea-ha-${family}`
         );
 
         return {
           name: dhcp.host.name,
-          role: i === 0 ? "primary" : "standby",
-          url: ctrlAgentEndpoint?.url
+          role: i === 0 ? "primary" : i > 1 ? "backup" : "standby",
+          url: ctrlAgentEndpoint.url,
+          "auto-failover": i <= 1
         };
       });
 
-    peers.length = 2;
-
     const loggers = [
       {
         "output-options": [
@@ -157,7 +173,7 @@ export class DHCPService extends Service {
       }
     ];
 
-    const commonConfig = family => {
+    const commonConfig = async (family) => {
       return {
         "interfaces-config": {
           interfaces: listenInterfaces(`IPv${family}`)
@@ -183,21 +199,6 @@ export class DHCPService extends Service {
         "renew-timer": 900,
         "rebind-timer": 1800,
         "valid-lifetime": 3600,
-        "preferred-lifetime": 3000,
-
-        "option-data": [
-          {
-            name: "dns-servers",
-            data: dnsServerEndpoints
-              .filter(endpoint => endpoint.family === `IPv${family}`)
-              .map(endpoint => endpoint.address)
-              .join(",")
-          },
-          {
-            name: "domain-search",
-            data: [...this.domains].join(",")
-          }
-        ],
         "hooks-libraries": [
           {
             library: "/usr/lib/kea/hooks/libdhcp_lease_cmds.so"
@@ -209,14 +210,33 @@ export class DHCPService extends Service {
                 {
                   "this-server-name": name,
                   mode: "hot-standby",
-                  peers
+                  "multi-threading": {
+                    "enable-multi-threading": true,
+                    "http-dedicated-listener": true,
+                    "http-listener-threads": 2,
+                    "http-client-threads": 2
+                  },
+                  peers: await peers(family)
                 }
               ]
             }
           }
         ],
         "dhcp-ddns": dhcpServerDdns,
-        loggers
+        loggers,
+        "option-data": [
+          {
+            name: "domain-name-servers",
+            data: dnsServerEndpoints
+              .filter(endpoint => endpoint.family === `IPv${family}`)
+              .map(endpoint => endpoint.address)
+              .join(",")
+          },
+          {
+            name: "domain-search",
+            data: [...this.domains].join(",")
+          }
+        ]
       };
     };
 
@@ -312,7 +332,8 @@ export class DHCPService extends Service {
         endpoint =>
           endpoint.type === "dhcp" &&
           endpoint.family === family &&
-          endpoint.networkInterface.kind !== "loopback"
+          endpoint.networkInterface.kind !== "loopback" &&
+          endpoint.networkInterface.kind !== "wlan"
       ).map(
         endpoint => `${endpoint.networkInterface.name}/${endpoint.address}`
       );
@@ -322,7 +343,7 @@ export class DHCPService extends Service {
     );
     const dhcp4 = {
       Dhcp4: {
-        ...commonConfig("4"),
+        ...(await commonConfig("4")),
         subnet4: subnets
           .filter(s => s.family === "IPv4")
           .map((subnet, index) => {
@@ -345,7 +366,7 @@ export class DHCPService extends Service {
     };
     const dhcp6 = {
       Dhcp6: {
-        ...commonConfig("6"),
+        ...(await commonConfig("6")),
         subnet6: subnets
           .filter(s => s.family === "IPv6")
           .map((subnet, index) => {

package/types/service.d.mts

@@ -340,5 +340,6 @@ export class Service extends Base {
     }[];
 }
 export function sortByPriority(a: any, b: any): number;
+export function sortInverseByPriority(a: any, b: any): number;
 import { Base } from "pmcf";
 import { Host } from "pmcf";