pmcf 1.42.0 → 1.42.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.42.0",
+  "version": "1.42.2",
   "publishConfig": {
     "access": "public"
   },
@@ -43,7 +43,7 @@
     "pacc": "^3.3.0"
   },
   "devDependencies": {
-    "@types/node": "^22.13.2",
+    "@types/node": "^22.13.4",
     "ava": "^6.2.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/base.mjs

@@ -1,6 +1,7 @@
 import { join } from "node:path";
 import { getAttribute } from "pacc";
 import { typesByName } from "./types.mjs";
+import { asArray } from "./utils.mjs";
 
 export class Base {
   owner;
@@ -46,10 +47,15 @@ export class Base {
   constructor(owner, data) {
     this.owner = owner;
 
-    if (data) {
-      this.name = data.name;
-      if (data.description) {
-        this.description = data.description;
+    switch (typeof data) {
+      case "string":
+        this.name = data;
+        break;
+      case "object": {
+        this.name = data.name;
+        if (data.description) {
+          this.description = data.description;
+        }
       }
     }
   }
@@ -62,9 +68,15 @@ export class Base {
       if (slot) {
         delete data[slotName];
         if (typeDef.collection) {
-          for (const [objectName, objectData] of Object.entries(slot)) {
-            objectData.name = objectName;
-            new typesByName[typeDef.type](this, objectData);
+          if (Array.isArray(slot) || typeof slot === "string") {
+            for (const item of asArray(slot)) {
+              new typesByName[typeDef.type](this, item);
+            }
+          } else {
+            for (const [objectName, objectData] of Object.entries(slot)) {
+              objectData.name = objectName;
+              new typesByName[typeDef.type](this, objectData);
+            }
           }
         } else {
           this[typeDef.type] = new typesByName[typeDef.type](this, slot);

package/src/network.mjs

@@ -1,5 +1,5 @@
 import { Owner } from "./owner.mjs";
-import { asArray } from "./utils.mjs";
+import { Subnet } from "./subnet.mjs";
 import { addType } from "./types.mjs";
 
 export class Network extends Owner {
@@ -20,11 +20,6 @@ export class Network extends Owner {
   constructor(owner, data) {
     super(owner, data);
 
-    if (data.subnets) {
-      this.addSubnets(data.subnets);
-      delete data.subnets;
-    }
-
     if (data.bridge) {
       this.bridge = owner.addBridge(this, data.bridge);
       delete data.bridge;
@@ -48,10 +43,10 @@ export class Network extends Owner {
     return super.networkNamed(name);
   }
 
-  addSubnets(value) {
-    for (const address of asArray(value)) {
-      const subnet = this.addSubnet(address);
-      subnet.networks.add(this);
+  addObject(object) {
+    super.addObject(object);
+    if (object instanceof Subnet) {
+      object.networks.add(this);
     }
   }
 
@@ -60,32 +55,6 @@ export class Network extends Owner {
   }
 
   set bridge(bridge) {
-    for (const network of bridge) {
-      if (network instanceof Network && network !== this) {
-        for (const subnet of this.subnets()) {
-          for (const otherSubnet of network.subnets()) {
-            if (
-              subnet !== otherSubnet &&
-              subnet.address === otherSubnet.address
-            ) {
-              /*console.log(
-                "SHARE SUBNETS",
-                subnet.owner.toString(),
-                otherSubnet.owner.toString()
-              );*/
-
-              otherSubnet.owner.addObject(subnet);
-              for (const n of otherSubnet.networks) {
-                subnet.networks.add(n);
-              }
-
-              //console.log(subnet.toString(),[...subnet.networks].map(n=>n.toString()));
-            }
-          }
-        }
-      }
-    }
-
     this.#bridge = bridge;
   }
 

package/src/owner.mjs

@@ -23,7 +23,7 @@ export class Owner extends Base {
       networks: { type: "network", collection: true },
       hosts: { type: "host", collection: true },
       clusters: { type: "cluster", collection: true },
-      /*  subnets: { type: "subnet", collection: true },*/
+      subnets: { type: "subnet", collection: true },
       dns: { type: "dns", collection: false }
     };
   }
@@ -66,7 +66,6 @@ export class Owner extends Base {
   }
 
   named(name) {
-    //console.log("NAMED", this.#membersByType.keys());
     for (const slot of this.#membersByType.values()) {
       const object = slot.get(name);
       if (object) {
@@ -106,9 +105,9 @@ export class Owner extends Base {
     this._addObject(object.typeName, object.fullName, object);
   }
 
-  async service(filter) {
+  service(filter) {
     let best;
-    for await (const service of this.services(filter)) {
+    for (const service of this.services(filter)) {
       if (!best || service.priority < best.priority) {
         best = service;
       }
@@ -117,9 +116,9 @@ export class Owner extends Base {
     return best;
   }
 
-  async *services(filter) {
-    for await (const host of this.hosts()) {
-      for await (const service of host.services(filter)) {
+  *services(filter) {
+    for (const host of this.hosts()) {
+      for (const service of host.services(filter)) {
         yield service;
       }
     }
@@ -164,13 +163,7 @@ export class Owner extends Base {
     const { cidr } = normalizeCIDR(address);
 
     if (cidr) {
-      let subnet = this.subnetNamed(cidr);
-
-      if (!subnet) {
-        subnet = new Subnet(this, { name: cidr });
-      }
-
-      return subnet;
+      return this.subnetNamed(cidr) || new Subnet(this, cidr);
     }
   }
 
@@ -229,7 +222,10 @@ export class Owner extends Base {
   _resolveBridges() {
     for (const bridge of this.#bridges) {
       //this.info(bridgeToJSON(bridge));
-      for (const network of bridge) {
+
+      const subnets = new Map();
+
+      for (let network of bridge) {
         if (typeof network === "string") {
           const other = this.networkNamed(network);
 
@@ -237,16 +233,31 @@ export class Owner extends Base {
             bridge.delete(network);
             bridge.add(other);
             other.bridge = bridge;
+            network = other;
           } else {
             this.error(`Unresolvabale bridge network`, network);
           }
         }
+
+        // enshure only one subnet address in the bridge
+        for (const subnet of network.subnets()) {
+          const present = subnets.get(subnet.address);
+          if (present) {
+            subnet.owner.addObject(present);
+
+            for (const n of subnet.networks) {
+              present.networks.add(n);
+            }
+          } else {
+            subnets.set(subnet.address, subnet);
+          }
+        }
       }
     }
   }
 
-  async *networkAddresses() {
-    for await (const host of this.hosts()) {
+  *networkAddresses() {
+    for (const host of this.hosts()) {
       for (const networkAddresses of host.networkAddresses()) {
         yield networkAddresses;
       }

package/src/subnet.mjs

@@ -13,20 +13,16 @@ export class Subnet extends Base {
     return "subnet";
   }
 
-  constructor(owner, data) {
-    const { cidr } = normalizeCIDR(data.name);
+  constructor(owner, address) {
+    const { cidr } = normalizeCIDR(address);
 
     if (!cidr) {
       const error = Error(`Invalid address`);
-      error.address = data.name;
+      error.address = address;
       throw error;
     }
 
-    data.name = cidr;
-
-    super(owner, data);
-
-    Object.assign(this, data);
+    super(owner, cidr);
 
     owner.addObject(this);
   }

package/types/network.d.mts

@@ -7,7 +7,6 @@ export class Network extends Owner {
     set bridge(bridge: any);
     get bridge(): any;
     get network(): this;
-    addSubnets(value: any): void;
     #private;
 }
 import { Owner } from "./owner.mjs";

package/types/owner.d.mts

@@ -12,6 +12,10 @@ export class Owner extends Base {
             type: string;
             collection: boolean;
         };
+        subnets: {
+            type: string;
+            collection: boolean;
+        };
         dns: {
             type: string;
             collection: boolean;
@@ -29,8 +33,8 @@ export class Owner extends Base {
     typeList(typeName: any): any;
     _addObject(typeName: any, fullName: any, object: any): void;
     addObject(object: any): void;
-    service(filter: any): Promise<any>;
-    services(filter: any): AsyncGenerator<any, void, unknown>;
+    service(filter: any): any;
+    services(filter: any): Generator<any, void, unknown>;
     locationNamed(name: any): any;
     locations(): any;
     hostNamed(name: any): any;
@@ -45,7 +49,7 @@ export class Owner extends Base {
     clusters(): any;
     addBridge(network: any, destinationNetworks: any): any;
     _resolveBridges(): void;
-    networkAddresses(): AsyncGenerator<any, void, unknown>;
+    networkAddresses(): Generator<any, void, unknown>;
     domains(): Generator<any, void, unknown>;
     #private;
 }