pmcf 3.10.25 → 3.11.0

package/src/services/kea.mjs

@@ -23,6 +23,7 @@ const KeaServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
+  key: "name",
   attributes: {
     "ddns-send-updates": {
       ...boolean_attribute_writable_true,
@@ -154,11 +155,8 @@ export class KeaService extends Service {
     console.log("kea", name, network.name);
 
     const dnsServerEndpoints = serviceEndpoints(network, {
-      services: {
-        types: "dns",
-        priority: ">=300"
-      },
-      endpoints: endpoint => endpoint.networkInterface.kind !== "loopback"
+      services: 'type="dns" && priority >= 300',
+      endpoints: endpoint => endpoint.networkInterface?.kind !== "loopback"
     });
 
     const packageData = {
@@ -176,10 +174,11 @@ export class KeaService extends Service {
     const peers = async family =>
       (
         await Array.fromAsync(
-          network.findServices({
-            type: "kea",
-            priority: ">=" + (this.priority < 100 ? this.priority : 100)
-          })
+          network.findServices(
+            `type="kea" && priority>=${
+              this.priority < 100 ? this.priority : 100
+            }`
+          )
         )
       )
         .sort(sortDescendingByPriority)
@@ -422,9 +421,12 @@ export class KeaService extends Service {
       Dhcp4: {
         ...(await commonConfig("4")),
         subnet4: subnets
-          .filter(s => s.family === "IPv4" &&
-            // TODO keep out tailscale
-            s.cidr !== "100.64.0.2/32")
+          .filter(
+            s =>
+              s.family === "IPv4" &&
+              // TODO keep out tailscale
+              s.cidr !== "100.64.0.2/32"
+          )
           .map((subnet, index) => {
             return {
               id: index + 1,

package/src/services/mosquitto.mjs

@@ -11,6 +11,7 @@ const MosquittoServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
+  key: "name",
   attributes: {
     log_timestamp: {
       ...boolean_attribute_writable_true,

package/src/services/openldap.mjs

@@ -12,6 +12,7 @@ const OpenLDAPServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
+  key: "name",
   attributes: {
     baseDN: string_attribute_writable,
     rootDN: string_attribute_writable,

package/src/services/systemd-journal-remote.mjs

@@ -7,7 +7,7 @@ const SystemdJournalRemoteServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
-  attributes: {},
+  key: "name",
   services: {
     endpoints: [
       {

package/src/services/systemd-journal-upload.mjs

@@ -8,6 +8,7 @@ const SystemdJournalUploadServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
+  key: "name",
   attributes: {
     url: string_attribute_writable
   },

package/src/services/systemd-journal.mjs

@@ -7,7 +7,7 @@ const SystemdJournalServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
-  attributes: {},
+  key: "name",
   service: {}
 };
 
@@ -30,7 +30,7 @@ export class SystemdJournalService extends Service {
 
   systemdConfigs(name) {
     return {
-      serviceName: "systemd-journald",  
+      serviceName: "systemd-journald",
       configFileName: `etc/systemd/journal.conf.d/${name}.conf`,
       content: [
         "Journal",

package/src/services/systemd-resolved.mjs

@@ -12,7 +12,7 @@ const SystemdResolvedServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ExtraSourceServiceTypeDefinition,
   priority: 0.1,
-  attributes: {},
+  key: "name",
   service: {}
 };
 
@@ -34,11 +34,13 @@ export class SystemdResolvedService extends ExtraSourceService {
   }
 
   systemdConfigs(name) {
-    const options = (priority, limit) => {
+    const options = (lower, upper, limit) => {
       return {
-        services: { types: "dns", priority },
+        services: `(type="dns" || type="bind") && priority>=${lower} && priority<=${upper}`,
         endpoints: e =>
-          e.networkInterface.kind !== "loopback" && e.family !== "dns",
+          e.networkInterface &&
+          e.networkInterface.kind !== "loopback" &&
+          e.family !== "dns",
         select: endpoint => endpoint.address,
         join: " ",
         limit
@@ -51,8 +53,8 @@ export class SystemdResolvedService extends ExtraSourceService {
       content: [
         "Resolve",
         {
-          DNS: serviceEndpoints(this, options("[300:399]", 4)),
-          FallbackDNS: serviceEndpoints(this, options("[100:199]", 4)),
+          DNS: serviceEndpoints(this, options(300, 399, 4)),
+          FallbackDNS: serviceEndpoints(this, options(100, 199, 4)),
           Domains: [...this.localDomains].join(" "),
           DNSSEC: "no",
           MulticastDNS: this.network.multicastDNS ? "yes" : "no",

package/src/services/systemd-timesyncd.mjs

@@ -8,11 +8,10 @@ import { addType } from "../types.mjs";
 
 const SystemdTimesyncdServiceTypeDefinition = {
   name: "systemd-timesyncd",
+  extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
-  extends: ExtraSourceServiceTypeDefinition,
   priority: 0.1,
-  attributes: {},
   service: {}
 };
 
@@ -34,10 +33,11 @@ export class SystemdTimesyncdService extends ExtraSourceService {
   }
 
   systemdConfigs(name) {
-    const options = priority => {
+    const options = (lower, upper) => {
       return {
-        services: { types: "ntp", priority },
-        endpoints: e => e.networkInterface?.kind !== "loopback",
+        services: `type='ntp' && priority >= ${lower} && priority <= ${upper}`,
+        endpoints: e =>
+          e.networkInterface && e.networkInterface.kind !== "loopback",
         select: endpoint => endpoint.address,
         join: " ",
         limit: 2
@@ -50,8 +50,8 @@ export class SystemdTimesyncdService extends ExtraSourceService {
       content: [
         "Time",
         {
-          NTP: serviceEndpoints(this, options("[300:399]")),
-          FallbackNTP: serviceEndpoints(this, options("[100:199]"))
+          NTP: serviceEndpoints(this, options(300, 399)),
+          FallbackNTP: serviceEndpoints(this, options(100, 199))
         }
       ]
     };

package/src/subnet.mjs

@@ -7,6 +7,7 @@ import {
   matchPrefixIP
 } from "ip-utilties";
 import { string_attribute, name_attribute, number_attribute } from "pacc";
+import { networks_attribute } from "./network-support.mjs";
 import { Base } from "./base.mjs";
 import { addType } from "./types.mjs";
 
@@ -15,9 +16,10 @@ const SubnetTypeDefinition = {
   owners: ["location", "owner", "network", "root"],
   priority: 0.6,
   constructWithIdentifierOnly: true,
+  key: "address",
   attributes: {
     address: name_attribute,
-    networks: { type: "network", collection: true, writable: true },
+    networks: networks_attribute,
     prefixLength: number_attribute,
     family: string_attribute
   }

package/src/types.mjs

@@ -1,10 +1,15 @@
-import { baseTypes, attributeIterator, types } from "pacc";
-import { asArray } from "./utils.mjs";
+import {
+  attributeIterator,
+  types,
+  oneOfType,
+  addType as paccAddType
+} from "pacc";
 import { addServiceTypes } from "./service-types.mjs";
 export { types };
 
 export function addType(clazz) {
   const type = clazz.typeDefinition;
+  type.clazz = clazz;
 
   if (type.specializationOf) {
     type.specializationOf.specializations[type.name] = type;
@@ -14,52 +19,24 @@ export function addType(clazz) {
     addServiceTypes({ [type.name]: type.service });
   }
 
-  types[type.name] = type;
-
-  type.clazz = clazz;
+  paccAddType(type);
 }
 
 export function resolveTypeLinks() {
   for (const type of Object.values(types)) {
+    if (typeof type.extends === "string") {
+      type.extends = types[type.extends];
+    }
+
     if (type.owners) {
       type.owners = type.owners.map(owner =>
         typeof owner === "string" ? types[owner] : owner
       );
-    } else {
-      type.owners = [];
-    }
-    for (const [path, attribute] of attributeIterator(type.attributes)) {
-      const name = path.join(".");
-      const ts = [];
-
-      for (const type of asArray(attribute.type)) {
-        if (typeof type === "string") {
-          if (baseTypes.has(type)) {
-            ts.push(type);
-          } else {
-            const t = types[type];
-            if (t) {
-              ts.push(t);
-            } else {
-              console.error("Unknown type", attribute.type, type.name, name);
-            }
-          }
-        } else {
-          ts.push(type);
-        }
-      }
-      attribute.type = ts;
-
-      if (attribute.isKey) {
-        type.identifier = { name, ...attribute };
-      }
     }
-  }
 
-  for (const type of Object.values(types)) {
-    if (!type.identifier) {
-      if (type.extends?.identifier) {
-        type.identifier = type.extends.identifier;
+    for (const [path, attribute] of attributeIterator(type.attributes)) {
+      if (typeof attribute.type === "string") {
+        attribute.type = oneOfType(attribute.type);
       }
     }
   }
@@ -67,6 +44,7 @@ export function resolveTypeLinks() {
 
 export function typeFactory(type, owner, data) {
   const factory = type.factoryFor?.(owner, data) || type.clazz;
+  //console.log(factory, type, owner, data);
   const object = new factory(owner);
   object.read(data);
   owner.addObject(object);

package/types/base.d.mts

@@ -6,7 +6,7 @@ export class Base {
     static get typeName(): string;
     static get typeDefinition(): {
         name: string;
-        owners: any[];
+        key: string;
         attributes: {
             owner: {
                 type: string;
@@ -17,7 +17,7 @@ export class Base {
             name: import("pacc").AttributeDefinition;
             description: {
                 writable: boolean;
-                type: string;
+                type: object;
                 isKey: boolean;
                 mandatory: boolean;
                 collection: boolean;
@@ -27,9 +27,11 @@ export class Base {
                 default?: any;
                 set?: Function;
                 get?: Function;
+                prepareValue?: Function;
                 values?: Set<any>;
                 externalName?: string;
                 env?: string[] | string;
+                additionalValues?: object;
             };
             priority: import("pacc").AttributeDefinition;
             directory: import("pacc").AttributeDefinition;
@@ -49,7 +51,7 @@ export class Base {
     _directory: any;
     _finalize: any;
     _properties: any;
-    ownerFor(property: any, data: any): any;
+    ownerFor(attribute: any, data: any): any;
     read(data: any, type?: any): void;
     named(name: any): void;
     typeNamed(typeName: any, name: any): any;

package/types/cluster.d.mts

@@ -7,7 +7,7 @@ export class Cluster extends Host {
             priority: number;
             extends: {
                 name: string;
-                owners: any[];
+                key: string;
                 attributes: {
                     owner: {
                         type: string;
@@ -18,7 +18,7 @@ export class Cluster extends Host {
                     name: import("pacc").AttributeDefinition;
                     description: {
                         writable: boolean;
-                        type: string;
+                        type: object;
                         isKey: boolean;
                         mandatory: boolean;
                         collection: boolean;
@@ -28,9 +28,11 @@ export class Cluster extends Host {
                         default?: any;
                         set?: Function;
                         get?: Function;
+                        prepareValue?: Function;
                         values?: Set<any>;
                         externalName?: string;
                         env?: string[] | string;
+                        additionalValues?: object;
                     };
                     priority: import("pacc").AttributeDefinition;
                     directory: import("pacc").AttributeDefinition;
@@ -39,11 +41,25 @@ export class Cluster extends Host {
                     tags: import("pacc").AttributeDefinition;
                 };
             };
+            key: string;
             attributes: {
                 networks: {
                     type: string;
                     collection: boolean;
+                    isKey: boolean;
                     writable: boolean;
+                    mandatory: boolean;
+                    private?: boolean;
+                    depends?: string;
+                    description?: string;
+                    default?: any;
+                    set?: Function;
+                    get?: Function;
+                    prepareValue?: Function;
+                    values?: Set<any>;
+                    externalName?: string;
+                    env?: string[] | string;
+                    additionalValues?: object;
                 };
                 hosts: {
                     type: string;
@@ -61,12 +77,26 @@ export class Cluster extends Host {
                         owners: string[];
                         priority: number;
                         constructWithIdentifierOnly: boolean;
+                        key: string;
                         attributes: {
                             address: import("pacc").AttributeDefinition;
                             networks: {
                                 type: string;
                                 collection: boolean;
+                                isKey: boolean;
                                 writable: boolean;
+                                mandatory: boolean;
+                                private?: boolean;
+                                depends?: string;
+                                description?: string;
+                                default?: any;
+                                set?: Function;
+                                get?: Function;
+                                prepareValue?: Function;
+                                values?: Set<any>;
+                                externalName?: string;
+                                env?: string[] | string;
+                                additionalValues?: object;
                             };
                             prefixLength: import("pacc").AttributeDefinition;
                             family: import("pacc").AttributeDefinition;
@@ -83,7 +113,7 @@ export class Cluster extends Host {
                 locales: import("pacc").AttributeDefinition;
                 administratorEmail: {
                     writable: boolean;
-                    type: string;
+                    type: object;
                     isKey: boolean;
                     mandatory: boolean;
                     collection: boolean;
@@ -93,9 +123,11 @@ export class Cluster extends Host {
                     default?: any;
                     set?: Function;
                     get?: Function;
+                    prepareValue?: Function;
                     values?: Set<any>;
                     externalName?: string;
                     env?: string[] | string;
+                    additionalValues?: object;
                 };
             };
         })[];
@@ -106,7 +138,7 @@ export class Cluster extends Host {
             owners: string[];
             extends: {
                 name: string;
-                owners: any[];
+                key: string;
                 attributes: {
                     owner: {
                         type: string;
@@ -117,7 +149,7 @@ export class Cluster extends Host {
                     name: import("pacc").AttributeDefinition;
                     description: {
                         writable: boolean;
-                        type: string;
+                        type: object;
                         isKey: boolean;
                         mandatory: boolean;
                         collection: boolean;
@@ -127,9 +159,11 @@ export class Cluster extends Host {
                         default?: any;
                         set?: Function;
                         get?: Function;
+                        prepareValue?: Function;
                         values?: Set<any>;
                         externalName?: string;
                         env?: string[] | string;
+                        additionalValues?: object;
                     };
                     priority: import("pacc").AttributeDefinition;
                     directory: import("pacc").AttributeDefinition;
@@ -138,6 +172,7 @@ export class Cluster extends Host {
                     tags: import("pacc").AttributeDefinition;
                 };
             };
+            key: string;
             attributes: {
                 networkInterfaces: {
                     type: string;
@@ -152,7 +187,7 @@ export class Cluster extends Host {
                 aliases: import("pacc").AttributeDefinition;
                 os: {
                     values: string[];
-                    type: string;
+                    type: object;
                     isKey: boolean;
                     writable: boolean;
                     mandatory: boolean;
@@ -163,14 +198,16 @@ export class Cluster extends Host {
                     default?: any;
                     set?: Function;
                     get?: Function;
+                    prepareValue?: Function;
                     externalName?: string;
                     env?: string[] | string;
+                    additionalValues?: object;
                 };
                 "machine-id": import("pacc").AttributeDefinition;
                 distribution: import("pacc").AttributeDefinition;
                 deployment: {
                     values: string[];
-                    type: string;
+                    type: object;
                     isKey: boolean;
                     writable: boolean;
                     mandatory: boolean;
@@ -181,8 +218,10 @@ export class Cluster extends Host {
                     default?: any;
                     set?: Function;
                     get?: Function;
+                    prepareValue?: Function;
                     externalName?: string;
                     env?: string[] | string;
+                    additionalValues?: object;
                 };
                 weight: import("pacc").AttributeDefinition;
                 serial: import("pacc").AttributeDefinition;
@@ -190,7 +229,7 @@ export class Cluster extends Host {
                 keymap: import("pacc").AttributeDefinition;
                 chassis: {
                     values: string[];
-                    type: string;
+                    type: object;
                     isKey: boolean;
                     writable: boolean;
                     mandatory: boolean;
@@ -201,12 +240,14 @@ export class Cluster extends Host {
                     default?: any;
                     set?: Function;
                     get?: Function;
+                    prepareValue?: Function;
                     externalName?: string;
                     env?: string[] | string;
+                    additionalValues?: object;
                 };
                 architecture: {
                     values: string[];
-                    type: string;
+                    type: object;
                     isKey: boolean;
                     writable: boolean;
                     mandatory: boolean;
@@ -217,8 +258,10 @@ export class Cluster extends Host {
                     default?: any;
                     set?: Function;
                     get?: Function;
+                    prepareValue?: Function;
                     externalName?: string;
                     env?: string[] | string;
+                    additionalValues?: object;
                 };
                 replaces: import("pacc").AttributeDefinition;
                 depends: import("pacc").AttributeDefinition;
@@ -232,7 +275,7 @@ export class Cluster extends Host {
                 isModel: import("pacc").AttributeDefinition;
                 hostName: {
                     writable: boolean;
-                    type: string;
+                    type: object;
                     isKey: boolean;
                     mandatory: boolean;
                     collection: boolean;
@@ -242,9 +285,11 @@ export class Cluster extends Host {
                     default?: any;
                     set?: Function;
                     get?: Function;
+                    prepareValue?: Function;
                     values?: Set<any>;
                     externalName?: string;
                     env?: string[] | string;
+                    additionalValues?: object;
                 };
                 cidrAddresses: import("pacc").AttributeDefinition;
                 cidrAddress: import("pacc").AttributeDefinition;
@@ -252,6 +297,7 @@ export class Cluster extends Host {
                 address: import("pacc").AttributeDefinition;
             };
         };
+        key: string;
         attributes: {
             routerId: import("pacc").AttributeDefinition;
             masters: {