pmcf 6.44.5 → 6.44.7

package/README.md

@@ -82,29 +82,29 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-14)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-15)
 *   [zones](#zones)
 *   [addressesStatement](#addressesstatement)
-    *   [Parameters](#parameters-15)
+    *   [Parameters](#parameters-16)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
-        *   [Parameters](#parameters-16)
+        *   [Parameters](#parameters-17)
 *   [SystemdJournalUploadService](#systemdjournaluploadservice)
     *   [Properties](#properties-1)
     *   [systemdConfigs](#systemdconfigs-1)
-        *   [Parameters](#parameters-17)
+        *   [Parameters](#parameters-18)
 *   [NetworkAddress](#networkaddress)
-    *   [Parameters](#parameters-18)
+    *   [Parameters](#parameters-19)
     *   [subnet](#subnet)
     *   [networkInterface](#networkinterface)
     *   [address](#address)
 *   [addresses](#addresses)
-    *   [Parameters](#parameters-19)
-*   [cidrAddresses](#cidraddresses)
     *   [Parameters](#parameters-20)
-*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
-    *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-21)
+*   [cidrAddresses](#cidraddresses)
+    *   [Parameters](#parameters-21)
 *   [families](#families)
 *   [secretName](#secretname)
 *   [directHosts](#directhosts)
@@ -293,7 +293,7 @@ Endpoint based on http
 ### Parameters
 
 *   `service` **Service** 
-*   `address` **any** 
+*   `address` **([string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String) | [URL](https://developer.mozilla.org/docs/Web/API/URL/URL))** 
 *   `data` **[object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)** 
 
 ### port
@@ -312,6 +312,18 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
+## SkeletonNetworkInterface
+
+**Extends ServiceOwner**
+
+### networkAddresses
+
+#### Parameters
+
+*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
+
 ## zones
 
 Type: [Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)\<bind\_zone>
@@ -402,18 +414,6 @@ Returns **Iterable<[string](https://developer.mozilla.org/docs/Web/JavaScript/Re
 
 Returns **[Array](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Array)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;
 
-## SkeletonNetworkInterface
-
-**Extends ServiceOwner**
-
-### networkAddresses
-
-#### Parameters
-
-*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
-
-Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
-
 ## families
 
 Returns **[Set](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Set)<[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)>**&#x20;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "6.44.5",
+  "version": "6.44.7",
   "publishConfig": {
     "access": "public"
   },
@@ -50,7 +50,7 @@
     "lint:docs": "documentation lint ./src**/*.mjs"
   },
   "dependencies": {
-    "aggregated-map": "^1.0.10",
+    "aggregated-map": "^1.0.11",
     "content-entry-transform": "^1.7.6",
     "ip-utilties": "^3.13.1",
     "npm-pkgbuild": "^22.1.3",
@@ -59,7 +59,7 @@
     "yaml": "^2.9.0"
   },
   "devDependencies": {
-    "@types/node": "^26.4.1",
+    "@types/node": "^26.5.0",
     "ava": "^8.0.1",
     "c8": "^12.0.0",
     "documentation": "^14.0.3",

package/src/common-attributes.mjs

@@ -15,7 +15,7 @@ import {
 
 export const networkAddressType = "network|host|network_interface";
 
-export const extends_attribute = {  
+export const extends_attribute = {
   ...default_collection_attribute_writable,
   name: "extends"
 };
@@ -78,6 +78,21 @@ export const clusters_attribute = {
   backpointer: owner_attribute
 };
 
+export const address_attribute = {
+  ...string_attribute_writable,
+  name: "address"
+};
+
+export const cidr_address_attribute = {
+  ...string_attribute_writable,
+  name: "cidrAddress"
+};
+
+export const cidr_addresses_attribute = {
+  ...string_collection_attribute_writable,
+  name: "cidrAddresses"
+};
+
 export const subnets_attribute = {
   ...default_collection_attribute_writable,
   name: "subnets",
@@ -140,15 +155,13 @@ export const networkAttributes = {
   multicastDNS: { ...boolean_attribute_writable, name: "multicastDNS" }
 };
 
+
 export const networkAddressAttributes = {
   hostName: hostname_attribute,
-  cidrAddresses: {
-    ...string_collection_attribute_writable,
-    name: "cidrAddresses"
-  },
-  cidrAddress: { ...string_attribute_writable, name: "cidrAddress" },
+  cidrAddresses: cidr_addresses_attribute,
+  cidrAddress: cidr_address_attribute,
   addresses: { ...string_collection_attribute_writable, name: "addresses" },
-  address: { ...string_attribute_writable, name: "address" }
+  address: address_attribute
 };
 
 export const endpointAttributes = {
@@ -162,4 +175,3 @@ export const endpointAttributes = {
   tls: { ...boolean_attribute_false, name: "tls" },
   address: { ...string_attribute, name: "address" }
 };
-

package/src/endpoint.mjs

@@ -182,7 +182,7 @@ export class HTTPEndpoint extends BaseEndpoint {
   /**
    *
    * @param {Service} service
-   * @param {*} address
+   * @param {string|URL} address
    * @param {object} data
    * @param {number} data.port
    * @param {string} data.pathname

package/src/network-address.mjs

@@ -9,7 +9,7 @@ import { familyIP, formatCIDR, decodeIP, addressType } from "ip-utilties";
 import { Subnet } from "./subnet.mjs";
 import { Owner, addType } from "pmcf";
 import { NetworkInterface } from "./network-interfaces/network-interface.mjs";
-import { family_attribute, subnet_attribute } from "./common-attributes.mjs";
+import { family_attribute, subnet_attribute, address_attribute, cidr_address_attribute } from "./common-attributes.mjs";
 /**
  *
  */
@@ -18,9 +18,9 @@ export class NetworkAddress {
   static priority = 1;
   static key = "address";
   static attributes = {
-    address: { ...string_attribute, name: "address" },
+    address: address_attribute,
     type: type_attribute,
-    cidrAddress: { ...string_attribute, name: "cidrAddress" },
+    cidrAddress: cidr_address_attribute,
     networkInterface: {
       ...default_attribute,
       name: "networkInterface",

package/src/services/kea.mjs

@@ -134,7 +134,12 @@ export class kea extends CoreService {
           {
             family: FAMILY_UNIX,
             path: "/run/kea/ctrl-4"
-          }
+          },
+          /*{
+            family: FAMILY_IPV4,
+            port: 53005,
+            pathname: "/"
+          }*/
         ]
       },
       "kea-control-dhcp6": {
@@ -142,7 +147,12 @@ export class kea extends CoreService {
           {
             family: FAMILY_UNIX,
             path: "/run/kea/ctrl-6"
-          }
+          },
+          /*{
+            family: FAMILY_IPV6,
+            port: 53005,
+            pathname: "/"
+          }*/
         ]
       },
       "kea-control-ddns": {
@@ -207,7 +217,9 @@ export class kea extends CoreService {
         "interfaces-config": {
           interfaces: listenInterfaces(`IPv${family}`)
         },
-        "control-sockets": [toUnix(this.endpoint(`kea-control-dhcp${family}`))],
+        "control-sockets": this.endpoints(`kea-control-dhcp${family}`).map(e =>
+          toSocket(e)
+        ),
         "lease-database": {
           type: "memfile",
           "lfc-interval": 3600
@@ -307,11 +319,32 @@ export class kea extends CoreService {
       return cfg;
     };
 
-    const toUnix = endpoint => {
-      return {
-        "socket-type": FAMILY_UNIX,
-        "socket-name": endpoint?.path
-      };
+    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 = {
@@ -319,9 +352,9 @@ export class kea extends CoreService {
         "http-host": ctrlAgentEndpoint.hostname,
         "http-port": ctrlAgentEndpoint.port,
         "control-sockets": {
-          dhcp4: toUnix(this.endpoint("kea-control-dhcp4")),
-          dhcp6: toUnix(this.endpoint("kea-control-dhcp6")),
-          d2: toUnix(this.endpoint("kea-control-ddns"))
+          dhcp4: toSocket(this.endpoint("kea-control-dhcp4")),
+          dhcp6: toSocket(this.endpoint("kea-control-dhcp6")),
+          d2: toSocket(this.endpoint("kea-control-ddns"))
         },
         loggers
       }
@@ -349,9 +382,7 @@ export class kea extends CoreService {
       DhcpDdns: {
         "ip-address": ddnsEndpoint.address,
         port: ddnsEndpoint.port,
-        "control-socket": toUnix(
-          this.endpoint(e => e.type === "kea-control-ddns")
-        ),
+        "control-socket": toSocket(this.endpoint("kea-control-ddns")),
         "tsig-keys": [],
         "forward-ddns": {
           "ddns-domains": dnsServersSlot([...this.domains])

package/src/network-support.mjs

@@ -1,62 +0,0 @@
-import {
-  default_attribute_writable,
-  string_collection_attribute_writable,
-  string_attribute_writable,
-  integer_attribute_writable,
-  hostname_attribute as hostname_attribute_base,
-  boolean_attribute_writable
-} from "pacc";
-
-export const networkAddressType = "network|host|network_interface";
-
-export const networks_attribute = {
-  ...default_attribute_writable,
-  name: "networks",
-  type: "network",
-  collection: true
-};
-
-export const psk_attribute = { ...string_attribute_writable, name: "psk" };
-export const ssid_attribute = { ...string_attribute_writable, name: "ssid" };
-export const hostname_attribute = {
-  ...hostname_attribute_base,
-  name: "hostName",
-  writable: true
-};
-
-export const networkAttributes = {
-  scope: {
-    ...string_attribute_writable,
-    name: "scope",
-    values: ["global", "site", "link", "host"]
-    //  default: "global"
-  },
-  class: {
-    ...string_attribute_writable,
-    name: "class",
-    values: ["10GBASE-T", "1000BASE-T", "100BASE-T", "10BASE-T"]
-  },
-  kind: {
-    ...string_attribute_writable,
-    name: "kind",
-    values: ["loopback", "ethernet", "wlan", "wireguard", "fiber", "dsl"]
-  },
-  ssid: ssid_attribute,
-  psk: psk_attribute,
-  secretName: { ...string_attribute_writable, name: "secretName" },
-  metric: { ...integer_attribute_writable, name: "metric" /*default: 1004*/ },
-  mtu: { ...integer_attribute_writable, name: "mtu", default: 1500 },
-  gateway: { ...default_attribute_writable, name: "gateway", type: "host" },
-  multicastDNS: { ...boolean_attribute_writable, name: "multicastDNS" }
-};
-
-export const networkAddressAttributes = {
-  hostName: hostname_attribute,
-  cidrAddresses: {
-    ...string_collection_attribute_writable,
-    name: "cidrAddresses"
-  },
-  cidrAddress: { ...string_attribute_writable, name: "cidrAddress" },
-  addresses: { ...string_collection_attribute_writable, name: "addresses" },
-  address: { ...string_attribute_writable, name: "address" }
-};