pmcf 6.49.17 → 6.50.0

package/package.json

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

package/src/cluster.mjs

@@ -183,7 +183,7 @@ export class cluster extends host {
 
               default:
                 switch (endpoint.protocol) {
-                  case "tcp":
+                  case PROTOCOL_TCP:
                     cfg.push(`    TCP_CHECK {`);
                     cfg.push("      connect_timeout 10");
                     cfg.push("    }");

package/src/common-attributes.mjs

@@ -12,6 +12,7 @@ import {
   boolean_attribute_false,
   port_attribute_writable
 } from "pacc";
+import { PROTOCOL_TCP, PROTOCOL_UDP, PROTOCOL_QUIC } from "./constants.mjs";
 
 export const networkAddressType = "network|host|network_interface";
 
@@ -166,7 +167,7 @@ export const endpointAttributes = {
   protocol: {
     ...string_attribute_writable,
     name: "protocol",
-    values: new Set(["tcp", "udp", "quic"])
+    values: new Set([PROTOCOL_TCP, PROTOCOL_UDP, PROTOCOL_QUIC])
   },
   type: { ...string_attribute, name: "type" },
   tls: { ...boolean_attribute_false, name: "tls" },

package/src/constants.mjs

@@ -0,0 +1,10 @@
+import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
+
+export const PROTOCOL_TCP = "tcp";
+export const PROTOCOL_UDP = "udp";
+export const PROTOCOL_QUIC = "quic";
+
+export const FAMILY_UNIX = "unix";
+export const FAMILY_DNS = "dns";
+export const FAMILY_IPV4_IPV6 = new Set([FAMILY_IPV4, FAMILY_IPV6]);
+

package/src/core-service.mjs

@@ -19,10 +19,9 @@ import {
   DomainNameEndpoint,
   HTTPEndpoint,
   unix_endpoint,
-  addType,
-  FAMILY_UNIX,
-  FAMILY_DNS
+  addType
 } from "pmcf";
+import { FAMILY_UNIX, FAMILY_DNS } from "./constants.mjs";
 import {
   networkAddressAttributes,
   extends_attribute,
@@ -77,7 +76,11 @@ export class CoreService extends base {
     systemdService: { ...string_attribute_writable, name: "systemdService" },
     systemUserName: { ...string_attribute_writable, name: "systemUserName" },
     systemGroupName: { ...string_attribute_writable, name: "systemGroupName" },
-    credentials: { ...default_collection_attribute_writable, type: credential, name: "credentials" }
+    credentials: {
+      ...default_collection_attribute_writable,
+      type: credential,
+      name: "credentials"
+    }
   };
 
   static {
@@ -155,16 +158,17 @@ export class CoreService extends base {
           delete options.kind;
 
           for (const na of this.host.networkAddresses()) {
-            if (e.kind && e.kind !== na.networkInterface.kind) {
+            if (
+              (e.family && e.family !== na.family) ||
+              (e.kind && e.kind !== na.networkInterface.kind)
+            ) {
               continue;
             }
-
+            
             if (e.pathname) {
               result.push(new HTTPEndpoint(this, na, options));
             } else {
-              if (e.family === na.family) {
-                result.push(new Endpoint(this, na, options));
-              }
+              result.push(new Endpoint(this, na, options));
             }
           }
 

package/src/endpoint.mjs

@@ -1,12 +1,9 @@
 import { getAttribute, string_attribute, url_attribute } from "pacc";
-import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
-import { addType } from "pmcf";
+import { FAMILY_IPV6 } from "ip-utilties";
+import { addType } from "./type.mjs";
 import { CoreService } from "./core-service.mjs";
 import { family_attribute, endpointAttributes } from "./common-attributes.mjs";
-
-export const FAMILY_UNIX = "unix";
-export const FAMILY_DNS = "dns";
-export const FAMILY_IPV4_IPV6 = new Set([FAMILY_IPV4, FAMILY_IPV6]);
+import { FAMILY_DNS, FAMILY_UNIX } from "./constants.mjs";
 
 class BaseEndpoint {
   static name = "base_endpoint";
@@ -186,6 +183,7 @@ export class HTTPEndpoint extends BaseEndpoint {
    * @param {object} data
    * @param {number} data.port
    * @param {string} data.pathname
+   * @param {string} data.family
    */
   constructor(service, address, data) {
     super(service, data);
@@ -195,15 +193,16 @@ export class HTTPEndpoint extends BaseEndpoint {
     } else if (address instanceof URL) {
       this.url = address;
     } else {
-      this.family = address.family;
+      this.family = data.family ?? address.family;
+
       this.url = new URL(
         (data.tls ? "https://" : "http://") +
-          (address.family === FAMILY_IPV6
+          (data.family === FAMILY_IPV6
             ? "[" + address.address + "]"
             : address.address) +
           ":" +
           data.port +
-          (data.pathname || "/")
+          (data.pathname ?? "/")
       );
       this.hostname = address.address;
     }
@@ -229,7 +228,7 @@ export class HTTPEndpoint extends BaseEndpoint {
   }
 
   get protocol() {
-    return "tcp";
+    return PROTOCOL_TCP;
   }
 
   get tls() {

package/src/module.mjs

@@ -1,4 +1,5 @@
 export * from "./type.mjs";
+export * from "./constants.mjs";
 export * from "./core.mjs";
 export * from "./content.mjs";
 export * from "./common-attributes.mjs";

package/src/service-types.mjs

@@ -1,9 +1,11 @@
 import { asArray } from "pacc";
 import { FAMILY_IPV6 } from "ip-utilties";
-import { FAMILY_UNIX, FAMILY_IPV4_IPV6 } from "./endpoint.mjs";
-
-const TCP = "tcp";
-const UDP = "udp";
+import {
+  FAMILY_UNIX,
+  FAMILY_IPV4_IPV6,
+  PROTOCOL_UDP,
+  PROTOCOL_TCP
+} from "./constants.mjs";
 
 /**
  * @typedef {object} ServiceType
@@ -11,7 +13,7 @@ const UDP = "udp";
  * @property {Array<Object>} services
  * @property {Array<ServiceType>} extends
  * @property {Array<object>} endpoints
- * 
+ *
  */
 export const ServiceTypes = {
   "alpm-repo": {
@@ -24,13 +26,13 @@ export const ServiceTypes = {
   syslog: {
     endpoints: [
       {
-        protocol: UDP,
+        protocol: PROTOCOL_UDP,
         family: FAMILY_IPV4_IPV6,
         port: 514,
         tls: false
       },
       {
-        protocol: TCP,
+        protocol: PROTOCOL_TCP,
         family: FAMILY_IPV4_IPV6,
         port: 514,
         tls: false
@@ -39,33 +41,63 @@ export const ServiceTypes = {
   },
   mqtt: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 1883, tls: false }
+      {
+        family: FAMILY_IPV4_IPV6,
+        protocol: PROTOCOL_TCP,
+        port: 1883,
+        tls: false
+      }
     ]
   },
   "secure-mqtt": {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 8883, tls: true }
+      {
+        family: FAMILY_IPV4_IPV6,
+        protocol: PROTOCOL_TCP,
+        port: 8883,
+        tls: true
+      }
     ]
   },
   ntp: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: UDP, port: 123, tls: false }
+      {
+        family: FAMILY_IPV4_IPV6,
+        protocol: PROTOCOL_UDP,
+        port: 123,
+        tls: false
+      }
     ]
   },
   dns: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: UDP, port: 53, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: PROTOCOL_UDP, port: 53, tls: false }
     ]
   },
   mdns: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: UDP, port: 5353, tls: false }
+      {
+        family: FAMILY_IPV4_IPV6,
+        protocol: PROTOCOL_UDP,
+        port: 5353,
+        tls: false
+      }
     ]
   },
   llmnr: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: UDP, port: 5355, tls: false },
-      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 5355, tls: false }
+      {
+        family: FAMILY_IPV4_IPV6,
+        protocol: PROTOCOL_UDP,
+        port: 5355,
+        tls: false
+      },
+      {
+        family: FAMILY_IPV4_IPV6,
+        protocol: PROTOCOL_TCP,
+        port: 5355,
+        tls: false
+      }
     ]
   },
   ldap: {
@@ -73,7 +105,7 @@ export const ServiceTypes = {
       {
         family: FAMILY_IPV4_IPV6,
         scheme: "ldap",
-        protocol: TCP,
+        protocol: PROTOCOL_TCP,
         port: 389,
         tls: false
       }
@@ -84,7 +116,7 @@ export const ServiceTypes = {
       {
         family: FAMILY_IPV4_IPV6,
         scheme: "ldaps",
-        protocol: TCP,
+        protocol: PROTOCOL_TCP,
         port: 636,
         tls: true
       }
@@ -98,7 +130,7 @@ export const ServiceTypes = {
       {
         family: FAMILY_IPV4_IPV6,
         scheme: "http",
-        protocol: TCP,
+        protocol: PROTOCOL_TCP,
         port: 80,
         tls: false
       }
@@ -109,7 +141,7 @@ export const ServiceTypes = {
       {
         family: FAMILY_IPV4_IPV6,
         scheme: "https",
-        protocol: TCP,
+        protocol: PROTOCOL_TCP,
         port: 443,
         tls: true
       }
@@ -121,7 +153,7 @@ export const ServiceTypes = {
       {
         family: FAMILY_IPV4_IPV6,
         scheme: "https",
-        protocol: UDP,
+        protocol: PROTOCOL_UDP,
         port: 443,
         tls: true
       }
@@ -133,54 +165,79 @@ export const ServiceTypes = {
   },
   rtsp: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 554, tls: false }
+      {
+        family: FAMILY_IPV4_IPV6,
+        protocol: PROTOCOL_TCP,
+        port: 554,
+        tls: false
+      }
     ]
   },
   smtp: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 25, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: PROTOCOL_TCP, port: 25, tls: false }
     ],
     dnsRecord: { type: "MX" }
   },
   smtps: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 465, tls: true }
+      { family: FAMILY_IPV4_IPV6, protocol: PROTOCOL_TCP, port: 465, tls: true }
     ],
     dnsRecord: { type: "MX" }
   },
   submission: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 587, tls: false }
+      {
+        family: FAMILY_IPV4_IPV6,
+        protocol: PROTOCOL_TCP,
+        port: 587,
+        tls: false
+      }
     ]
   },
   lmtp: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 24, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: PROTOCOL_TCP, port: 24, tls: false }
     ]
   },
   ssh: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 22, tls: false }
+      { family: FAMILY_IPV4_IPV6, protocol: PROTOCOL_TCP, port: 22, tls: false }
     ]
   },
   imap: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 143, tls: false }
+      {
+        family: FAMILY_IPV4_IPV6,
+        protocol: PROTOCOL_TCP,
+        port: 143,
+        tls: false
+      }
     ]
   },
   imaps: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 993, tls: true }
+      { family: FAMILY_IPV4_IPV6, protocol: PROTOCOL_TCP, port: 993, tls: true }
     ]
   },
   dhcp: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: UDP, port: 547, tls: false }
+      {
+        family: FAMILY_IPV4_IPV6,
+        protocol: PROTOCOL_UDP,
+        port: 547,
+        tls: false
+      }
     ]
   },
   "dhcpv6-client": {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 546, tls: false }
+      {
+        family: FAMILY_IPV4_IPV6,
+        protocol: PROTOCOL_TCP,
+        port: 546,
+        tls: false
+      }
     ]
   },
   "dhcpv6-server": {
@@ -188,7 +245,12 @@ export const ServiceTypes = {
   },
   smb: {
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 445, tls: false }
+      {
+        family: FAMILY_IPV4_IPV6,
+        protocol: PROTOCOL_TCP,
+        port: 445,
+        tls: false
+      }
     ]
   },
   nginx: {
@@ -209,19 +271,34 @@ export const ServiceTypes = {
   pcp: {
     // rfc6887
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: UDP, port: 5351, tls: false }
+      {
+        family: FAMILY_IPV4_IPV6,
+        protocol: PROTOCOL_UDP,
+        port: 5351,
+        tls: false
+      }
     ]
   },
   "pcp-multicast": {
     // rfc6887
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: UDP, port: 5350, tls: false }
+      {
+        family: FAMILY_IPV4_IPV6,
+        protocol: PROTOCOL_UDP,
+        port: 5350,
+        tls: false
+      }
     ]
   },
-  "mbap": {
-    // Modbus TCP
+  mbap: {
+    // Modbus PROTOCOL_TCP
     endpoints: [
-      { family: FAMILY_IPV4_IPV6, protocol: TCP, port: 502, tls: false }
+      {
+        family: FAMILY_IPV4_IPV6,
+        protocol: PROTOCOL_TCP,
+        port: 502,
+        tls: false
+      }
     ]
   }
 };
@@ -276,9 +353,9 @@ export function serviceTypes(type) {
 }
 
 /**
- * 
- * @param {ServiceType} type 
- * @param {boolean} bundeledToo 
+ *
+ * @param {ServiceType} type
+ * @param {boolean} bundeledToo
  * @returns {Array<Object>}
  */
 export function serviceTypeEndpoints(type, bundeledToo) {

package/src/services/bind.mjs

@@ -26,7 +26,8 @@ import {
   addresses,
   networkAddressType,
   addType,
-  FAMILY_IPV4_IPV6
+  FAMILY_IPV4_IPV6,
+  PROTOCOL_TCP
 } from "pmcf";
 import { yesno, writeLines } from "../utils.mjs";
 import {
@@ -797,7 +798,7 @@ export class bind extends CoreService {
           {
             family: FAMILY_IPV4_IPV6,
             port: 19521,
-            protocol: "tcp",
+            protocol: PROTOCOL_TCP,
             pathname: "/",
             tls: false,
             kind: "loopback"
@@ -809,7 +810,7 @@ export class bind extends CoreService {
           {
             family: FAMILY_IPV4_IPV6,
             port: 953,
-            protocol: "tcp",
+            protocol: PROTOCOL_TCP,
             tls: false,
             kind: "loopback"
           }

package/src/services/chrony.mjs

@@ -1,7 +1,8 @@
 import { join } from "node:path";
 import { default_collection_attribute_writable, asArray } from "pacc";
-import { addType, FAMILY_UNIX, FAMILY_IPV4_IPV6, CoreService } from "pmcf";
+import { addType, CoreService } from "pmcf";
 import { writeLines } from "../utils.mjs";
+import { FAMILY_UNIX, FAMILY_IPV4_IPV6, PROTOCOL_TCP } from "../constants.mjs";
 
 export class chrony extends CoreService {
   static attributes = {
@@ -22,7 +23,7 @@ export class chrony extends CoreService {
           {
             family: FAMILY_IPV4_IPV6,
             port: 323,
-            protocol: "tcp",
+            protocol: PROTOCOL_TCP,
             tls: false
           },
           {

package/src/services/headscale.mjs

@@ -1,5 +1,6 @@
 import { FAMILY_IPV4 } from "ip-utilties";
-import { CoreService, addType, FAMILY_UNIX } from "pmcf";
+import { CoreService, addType } from "pmcf";
+import { FAMILY_UNIX, PROTOCOL_TCP } from "../constants.mjs";
 
 export class headscale extends CoreService {
   static service = {
@@ -11,21 +12,21 @@ export class headscale extends CoreService {
       {
         family: FAMILY_IPV4,
         port: 8080,
-        protocol: "tcp",
+        protocol: PROTOCOL_TCP,
         tls: false
       },
       {
         description: "grpc",
         family: FAMILY_IPV4,
         port: 50443,
-        protocol: "tcp",
+        protocol: PROTOCOL_TCP,
         tls: false
       },
       {
         description: "metrics debug",
         family: FAMILY_IPV4,
         port: 9090,
-        protocol: "tcp",
+        protocol: PROTOCOL_TCP,
         tls: false
       }
     ]

package/src/services/influxdb.mjs

@@ -1,8 +1,9 @@
 import { join } from "node:path";
 import { stringify } from "yaml";
 import { boolean_attribute_writable_true } from "pacc";
-import { CoreService, addType, FAMILY_IPV4_IPV6 } from "pmcf";
+import { CoreService, addType } from "pmcf";
 import { writeLines, filterConfigurable } from "../utils.mjs";
+import { FAMILY_IPV4_IPV6, PROTOCOL_TCP } from "../constants.mjs";
 
 export class influxdb extends CoreService {
   static attributes = {
@@ -18,7 +19,7 @@ export class influxdb extends CoreService {
       {
         family: FAMILY_IPV4_IPV6,
         port: 8086,
-        protocol: "tcp",
+        protocol: PROTOCOL_TCP,
         tls: false,
         pathname: "/"
       }

package/src/services/kea.mjs

@@ -20,9 +20,9 @@ import {
   Subnet,
   CoreService,
   Endpoint,
-  sortDescendingByPriority,
-  FAMILY_UNIX
+  sortDescendingByPriority
 } from "pmcf";
+import { FAMILY_UNIX, PROTOCOL_TCP } from "../constants.mjs";
 import { writeLines } from "../utils.mjs";
 
 class kea_subnet extends Subnet {
@@ -102,7 +102,7 @@ export class kea extends CoreService {
             family: FAMILY_IPV4,
             kind: "loopback",
             port: 53001,
-            protocol: "tcp",
+            protocol: PROTOCOL_TCP,
             tls: false
           }
         ]
@@ -113,7 +113,7 @@ export class kea extends CoreService {
             family: FAMILY_IPV4,
             port: 53003,
             pathname: "/",
-            protocol: "tcp",
+            protocol: PROTOCOL_TCP,
             tls: false
           }
         ]
@@ -124,7 +124,7 @@ export class kea extends CoreService {
             family: FAMILY_IPV6,
             port: 53004,
             pathname: "/",
-            protocol: "tcp",
+            protocol: PROTOCOL_TCP,
             tls: false
           }
         ]
@@ -172,6 +172,122 @@ export class kea extends CoreService {
 
   subnets = new Map();
 
+  listenInterfaces(family) {
+    return this.endpoints(
+      endpoint =>
+        endpoint.type === "dhcp" &&
+        endpoint.family === family &&
+        endpoint.networkInterface.kind !== "loopback" &&
+        endpoint.networkInterface.kind !== "tun"
+    ).map(endpoint => `${endpoint.networkInterface.name}/${endpoint.address}`);
+  }
+
+  commonConfig(family) {
+    const cfg = {
+      "interfaces-config": {
+        interfaces: this.listenInterfaces(`IPv${family}`)
+      },
+      "control-sockets": this.endpoints(`kea-control-dhcp${family}`).map(e =>
+        toSocket(e)
+      ),
+      "lease-database": {
+        type: "memfile",
+        "lfc-interval": 3600
+      },
+      "multi-threading": {
+        "enable-multi-threading": true,
+        "thread-pool-size": 2,
+        "packet-queue-size": 4
+      },
+      "expired-leases-processing": {
+        "reclaim-timer-wait-time": 10,
+        "flush-reclaimed-timer-wait-time": 25,
+        "hold-reclaimed-time": 3600,
+        "max-reclaim-leases": 100,
+        "max-reclaim-time": 250,
+        "unwarned-reclaim-cycles": 5
+      },
+      "hooks-libraries": [
+        /*{
+            library: "/usr/lib/kea/hooks/libdhcp_ddns_tuning.so"
+          },*/
+        {
+          library: "/usr/lib/kea/hooks/libdhcp_lease_cmds.so"
+        },
+        {
+          library: "/usr/lib/kea/hooks/libdhcp_ha.so",
+          parameters: {
+            "high-availability": [
+              {
+                "this-server-name": this.host.name,
+                mode: "hot-standby",
+                "heartbeat-delay": 60000,
+                "max-response-delay": 60000,
+                "max-ack-delay": 10000,
+                /*
+                  "multi-threading": {
+                    "enable-multi-threading": true,
+                    "http-dedicated-listener": true,
+                    "http-listener-threads": 2,
+                    "http-client-threads": 2
+                  },*/
+                peers: asArray(this.peers)
+                  .sort(sortDescendingByPriority)
+                  .reduce((a, kea) => {
+                    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;
+                  }, [])
+              }
+            ]
+          }
+        }
+      ],
+      "option-data": [
+        {
+          name: family == 4 ? "domain-name-servers" : "dns-servers",
+          data: asArray(
+            this.dnsServerEndpoints
+              .filter(
+                endpoint =>
+                  endpoint.family === `IPv${family}` &&
+                  addressType(endpoint.address) !== ADDRESS_TYPE_LOOPBACK
+              )
+              .map(endpoint => endpoint.address)
+          ).join(",")
+        },
+        {
+          name: "domain-search",
+          data: [...this.domains].join(",")
+        }
+      ]
+    };
+
+    for (const [path, attribute] of extendingAttributeIterator(
+      this.constructor,
+      attribute => attribute.configurable && this[attribute.name] !== undefined
+    )) {
+      const name = path.join(".");
+      cfg[name] = this[name];
+    }
+
+    return cfg;
+  }
+
   async *preparePackages(dir) {
     const ctrlAgentEndpoint = this.endpoint("kea-ha-4");
 
@@ -179,13 +295,9 @@ export class kea extends CoreService {
       return;
     }
 
-    const network = this.network;
     const host = this.host;
     const source = host.owner;
-    const name = host.name;
     const subnets = [...this.subnets.values()];
-    const dnsServerEndpoints = this.dnsServerEndpoints;
-    const packageData = await this.preparePackage(dir);
 
     const loggers = [
       {
@@ -199,150 +311,6 @@ export class kea extends CoreService {
       }
     ];
 
-    const peers = this.peers;
-
-    const commonConfig = family => {
-      const cfg = {
-        "interfaces-config": {
-          interfaces: listenInterfaces(`IPv${family}`)
-        },
-        "control-sockets": this.endpoints(`kea-control-dhcp${family}`).map(e =>
-          toSocket(e)
-        ),
-        "lease-database": {
-          type: "memfile",
-          "lfc-interval": 3600
-        },
-        "multi-threading": {
-          "enable-multi-threading": true,
-          "thread-pool-size": 2,
-          "packet-queue-size": 4
-        },
-        "expired-leases-processing": {
-          "reclaim-timer-wait-time": 10,
-          "flush-reclaimed-timer-wait-time": 25,
-          "hold-reclaimed-time": 3600,
-          "max-reclaim-leases": 100,
-          "max-reclaim-time": 250,
-          "unwarned-reclaim-cycles": 5
-        },
-        "hooks-libraries": [
-          /*{
-            library: "/usr/lib/kea/hooks/libdhcp_ddns_tuning.so"
-          },*/
-          {
-            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",
-                  "heartbeat-delay": 60000,
-                  "max-response-delay": 60000,
-                  "max-ack-delay": 10000,
-                  /*
-                  "multi-threading": {
-                    "enable-multi-threading": true,
-                    "http-dedicated-listener": true,
-                    "http-listener-threads": 2,
-                    "http-client-threads": 2
-                  },*/
-                  peers: asArray(peers)
-                    .sort(sortDescendingByPriority)
-                    .reduce((a, kea) => {
-                      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;
-                    }, [])
-                }
-              ]
-            }
-          }
-        ],
-        "dhcp-ddns": dhcpServerDdns,
-
-        loggers,
-        "option-data": [
-          {
-            name: family == 4 ? "domain-name-servers" : "dns-servers",
-            data: asArray(
-              dnsServerEndpoints
-                .filter(
-                  endpoint =>
-                    endpoint.family === `IPv${family}` &&
-                    addressType(endpoint.address) !== ADDRESS_TYPE_LOOPBACK
-                )
-                .map(endpoint => endpoint.address)
-            ).join(",")
-          },
-          {
-            name: "domain-search",
-            data: [...this.domains].join(",")
-          }
-        ]
-      };
-
-      for (const [path, attribute] of extendingAttributeIterator(
-        this.constructor,
-        attribute =>
-          attribute.configurable && this[attribute.name] !== undefined
-      )) {
-        const name = path.join(".");
-
-        cfg[name] = this[name];
-      }
-
-      return cfg;
-    };
-
-    const toSocket = endpoint => {
-      switch (endpoint.family) {
-        case FAMILY_IPV4:
-        case FAMILY_IPV6:
-          return {
-            "socket-type": "http",
-            "socket-address": endpoint.address.hostname,
-            "socket-port": endpoint.port,
-            authentication: {
-              type: "basic",
-              realm: "Kea Control Agent",
-              directory: "/etc/kea",
-              clients: [
-                {
-                  "user-file": "kea-api-user",
-                  "password-file": "kea-api-password"
-                }
-              ]
-            }
-          };
-        case FAMILY_UNIX:
-          return {
-            "socket-type": FAMILY_UNIX,
-            "socket-name": endpoint?.path
-          };
-      }
-    };
-
     /*const ctrlAgent = {
       "Control-agent": {
         "http-host": ctrlAgentEndpoint.hostname,
@@ -360,7 +328,7 @@ export class kea extends CoreService {
       names.map(name => {
         return {
           name,
-          "dns-servers": dnsServerEndpoints
+          "dns-servers": asArray(this.dnsServerEndpoints)
             .filter(
               endpoint =>
                 endpoint.family === FAMILY_IPV4 &&
@@ -388,7 +356,6 @@ export class kea extends CoreService {
             subnets.map(s => s.prefix).map(prefix => reverseArpa(prefix))
           )
         },
-
         loggers
       }
     };
@@ -436,20 +403,9 @@ export class kea extends CoreService {
         })
         .sort((a, b) => a.hostname?.localeCompare(b.hostname));
 
-    const listenInterfaces = family =>
-      this.endpoints(
-        endpoint =>
-          endpoint.type === "dhcp" &&
-          endpoint.family === family &&
-          endpoint.networkInterface.kind !== "loopback" &&
-          endpoint.networkInterface.kind !== "tun"
-      ).map(
-        endpoint => `${endpoint.networkInterface.name}/${endpoint.address}`
-      );
-
     const dhcp4 = {
       Dhcp4: {
-        ...commonConfig("4"),
+        ...this.commonConfig("4"),
         subnet4: subnets
           .filter(s => s.family === FAMILY_IPV4)
           .map((subnet, index) => {
@@ -461,16 +417,18 @@ export class kea extends CoreService {
               "option-data": [
                 {
                   name: "routers",
-                  data: network.gateway.address
+                  data: this.network.gateway.address
                 }
               ]
             };
-          })
+          }),
+        "dhcp-ddns": dhcpServerDdns,
+        loggers
       }
     };
     const dhcp6 = {
       Dhcp6: {
-        ...commonConfig("6"),
+        ...this.commonConfig("6"),
         subnet6: subnets
           .filter(s => s.family === FAMILY_IPV6)
           .map((subnet, index) => {
@@ -480,10 +438,14 @@ export class kea extends CoreService {
               pools: [{ pool: subnet.pool.join(" - ") }],
               reservations: reservations(subnet, "6")
             };
-          })
+          }),
+        "dhcp-ddns": dhcpServerDdns,
+        loggers
       }
     };
 
+    const packageData = await this.preparePackage(dir);
+
     for (const [name, data] of Object.entries({
       "kea-dhcp-ddns": ddns,
       "kea-dhcp4": dhcp4,
@@ -500,3 +462,31 @@ export class kea extends CoreService {
     yield packageData;
   }
 }
+
+function toSocket(endpoint) {
+  switch (endpoint.family) {
+    case FAMILY_IPV4:
+    case FAMILY_IPV6:
+      return {
+        "socket-type": "http",
+        "socket-address": endpoint.address.hostname,
+        "socket-port": endpoint.port,
+        authentication: {
+          type: "basic",
+          realm: "Kea Control Agent",
+          directory: "/etc/kea",
+          clients: [
+            {
+              "user-file": "kea-api-user",
+              "password-file": "kea-api-password"
+            }
+          ]
+        }
+      };
+    case FAMILY_UNIX:
+      return {
+        "socket-type": FAMILY_UNIX,
+        "socket-name": endpoint?.path
+      };
+  }
+}

package/src/services/systemd-journal-remote.mjs

@@ -4,8 +4,9 @@ import {
   boolean_attribute_writable,
   integer_attribute_writable
 } from "pacc";
-import { CoreService, addType, FAMILY_IPV4_IPV6 } from "pmcf";
+import { CoreService, addType } from "pmcf";
 import { filterConfigurable, sectionLines } from "../utils.mjs";
+import { FAMILY_IPV4_IPV6, PROTOCOL_TCP } from "../constants.mjs";
 
 /**
  * @property {string} ServerCertificateFile
@@ -77,7 +78,7 @@ export class SystemdJournalRemoteService extends CoreService {
       {
         family: FAMILY_IPV4_IPV6,
         port: 19532,
-        protocol: "tcp",
+        protocol: PROTOCOL_TCP,
         tls: false,
         pathname: "/"
       }

package/src/services/tailscale.mjs

@@ -1,5 +1,6 @@
 import { FAMILY_IPV4 } from "ip-utilties";
 import { CoreService, addType } from "pmcf";
+import { PROTOCOL_TCP } from "../constants.mjs";
 
 export class tailscale extends CoreService {
   static service = {
@@ -7,7 +8,7 @@ export class tailscale extends CoreService {
       {
         family: FAMILY_IPV4,
         port: 41641,
-        protocol: "tcp",
+        protocol: PROTOCOL_TCP,
         tls: false
       }
     ]