pmcf 1.5.3 → 1.6.1

package/bin/pmcf-named-defs

@@ -74,7 +74,7 @@ async function generateNamedDefs(location, targetDir) {
     };
     zones.push(zone);
 
-    for await (const subnet of location.subnets()) {
+    for (const subnet of location.subnets()) {
       if (subnet.address) {
         const reverse = reverseAddress(subnet.address);
         const reverseArpa = reverseArpaAddress(subnet.address);

package/package.json

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

package/src/model.mjs

@@ -101,7 +101,7 @@ export class Base {
   }
 
   toString() {
-    return this.typeName + ":" + this.owner.name + "/" + this.name;
+    return this.typeName + ":" + (this.owner?.name || "") + "/" + this.name;
   }
 
   get propertyNames() {
@@ -114,9 +114,96 @@ export class Base {
 }
 
 export class Owner extends Base {
-  addHost(host) {}
-  addNetwork(network) {}
-  async network(name) {}
+  #hosts = new Map();
+  #networks = new Map();
+  #subnets = new Map();
+  #bridges = new Set();
+
+  async *hosts() {
+    for (const host of this.#hosts.values()) {
+      yield host;
+    }
+  }
+
+  addHost(host) {
+    this.#hosts.set(host.name, host);
+  }
+
+  network(name) {
+    return this.#networks.get(name);
+  }
+
+  async *networks() {
+    for (const network of this.#networks.values()) {
+      yield network;
+    }
+  }
+
+  addNetwork(network) {
+    this.#networks.set(network.name, network);
+  }
+
+  addBridge(network, destinationNetworks) {
+    console.log(
+      "BRIDGE",
+      network.name,
+      destinationNetworks.map(n => (this.network(n) ? n : `(${n})`))
+    );
+
+    let bridge;
+
+    for (bridge of this.#bridges) {
+      if (bridge.has(network.name)) {
+        bridge.delete(network.name);
+        bridge.add(network);
+
+        console.log(
+          "REPLACE",
+          network.name,
+          [...bridge].map(n => n.name||`(${n})`)
+        );
+
+        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);
+  }
+
+  subnet(name) {
+    return this.#subnets.get(name);
+  }
+
+  subnets() {
+    return this.#subnets.values();
+  }
+
+  toJSON() {
+    return {
+      ...super.toJSON(),
+      networks: [...this.#networks.keys()].sort(),
+      subnets: [...this.#subnets.keys()].sort(),
+      bridges: [...this.#bridges.keys()].sort(),
+      hosts: [...this.#hosts.keys()].sort()
+    };
+  }
 }
 
 export class World extends Owner {
@@ -237,9 +324,6 @@ export class Location extends Owner {
   domain;
   dns;
   #administratorEmail;
-  #hosts = new Map();
-  #networks = new Map();
-  #subnets = new Map();
 
   static get typeName() {
     return "location";
@@ -253,23 +337,9 @@ export class Location extends Owner {
     Object.assign(this, data);
 
     if (networks) {
-      for (const [name, network] of Object.entries(networks)) {
-        network.name = name;
-        this.addNetwork(network);
-      }
-
-      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;
-            })
-          );
-        }
+      for (const [name, data] of Object.entries(networks)) {
+        data.name = name;
+        new Network(this, data);
       }
     }
   }
@@ -316,67 +386,6 @@ export class Location extends Owner {
     }
   }
 
-  async network(name) {
-    return this.#networks.get(name);
-  }
-
-  async *networks() {
-    for (const network of this.#networks.values()) {
-      yield network;
-    }
-  }
-
-  async *subnets() {
-    for (const subnet of this.#subnets.values()) {
-      yield subnet;
-    }
-  }
-
-  addNetwork(data) {
-    if (!data?.name) {
-      return undefined;
-    }
-
-    let network = this.#networks.get(data.name);
-    if (network) {
-      return network;
-    }
-
-    if (data instanceof Network) {
-      this.#networks.set(data.name, data);
-      return data;
-    }
-
-    network = new Network(this, data);
-    this.#networks.set(data.name, network);
-
-    const subnetAddress = network.subnetAddress;
-
-    if (subnetAddress) {
-      let subnet = this.#subnets.get(subnetAddress);
-      if (!subnet) {
-        subnet = new Subnet(this, subnetAddress);
-        this.#subnets.set(subnetAddress, subnet);
-      }
-      network.subnet = subnet;
-      subnet.networks.add(network);
-    }
-    return network;
-  }
-
-  addHost(host) {
-    this.#hosts.set(host.name, host);
-
-    for (const [name, iface] of Object.entries(host.networkInterfaces)) {
-      const network = this.addNetwork({ name: iface.network });
-      if (!network) {
-        console.error("Missing network", host.name, name);
-      } else {
-        network.addHost(host);
-      }
-    }
-  }
-
   get dnsAllowedUpdates() {
     return this.dns?.allowedUpdates || [];
   }
@@ -392,23 +401,15 @@ export class Location extends Owner {
   get propertyNames() {
     return [...super.propertyNames, "domain" /*, "hosts"*/];
   }
-
-  toJSON() {
-    return {
-      ...super.toJSON(),
-      hosts: [...this.#hosts.keys()].sort()
-    };
-  }
 }
 
-export class Network extends Base {
-  #hosts = new Map();
+export class Network extends Owner {
   kind;
   scope;
   metric;
   ipv4;
-  ipv4_netmask;
   subnet;
+  bridge;
 
   static get typeName() {
     return "network";
@@ -417,16 +418,38 @@ export class Network extends Base {
   constructor(owner, data) {
     super(owner, data);
 
+    let bridges;
+    if (data.bridges) {
+      bridges = data.bridges;
+      delete data.bridges;
+    }
+
     Object.assign(this, data);
 
-    if (this.ipv4) {
-      const m = this.ipv4.match(/\/(\d+)$/);
-      if (m) {
-        this.ipv4_netmask = m[1];
+    const subnetAddress = this.subnetAddress;
+
+    if (subnetAddress) {
+      let subnet = owner.subnet(subnetAddress);
+      if (!subnet) {
+        subnet = new Subnet(owner, { name: subnetAddress });
       }
+
+      this.subnet = subnet;
+      subnet.networks.add(this);
     }
 
     owner.addNetwork(this);
+
+    if (bridges) {
+      this.bridge = owner.addBridge(this, bridges);
+    }
+  }
+
+  get ipv4_netmask() {
+    const m = this.ipv4?.match(/\/(\d+)$/);
+    if (m) {
+      return m[1];
+    }
   }
 
   get subnetAddress() {
@@ -437,18 +460,15 @@ export class Network extends Base {
     }
   }
 
-  async *hosts() {
-    for (const host of this.#hosts.values()) {
-      yield host;
-    }
-  }
-
-  addHost(host) {
-    this.#hosts.set(host.name, host);
-  }
-
   get propertyNames() {
-    return [...super.propertyNames, "kind", "ipv4", "scope", "metric"];
+    return [
+      ...super.propertyNames,
+      "kind",
+      "ipv4",
+      "scope",
+      "metric",
+      "bridge"
+    ];
   }
 }
 
@@ -535,7 +555,14 @@ export class Host extends Base {
       iface.host = this;
       iface.name = name;
       if (iface.network) {
-        iface.network = this.network(iface.network);
+        const network = owner.network(iface.network);
+
+        if (!network) {
+          console.error(`${this.toString()}: Missing network`, iface.network);
+        } else {
+          iface.network = network;
+          network.addHost(this);
+        }
       }
     }
 
@@ -664,7 +691,6 @@ export class Host extends Base {
 
 export class Model extends Host {}
 
-
 export class Subnet extends Base {
   networks = new Set();
 
@@ -672,8 +698,12 @@ export class Subnet extends Base {
     return "subnet";
   }
 
-  constructor(owner, address) {
-    super(owner, { name: address });
+  constructor(owner, data) {
+    super(owner, data);
+
+    Object.assign(this, data);
+
+    owner.addSubnet(this);
   }
 
   get address() {

package/types/model.d.mts

@@ -24,9 +24,22 @@ export class Base {
     #private;
 }
 export class Owner extends Base {
+    hosts(): AsyncGenerator<any, void, unknown>;
     addHost(host: any): void;
+    network(name: any): any;
+    networks(): AsyncGenerator<any, void, unknown>;
     addNetwork(network: any): void;
-    network(name: any): Promise<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;
 }
 export class World extends Owner {
     static get types(): {
@@ -52,33 +65,23 @@ export class World extends Owner {
 export class Location extends Owner {
     domain: any;
     dns: any;
-    hosts(): AsyncGenerator<any, void, unknown>;
     service(filter: any): Promise<any>;
     services(filter: any): AsyncGenerator<any, void, unknown>;
     networkAddresses(): AsyncGenerator<any, void, unknown>;
-    network(name: any): Promise<any>;
-    networks(): AsyncGenerator<any, void, unknown>;
-    subnets(): AsyncGenerator<any, void, unknown>;
-    addNetwork(data: any): any;
     get dnsAllowedUpdates(): any;
     get dnsRecordTTL(): any;
     get administratorEmail(): any;
-    toJSON(): {
-        hosts: any[];
-    };
     #private;
 }
-export class Network extends Base {
+export class Network extends Owner {
     kind: any;
     scope: any;
     metric: any;
     ipv4: any;
-    ipv4_netmask: any;
     subnet: any;
+    bridge: any;
+    get ipv4_netmask(): any;
     get subnetAddress(): any;
-    hosts(): AsyncGenerator<any, void, unknown>;
-    addHost(host: any): void;
-    #private;
 }
 export class Host extends Base {
     static prepareData(world: any, data: any): Promise<typeof Host>;