pmcf 4.30.8 → 5.0.0

package/bin/pmcf-diagram

@@ -27,7 +27,7 @@ for await (const host of location.hosts()) {
 
 for await (const network of location.networks) {
   console.log(
-    `  ${q(network.name)} [label="${network.name}\\n${[...network.subnets()]
+    `  ${q(network.name)} [label="${network.name}\\n${[...network.subnets.keys()]
       .map(s => s.address)
       .join(" ")}" shape=circle];`
   );

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "4.30.8",
+  "version": "5.0.0",
   "publishConfig": {
     "access": "public"
   },
@@ -50,15 +50,15 @@
     "lint:docs": "documentation lint ./src**/*.mjs"
   },
   "dependencies": {
-    "aggregated-map": "^1.0.4",
+    "aggregated-map": "^1.0.7",
     "content-entry-transform": "^1.6.9",
-    "ip-utilties": "^3.1.1",
-    "npm-pkgbuild": "^20.7.6",
-    "pacc": "^9.5.0",
+    "ip-utilties": "^3.1.3",
+    "npm-pkgbuild": "^20.7.10",
+    "pacc": "^10.4.0",
     "package-directory": "^8.2.0"
   },
   "devDependencies": {
-    "@types/node": "^26.0.0",
+    "@types/node": "^26.1.0",
     "ava": "^8.0.1",
     "c8": "^11.0.0",
     "documentation": "^14.0.3",
@@ -70,7 +70,7 @@
     }
   },
   "engines": {
-    "node": ">=26.2.0"
+    "node": ">=26.4.0"
   },
   "repository": {
     "type": "git",

package/src/base.mjs

@@ -12,20 +12,20 @@ import {
   parse,
   globals,
   expand,
+  extract,
   toExternal,
   filterPublic,
   extendingAttributeIterator,
-  default_attribute,
   name_attribute_writable,
-  string_attribute,
+  type_attribute,
   string_attribute_writable,
   string_set_attribute_writable,
-  number_attribute_writable,
   description_attribute_writable,
   boolean_attribute_writable
 } from "pacc";
 import { union } from "./utils.mjs";
 import { addType } from "pmcf";
+import { owner_attribute } from "./common-attributes.mjs";
 
 /**
  *
@@ -39,15 +39,17 @@ export class Base {
   static attributes = {
     name: name_attribute_writable,
     description: description_attribute_writable,
-    priority: number_attribute_writable,
-    directory: string_attribute_writable,
-    packaging: string_attribute_writable,
-    disabled: boolean_attribute_writable,
-    tags: string_set_attribute_writable,
-    owner: { ...default_attribute, type: "base", owner: false },
-    type: string_attribute
+    owner: owner_attribute,
+    type: type_attribute,
+    directory: { ...string_attribute_writable, name: "directory" },
+    packaging: { ...string_set_attribute_writable, name: "packaging" },
+    disabled: { ...boolean_attribute_writable, name: "disabled" },
+    tags: { ...string_set_attribute_writable, name: "tags" },
+    template: { ...boolean_attribute_writable, name: "template", private: true }
   };
-
+  /*asMapEntry = (attribute, value, object) => {
+    console.log("asMapEntry",attribute?.name,value);
+    return [value.name, value]; };*/
   static {
     addType(this);
   }
@@ -56,7 +58,6 @@ export class Base {
     return this.name + ".json";
   }
 
-  owner;
   description;
   name;
   properties = {};
@@ -65,76 +66,55 @@ export class Base {
   _packaging = new Set();
   _directory;
 
-  /**
-   *
-   * @param {Base} owner
-   * @param {object} [data]
-   */
-  constructor(owner, data) {
-    this.owner = owner;
-
-    switch (typeof data) {
-      case "string":
-        this.name = data;
-        break;
+  set owner(value) {
+    if (this === value || this === value?.owner) {
+      this.error("Unable to own myself", value.fullName);
+    } else {
+      this._owner = value;
     }
   }
 
-  ownerFor(attribute, data) {
-    const owners = attribute.type.owners;
+  get owner() {
+    return this._owner;
+  }
 
-    if (owners) {
-      for (const type of owners) {
-        if (this.typeName === type?.name) {
-          return this;
-        }
-      }
-      for (const type of owners) {
-        const owner = this[type?.name];
-        if (owner) {
-          return owner;
-        }
-      }
+  forOwner(owner) {
+    /*if (owner === this) {
+      this.error("cant own myself");
+    }*/
+    if (this.owner !== owner) {
+      const newObject = Object.create(this);
+      newObject.owner = owner;
+      return newObject;
     }
+
     return this;
   }
 
   materializeExtends() {}
 
   named(name) {
+    if (name[0] === "/") {
+      return this.root.named(name.substring(1));
+    }
+
+    const parts = name.split("/");
+    const first = parts.shift();
+
     for (const [path, attribute] of extendingAttributeIterator(
       this.constructor,
-      (name, attribute) => !attribute.type.primitive
+      attribute => !attribute.type.primitive
     )) {
       const value = this[path];
       if (typeof value?.get === "function") {
-        const object = value.get(name);
-        // console.log("NAMED", name, object.fullName);
+        const object = value.get(first);
         if (object) {
-          return object;
+          return parts.length >= 1 ? object.named(parts.join("/")) : object;
         }
       }
     }
   }
 
-  typeNamed(typeName, name) {
-    if (this.owner) {
-      const object = this.owner.typeNamed(typeName, name); // TODO split
-      if (object) {
-        return object;
-      }
-    }
-
-    const object = this.named(name);
-    if (object?.typeName === typeName) {
-      return object;
-    }
-  }
-
-  addObject(object) {
-    return this.owner.addObject(object);
-  }
-
   /**
    * Deliver AggregatedMap of all property Maps.
    * @param {string[]} directions
@@ -156,7 +136,10 @@ export class Base {
   unionFromDirections(directions, property) {
     let collected = new Set();
     for (const node of this.walkDirections(directions)) {
-      collected = collected.union(node[property]);
+      const value = node[property];
+      if (value !== undefined) {
+        collected = collected.union(value);
+      }
     }
 
     return collected;
@@ -167,22 +150,29 @@ export class Base {
 
     for (const [path, attribute] of extendingAttributeIterator(
       this.constructor,
-      (name, attribute) => attribute.owner && !attribute.type.primitive
+      attribute => attribute.backpointer?.name === "owner"
     )) {
       const value = this[path];
-      if (value) {
+
+      if (value !== undefined) {
         if (attribute.collection) {
-          if (typeof value.values !== "function") {
+          if (typeof value.values === "function") {
+            all.push(...value.values());
+          } else {
             if (value instanceof Iterator) {
               all.push(...value);
             } else {
-              if (typeof value === "object") {
+              if (value instanceof Base) {
+                this.error(
+                  `Unexpected scalar value for "${attribute.name}"`,
+                  value.fullName
+                );
+                all.push(value); // TODO should not happen
+              } else if (typeof value === "object") {
                 //console.log("NO F", this.fullName, path, value);
                 all.push(...Object.values(value));
               }
             }
-          } else {
-            all.push(...value.values());
           }
         } else {
           all.push(value);
@@ -229,22 +219,19 @@ export class Base {
     }
   }
 
-  forOwner(owner) {
-    if (this.owner !== owner) {
-      const newObject = Object.create(this);
-      newObject.owner = owner;
-      return newObject;
-    }
-
-    return this;
-  }
-
   isNamed(name) {
     return name[0] === "/" ? this.fullName === name : this.name === name;
   }
 
   *find(pattern) {
+    const seen = new Set();
+
     for (const node of this.walkDirections(["children"])) {
+      if (seen.has(node)) {
+        continue;
+      }
+      seen.add(node);
+
       for (const p of pattern) {
         if (node.fullName.match(p)) {
           yield node;
@@ -255,7 +242,8 @@ export class Base {
   }
 
   get typeName() {
-    return this.constructor.name;
+    const type = this.constructor;
+    return type.specializationOf?.name || type.name;
   }
 
   /**
@@ -324,11 +312,7 @@ export class Base {
   }
 
   get root() {
-    return this.owner.root;
-  }
-
-  get location() {
-    return this.owner?.location;
+    return this.owner?.root;
   }
 
   get host() {
@@ -397,7 +381,7 @@ export class Base {
   }
 
   get services() {
-    return this.owner?.services || [];
+    return this.owner?.services || new Map();
   }
 
   set directory(directory) {
@@ -405,13 +389,16 @@ export class Base {
   }
 
   get directory() {
-    return this._directory ?? join(this.owner.directory, this.name);
+    return (
+      this._directory ??
+      (this.owner?.directory
+        ? join(this.owner.directory, this.name)
+        : this.name)
+    );
   }
 
   get fullName() {
-    return this.name
-      ? join(this.owner.fullName, "/", this.name)
-      : this.owner.fullName;
+    return this.owner ? join(this.owner.fullName, "/", this.name) : this.name;
   }
 
   get derivedPackaging() {
@@ -506,7 +493,11 @@ export class Base {
    * @return {boolean}
    */
   get isTemplate() {
-    return this.name?.indexOf("*") >= 0 || this.owner?.isTemplate || false;
+    //console.log("T", this.name, this.owner?.name, this.owner?.owner?.name);
+    return (
+      this.template ??
+      (this.name?.indexOf("*") >= 0 || this.owner?.isTemplate || false)
+    );
   }
 
   /**
@@ -539,98 +530,6 @@ export class Base {
   }
 
   toJSON() {
-    return extractFrom(this, this.constructor);
-  }
-}
-
-export function extractFrom(object, type = object?.constructor) {
-  switch (typeof object) {
-    case "undefined":
-    case "string":
-    case "number":
-    case "boolean":
-      return object;
+    return extract(this);
   }
-
-  if (object instanceof Set) {
-    object = [...object];
-  }
-
-  if (typeof object[Symbol.iterator] === "function") {
-    object = [...object].map(o => (o instanceof Base ? extractFrom(o) : o));
-
-    if (object.length === 0) {
-      return undefined;
-    }
-
-    if (type?.key) {
-      return Object.fromEntries(
-        object.map(o => {
-          o = extractFrom(o);
-          const name = o[type.key];
-          delete o[type.key];
-          return [name, o];
-        })
-      );
-    }
-
-    return object.length ? object : undefined;
-  }
-
-  const json = {};
-
-  for (const [path, def] of extendingAttributeIterator(type, filterPublic)) {
-    const name = path.join(".");
-    let value = object[name];
-
-    switch (typeof value) {
-      case "function":
-        {
-          value = object[name]();
-
-          if (typeof value?.next === "function") {
-            value = [...value];
-          }
-
-          value = extractFrom(value, def.type);
-          if (value !== undefined) {
-            json[name] = value;
-          }
-        }
-        break;
-      case "object":
-        if (value instanceof Base) {
-          json[name] = { type: value.typeName };
-          if (value.name) {
-            json[name].name = value.name;
-          }
-        } else {
-          if (typeof value[Symbol.iterator] === "function") {
-            value = extractFrom(value);
-
-            if (value !== undefined) {
-              json[name] = value;
-            }
-          } else {
-            const resultObject = Object.fromEntries(
-              Object.entries(value).map(([k, v]) => [
-                k,
-                v // extractFrom(v, def.type)
-              ])
-            );
-            if (Object.keys(resultObject).length > 0) {
-              json[name] = resultObject;
-            }
-          }
-        }
-        break;
-      case "undefined":
-        break;
-
-      default:
-        json[name] = value;
-    }
-  }
-
-  return json;
 }

package/src/cluster.mjs

@@ -1,68 +1,50 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { FAMILY_IPV4 } from "ip-utilties";
-import {
-  default_attribute_writable,
-  default_attribute,
-  number_attribute_writable,
-  duration_attribute_writable
-} from "pacc";
-import { Owner } from "./owner.mjs";
+import { number_attribute_writable, duration_attribute_writable } from "pacc";
 import { Host } from "./host.mjs";
 import { addType, serviceEndpoints } from "pmcf";
+import {
+  networkInterfaces_attribute,
+  cluster_attribute
+} from "./common-attributes.mjs";
 import { writeLines } from "./utils.mjs";
 
 export class Cluster extends Host {
   static name = "cluster";
   static priority = 1.5;
-  static owners = [Owner, "network", "location", "root"];
   static attributes = {
-    routerId: { ...number_attribute_writable, default: 100 },
+    routerId: { ...number_attribute_writable, name: "routerId", default: 100 },
     masters: {
-      ...default_attribute_writable,
-      type: "network_interface",
-      collection: true
+      ...networkInterfaces_attribute,
+      name: "masters",
+      backpointer: cluster_attribute
     },
     backups: {
-      ...default_attribute_writable,
-      type: "network_interface",
-      collection: true
+      ...networkInterfaces_attribute,
+      name: "backups",
+      backpointer: cluster_attribute
     },
     members: {
-      ...default_attribute,
-      type: "network_interface",
-      collection: true
+      ...networkInterfaces_attribute,
+      name: "members"
     },
-    checkInterval: { ...duration_attribute_writable, default: 60 }
+    checkInterval: {
+      ...duration_attribute_writable,
+      name: "checkInterval",
+      default: 60
+    }
   };
 
   static {
     addType(this);
   }
 
-  _masters = [];
-  _backups = [];
+  masters = [];
+  backups = [];
   routerId = 100;
   checkInterval = 60;
 
-  set masters(value) {
-    this._masters.push(value);
-    value.cluster = this;
-  }
-
-  get masters() {
-    return this._masters;
-  }
-
-  set backups(value) {
-    this._backups.push(value);
-    value.cluster = this;
-  }
-
-  get backups() {
-    return this._backups;
-  }
-
   get members() {
     return new Set(this.masters).union(new Set(this.backups));
   }
@@ -74,7 +56,7 @@ export class Cluster extends Host {
     )) {
       const host = ni.host;
       const packageStagingDir = join(stagingDir, host.name);
-      const location = `${this.location.name}-${host.name}`;
+      const location = `${this.owner.name}-${host.name}`;
 
       const packageData = host.packageData;
       packageData.sources.push(

package/src/{network-support.mjs → common-attributes.mjs}

@@ -1,5 +1,7 @@
 import {
+  default_attribute,
   default_attribute_writable,
+  default_collection_attribute_writable,
   string_collection_attribute_writable,
   string_attribute_writable,
   integer_attribute_writable,
@@ -9,11 +11,70 @@ import {
 
 export const networkAddressType = "network|host|network_interface";
 
-export const networks_attribute = {
+export const owner_attribute = {
+  ...default_attribute,
+  name: "owner",
+  type: "owner"
+};
+
+export const network_attribute = {
   ...default_attribute_writable,
+  name: "network",
+  type: "network"
+};
+
+export const networks_attribute = {
+  ...default_collection_attribute_writable,
   name: "networks",
   type: "network",
-  collection: true
+  backpointer: owner_attribute
+};
+
+export const networkInterfaces_attribute = {
+  ...default_collection_attribute_writable,
+  name: "networkInterfaces",
+  type: "network_interface",
+  backpointer: owner_attribute
+};
+
+export const hosts_attribute = {
+  ...default_collection_attribute_writable,
+  name: "hosts",
+  type: "host",
+  backpointer: owner_attribute
+};
+
+export const owners_attribute = {
+  ...default_collection_attribute_writable,
+  name: "owners",
+  type: "owner",
+  backpointer: owner_attribute
+};
+
+export const cluster_attribute = {
+  ...default_attribute_writable,
+  name: "cluster",
+  type: "cluster"
+};
+
+export const clusters_attribute = {
+  ...default_collection_attribute_writable,
+  name: "clusters",
+  type: "cluster",
+  backpointer: owner_attribute
+};
+
+export const subnets_attribute = {
+  ...default_collection_attribute_writable,
+  name: "subnets",
+  type: "subnet",
+  backpointer: owner_attribute
+};
+
+export const bridges_attribute = {
+  ...networks_attribute,
+  name: "bridges",
+  backpointer: { ...networks_attribute, name: "bridges" }
 };
 
 export const psk_attribute = { ...string_attribute_writable, name: "psk" };
@@ -28,18 +89,18 @@ export const networkAttributes = {
   scope: {
     ...string_attribute_writable,
     name: "scope",
-    values: ["global", "site", "link", "host"]
+    values: new Set(["global", "site", "link", "host"])
     //  default: "global"
   },
   class: {
     ...string_attribute_writable,
     name: "class",
-    values: ["10GBASE-T", "1000BASE-T", "100BASE-T", "10BASE-T"]
+    values: new Set(["10GBASE-T", "1000BASE-T", "100BASE-T", "10BASE-T"])
   },
   kind: {
     ...string_attribute_writable,
     name: "kind",
-    values: ["loopback", "ethernet", "wlan", "wireguard", "fiber", "dsl"]
+    values: new Set(["loopback", "ethernet", "wlan", "wireguard", "fiber", "dsl"])
   },
   ssid: ssid_attribute,
   psk: psk_attribute,

package/src/extra-source-service.mjs

@@ -1,15 +1,16 @@
-import { default_attribute_writable, addType } from "pacc";
+import { AggregatedMap } from "aggregated-map";
+import { default_collection_attribute_writable, addType } from "pacc";
 import { Service } from "./service.mjs";
 import { networkAddressType } from "pmcf";
 
 export class ExtraSourceService extends Service {
   static name = "extra-source-service";
-  static specializationOf = Service;
+
   static attributes = {
     source: {
-      ...default_attribute_writable,
-      type: networkAddressType,
-      collection: true
+      ...default_collection_attribute_writable,
+      name: "source",
+      type: networkAddressType
     }
   };
 
@@ -24,9 +25,9 @@ export class ExtraSourceService extends Service {
   }
 
   get services() {
-    return [
+    return new AggregatedMap([
       this.owner.owner.services,
       ...this.source.map(s => s.services)
-    ].flat();
+    ]);
   }
 }