pmcf 1.6.1 → 1.6.3

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.6.1",
+  "version": "1.6.3",
   "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;
   }
@@ -144,43 +148,32 @@ export class Owner extends Base {
   }
 
   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 (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.has(network)) {
-        break;
+      if (!bridge) {
+        bridge = new Set([network]);
+        this.#bridges.add(bridge);
       }
-    }
 
-    if (!bridge) {
-      bridge = new Set([network]);
-      this.#bridges.add(bridge);
-    }
+      for (const name of destinationNetworks) {
+        bridge.add(this.network(name) || name);
+      }
 
-    for (const name of destinationNetworks) {
-      bridge.add(this.network(name) || name);
+      return bridge;
     }
-
-    return bridge;
   }
 
   addSubnet(subnet) {
@@ -200,7 +193,7 @@ export class Owner extends Base {
       ...super.toJSON(),
       networks: [...this.#networks.keys()].sort(),
       subnets: [...this.#subnets.keys()].sort(),
-      bridges: [...this.#bridges.keys()].sort(),
+      bridges: [...this.#bridges].map(b => bridgeToJSON(b)),
       hosts: [...this.#hosts.keys()].sort()
     };
   }
@@ -250,7 +243,7 @@ export class World extends Owner {
 
       type = await type.prepareData(this, data);
       object = new type(owner, data);
-      this.#byName.set(object.name, object);
+      this.addObject(object);
     }
 
     return object;
@@ -266,6 +259,10 @@ export class World extends Owner {
     }
   }
 
+  addObject(object) {
+    this.#byName.set(object.name, object);
+  }
+
   async named(name) {
     await this.load();
     return this.#byName.get(name);
@@ -305,12 +302,6 @@ export class World extends Owner {
     return this._loadType(name, Host);
   }
 
-  async *subnets() {
-    for await (const location of this.locations()) {
-      yield* location.subnets();
-    }
-  }
-
   async *networkAddresses() {
     for await (const host of this.hosts()) {
       for (const networkAddresses of host.networkAddresses()) {
@@ -440,9 +431,7 @@ export class Network extends Owner {
 
     owner.addNetwork(this);
 
-    if (bridges) {
-      this.bridge = owner.addBridge(this, bridges);
-    }
+    this.bridge = owner.addBridge(this, bridges);
   }
 
   get ipv4_netmask() {
@@ -557,11 +546,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);
         }
       }
     }
@@ -849,3 +838,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(): {};
@@ -36,7 +37,7 @@ export class Owner extends Base {
     toJSON(): {
         networks: any[];
         subnets: any[];
-        bridges: any[];
+        bridges: any[][];
         hosts: any[];
     };
     #private;
@@ -49,13 +50,13 @@ export class World extends Owner {
     get world(): this;
     _loadType(name: any, type: any): Promise<any>;
     load(): Promise<void>;
+    addObject(object: any): void;
     named(name: any): Promise<any>;
     locations(): AsyncGenerator<Location, void, unknown>;
     hosts(): AsyncGenerator<Host, void, unknown>;
     domains(): AsyncGenerator<any, void, unknown>;
     location(name: any): Promise<any>;
     host(name: any): Promise<any>;
-    subnets(): AsyncGenerator<any, void, unknown>;
     networkAddresses(): AsyncGenerator<{
         address: any;
         networkInterface: any;