pmcf 6.40.7 → 6.41.0

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)
@@ -309,6 +309,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>
@@ -399,18 +411,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.40.7",
+  "version": "6.41.0",
   "publishConfig": {
     "access": "public"
   },

package/src/core-service.mjs

@@ -1,4 +1,9 @@
-import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
+import {
+  FAMILY_IPV4,
+  FAMILY_IPV6,
+  ADDRESS_TYPE_LOOPBACK,
+  addressType
+} from "ip-utilties";
 import {
   string_attribute_writable,
   number_attribute_writable,
@@ -380,3 +385,19 @@ export function serviceEndpoints(sources, options = {}) {
 
   return options.join ? res.join(options.join) : res;
 }
+
+export function endpoints(entries) {
+  return asArray(entries)
+    .map(e => e.endpoints())
+    .flat();
+}
+
+export function endpointAddresses(entries) {
+  return endpoints(entries)
+    .filter(
+      e =>
+        e.networkAddress &&
+        addressType(e.networkAddress.address) !== ADDRESS_TYPE_LOOPBACK
+    )
+    .map(e => e.networkAddress.address);
+}

package/src/host.mjs

@@ -314,7 +314,7 @@ export class Host extends ServiceOwner {
     const packageData = await this.packageData;
 
     packageData.sources.push(
-      await Array.fromAsync(this.templateContent()),
+      ...await Array.fromAsync(this.templateContent()),
       new FileContentProvider({
         dir,
         pattern: ["**/*", "**/.ssh/*"],

package/src/services/bind.mjs

@@ -1,7 +1,7 @@
 import { join } from "node:path";
 import { createHmac } from "node:crypto";
 import { FileContentProvider } from "npm-pkgbuild";
-import { reverseArpa, ADDRESS_TYPE_LOOPBACK, addressType } from "ip-utilties";
+import { reverseArpa } from "ip-utilties";
 import {
   default_collection_attribute,
   default_collection_attribute_writable,
@@ -22,6 +22,7 @@ import {
   base,
   CoreService,
   Endpoint,
+  endpointAddresses,
   addresses,
   networkAddressType,
   addType,
@@ -649,18 +650,6 @@ class bind_view extends bind_object {
   }
 }
 
-function endpointAddresses(entries) {
-  return asArray(entries)
-    .map(e => e.endpoints())
-    .flat()
-    .filter(
-      e =>
-        e.networkAddress &&
-        addressType(e.networkAddress.address) !== ADDRESS_TYPE_LOOPBACK
-    )
-    .map(e => e.networkAddress.address);
-}
-
 /**
  *
  * @param {string} prefix
@@ -804,7 +793,9 @@ export class bind extends CoreService {
   async *preparePackages(dir) {
     const packageData = await this.packageData;
 
-    packageData.sources = await Array.fromAsync(this.templateContent());
+    packageData.sources.push(
+      ...(await Array.fromAsync(this.templateContent()))
+    );
 
     let hasContent = packageData.sources.length > 0;
 

package/src/services/kea.mjs

@@ -10,13 +10,16 @@ import {
   string_attribute_writable,
   number_attribute_writable,
   boolean_attribute_writable_true,
+  default_collection_attribute_writable,
   extendingAttributeIterator
 } from "pacc";
 import {
   addType,
   CoreService,
+  Endpoint,
+  endpointAddresses,
   sortDescendingByPriority,
-  serviceEndpoints,
+  endpoints,
   SUBNET_LOCALHOST_IPV4,
   SUBNET_LOCALHOST_IPV6,
   FAMILY_UNIX
@@ -25,6 +28,12 @@ import { writeLines } from "../utils.mjs";
 
 export class kea extends CoreService {
   static attributes = {
+    dnsServers: {
+      ...default_collection_attribute_writable,
+      type: Endpoint,
+      name: "dnsServers",
+      deferredExpression: true
+    },
     "ddns-send-updates": {
       ...boolean_attribute_writable_true,
       name: "ddns-send-updates",
@@ -146,14 +155,22 @@ export class kea extends CoreService {
 
     //console.log(source.fullName, [...source.hosts.keys()]);
 
-    const dnsServerEndpoints = serviceEndpoints(source, {
-      services: "services[types[dns] && priority>=300]",
-      endpoints: endpoint => endpoint.networkInterface?.kind !== "loopback"
-    });
+    const dnsServerEndpoints = endpoints(this.dnsServers).filter(
+      e => e.networkInterface?.kind !== "loopback"
+    );
 
     const packageData = await this.packageData;
 
-    packageData.sources.push(new FileContentProvider(dir + "/"));
+    packageData.sources.push(
+      ...(await Array.fromAsync(this.templateContent()))
+    );
+
+    packageData.sources.push(
+      new FileContentProvider({
+        dir: dir + "/",
+        permissions: this.content?.permissions
+      })
+    );
 
     const peers = async family =>
       Array.from(

package/src/subnet.mjs

@@ -77,7 +77,7 @@ export class Subnet extends core {
     return [
       this.family === FAMILY_IPV6
         ? this.cidr
-        : rangeIP(this.prefix, this.prefixLength, 51, 6).map(a => decodeIP(a))
+        : rangeIP(this.prefix, this.prefixLength, 51, 20).map(a => decodeIP(a))
     ];
   }