pmcf 1.35.4 → 1.36.1

package/bin/pmcf-diagram

@@ -17,10 +17,9 @@ console.log("graph G {");
 console.log("  node [shape=record];");
 for await (const host of location.hosts()) {
   console.log(
-    `  ${id(host.name)} [label="${host.name}|{${Object.entries(
-      host.networkInterfaces
-    )
-      .map(([n, i]) => `<${id(n)}> ${n}`)
+    `  ${id(host.name)} [label="${host.name}|{${
+      host.networkInterfaces.values()
+      .map((ni) => `<${id(ni.name)}> ${ni.name}`)
       .join("|")}}"];`
   );
 }
@@ -33,9 +32,9 @@ for await (const network of location.networks()) {
   );
 
   for await (const host of network.hosts()) {
-    for (const [n, i] of Object.entries(host.networkInterfaces)) {
-      if (i.network === network) {
-        console.log(`  ${id(network.name)} -- ${id(host.name)}:${id(n)};`);
+    for (const ni of host.networkInterfaces.values()) {
+      if (ni.network === network) {
+        console.log(`  ${id(network.name)} -- ${id(host.name)}:${id(ni.name)};`);
       }
     }
   }

package/bin/pmcf-host-defs

@@ -44,7 +44,7 @@ async function generateMachineInfo(host, dir) {
 async function generateNetworkDefs(host, dir) {
   const networkDir = join(dir, "etc/systemd/network");
 
-  for (const ni of Object.values(host.networkInterfaces)) {
+  for (const ni of host.networkInterfaces.values()) {
     if (ni.name !== "eth0" && ni.hwaddr) {
       await writeLines(networkDir, `${ni.name}.link`, [
         sectionLines("Match", { MACAddress: ni.hwaddr }),
@@ -69,7 +69,7 @@ async function generateNetworkDefs(host, dir) {
       case "wifi":
         const routeSectionExtra = ni.destination
           ? { Destination: ni.destination }
-          : { Gateway: host.location.gateway_ipv4 };
+          : { Gateway: ni.gatewayAddress };
 
         const networkSectionExtra = ni.arpbridge
           ? {

package/package.json

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

package/src/base.mjs

@@ -47,10 +47,10 @@ export class Base {
     }
   }
 
-  withOwner(owner) {
+  forOwner(owner) {
     if (this.owner !== owner) {
       // @ts-ignore
-      return new this.constructor(owner, this);
+      return new this.constructor(owner, this.toJSON());
     }
 
     return this;
@@ -87,11 +87,14 @@ export class Base {
   }
 
   get directory() {
-    return this.#directory || join(this.owner.directory, this.name);
+    return (
+      this.#directory ||
+      (this.owner ? join(this.owner.directory, this.name) : this.name)
+    );
   }
 
   get fullName() {
-    return this.owner && this.name
+    return this.owner?.fullName && this.name
       ? join(this.owner.fullName, this.name)
       : this.name;
   }
@@ -200,9 +203,13 @@ export function extractFrom(object) {
             json[p].name = value.name;
           }
         } else {
-          json[p] = Object.fromEntries(
-            Object.entries(value).map(([k, v]) => [k, extractFrom(v)])
-          );
+          if (Array.isArray(value)) {
+            json[p] = value;
+          } else {
+            json[p] = Object.fromEntries(
+              Object.entries(value).map(([k, v]) => [k, extractFrom(v)])
+            );
+          }
         }
         break;
       default:

package/src/model.mjs

@@ -27,6 +27,11 @@ export class Root extends Owner {
     this.addObject(this);
   }
 
+  get types()
+  {
+    return this.constructor.types;
+  }
+
   get fullName() {
     return "";
   }
@@ -123,10 +128,10 @@ export class Location extends Owner {
 }
 
 export class Host extends Base {
-  networkInterfaces = {};
   postinstall = [];
   #services = [];
   #extends = [];
+  #networkInterfaces = new Map();
   #provides = new Set();
   #replaces = new Set();
   #depends = new Set();
@@ -203,25 +208,32 @@ export class Host extends Base {
       delete data.services;
     }
 
+    if (data.networkInterfaces) {
+      for (const [name, iface] of Object.entries(data.networkInterfaces)) {
+        iface.name = name;
+        new NetworkInterface(this, iface);
+      }
+      delete data.networkInterfaces;
+    }
+
     for (const host of this.extends) {
       for (const service of host.services()) {
-        service.withOwner(this);
+        service.forOwner(this);
       }
+
+      /*for (const ni of host.networkInterfaces.values()) {
+        ni.forOwner(this);
+      }*/
     }
 
     Object.assign(this, data);
 
-    for (const [name, iface] of Object.entries(this.networkInterfaces)) {
-      iface.name = name;
-      new NetworkInterface(this, iface);
-    }
-
     owner.addObject(this);
   }
 
   _traverse(...args) {
     if (super._traverse(...args)) {
-      for (const ni of Object.values(this.networkInterfaces)) {
+      for (const ni of this.networkInterfaces.values()) {
         ni._traverse(...args);
       }
       for (const service of this.services()) {
@@ -331,8 +343,16 @@ export class Host extends Base {
     }
   }
 
+  get networkInterfaces() {
+    return this.#networkInterfaces;
+  }
+
+  networkInterfacesNamed(name) {
+    return this.#networkInterfaces.get(name);
+  }
+
   addNetworkInterface(networkInterface) {
-    this.networkInterfaces[networkInterface.name] = networkInterface;
+    this.#networkInterfaces.set(networkInterface.name, networkInterface);
 
     if (networkInterface.network) {
       networkInterface.network.addObject(this);
@@ -340,7 +360,7 @@ export class Host extends Base {
   }
 
   *networkAddresses() {
-    for (const networkInterface of Object.values(this.networkInterfaces)) {
+    for (const networkInterface of this.networkInterfaces.values()) {
       for (const address of networkInterface.ipAddresses) {
         yield {
           networkInterface,
@@ -355,6 +375,7 @@ export class Host extends Base {
   get ipAddresses() {
     return [...this.networkAddresses()].map(na => na.address);
   }
+
   get ipAddressesWithPrefixLength() {
     return [...this.networkAddresses()].map(na => na.addressWithPrefixLength);
   }
@@ -385,6 +406,9 @@ export class Host extends Base {
     return {
       ...super.toJSON(),
       extends: this.extends.map(host => host.name),
+      networkInterfaces: Object.fromEntries(
+        [...this.networkInterfaces.values()].map(ni => [ni.name, ni.toJSON()])
+      ),
       services: Object.fromEntries(
         [...this.services()].map(s => [s.name, s.toJSON()])
       )
@@ -472,6 +496,19 @@ export class NetworkInterface extends Base {
     return `${address}/${this.subnetForAddress(address)?.prefixLength}`;
   }
 
+  get gateway() {
+    return this.network?.gateway;
+  }
+
+  get gatewayAddress() {
+    console.log(typeof this.gateway);
+    for (const a of this.gateway.networkAddresses()) {
+      if (a.networkInterface.network === this.network) {
+        return a.address;
+      }
+    }
+  }
+
   get ipAddresses() {
     return this.#ipAddresses.keys();
   }
@@ -543,6 +580,7 @@ export class NetworkInterface extends Base {
       "arpbridge",
       "hwaddr",
       "network",
+      "gateway",
       "ssid",
       "psk",
       "scope",

package/src/owner.mjs

@@ -14,6 +14,19 @@ export class Owner extends Base {
     return "owner";
   }
 
+  /*static async prepareData(root, data) {
+    if (data.networks) {
+      for (const [name, networkData] of Object.entries(data.networks)) {
+        if(networkData.gateway) {
+          networkData.gateway = await root.load(networkData.gateway, { type: root.types.host });
+          console.log("GATEWAY", networkData.gateway);
+        }
+      }
+    }
+
+    return this;
+  }*/
+
   constructor(owner, data = {}) {
     super(owner, data);
 
@@ -309,6 +322,12 @@ export class Network extends Owner {
 
     Object.assign(this, data);
 
+    if (typeof this.gateway === "string") {
+      this.finalize(() => {
+        this.gateway = this.owner.hostNamed(this.gateway);
+      });
+    }
+
     this.bridge = owner.addBridge(this, bridge);
   }
 
@@ -349,7 +368,7 @@ export class Subnet extends Base {
   constructor(owner, data) {
     const { cidr } = normalizeCIDR(data.name);
 
-    if(!cidr) {
+    if (!cidr) {
       const error = Error(`Invalid address`);
       error.address = data.name;
       throw error;
@@ -368,8 +387,7 @@ export class Subnet extends Base {
     return address.startsWith(this.prefix);
   }
 
-  get isLinkLocal()
-  {
+  get isLinkLocal() {
     return isLinkLocal(this.address);
   }
 

package/src/service.mjs

@@ -53,7 +53,7 @@ export class Service extends Base {
     owner.addService(this);
   }
 
-  withOwner(owner) {
+  forOwner(owner) {
     if (this.owner !== owner) {
       const data = { name: this.name };
       if (this.alias) {

package/types/base.d.mts

@@ -11,7 +11,7 @@ export class Base {
     owner: any;
     name: any;
     description: any;
-    withOwner(owner: any): any;
+    forOwner(owner: any): any;
     get typeName(): any;
     get root(): any;
     get location(): any;

package/types/model.d.mts

@@ -3,6 +3,7 @@ export class Root extends Owner {
         [k: string]: typeof DNSService | typeof Owner | typeof Subnet | typeof Service | typeof Host | typeof NetworkInterface;
     };
     constructor(directory: any);
+    get types(): any;
     get fullName(): string;
     get root(): this;
     load(name: any, options: any): any;
@@ -13,7 +14,6 @@ export class Location extends Owner {
 }
 export class Host extends Base {
     static prepareData(root: any, data: any): Promise<typeof Host>;
-    networkInterfaces: {};
     postinstall: any[];
     _traverse(...args: any[]): boolean;
     get deployment(): any;
@@ -36,6 +36,8 @@ export class Host extends Base {
     get host(): this;
     addService(service: any): void;
     services(filter: any): Generator<any, void, unknown>;
+    get networkInterfaces(): Map<any, any>;
+    networkInterfacesNamed(name: any): any;
     addNetworkInterface(networkInterface: any): void;
     networkAddresses(): Generator<{
         networkInterface: any;
@@ -48,6 +50,7 @@ export class Host extends Base {
     publicKey(type?: string): Promise<string>;
     toJSON(): {
         extends: any[];
+        networkInterfaces: any;
         services: any;
     };
     #private;
@@ -61,6 +64,8 @@ export class NetworkInterface extends Base {
     get ipAddresses(): MapIterator<any>;
     subnetForAddress(address: any): any;
     addressWithPrefixLength(address: any): string;
+    get gateway(): any;
+    get gatewayAddress(): any;
     get ipAddressesWithPrefixLength(): string[];
     get ipv4Addresses(): any[];
     get ipv6Addresses(): any[];