pmcf 6.54.3 → 6.54.5

package/README.md

@@ -81,30 +81,30 @@ generates config packages for:
 *   [domainNames](#domainnames)
 *   [InitializationContext](#initializationcontext)
     *   [Parameters](#parameters-14)
+*   [SkeletonNetworkInterface](#skeletonnetworkinterface)
+    *   [networkAddresses](#networkaddresses)
+        *   [Parameters](#parameters-15)
 *   [Interface](#interface)
 *   [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)
@@ -308,6 +308,18 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 *   `directory`   (optional, default `"/"`)
 
+## SkeletonNetworkInterface
+
+**Extends Interface**
+
+### networkAddresses
+
+#### Parameters
+
+*   `filter` **[Object](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/Object)**  (optional, default `n=>true`)
+
+Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
+
 ## Interface
 
 **Extends ServiceOwner**
@@ -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 Interface**
-
-### 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.54.3",
+  "version": "6.54.5",
   "publishConfig": {
     "access": "public"
   },

package/src/core-service.mjs

@@ -97,7 +97,11 @@ export class CoreService extends base {
   }
 
   get network() {
-    return this.host.network;
+    return this.owner.network;
+  }
+
+  get networks() {
+    return this.owner.networks;
   }
 
   get host() {
@@ -112,12 +116,13 @@ export class CoreService extends base {
     return this.host?.domainName;
   }
 
-  get networks() {
-    return this.host.networks;
+  networkAddresses(filter)
+  {
+    return this.owner.networkAddresses(filter);
   }
 
   get subnets() {
-    return this.host.subnets;
+    return this.owner.subnets;
   }
 
   get url() {

package/src/interfaces/network-interface.mjs

@@ -96,6 +96,10 @@ export class NetworkInterface extends SkeletonNetworkInterface {
     );
   }
 
+  get networks() {
+    return new Set([this.network]);
+  }
+
   get gateway() {
     return this.network?.gateway;
   }

package/src/network-address.mjs

@@ -1,4 +1,10 @@
-import { default_attribute, type_attribute, getAttribute, asArray } from "pacc";
+import {
+  default_attribute,
+  type_attribute,
+  getAttribute,
+  asArray,
+  leafValues
+} from "pacc";
 import { familyIP, formatCIDR, decodeIP, addressType } from "ip-utilties";
 import { Subnet } from "./subnet.mjs";
 import { owner } from "./owner.mjs";
@@ -10,6 +16,7 @@ import {
   address_attribute,
   cidr_address_attribute
 } from "./common-attributes.mjs";
+
 /**
  *
  */
@@ -96,31 +103,30 @@ export class NetworkAddress {
  * @param {Iterable<owner|string>} sources
  * @param {Object} options
  * @param {boolean} options.aggregate
- * @param {Object} options.filter
  * @returns {Iterable<string>} addresses
  */
 export function addresses(sources, options) {
   return [
-    ...new Set(
-      asArray(sources)
-        .map(s => {
-          if (typeof s === "string") {
-            return s;
+    ...[...leafValues(sources)].reduce((all, source) => {
+      if (typeof source === "string") {
+        all.add(source);
+      } else {
+        if (source.subnets?.size && options?.aggregate) {
+          for (const address of source.subnets.keys()) {
+            all.add(address);
           }
-          if (options?.aggregate && s instanceof owner && s.subnets.size > 0) {
-            return [...s.subnets.keys()];
+        } else if (source.networkAddresses) {
+          for (const na of source.networkAddresses()) {
+            all.add(decodeIP(na.address));
           }
-
-          return s.networkAddresses
-            ? [...s.networkAddresses(options?.filter)]
-            : s;
-        })
-        .flat()
-        .map(object =>
-          typeof object === "string" ? object : decodeIP(object.address)
-        )
-    )
-  ].filter(e => e !== "");
+        } else {
+          all.add(decodeIP(source.address));
+        }
+      }
+
+      return all;
+    }, new Set())
+  ];
 }
 
 /**

package/src/services/bind.mjs

@@ -16,8 +16,7 @@ import {
   integer_attribute_writable,
   integer_attribute,
   secret_attribute_writable,
-  asArray,
-  leafValues
+  asArray
 } from "pacc";
 import {
   base,
@@ -859,8 +858,7 @@ export class bind extends CoreService {
   }
 
   async writeServers(outputControl) {
-
-    // TODO 
+    // TODO
     const all = new Map();
     for (const service of this.primaries) {
       for (const subnet of service.host.network.subnets.values()) {