pmcf 2.51.1 → 2.51.3

package/package.json

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

package/src/services/dhcp.mjs

@@ -77,13 +77,12 @@ export class DHCPService extends Service {
   endpoints(filter) {
     const endpoints = super.endpoints(filter);
 
-    for (const na of this.host.networkAddresses(
-      na => na.networkInterface.kind === "loopback"
-    )) {
-      endpoints.push(
-        new HTTPEndpoint(this, na, controlAgentEndpoint),
-        new Endpoint(this, na, ddnsEndpoint)
-      );
+    for (const na of this.host.networkAddresses()) {
+      endpoints.push(new HTTPEndpoint(this, na, controlAgentEndpoint));
+
+      if (na.networkInterface.kind === "loopback") {
+        endpoints.push(new Endpoint(this, na, ddnsEndpoint));
+      }
     }
 
     endpoints.push(
@@ -122,10 +121,30 @@ export class DHCPService extends Service {
       }
     };
 
-        const ctrlAgentEndpoint = this.endpoint(
+    const ctrlAgentEndpoint = this.endpoint(
       e => e.type === "kea-control-agent"
     );
 
+    const peers = (
+      await Array.fromAsync(
+        network.findServices({ type: "dhcp", priority: ">10" })
+      )
+    )
+      .sort((a, b) => (a.host === host ? -1 : 1))
+      .map((dhcp, i) => {
+        const ctrlAgentEndpoint = dhcp.endpoint(
+          e => e.type === "kea-control-agent"
+        );
+
+        return {
+          name: dhcp.host.name,
+          role: i === 0 ? "primary" : "standby",
+          url: ctrlAgentEndpoint?.url
+        };
+      });
+
+      peers.length = 2;
+      
     const commonConfig = {
       "lease-database": {
         type: "memfile",
@@ -156,18 +175,7 @@ export class DHCPService extends Service {
               {
                 "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"
-                  }*/
-                ]
+                peers
               }
             ]
           }
@@ -219,10 +227,12 @@ export class DHCPService extends Service {
         };
       });
 
+    const ddnsEndpoint = this.endpoint(e => e.type === "kea-ddns");
+
     const ddns = {
       DhcpDdns: {
-        "ip-address": "127.0.0.1",
-        port: 53001,
+        "ip-address": ddnsEndpoint.address,
+        port: ddnsEndpoint.port,
         "control-socket": toUnix(
           this.endpoint(e => e.type === "kea-control-ddns")
         ),
@@ -241,8 +251,8 @@ export class DHCPService extends Service {
 
     const dhcpServerDdns = {
       "enable-updates": true,
-      "server-ip": "127.0.0.1",
-      "server-port": ddns.DhcpDdns.port,
+      "server-address": ddnsEndpoint.address,
+      "server-port": ddnsEndpoint.port,
       "max-queue-size": 64,
       "ncr-protocol": "UDP",
       "ncr-format": "JSON"