pmcf 1.17.1 → 1.19.0

package/bin/pmcf-host-defs

@@ -98,8 +98,8 @@ async function generateNetworkDefs(host, dir) {
           "",
           sectionLines("Route", {
             ...routeSectionExtra,
-            Scope: network?.network.scope || "global",
-            Metric: network?.network.metric || 1004,
+            Scope: network.scope,
+            Metric: network.metric,
             InitialCongestionWindow: 20,
             InitialAdvertisedReceiveWindow: 20
           }),
@@ -137,8 +137,8 @@ ctrl_interface=DIR=/run/wpa_supplicant GROUP=netdev
 update_config=1
 p2p_disabled=1
 network={
-  ssid="${network.ssid || network.network?.ssid}"
-  psk=${network.psk || network.network?.psk}
+  ssid="${network.ssid}"
+  psk=${network.psk}
   scan_ssid=1
 }`,
           "utf8"

package/package.json

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

package/src/model.mjs

@@ -776,6 +776,10 @@ export class Host extends Base {
 
   addNetworkInterface(networkInterface) {
     this.networkInterfaces[networkInterface.name] = networkInterface;
+
+    if(networkInterface.network) {
+      networkInterface.network.addHost(this);
+    }
   }
 
   *networkAddresses() {
@@ -833,28 +837,86 @@ export class NetworkInterface extends Base {
     return "network_interface";
   }
 
+  #scope;
+  #metric;
+  #ssid;
+  #psk;
+  arpbridge;
+  hwaddr;
+  network;
+
   constructor(owner, data) {
     super(owner, data);
 
+    if (data.ssid) {
+      this.#ssid = data.ssid;
+      delete data.ssid;
+    }
+    if (data.psk) {
+      this.#psk = data.psk;
+      delete data.psk;
+    }
+    if (data.scope) {
+      this.#psk = data.scope;
+      delete data.scope;
+    }
+    if (data.metric) {
+      this.#metric = data.metric;
+      delete data.psmetric;
+    }
+
     if (data.network) {
       const network = owner.owner.network(data.network);
 
       if (network) {
         data.network = network;
-        network.addHost(owner);
       } else {
         this.error("Missing network", data.network);
       }
     }
-
+    else if(owner.owner instanceof Network) {
+      data.network = owner.owner;
+    }
+    
     Object.assign(this, data);
 
     owner.addNetworkInterface(this);
+
+    //this.arpbridge = owner.addARPBridge(this, data.arpbridge);
   }
 
   get host() {
     return this.owner;
   }
+
+  get scope() {
+    return this.#scope || this.network?.scope || "global";
+  }
+
+  get metric() {
+    return this.#metric || this.network?.metric || 1004;
+  }
+
+  get ssid() {
+    return this.#ssid || this.network?.ssid;
+  }
+
+  get psk() {
+    return this.#psk || this.network?.psk;
+  }
+
+  get propertyNames() {
+    return [
+      ...super.propertyNames,
+      "arpbridge",
+      "hwaddr",
+      "network",
+      "ssid",
+      "psk",
+      "scope",
+      "metric"
+    ];
+  }
 }
 
 export class Subnet extends Base {

package/types/model.d.mts

@@ -124,6 +124,14 @@ export class Host extends Base {
     #private;
 }
 export class NetworkInterface extends Base {
+    arpbridge: any;
+    hwaddr: any;
+    network: any;
+    get scope(): any;
+    get metric(): any;
+    get ssid(): any;
+    get psk(): any;
+    #private;
 }
 export class Subnet extends Base {
     networks: Set<any>;