pmcf 1.6.0 → 1.6.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.6.0",
+  "version": "1.6.2",
   "publishConfig": {
     "access": "public"
   },

package/src/model.mjs

@@ -100,6 +100,10 @@ export class Base {
     return object;
   }
 
+  error(...args) {
+    console.error(`${this.toString()}:`, ...args);
+  }
+
   toString() {
     return this.typeName + ":" + (this.owner?.name || "") + "/" + this.name;
   }
@@ -117,6 +121,7 @@ export class Owner extends Base {
   #hosts = new Map();
   #networks = new Map();
   #subnets = new Map();
+  #bridges = new Set();
 
   async *hosts() {
     for (const host of this.#hosts.values()) {
@@ -142,6 +147,35 @@ export class Owner extends Base {
     this.#networks.set(network.name, network);
   }
 
+  addBridge(network, destinationNetworks) {
+    if (destinationNetworks) {
+      let bridge;
+
+      for (bridge of this.#bridges) {
+        if (bridge.has(network.name)) {
+          bridge.delete(network.name);
+          bridge.add(network);
+          break;
+        }
+
+        if (bridge.has(network)) {
+          break;
+        }
+      }
+
+      if (!bridge) {
+        bridge = new Set([network]);
+        this.#bridges.add(bridge);
+      }
+
+      for (const name of destinationNetworks) {
+        bridge.add(this.network(name) || name);
+      }
+
+      return bridge;
+    }
+  }
+
   addSubnet(subnet) {
     this.#subnets.set(subnet.name, subnet);
   }
@@ -159,6 +193,7 @@ export class Owner extends Base {
       ...super.toJSON(),
       networks: [...this.#networks.keys()].sort(),
       subnets: [...this.#subnets.keys()].sort(),
+      bridges: [...this.#bridges].map(b => bridgeToJSON(b)),
       hosts: [...this.#hosts.keys()].sort()
     };
   }
@@ -299,22 +334,6 @@ export class Location extends Owner {
         data.name = name;
         new Network(this, data);
       }
-
-      /*
-      for (const network of this.#networks.values()) {
-        if (network.bridges) {
-          network.bridges = new Set(
-            network.bridges.map(b => {
-              const n = this.network(b);
-              if (!n) {
-                console.error(`No network named ${b}`);
-              }
-              return n;
-            })
-          );
-        }
-      }
-      */
     }
   }
 
@@ -383,6 +402,7 @@ export class Network extends Owner {
   metric;
   ipv4;
   subnet;
+  bridge;
 
   static get typeName() {
     return "network";
@@ -391,6 +411,12 @@ export class Network extends Owner {
   constructor(owner, data) {
     super(owner, data);
 
+    let bridges;
+    if (data.bridges) {
+      bridges = data.bridges;
+      delete data.bridges;
+    }
+
     Object.assign(this, data);
 
     const subnetAddress = this.subnetAddress;
@@ -406,6 +432,8 @@ export class Network extends Owner {
     }
 
     owner.addNetwork(this);
+
+    this.bridge = owner.addBridge(this, bridges);
   }
 
   get ipv4_netmask() {
@@ -424,7 +452,14 @@ export class Network extends Owner {
   }
 
   get propertyNames() {
-    return [...super.propertyNames, "kind", "ipv4", "scope", "metric"];
+    return [
+      ...super.propertyNames,
+      "kind",
+      "ipv4",
+      "scope",
+      "metric",
+      "bridge"
+    ];
   }
 }
 
@@ -513,11 +548,11 @@ export class Host extends Base {
       if (iface.network) {
         const network = owner.network(iface.network);
 
-        if (!network) {
-          console.error(`${this.toString()}: Missing network`, iface.network);
-        } else {
+        if (network) {
           iface.network = network;
           network.addHost(this);
+        } else {
+          this.error("Missing network", iface.network);
         }
       }
     }
@@ -805,3 +840,7 @@ function extractFrom(object, propertyNames) {
   }
   return json;
 }
+
+function bridgeToJSON(bridge) {
+  return [...bridge].map(n => n.name || `(${n})`).sort();
+}

package/types/model.d.mts

@@ -18,6 +18,7 @@ export class Base {
     set directory(directory: any);
     get directory(): any;
     expand(object: any): any;
+    error(...args: any[]): void;
     toString(): string;
     get propertyNames(): string[];
     toJSON(): {};
@@ -29,12 +30,14 @@ export class Owner extends Base {
     network(name: any): any;
     networks(): AsyncGenerator<any, void, unknown>;
     addNetwork(network: any): void;
+    addBridge(network: any, destinationNetworks: any): any;
     addSubnet(subnet: any): void;
     subnet(name: any): any;
     subnets(): MapIterator<any>;
     toJSON(): {
         networks: any[];
         subnets: any[];
+        bridges: any[][];
         hosts: any[];
     };
     #private;
@@ -77,6 +80,7 @@ export class Network extends Owner {
     metric: any;
     ipv4: any;
     subnet: any;
+    bridge: any;
     get ipv4_netmask(): any;
     get subnetAddress(): any;
 }