pmcf 4.25.4 → 4.25.6

package/README.md

@@ -73,11 +73,11 @@ generates config packages for:
     *   [Parameters](#parameters-12)
     *   [port](#port-1)
 *   [id](#id)
-*   [InitializationContext](#initializationcontext)
-    *   [Parameters](#parameters-13)
 *   [SkeletonNetworkInterface](#skeletonnetworkinterface)
     *   [networkAddresses](#networkaddresses)
-        *   [Parameters](#parameters-14)
+        *   [Parameters](#parameters-13)
+*   [InitializationContext](#initializationcontext)
+    *   [Parameters](#parameters-14)
 *   [SystemdJournalRemoteService](#systemdjournalremoteservice)
     *   [Properties](#properties)
     *   [systemdConfigs](#systemdconfigs)
@@ -263,14 +263,6 @@ Returns **[number](https://developer.mozilla.org/docs/Web/JavaScript/Reference/G
 
 Returns **[string](https://developer.mozilla.org/docs/Web/JavaScript/Reference/Global_Objects/String)** 
 
-## InitializationContext
-
-Keeps track of all in flight object creations and loose ends during config initialization.
-
-### Parameters
-
-*   `directory`   (optional, default `"/"`)
-
 ## SkeletonNetworkInterface
 
 **Extends ServiceOwner**
@@ -283,6 +275,14 @@ Keeps track of all in flight object creations and loose ends during config initi
 
 Returns **Iterable<[NetworkAddress](#networkaddress)>**&#x20;
 
+## InitializationContext
+
+Keeps track of all in flight object creations and loose ends during config initialization.
+
+### Parameters
+
+*   `directory`   (optional, default `"/"`)
+
 ## SystemdJournalRemoteService
 
 **Extends Service**

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.25.4",
+  "version": "4.25.6",
   "publishConfig": {
     "access": "public"
   },
@@ -53,7 +53,7 @@
     "aggregated-map": "^1.0.4",
     "content-entry-transform": "^1.6.9",
     "ip-utilties": "^3.0.4",
-    "npm-pkgbuild": "^20.6.4",
+    "npm-pkgbuild": "^20.7.1",
     "pacc": "^9.2.13",
     "package-directory": "^8.2.0"
   },

package/src/base.mjs

@@ -561,6 +561,10 @@ export function extractFrom(
       return object;
   }
 
+  if (object instanceof Set) {
+    object = [...object];
+  }
+
   if (typeof object[Symbol.iterator] === "function") {
     object = [...object].map(o => (o instanceof Base ? extractFrom(o) : o));
 

package/src/host.mjs

@@ -433,15 +433,13 @@ export class Host extends ServiceOwner {
   }
 
   get subnets() {
-    const sn = new Map();
+    let all = new Set();
 
     for (const networkInterface of this.networkInterfaces.values()) {
-      for (const s of networkInterface.subnets()) {
-        sn.set(s.address, s);
-      }
+      all = all.union(networkInterface.subnets);
     }
 
-    return new Set(sn.values());
+    return all;
   }
 
   async publicKey(type = "ed25519") {

package/src/network-address.mjs

@@ -57,7 +57,7 @@ export function addresses(sources, options) {
             return s;
           }
           if (options?.aggregate && s instanceof Owner && s.subnets) {
-            return [...s.subnets()];
+            return [...s.subnets];
           }
 
           return s.networkAddresses

package/src/network-interfaces/skeleton.mjs

@@ -24,8 +24,7 @@ export class SkeletonNetworkInterface extends ServiceOwner {
     }
   }
 
-  get services()
-  {
+  get services() {
     return new AggregatedMap([super.services, this.owner.services]);
   }
 
@@ -66,8 +65,8 @@ export class SkeletonNetworkInterface extends ServiceOwner {
     this._network = network;
   }
 
-  *subnets() {
-    yield* this.ipAddresses.values();
+  get subnets() {
+    return new Set(this.ipAddresses.values());
   }
 
   get ipAddresses() {

package/src/network.mjs

@@ -38,7 +38,7 @@ export class Network extends Owner {
   }
 
   get address() {
-    for (const subnet of this.subnets()) {
+    for (const subnet of this.subnets) {
       return subnet.address;
     }
   }

package/src/owner.mjs

@@ -54,6 +54,7 @@ export class Owner extends Base {
 
   _membersByType = new Map();
   _bridges = new Set();
+  _subnets = new Set();
 
   /**
    * @return {boolean}
@@ -132,26 +133,34 @@ export class Owner extends Base {
   }
 
   addTypeObject(typeName, name, object) {
-    const typeSlot = this._membersByType.getOrInsertComputed(typeName, () => new Map());
+    const typeSlot = this._membersByType.getOrInsertComputed(
+      typeName,
+      () => new Map()
+    );
     typeSlot.set(name, object);
   }
 
   addObject(object) {
-    if (object.owner && object.owner !== this) {
-      this.addTypeObject(
-        object.typeName,
-        object.owner.name + "/" + object.name,
-        object
-      );
-
-      return;
+    if (object instanceof Subnet) {
+      this._subnets.add(object);
+    } else {
+      if (object.owner && object.owner !== this) {
+        this.addTypeObject(
+          object.typeName,
+          object.owner.name + "/" + object.name,
+          object
+        );
+
+        return;
+      }
+      this.addTypeObject(object.typeName, object.name, object);
     }
-    this.addTypeObject(object.typeName, object.name, object);
   }
 
-  get services()
-  {
-    return [...this.hosts].map(host=>Array.from(host.services.values())).flat();
+  get services() {
+    return [...this.hosts]
+      .map(host => Array.from(host.services.values()))
+      .flat();
   }
 
   get locations() {
@@ -192,14 +201,11 @@ export class Owner extends Base {
   }
 
   subnetNamed(name) {
-    return this.typeNamed("subnet", name);
+    return [...this.subnets].find(s => s.name == name);
   }
 
-  *subnets() {
-    if (this.owner) {
-      yield* this.owner.subnets();
-    }
-    yield* this.typeList("subnet");
+  get subnets() {
+    return this.unionFromDirections(["this", "owner"], "_subnets");
   }
 
   addSubnet(address) {
@@ -215,19 +221,18 @@ export class Owner extends Base {
       subnet =
         familyIP(address) === "IPv4" ? SUBNET_GLOBAL_IPV4 : SUBNET_GLOBAL_IPV6;
 
-      /*
       this.error(
         `Address without subnet ${address}`,
-        [...this.subnets()].map(s => s.address)
+        [...this.subnets].map(s => s.address)
       );
-      */
     }
 
+    this._subnets.add(subnet);
     return subnet;
   }
 
   subnetForAddress(address) {
-    for (const subnet of this.subnets()) {
+    for (const subnet of this.subnets) {
       if (subnet.matchesAddress(address)) {
         return subnet;
       }
@@ -301,7 +306,7 @@ export class Owner extends Base {
           }
         }
         // enshure only one subnet address in the bridge
-        for (const subnet of network.subnets()) {
+        for (const subnet of network.subnets) {
           const present = subnets.get(subnet.address);
           if (present) {
             subnet.owner.addObject(present);

package/src/subnet.mjs

@@ -108,12 +108,10 @@ export const SUBNET_LOCALHOST_IPV6 = new Subnet(_owner, "::1/128");
 export const SUBNET_LINK_LOCAL_IPV6 = new Subnet(_owner, "fe80::/64");
 
 export function subnets(sources) {
-  const all = new Set();
+  let all = new Set();
 
   for (const source of sources) {
-    for (const subnet of source.subnets()) {
-      all.add(subnet);
-    }
+    all = all.union(source.subnets);
   }
 
   return all;