pmcf 1.19.0 → 1.20.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "1.19.0",
+  "version": "1.20.0",
   "publishConfig": {
     "access": "public"
   },
@@ -40,7 +40,7 @@
     "lint:typescript": "tsc --allowJs --checkJs --noEmit --resolveJsonModule --target es2024 --lib esnext -m esnext --module nodenext --moduleResolution nodenext ./src**/*.mjs"
   },
   "devDependencies": {
-    "@types/node": "^22.10.9",
+    "@types/node": "^22.10.10",
     "ava": "^6.2.0",
     "c8": "^10.1.3",
     "documentation": "^14.0.3",

package/src/model.mjs

@@ -87,7 +87,7 @@ export class Base {
   }
 
   get fullName() {
-    return this.owner ? join(this.owner.fullName, this.name) : this.name;
+    return this.owner?.fullName ? join(this.owner.fullName, this.name) : this.name;
   }
 
   expand(object) {
@@ -114,6 +114,29 @@ export class Base {
     return object;
   }
 
+  #finalize;
+
+  finalize(action) {
+    if (!this.#finalize) {
+      this.#finalize = [];
+    }
+    this.#finalize.push(action);
+  }
+
+  execFinalize() {
+    if (this.#finalize) {
+      //this.info("finalize");
+      let i = 0;
+      for (const action of this.#finalize) {
+        if (action) {
+          this.#finalize[i] = undefined;
+          action();
+        }
+        i++;
+      }
+    }
+  }
+
   error(...args) {
     console.error(`${this.toString()}:`, ...args);
   }
@@ -166,6 +189,18 @@ export class Owner extends Base {
       }
     }
     Object.assign(this, data);
+
+    this.finalize(() => {
+      for (const network of this.#networks.values()) {
+        network.execFinalize();
+      }
+    });
+
+    this.finalize(() => {
+      for (const host of this.#hosts.values()) {
+        host.execFinalize();
+      }
+    });
   }
 
   get dns() {
@@ -248,7 +283,7 @@ export class Owner extends Base {
           other.bridge = bridge;
         } else {
           bridge.add(name);
-          this.resolveLater(() => this._resolveBridges());
+          this.finalize(() => this._resolveBridges());
         }
       }
 
@@ -284,18 +319,6 @@ export class Owner extends Base {
     }
   }
 
-  #resolveActions = [];
-
-  resolveLater(action) {
-    this.#resolveActions.push(action);
-  }
-
-  resolve() {
-    for (const action of this.#resolveActions) {
-      action();
-    }
-  }
-
   addSubnet(subnet) {
     this.#subnets.set(subnet.name, subnet);
   }
@@ -414,6 +437,8 @@ export class World extends Owner {
         await this.load(name, { type });
       }
     }
+
+    this.execFinalize();
   }
 
   addObject(object) {
@@ -676,6 +701,12 @@ export class Host extends Base {
     }
 
     owner.addHost(this);
+
+    this.finalize(() => {
+      for (const ni of Object.values(this.networkInterfaces)) {
+        ni.execFinalize();
+      }
+    });
   }
 
   get deployment() {
@@ -777,7 +808,7 @@ export class Host extends Base {
   addNetworkInterface(networkInterface) {
     this.networkInterfaces[networkInterface.name] = networkInterface;
 
-    if(networkInterface.network) {
+    if (networkInterface.network) {
       networkInterface.network.addHost(this);
     }
   }
@@ -841,9 +872,9 @@ export class NetworkInterface extends Base {
   #metric;
   #ssid;
   #psk;
+  #network;
   arpbridge;
   hwaddr;
-  network;
 
   constructor(owner, data) {
     super(owner, data);
@@ -866,18 +897,20 @@ export class NetworkInterface extends Base {
     }
 
     if (data.network) {
-      const network = owner.owner.network(data.network);
+      let network = owner.owner.network(data.network);
 
       if (network) {
-        data.network = network;
+        this.network = network;
       } else {
-        this.error("Missing network", data.network);
+        network = data.network;
+        this.finalize(() => (this.network = network));
       }
+
+      delete data.network;
+    } else if (owner.owner instanceof Network) {
+      this.network = owner.owner;
     }
-    else if(owner.owner instanceof Network) {
-      data.network = owner.owner;
-    }
-    
+
     Object.assign(this, data);
 
     owner.addNetworkInterface(this);
@@ -885,6 +918,25 @@ export class NetworkInterface extends Base {
     //this.arpbridge = owner.addARPBridge(this, data.arpbridge);
   }
 
+  get network() {
+    return this.#network;
+  }
+
+  set network(networkOrName) {
+    if (!(networkOrName instanceof Network)) {
+      let network = this.owner.owner.network(networkOrName);
+
+      if (network) {
+        this.#network = network;
+        return;
+      } else {
+        this.error("Unknown network", networkOrName);
+      }
+    }
+
+    this.#network = networkOrName;
+  }
+
   get host() {
     return this.owner;
   }

package/types/model.d.mts

@@ -19,6 +19,8 @@ export class Base {
     get directory(): any;
     get fullName(): any;
     expand(object: any): any;
+    finalize(action: any): void;
+    execFinalize(): void;
     error(...args: any[]): void;
     info(...args: any[]): void;
     toString(): string;
@@ -43,8 +45,6 @@ export class Owner extends Base {
     addBridge(network: any, destinationNetworks: any): any;
     _resolveBridges(): void;
     networkAddresses(): AsyncGenerator<any, void, unknown>;
-    resolveLater(action: any): void;
-    resolve(): void;
     addSubnet(subnet: any): void;
     subnet(name: any): any;
     subnets(): MapIterator<any>;
@@ -126,7 +126,8 @@ export class Host extends Base {
 export class NetworkInterface extends Base {
     arpbridge: any;
     hwaddr: any;
-    network: any;
+    set network(networkOrName: any);
+    get network(): any;
     get scope(): any;
     get metric(): any;
     get ssid(): any;