pmcf 6.46.4 → 6.46.6

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.46.4",
+  "version": "6.46.6",
   "publishConfig": {
     "access": "public"
   },
@@ -53,8 +53,8 @@
     "aggregated-map": "^1.0.11",
     "content-entry-transform": "^1.7.6",
     "ip-utilties": "^3.13.1",
-    "npm-pkgbuild": "^22.1.5",
-    "pacc": "^11.9.0",
+    "npm-pkgbuild": "^22.1.6",
+    "pacc": "^11.10.0",
     "package-directory": "^8.2.0",
     "yaml": "^2.9.0"
   },

package/src/cluster.mjs

@@ -46,6 +46,11 @@ export class cluster extends Host {
     return new Set(this.masters).union(new Set(this.backups));
   }
 
+  get isCluster()
+  {
+    return true;
+  }
+  
   isMember(host) {
     return super.isMember(host) || this.hosts.get(host.name) === host;
   }

package/src/host.mjs

@@ -178,6 +178,11 @@ export class Host extends ServiceOwner {
     return parts[parts.length - 1].toLowerCase();
   }
 
+  get isCluster()
+  {
+    return false;
+  }
+  
   isMember(host) {
     return this === host;
   }

package/src/services/kea.mjs

@@ -134,7 +134,7 @@ export class kea extends CoreService {
           {
             family: FAMILY_UNIX,
             path: "/run/kea/ctrl-4"
-          },
+          }
           /*{
             family: FAMILY_IPV4,
             port: 53005,
@@ -147,7 +147,7 @@ export class kea extends CoreService {
           {
             family: FAMILY_UNIX,
             path: "/run/kea/ctrl-6"
-          },
+          }
           /*{
             family: FAMILY_IPV6,
             port: 53005,
@@ -264,18 +264,24 @@ export class kea extends CoreService {
                   peers: peers
                     .sort(sortDescendingByPriority)
                     .reduce((a, kea) => {
-                      const ctrlAgentEndpoint = kea.endpoint(
-                        `kea-ha-${family}`
-                      );
-                      if (ctrlAgentEndpoint) {
-                        const i = a.length;
-                        a.push({
-                          name: kea.host.name,
-                          role:
-                            i === 0 ? "primary" : i > 1 ? "backup" : "standby",
-                          url: ctrlAgentEndpoint.url,
-                          "auto-failover": i <= 1
-                        });
+                      if (!kea.host.isCluster) {
+                        const ctrlAgentEndpoint = kea.endpoint(
+                          `kea-ha-${family}`
+                        );
+                        if (ctrlAgentEndpoint) {
+                          const i = a.length;
+                          a.push({
+                            name: kea.host.name,
+                            role:
+                              i === 0
+                                ? "primary"
+                                : i > 1
+                                  ? "backup"
+                                  : "standby",
+                            url: ctrlAgentEndpoint.url,
+                            "auto-failover": i <= 1
+                          });
+                        }
                       }
                       return a;
                     }, [])