pmcf 4.30.8 → 5.0.0

package/src/network-interfaces/loopback.mjs

@@ -12,19 +12,12 @@ const _localDomains = new Set(["localhost"]);
 
 export class loopback extends SkeletonNetworkInterface {
   static specializationOf = NetworkInterface;
+  static commonNamePattern = /^lo\d*$/;
 
   static {
     addType(this);
   }
 
-  static isCommonName(name) {
-    return name.match(/^lo\d*$/);
-  }
-
-  get kind() {
-    return this.constructor.name;
-  }
-
   set scope(v) {}
   get scope() {
     return "host";

package/src/network-interfaces/network-interface.mjs

@@ -1,32 +1,31 @@
 import { join } from "node:path";
-import { hasWellKnownSubnet, normalizeIP } from "ip-utilties";
 import {
-  default_attribute_writable,
   string_attribute_writable,
-  hostname_attribute,
-  addType
+  default_collection_attribute_writable
 } from "pacc";
-import { Host, cidrAddresses } from "pmcf";
+import { network_attribute } from "../common-attributes.mjs";
+import { Host, cidrAddresses, addType } from "pmcf";
 import {
   networkAttributes,
-  networkAddressAttributes
-} from "../network-support.mjs";
-import { asArray, writeLines, sectionLines } from "../utils.mjs";
+  networkAddressAttributes,
+  hostname_attribute,
+  cluster_attribute
+} from "../common-attributes.mjs";
+import { writeLines, sectionLines } from "../utils.mjs";
 import { SkeletonNetworkInterface } from "./skeleton.mjs";
-import { Network } from "../network.mjs";
 import { yesno } from "../utils.mjs";
 
 export class NetworkInterface extends SkeletonNetworkInterface {
   static name = "network_interface";
   static owners = [Host];
+  static specializationOf = NetworkInterface;
   static specializations = {};
   static factoryFor(owner, value) {
     let st = this.specializations[value.kind];
 
-    //console.log("factoryFor", owner, value);
     if (!st) {
       for (st of Object.values(this.specializations)) {
-        if (st.isCommonName && st.isCommonName(value.name)) {
+        if (st.isCommonName(value.name)) {
           break;
         }
       }
@@ -41,28 +40,26 @@ export class NetworkInterface extends SkeletonNetworkInterface {
     return this;
   }
   static attributes = {
+    network: network_attribute,
+    cluster: cluster_attribute,
     ...networkAttributes,
     ...networkAddressAttributes,
-    hostName: { ...hostname_attribute, writable: true },
-    ipAddresses: string_attribute_writable,
-    hwaddr: string_attribute_writable,
-    network: {
-      ...default_attribute_writable,
-      type: Network,
-      owner: false
+    hostName: hostname_attribute,
+    ipAddresses: {
+      ...default_collection_attribute_writable,
+      type: "ip",
+      name: "ipAddresses",
+      private: true
     },
-    destination: string_attribute_writable
+    hwaddr: { ...string_attribute_writable, name: "hwaddr" },
+    destination: { ...string_attribute_writable, name: "destination" }
   };
 
   static {
     addType(this);
   }
 
-  static isCommonName(name) {
-    return false;
-  }
-
-  _ipAddresses = new Map();
+  ipAddresses = new Map();
   _scope;
   _metric;
   _kind;
@@ -71,22 +68,13 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   _class;
 
   addSubnet(address) {
-    if (!this.network) {
-      if (!hasWellKnownSubnet(address)) {
-        this.error("Missing network", address);
-      }
-    } else {
+    if (this.network) {
       return this.network.addSubnet(address);
-    }
-  }
-
-  get ipAddresses() {
-    return this._ipAddresses;
-  }
-
-  set ipAddresses(value) {
-    for (const address of asArray(value)) {
-      this._ipAddresses.set(normalizeIP(address), this.addSubnet(address));
+    } else {
+      /*if (!hasWellKnownSubnet(address)) {
+        this.error("Missing network", address);
+      }*/
+      return address;
     }
   }
 
@@ -181,7 +169,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   }
 
   get kind() {
-    return this.attribute("_kind") ?? this.network?.kind;
+    return this.attribute("_kind") ?? this.network?.kind ?? super.kind;
   }
 
   async systemdDefinitions(dir, packageData) {

package/src/network-interfaces/skeleton.mjs

@@ -9,10 +9,15 @@ import { ServiceOwner } from "../service-owner.mjs";
  *
  */
 export class SkeletonNetworkInterface extends ServiceOwner {
-  
   static get typeName() {
     return "network_interface";
   }
+  
+  static commonNamePattern = new RegExp(`^${this.name}\d+$`);
+
+  static isCommonName(name) {
+    return this.commonNamePattern.test(name);
+  }
 
   static {
     addType(this);
@@ -20,8 +25,8 @@ export class SkeletonNetworkInterface extends ServiceOwner {
 
   _network;
 
-  get typeName() {
-    return "network_interface";
+  get kind() {
+    return this.constructor.name;
   }
 
   get host() {
@@ -31,17 +36,15 @@ export class SkeletonNetworkInterface extends ServiceOwner {
   }
 
   get services() {
-    return new AggregatedMap([super.services, this.owner.services]);
+    return this.owner
+      ? new AggregatedMap([super.services, this.owner.services])
+      : super.services;
   }
 
   get hosts() {
     return asArray(this.host);
   }
 
-  get network_interface() {
-    return this;
-  }
-
   get domainName() {
     return this.host?.domainName;
   }
@@ -68,7 +71,9 @@ export class SkeletonNetworkInterface extends ServiceOwner {
   }
 
   get subnets() {
-    return new Set(this.ipAddresses.values());
+    return new Map(
+      [...new Set(this.ipAddresses.values())].map(s => [s.name, s])
+    );
   }
 
   get ipAddresses() {

package/src/network-interfaces/tun.mjs

@@ -2,15 +2,10 @@ import { addType } from "pacc";
 import { NetworkInterface } from "./network-interface.mjs";
 
 export class tun extends NetworkInterface {
-  static specializationOf = NetworkInterface;
 
   static {
     addType(this);
   }
 
-  get kind() {
-    return this.constructor.name;
-  }
-
   async systemdDefinitions(dir, packageData) {}
 }

package/src/network-interfaces/wireguard.mjs

@@ -9,10 +9,6 @@ export class wireguard extends SkeletonNetworkInterface {
     addType(this);
   }
 
-  get kind() {
-    return this.constructor.name;
-  }
-
   get ipAddresses() {
     return new Map();
   }

package/src/network-interfaces/wlan.mjs

@@ -1,38 +1,27 @@
 import { mkdir } from "node:fs/promises";
 import { join } from "node:path";
-import {
-  string_attribute_writable,
-  secret_attribute_writable,
-  addType
-} from "pacc";
+import { string_attribute_writable, addType } from "pacc";
 import { writeLines, sectionLines } from "../utils.mjs";
-import { NetworkInterface } from "./network-interface.mjs";
+import { psk_attribute, ssid_attribute } from "../common-attributes.mjs";
 import { ethernet } from "./ethernet.mjs";
 
 export class wlan extends ethernet {
-  static specializationOf = NetworkInterface;
   static attributes = {
-    ssid: string_attribute_writable,
-    psk: secret_attribute_writable,
-    secretName: string_attribute_writable
+    ssid: ssid_attribute,
+    psk: psk_attribute,
+    secretName: { ...string_attribute_writable, name: "secretName" }
   };
 
+  static commonNamePattern = /^wlan\d*$/;
+
   static {
     addType(this);
   }
 
-  static isCommonName(name) {
-    return name.match(/^wlan\d+$/);
-  }
-
   _ssid;
   _psk;
   _secretName;
 
-  get kind() {
-    return this.constructor.name;
-  }
-
   set secretName(value) {
     this._secretName = value;
   }

package/src/network.mjs

@@ -1,21 +1,19 @@
-import { default_attribute_writable } from "pacc";
-import { addType } from "pmcf";
+import { AggregatedMap } from "aggregated-map";
+import { addType, assign } from "pmcf";
 import { Owner } from "./owner.mjs";
+import {
+  networkAttributes,
+  bridges_attribute,
+  subnets_attribute
+} from "./common-attributes.mjs";
 import { Subnet } from "./subnet.mjs";
-import { networkAttributes } from "./network-support.mjs";
 
 export class Network extends Owner {
   static name = "network";
-  static owners = ["location", Owner, "root"];
+  static owners = [Owner, "root"];
   static attributes = {
     ...networkAttributes,
-    bridge: {
-      ...default_attribute_writable,
-      type: Network,
-      collection: true,
-      owner: false
-    },
-    gateway: { ...default_attribute_writable, type: "host", owner: false }
+    bridges: bridges_attribute
   };
 
   static {
@@ -25,52 +23,50 @@ export class Network extends Owner {
   kind;
   scope;
   metric;
-  gateway;
-  _bridge;
+  bridges = new Set();
 
-  get network() {
-    return this;
+  get gateway() {
+    for (const b of [this, ...this.bridges]) {
+      if (b._gateway) {
+        return b._gateway;
+      }
+    }
   }
 
-  get address() {
-    for (const subnet of this.subnets) {
-      return subnet.address;
-    }
+  set gateway(value) {
+    this._gateway = value;
   }
 
-  networkNamed(name) {
-    if (this.isNamed(name)) {
-      return this;
-    }
-    return super.networkNamed(name);
+  get network() {
+    return this;
   }
 
-  addObject(object) {
-    super.addObject(object);
-    if (object instanceof Subnet) {
-      object.networks.add(this);
+  get address() {
+    for (const subnet of this.subnets.values()) {
+      return subnet.address;
     }
   }
 
   get hosts() {
-    if (this.bridge) {
-      let hosts = new Set();
-      for (const network of this.bridge) {
-        hosts = hosts.union(network.directHosts());
-      }
-      return hosts;
-    }
-
-    return super.hosts;
+    return this.bridges.size > 0
+      ? new AggregatedMap(
+          [this, ...this.bridges].map(network => network.directHosts)
+        )
+      : super.hosts;
   }
 
-  get bridge() {
-    return this._bridge;
-  }
+  get subnets() {
+    if (!this._subnets.get("fe80::/64")) {
+      const linkLocal = new Subnet("fe80::/64");
+      this._subnets.set(linkLocal.address,linkLocal);
+      //assign(subnets_attribute, this, linkLocal);
+    }
 
-  set bridge(network) {
-    this._bridge = this.owner.addBridge(this, network);
-    network.bridge = this.bridge; // TODO should happen in addBridge
+    return this.bridges.size > 0
+      ? new AggregatedMap(
+          [this, ...this.bridges].map(network => network._subnets)
+        )
+      : super.subnets;
   }
 
   set secretName(value) {