pmcf 4.27.0 → 4.27.2

package/package.json

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

package/src/host.mjs

@@ -10,7 +10,7 @@ import {
   boolean_attribute_false,
   addType
 } from "pacc";
-import {  Base, NetworkInterface, addresses } from "pmcf";
+import {  NetworkInterface, addresses } from "pmcf";
 import { ServiceOwner } from "./service-owner.mjs";
 import { networkAddressAttributes } from "./network-support.mjs";
 import { addHook } from "./hooks.mjs";
@@ -28,7 +28,7 @@ export class Host extends ServiceOwner {
   static name = "host";
   static priority = 1.9;
   static owners = ["owner", "network", "root"];
-  static extends = Base;
+  static extends = ServiceOwner;
   static key = "name";
   static attributes = {
     ...networkAddressAttributes,
@@ -37,11 +37,6 @@ export class Host extends ServiceOwner {
       type: "network_interface",
       collection: true
     },
-    services: {
-      ...default_attribute_writable,
-      type: "service",
-      collection: true
-    },
     aliases: string_set_attribute_writable,
     os: {
       ...string_attribute_writable,
@@ -87,7 +82,6 @@ export class Host extends ServiceOwner {
     isModel: boolean_attribute_false
   };
 
-
   static {
     addType(this);
   }
@@ -111,16 +105,13 @@ export class Host extends ServiceOwner {
     super.materializeExtends();
 
     for (const host of this.walkDirections(["extends"])) {
-
-
       for (const [name, ni] of host.networkInterfaces) {
-        const present = this._networkInterfaces.get(name);
+        const present = this._networkInterfaces.get(ni.name);
 
         if (present) {
-          //console.log("LINK", present.fullName, ni.fullName,present.extends);
           present.extends.add(ni);
         } else {
-          this._networkInterfaces.set(name, ni.forOwner(this));
+          this.networkInterfaces = ni.forOwner(this);
         }
       }
     }

package/src/owner.mjs

@@ -23,11 +23,12 @@ export class Owner extends Base {
   static key = "name";
   static attributes = {
     networks: networks_attribute,
-    hosts: { ...default_attribute_writable, type: "host", collection: true },
+    hosts: { ...default_attribute_writable, type: "host", collection: true, owner: true },
     clusters: {
       ...default_attribute_writable,
       type: "cluster",
-      collection: true
+      collection: true,
+      owner: true
     },
     subnets: {
       ...default_attribute_writable,

package/src/service-owner.mjs

@@ -1,6 +1,24 @@
+import { default_attribute_writable, addType } from "pacc";
 import { Base, Service } from "pmcf";
 
 export class ServiceOwner extends Base {
+  static name = "service-owner";
+  static priority = 1.9;
+  static owners = ["owner", "network", "root"];
+  static extends = Base;
+  static key = "name";
+  static attributes = {
+    services: {
+      ...default_attribute_writable,
+      type: "service",
+      collection: true
+    }
+  };
+
+  static {
+    addType(this);
+  }
+
   _services = new Map();
 
   set services(service) {
@@ -14,9 +32,9 @@ export class ServiceOwner extends Base {
   addObject(object) {
     if (object instanceof Service) {
       this._services.set(object.name, object);
+    } else {
+      super.addObject(object);
     }
-
-    super.addObject(object);
   }
 
   materializeExtends() {
@@ -34,27 +52,6 @@ export class ServiceOwner extends Base {
         this.services = service.forOwner(this);
       }
     }
-
-    /*
-    if (this.fullName === "/SW/mini1") {
-      const myServiceNames = new Set([...this.services.keys()]);
-      const extendingSericeNames = new Set([
-        ...this.mapFromDirections(["extends"], "_services").keys()
-      ]);
-
-      console.log("XXX",this.fullName, [...this.extends].map(n=>n.fullName), myServiceNames, extendingSericeNames);
-
-      if (!extendingSericeNames.isSubsetOf(myServiceNames)) {
-        // const diff = myServiceNames.difference(extendingSericeNames);
-        console.log(
-          "DIFF",
-          this.fullName,
-          myServiceNames,
-          extendingSericeNames
-        );
-      }
-    }
-    */
   }
 
   _traverse(...args) {

package/src/service.mjs

@@ -33,7 +33,7 @@ export const endpointAttributes = {
   port: number_attribute_writable,
   protocol: {
     ...string_attribute_writable,
-    values: ["tcp", "udp"]
+    values: ["tcp", "udp", "quic"]
   },
   type: string_attribute_writable,
   types: string_set_attribute,
@@ -61,7 +61,12 @@ export class Service extends Base {
   static attributes = {
     ...networkAddressAttributes,
     ...endpointAttributes,
-    extends: { ...default_attribute_writable, type: Service, collection: true, owner: false },
+    extends: {
+      ...default_attribute_writable,
+      type: Service,
+      collection: true,
+      owner: false
+    },
     alias: string_attribute_writable,
     weight: { ...number_attribute_writable /*default: 1*/ },
     systemdService: string_attribute_writable