pmcf 4.19.2 → 4.20.0

package/src/services/chrony.mjs

@@ -12,6 +12,7 @@ import { writeLines } from "../utils.mjs";
 
 const ChronyServiceTypeDefinition = {
   name: "chrony",
+  priority: 1,
   extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
@@ -45,15 +46,12 @@ const ChronyServiceTypeDefinition = {
 };
 
 export class ChronyService extends ExtraSourceService {
+  static typeDefinition = ChronyServiceTypeDefinition;
   static {
     addType(this);
     addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
-  static get typeDefinition() {
-    return ChronyServiceTypeDefinition;
-  }
-
   get type() {
     return ChronyServiceTypeDefinition.name;
   }
@@ -66,7 +64,7 @@ export class ChronyService extends ExtraSourceService {
 
     const lines = [
       ...serviceEndpoints(this, {
-        services: 'in("ntp",types) && priority>=100',
+        services: "services[types[ntp] && priority>=100]",
         endpoints: e =>
           e.type === "ntp" &&
           !isLinkLocal(e.address) &&

package/src/services/headscale.mjs

@@ -4,6 +4,7 @@ import { ServiceTypeDefinition, Service } from "../service.mjs";
 
 const HeadscaleServiceTypeDefinition = {
   name: "headscale",
+  priority: 1,
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
@@ -39,12 +40,9 @@ const HeadscaleServiceTypeDefinition = {
 };
 
 export class HeadscaleService extends Service {
+  static typeDefinition = HeadscaleServiceTypeDefinition;
   static {
     addType(this);
     addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
-
-  static get typeDefinition() {
-    return HeadscaleServiceTypeDefinition;
-  }
 }

package/src/services/influxdb.mjs

@@ -11,6 +11,7 @@ import { Service, ServiceTypeDefinition } from "../service.mjs";
 
 const InfluxdbServiceTypeDefinition = {
   name: "influxdb",
+  priority: 1,
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
@@ -43,15 +44,12 @@ const InfluxdbServiceTypeDefinition = {
 };
 
 export class InfluxdbService extends Service {
+  static typeDefinition = InfluxdbServiceTypeDefinition;
   static {
     addType(this);
     addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
-  static get typeDefinition() {
-    return InfluxdbServiceTypeDefinition;
-  }
-
   get type() {
     return InfluxdbServiceTypeDefinition.name;
   }

package/src/services/kea.mjs

@@ -20,6 +20,7 @@ import { writeLines } from "../utils.mjs";
 
 const KeaServiceTypeDefinition = {
   name: "kea",
+  priority: 1,
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
@@ -129,15 +130,12 @@ const KeaServiceTypeDefinition = {
 const keaVersion = "3.0.1";
 
 export class KeaService extends Service {
+  static typeDefinition = KeaServiceTypeDefinition;
   static {
     addType(this);
     addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
-  static get typeDefinition() {
-    return KeaServiceTypeDefinition;
-  }
-
   get type() {
     return KeaServiceTypeDefinition.name;
   }
@@ -154,7 +152,7 @@ export class KeaService extends Service {
     const name = host.name;
 
     const dnsServerEndpoints = serviceEndpoints(network, {
-      services: 'in("dns",types) && priority>=300',
+      services: "services[types[dns] && priority>=300]",
       endpoints: endpoint => endpoint.networkInterface?.kind !== "loopback"
     });
 
@@ -163,11 +161,9 @@ export class KeaService extends Service {
     packageData.sources.push(new FileContentProvider(dir + "/"));
 
     const peers = async family =>
-      (
-        await Array.fromAsync(
-          network.findServices(
-            `type="kea" && priority>=${Math.min(this.priority, 100)}`
-          )
+      Array.from(
+        network.expression(
+          `services[types[kea] && priority>=${Math.min(this.priority, 100)}]`
         )
       )
         .sort(sortDescendingByPriority)

package/src/services/mosquitto.mjs

@@ -4,6 +4,7 @@ import { Service, ServiceTypeDefinition } from "../service.mjs";
 
 const MosquittoServiceTypeDefinition = {
   name: "mosquitto",
+  priority: 1,
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
@@ -33,15 +34,12 @@ const MosquittoServiceTypeDefinition = {
 };
 
 export class MosquittoService extends Service {
+  static typeDefinition = MosquittoServiceTypeDefinition;
   static {
     addType(this);
     addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
-  static get typeDefinition() {
-    return MosquittoServiceTypeDefinition;
-  }
-
   get type() {
     return MosquittoServiceTypeDefinition.name;
   }

package/src/services/openldap.mjs

@@ -10,6 +10,7 @@ import { ServiceTypeDefinition, Service } from "../service.mjs";
 
 const OpenLDAPServiceTypeDefinition = {
   name: "openldap",
+  priority: 1,
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
@@ -26,15 +27,12 @@ const OpenLDAPServiceTypeDefinition = {
 };
 
 export class OpenLDAPService extends Service {
+  static typeDefinition = OpenLDAPServiceTypeDefinition;
   static {
     addType(this);
     addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
-  static get typeDefinition() {
-    return OpenLDAPServiceTypeDefinition;
-  }
-
   _base;
 
   get type() {

package/src/services/postfix.mjs

@@ -4,6 +4,7 @@ import { ServiceTypeDefinition, Service } from "../service.mjs";
 
 const PostfixServiceTypeDefinition = {
   name: "postfix",
+  priority: 1,
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
@@ -17,15 +18,12 @@ const PostfixServiceTypeDefinition = {
 };
 
 export class PostfixService extends Service {
+  static typeDefinition = PostfixServiceTypeDefinition;
   static {
     addType(this);
     addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
-  static get typeDefinition() {
-    return PostfixServiceTypeDefinition;
-  }
-
   get type() {
     return PostfixServiceTypeDefinition.name;
   }

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

@@ -10,6 +10,7 @@ import { filterConfigurable, sectionLines } from "../utils.mjs";
 
 const SystemdJournalRemoteServiceTypeDefinition = {
   name: "systemd-journal-remote",
+  priority: 1,
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
@@ -87,15 +88,12 @@ const SystemdJournalRemoteServiceTypeDefinition = {
  * @property {string} ServerKeyFile
  */
 export class SystemdJournalRemoteService extends Service {
+  static typeDefinition = SystemdJournalRemoteServiceTypeDefinition;
   static {
     addType(this);
     addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
-  static get typeDefinition() {
-    return SystemdJournalRemoteServiceTypeDefinition;
-  }
-
   get type() {
     return SystemdJournalRemoteServiceTypeDefinition.name;
   }

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

@@ -1,5 +1,6 @@
 import {
   string_attribute_writable,
+  string_collection_attribute_writable,
   boolean_attribute_writable,
   addType
 } from "pacc";
@@ -8,6 +9,7 @@ import { filterConfigurable, sectionLines } from "../utils.mjs";
 
 const SystemdJournalUploadServiceTypeDefinition = {
   name: "systemd-journal-upload",
+  priority: 1,
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
@@ -17,27 +19,27 @@ const SystemdJournalUploadServiceTypeDefinition = {
     ServerKeyFile: {
       ...string_attribute_writable,
       configurable: true
-      //   default: "/etc/ssl/private/journal-upload.pem"
+      // default: "/etc/ssl/private/journal-upload.pem"
     },
     ServerCertificateFile: {
       ...string_attribute_writable,
       configurable: true
-      //   default: "/etc/ssl/certs/journal-upload.pem"
+      // default: "/etc/ssl/certs/journal-upload.pem"
     },
     TrustedCertificateFile: {
       ...string_attribute_writable,
       configurable: true
-      //  default: "/etc/ssl/ca/trusted.pem"
+      // default: "/etc/ssl/ca/trusted.pem"
     },
     Compression: {
-      ...string_attribute_writable,
+      ...string_collection_attribute_writable,
       configurable: true
-      //   default: "zstd lz4 xz"
+      // default: "zstd lz4 xz"
     },
     ForceCompression: {
       ...boolean_attribute_writable,
       configurable: true
-      //   default: false
+      // default: false
     }
   },
   service: {
@@ -51,15 +53,12 @@ const SystemdJournalUploadServiceTypeDefinition = {
  * @property {string} ServerKeyFile
  */
 export class SystemdJournalUploadService extends Service {
+  static typeDefinition = SystemdJournalUploadServiceTypeDefinition;
   static {
     addType(this);
     addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
-  static get typeDefinition() {
-    return SystemdJournalUploadServiceTypeDefinition;
-  }
-
   get type() {
     return SystemdJournalUploadServiceTypeDefinition.name;
   }

package/src/services/systemd-journald.mjs

@@ -8,6 +8,7 @@ import { filterConfigurable, sectionLines } from "../utils.mjs";
 
 const SystemdJournalServiceTypeDefinition = {
   name: "systemd-journald",
+  priority: 1,
   extends: ServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
@@ -112,15 +113,12 @@ const SystemdJournalServiceTypeDefinition = {
 };
 
 export class SystemdJournaldService extends Service {
+  static typeDefinition = SystemdJournalServiceTypeDefinition;
   static {
     addType(this);
     addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
-  static get typeDefinition() {
-    return SystemdJournalServiceTypeDefinition;
-  }
-
   get type() {
     return SystemdJournalServiceTypeDefinition.name;
   }

package/src/services/systemd-resolved.mjs

@@ -23,48 +23,53 @@ import {
 
 const SystemdResolvedServiceTypeDefinition = {
   name: "systemd-resolved",
+  priority: 1,
   extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
   key: "name",
   attributes: {
-   /* Resolve: {
+    /* Resolve: {
       ...object_attribute,
       attributes: {*/
-        DNS: { ...string_attribute_writable, configurable: true },
-        FallbackDNS: { ...string_attribute_writable, configurable: true },
-        
-        domains: { externalName: "Domains", ...string_collection_attribute_writable, configurable: true },
+    DNS: { ...string_attribute_writable, configurable: true },
+    FallbackDNS: { ...string_attribute_writable, configurable: true },
 
-        MulticastDNS: { ...yesno_attribute_writable, configurable: true },
-        Cache: { ...boolean_attribute_writable, configurable: true },
-        CacheFromLocalhost: {
-          ...boolean_attribute_writable,
-          configurable: true
-        },
-        DNSStubListener: { ...boolean_attribute_writable, configurable: true },
-        DNSStubListenerExtra: {
-          ...string_attribute_writable,
-          configurable: true
-        },
-        ReadEtcHosts: { ...boolean_attribute_writable, configurable: true },
-        ResolveUnicastSingleLabel: {
-          ...boolean_attribute_writable,
-          configurable: true
-        },
-        StaleRetentionSec: {
-          ...duration_attribute_writable,
-          configurable: true
-        },
-        RefuseRecordTypes: { ...string_attribute_writable, configurable: true },
-        DNSSEC: {
-          ...yesno_attribute_writable,
-          default: false,
-          configurable: true
-        },
-        DNSOverTLS: { ...yesno_attribute_writable, configurable: true },
-        LLMNR: { ...yesno_attribute_writable, configurable: true }
-     /* }
+    domains: {
+      externalName: "Domains",
+      ...string_collection_attribute_writable,
+      configurable: true
+    },
+
+    MulticastDNS: { ...yesno_attribute_writable, configurable: true },
+    Cache: { ...boolean_attribute_writable, configurable: true },
+    CacheFromLocalhost: {
+      ...boolean_attribute_writable,
+      configurable: true
+    },
+    DNSStubListener: { ...boolean_attribute_writable, configurable: true },
+    DNSStubListenerExtra: {
+      ...string_attribute_writable,
+      configurable: true
+    },
+    ReadEtcHosts: { ...boolean_attribute_writable, configurable: true },
+    ResolveUnicastSingleLabel: {
+      ...boolean_attribute_writable,
+      configurable: true
+    },
+    StaleRetentionSec: {
+      ...duration_attribute_writable,
+      configurable: true
+    },
+    RefuseRecordTypes: { ...string_attribute_writable, configurable: true },
+    DNSSEC: {
+      ...yesno_attribute_writable,
+      default: false,
+      configurable: true
+    },
+    DNSOverTLS: { ...yesno_attribute_writable, configurable: true },
+    LLMNR: { ...yesno_attribute_writable, configurable: true }
+    /* }
     }*/
   },
   service: {
@@ -73,15 +78,12 @@ const SystemdResolvedServiceTypeDefinition = {
 };
 
 export class SystemdResolvedService extends ExtraSourceService {
+  static typeDefinition = SystemdResolvedServiceTypeDefinition;
   static {
     addType(this);
     addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
-  static get typeDefinition() {
-    return SystemdResolvedServiceTypeDefinition;
-  }
-
   get type() {
     return SystemdResolvedServiceTypeDefinition.name;
   }
@@ -89,20 +91,18 @@ export class SystemdResolvedService extends ExtraSourceService {
   systemdConfigs(name) {
     const options = (lower, upper, limit) => {
       return {
-        services: `in("dns",types) && priority>=${lower} && priority<=${upper}`,
+        services: `services[types[dns] && priority>=${lower} && priority<=${upper}]`,
         endpoints: e =>
           e.family == "IPv4" &&
           e.networkInterface &&
           e.networkInterface.kind !== "loopback",
-          //e.family !== "dns",
+        //e.family !== "dns",
         select: endpoint => endpoint.address,
         join: " ",
         limit
       };
     };
 
-   //console.log([...this.owner.expression('services[in("dns",types) && priority>=300 && priority<=399].owner.name')]);
-
     return {
       serviceName: this.systemdService,
       configFileName: `etc/systemd/resolved.conf.d/${name}.conf`,

package/src/services/systemd-timesyncd.mjs

@@ -14,6 +14,7 @@ import { filterConfigurable, sectionLines } from "../utils.mjs";
 
 const SystemdTimesyncdServiceTypeDefinition = {
   name: "systemd-timesyncd",
+  priority: 1,
   extends: ExtraSourceServiceTypeDefinition,
   specializationOf: ServiceTypeDefinition,
   owners: ServiceTypeDefinition.owners,
@@ -33,15 +34,12 @@ const SystemdTimesyncdServiceTypeDefinition = {
 };
 
 export class SystemdTimesyncdService extends ExtraSourceService {
+  static typeDefinition = SystemdTimesyncdServiceTypeDefinition;
   static {
     addType(this);
     addServiceType(this.typeDefinition.service, this.typeDefinition.name);
   }
 
-  static get typeDefinition() {
-    return SystemdTimesyncdServiceTypeDefinition;
-  }
-
   get type() {
     return SystemdTimesyncdServiceTypeDefinition.name;
   }
@@ -49,7 +47,8 @@ export class SystemdTimesyncdService extends ExtraSourceService {
   systemdConfigs(name) {
     const options = (lower, upper) => {
       return {
-        services: `in("ntp",types) && priority >= ${lower} && priority <= ${upper}`,
+        // TODO types[ntp]
+        services: `services[in("ntp",types) && priority >= ${lower} && priority <= ${upper}]`,
         endpoints: e =>
           e.networkInterface && e.networkInterface.kind !== "loopback",
         select: endpoint => endpoint.address,
@@ -61,14 +60,11 @@ export class SystemdTimesyncdService extends ExtraSourceService {
     return {
       serviceName: this.systemdService,
       configFileName: `etc/systemd/timesyncd.conf.d/${name}.conf`,
-      content: sectionLines(
-        "Time",
-        {
-          NTP: serviceEndpoints(this, options(300, 399)),
-          FallbackNTP: serviceEndpoints(this, options(100, 199)),
-          ...this.getProperties(filterConfigurable)
-        })
-      
+      content: sectionLines("Time", {
+        NTP: serviceEndpoints(this, options(300, 399)),
+        FallbackNTP: serviceEndpoints(this, options(100, 199)),
+        ...this.getProperties(filterConfigurable)
+      })
     };
   }
 }

package/src/services/tailscale.mjs

@@ -3,6 +3,7 @@ import { ServiceTypeDefinition, Service } from "../service.mjs";
 
 export class TailscaleService extends Service {
   static name = "tailscale";
+  static priority = 1;
   static extends = ServiceTypeDefinition;
   static specializationOf = ServiceTypeDefinition;
   static owners = ServiceTypeDefinition.owners;
@@ -18,7 +19,9 @@ export class TailscaleService extends Service {
     ]
   };
 
-  /*static {
+  static typeDefinition = this;
+
+  static {
     addType(TailscaleService);
-  }*/
+  }
 }

package/src/subnet.mjs

@@ -6,12 +6,18 @@ import {
   familyIP,
   matchPrefixIP
 } from "ip-utilties";
-import { string_attribute, name_attribute, number_attribute, addType } from "pacc";
+import {
+  string_attribute,
+  name_attribute,
+  number_attribute,
+  addType
+} from "pacc";
 import { networks_attribute } from "./network-support.mjs";
 import { Base } from "./base.mjs";
 
 const SubnetTypeDefinition = {
   name: "subnet",
+  priority: 1,
   owners: ["location", "owner", "network", "root"],
   constructWithIdentifierOnly: true,
   key: "address",
@@ -24,15 +30,13 @@ const SubnetTypeDefinition = {
 };
 
 export class Subnet extends Base {
-  networks = new Set();
+  static typeDefinition = SubnetTypeDefinition;
 
   static {
     addType(this);
   }
 
-  static get typeDefinition() {
-    return SubnetTypeDefinition;
-  }
+  networks = new Set();
 
   constructor(owner, address) {
     const { longPrefix, prefix, prefixLength, cidr } = normalizeCIDR(address);