pmcf 4.30.8 → 5.0.0

package/src/services/alpm.mjs

@@ -1,30 +1,34 @@
 import {
-  default_attribute_writable,
+  default_collection_attribute_writable,
   name_attribute_writable,
   string_attribute_writable,
   string_set_attribute_writable
 } from "pacc";
 import { addType, Service, Base } from "pmcf";
+import { owner_attribute } from "../common-attributes.mjs";
 
 class alpm_repository extends Base {
   static attributes = {
     name: name_attribute_writable,
-    base: string_attribute_writable,
-    architectures: string_set_attribute_writable
+    base: { ...string_attribute_writable, name: "base" },
+    architectures: { ...string_set_attribute_writable, name: "architectures" },
+    owner: owner_attribute
   };
 
   static {
     addType(this);
   }
+
+  architectures = new Set();
 }
 
 export class alpm extends Service {
-  static specializationOf = Service;
   static attributes = {
     repositories: {
-      ...default_attribute_writable,
+      ...default_collection_attribute_writable,
+      name: "repositories",
       type: alpm_repository,
-      collection: true
+      backpointer: owner_attribute
     }
   };
 

package/src/services/bind.mjs

@@ -1,8 +1,14 @@
 import { join, dirname } from "node:path";
 import { createHmac } from "node:crypto";
 import { FileContentProvider } from "npm-pkgbuild";
-import { isLinkLocal, reverseArpa, FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import {
+  isLinkLocal,
+  reverseArpa,
+  FAMILY_IPV4,
+  FAMILY_IPV6
+} from "ip-utilties";
+import {
+  default_collection_attribute_writable,
   default_attribute_writable,
   duration_attribute_writable,
   string_set_attribute_writable,
@@ -12,7 +18,6 @@ import {
   name_attribute_writable
 } from "pacc";
 import {
-  Service,
   Base,
   ExtraSourceService,
   serviceEndpoints,
@@ -28,6 +33,7 @@ import {
   sortZoneRecords
 } from "../dns-utils.mjs";
 import { addHook } from "../hooks.mjs";
+import { owner_attribute } from "../common-attributes.mjs";
 
 const bindNetworkAddressTypes = networkAddressType + "|bind_group";
 
@@ -35,44 +41,71 @@ class bind_group extends Base {
   static priority = 1;
   static attributes = {
     name: name_attribute_writable,
+    owner: owner_attribute,
     access: {
       type: bindNetworkAddressTypes,
+      name: "access",
       collection: true,
       writable: true
     },
-    excludeInterfaceKinds: string_set_attribute_writable,
+    excludeInterfaceKinds: {
+      ...string_set_attribute_writable,
+      name: "excludeInterfaceKinds"
+    },
     exclude: {
-      ...default_attribute_writable,
-      type: networkAddressType,
-      collection: true
+      ...default_collection_attribute_writable,
+      name: "exclude",
+      type: networkAddressType
     },
     entries: {
-      type: networkAddressType + "|location|owner",
-      collection: true,
-      writable: true
+      ...default_collection_attribute_writable,
+      type: networkAddressType + "|owner",
+      name: "entries"
+    },
+    sharedWith: {
+      ...default_attribute_writable,
+      name: "sharedWith",
+      type: bind_group
     },
-    sharedWith: { ...default_attribute_writable, type: bind_group },
     allowedUpdates: {
       type: bindNetworkAddressTypes,
+      name: "allowedUpdates",
       collection: true,
       writable: true
     },
-    notify: boolean_attribute_writable_false,
-    hasCatalog: boolean_attribute_writable_true,
-    hasReverse: boolean_attribute_writable_false,
-    hasSVRRecords: boolean_attribute_writable_false,
-    hasLinkLocalAdresses: boolean_attribute_writable_false,
-    hasLocationRecord: boolean_attribute_writable_true,
-
-    recordTTL: { ...duration_attribute_writable, default: "1W" },
+    notify: { ...boolean_attribute_writable_false, name: "notify" },
+    hasCatalog: { ...boolean_attribute_writable_true, name: "hasCatalog" },
+    hasReverse: { ...boolean_attribute_writable_false, name: "hasReverse" },
+    hasSVRRecords: {
+      ...boolean_attribute_writable_false,
+      name: "hasSVRRecords"
+    },
+    hasLinkLocalAdresses: {
+      ...boolean_attribute_writable_false,
+      name: "hasLinkLocalAdresses"
+    },
+    hasLocationRecord: {
+      ...boolean_attribute_writable_true,
+      name: "hasLocationRecord"
+    },
+    recordTTL: {
+      ...duration_attribute_writable,
+      name: "recordTTL",
+      default: "1W"
+    },
     serial: {
       ...integer_attribute_writable,
+      name: "serial",
       default: Math.ceil(Date.now() / 1000)
     },
-    refresh: { ...duration_attribute_writable, default: 36000 },
-    retry: { ...duration_attribute_writable, default: 72000 },
-    expire: { ...duration_attribute_writable, default: 600000 },
-    minimum: { ...duration_attribute_writable, default: 60000 }
+    refresh: {
+      ...duration_attribute_writable,
+      name: "refresh",
+      default: 36000
+    },
+    retry: { ...duration_attribute_writable, name: "retry", default: 72000 },
+    expire: { ...duration_attribute_writable, name: "expire", default: 600000 },
+    minimum: { ...duration_attribute_writable, name: "minimum", default: 60000 }
   };
 
   static {
@@ -100,12 +133,6 @@ class bind_group extends Base {
   }
 
   get defaultRecords() {
-    /*
-     const ss = this.location.services.filter(s=>s.types.has('dns') && s.priority>=300);
-    const ss = [
-      ...this.location.expression("services[types['dns'] && priority>=300]")
-    ].sort(sortAscendingByPriority)
-*/
     const nameService = this.owner; //ss[0];
 
     console.log(
@@ -167,7 +194,7 @@ class bind_group extends Base {
       );
 
       for (const domain of source.localDomains) {
-        const locationName = source.location.name;
+        const locationName = source.owner.name;
         const reverseZones = new Map();
 
         const config = {
@@ -270,7 +297,7 @@ class bind_group extends Base {
 
               const sm = new Map();
 
-              for (const service of host.services) {
+              for (const service of host.services.values()) {
                 for (const record of service.dnsRecordsForDomainName(
                   host.domainName,
                   this.hasSVRRecords
@@ -395,18 +422,17 @@ function addressesStatement(prefix, objects, generateEmpty = false) {
 }
 
 export class bind extends ExtraSourceService {
-  static specializationOf = Service;
   static attributes = {
     groups: {
-      ...default_attribute_writable,
+      ...default_collection_attribute_writable,
+      name: "groups",
       type: bind_group,
-      collection: true,
-      writable: true
+      backpointer: owner_attribute
     },
     primaries: {
-      ...default_attribute_writable,
-      type: networkAddressType,
-      collection: true
+      ...default_collection_attribute_writable,
+      name: "primaries",
+      type: networkAddressType
     }
   };
   static service = {
@@ -451,52 +477,24 @@ export class bind extends ExtraSourceService {
     addType(this);
   }
 
-  groups = {};
+  groups = new Map();
 
   materializeExtends() {
     super.materializeExtends();
 
-    //console.log("ME", this.fullName, this.extends);
     for (const service of this.walkDirections(["extends"])) {
-      console.log(
-        "BindService materializeExtends",
-        this.fullName,
-        service.fullName
-      );
-
-      for (const group of Object.values(service.groups)) {
-        const present = this.groups[group.name];
+      for (const group of service.groups.values()) {
+        const present = this.groups.get(group.name);
 
         if (present) {
-          //console.log("LINK", present.fullName, group.fullName);
-          present.extends.push(group);
+          present.extends.add(group);
         } else {
-          this.groups[group.name] = group.forOwner(this);
-
-          console.log(
-            group.fullName,
-            this.groups[group.name].entries.map(e => e.fullName)
-          );
+          this.groups.set(group.name, group.forOwner(this));
         }
-
-        /*
-      console.log(
-        eg.fullName,
-        eg.entries.map(e => e.fullName)
-      );*/
-        //console.log("EXTENDS", this.fullName, service.fullName, eg.fullName, eg.owner.fullName);
       }
     }
   }
 
-  typeNamed(type, name) {
-    if (type === bind_group.name) {
-      return this.groups[name];
-    }
-
-    return super.typeNamed(type, name);
-  }
-
   get serverType() {
     return this.primaries ? "secondary" : "primary";
   }
@@ -596,11 +594,11 @@ export class bind extends ExtraSourceService {
 
   async *generateOutfacingDefs(outputControl, sources) {
     for (const source of sources) {
-      for (const host of source.hosts) {
+      for (const host of source.hosts.values()) {
         this.outfacingZones(
           outputControl,
           host,
-          this.groups.internal,
+          this.groups.get("internal"),
           this.defaultRecords
         );
       }
@@ -631,7 +629,7 @@ export class bind extends ExtraSourceService {
 
       const zone = {
         id: domain,
-        file: `${host.location.name}/outfacing/${domain}.zone`,
+        file: `${host.owner.name}/outfacing/${domain}.zone`,
         records: new Set(records)
       };
       const config = {
@@ -644,7 +642,7 @@ export class bind extends ExtraSourceService {
       outputControl.configs.push(config);
 
       if (this.hasLocationRecord) {
-        zone.records.add(DNSRecord("location", "TXT", host.location.name));
+        zone.records.add(DNSRecord("location", "TXT", host.owner.name));
       }
       for (const na of host.networkAddresses(
         na => na.networkInterface.kind !== "loopback"
@@ -660,11 +658,7 @@ export class bind extends ExtraSourceService {
         }
       }
 
-      this.assignCatalog(
-        outputControl,
-        zone,
-        `outfacting.${host.location.name}`
-      );
+      this.assignCatalog(outputControl, zone, `outfacting.${host.owner.name}`);
     });
   }
 }

package/src/services/chrony.mjs

@@ -2,11 +2,10 @@ import { join } from "node:path";
 import { FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
 import { FileContentProvider } from "npm-pkgbuild";
 import { isLinkLocal } from "ip-utilties";
-import { Service, serviceEndpoints, addType, ExtraSourceService } from "pmcf";
+import { serviceEndpoints, addType, ExtraSourceService } from "pmcf";
 import { writeLines } from "../utils.mjs";
 
 export class chrony extends ExtraSourceService {
-  static specializationOf = Service;
   static service = {
     systemdService: "chronyd.service",
     extends: ["ntp"],
@@ -78,9 +77,9 @@ export class chrony extends ExtraSourceService {
       "ntsdumpdir /var/lib/chrony",
       "dumpdir /var/lib/chrony",
       "pidfile /run/chrony/chronyd.pid",
-      [...this.subnets].map(s => `allow ${s.address}`),
+      [...this.values()].map(s => `allow ${s.address}`),
       "cmdratelimit interval -4 burst 16",
-      [...this.subnets].map(s => `cmdallow ${s.address}`)
+      [...this.subnets.values()].map(s => `cmdallow ${s.address}`)
     ];
 
     await writeLines(join(dir, "etc"), "chrony.conf", lines);

package/src/services/headscale.mjs

@@ -2,7 +2,6 @@ import { FAMILY_IPV4 } from "ip-utilties";
 import { Service, addType } from "pmcf";
 
 export class headscale extends Service {
-  static specializationOf = Service;
   static service = {
     endpoints: [
       {

package/src/services/influxdb.mjs

@@ -10,11 +10,11 @@ import {
 } from "../utils.mjs";
 
 export class influxdb extends Service {
-  static specializationOf = Service;
   static attributes = {
     metricsDisabled: {
-      externalName: "metrics-disabled",
       ...boolean_attribute_writable_true,
+      name: "metricsDisabled",
+      externalName: "metrics-disabled",
       configurable: true
     }
   };

package/src/services/kea.mjs

@@ -1,6 +1,11 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
-import { reverseArpa, isLinkLocal, FAMILY_IPV4, FAMILY_IPV6 } from "ip-utilties";
+import {
+  reverseArpa,
+  isLinkLocal,
+  FAMILY_IPV4,
+  FAMILY_IPV6
+} from "ip-utilties";
 import {
   string_attribute_writable,
   number_attribute_writable,
@@ -19,32 +24,36 @@ import { writeLines } from "../utils.mjs";
 const keaVersion = "3.0.1";
 
 export class kea extends Service {
-  static specializationOf = Service;
   static attributes = {
     "ddns-send-updates": {
       ...boolean_attribute_writable_true,
+      name: "ddns-send-updates",
       configurable: true
     },
     "renew-timer": {
       ...number_attribute_writable,
+      name: "renew-timer",
       configurable: true,
       default: 900
     },
     "rebind-timer": {
       ...number_attribute_writable,
+      name: "rebind-timer",
       configurable: true,
       default: 1800
     },
     "valid-lifetime": {
       ...number_attribute_writable,
+      name: "valid-lifetime",
       mandatory: true,
       configurable: true,
       default: 86400
     },
     "ddns-conflict-resolution-mode": {
       ...string_attribute_writable,
+      name: "ddns-conflict-resolution-mode",
       configurable: true
-      //values: ["check-exists-with-dhcid","no-check-with-dhcid"]
+      //values: new Set(["check-exists-with-dhcid","no-check-with-dhcid"])
     }
   };
   static service = {
@@ -287,7 +296,8 @@ export class kea extends Service {
           name,
           "dns-servers": dnsServerEndpoints
             .filter(
-              endpoint => endpoint.family === FAMILY_IPV4 && endpoint.type === "dns"
+              endpoint =>
+                endpoint.family === FAMILY_IPV4 && endpoint.type === "dns"
             )
             .map(endpoint => {
               return { "ip-address": endpoint.address };
@@ -298,7 +308,7 @@ export class kea extends Service {
     const ddnsEndpoint = this.endpoint("kea-ddns");
 
     const subnetPrefixes = new Set(
-      [...this.subnets]
+      [...this.subnets.values()]
         .filter(s => s != SUBNET_LOCALHOST_IPV4 && s != SUBNET_LOCALHOST_IPV6)
         .map(s => s.prefix)
     );
@@ -379,7 +389,7 @@ export class kea extends Service {
         endpoint => `${endpoint.networkInterface.name}/${endpoint.address}`
       );
 
-    const subnets = [...this.subnets].filter(
+    const subnets = [...this.subnets.values()].filter(
       s => s !== SUBNET_LOCALHOST_IPV4 && s !== SUBNET_LOCALHOST_IPV6
     );
 

package/src/services/mosquitto.mjs

@@ -2,23 +2,26 @@ import { port_attribute, string_attribute_writable } from "pacc";
 import { Service, addType } from "pmcf";
 
 export class mosquitto extends Service {
-  static specializationOf = Service;
   static attributes = {
     listener: {
       ...port_attribute,
+      name: "listener",
       writable: true,
       configurable: true
     },
     persistence_location: {
       ...string_attribute_writable,
+      name: "persistence_location",
       configurable: true
     },
     password_file: {
       ...string_attribute_writable,
+      name: "password_file",
       configurable: true
     },
     acl_file: {
       ...string_attribute_writable,
+      name: "acl_file",
       configurable: true
     }
   };

package/src/services/openldap.mjs

@@ -2,10 +2,9 @@ import { string_attribute_writable } from "pacc";
 import { Service, addType } from "pmcf";
 
 export class openldap extends Service {
-  static specializationOf = Service;
   static attributes = {
-    base: string_attribute_writable,
-    uri: string_attribute_writable
+    base: { ...string_attribute_writable, name: "base" },
+    uri: { ...string_attribute_writable, name: "uri" }
   };
   static service = {
     systemdService: "slapd.service",
@@ -41,9 +40,9 @@ export class openldap extends Service {
 
     const packageData = this.packageData;
 
-    console.log(
+    /*console.log(
       [...this.walkDirections(["this", "extends"])].map(n => n.fullName)
-    );
+    );*/
 
     packageData.sources = await Array.fromAsync(
       this.templateContent(

package/src/services/postfix.mjs

@@ -1,8 +1,6 @@
 import { Service, addType } from "pmcf";
 
 export class postfix extends Service {
-  static specializationOf = Service;
-  static attributes = {};
   static service = {
     systemdService: "postfix.service",
     extends: ["smtp", "lmtp", "submission"],

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

@@ -14,50 +14,60 @@ import { filterConfigurable, sectionLines } from "../utils.mjs";
  */
 export class SystemdJournalRemoteService extends Service {
   static name = "systemd-journal-remote";
-  static specializationOf = Service;
+
   static attributes = {
     Seal: {
       ...boolean_attribute_writable,
+      name: "Seal",
       configurable: true
     },
     SplitMode: {
       ...string_attribute_writable,
-      values: [false, "host"],
+      name: "SplitMode",
+      values: new Set([false, "host"]),
       configurable: true
     },
     ServerKeyFile: {
       ...string_attribute_writable,
+      name: "ServerKeyFile",
       configurable: true
       //   default: "/etc/ssl/private/journal-upload.pem"
     },
     ServerCertificateFile: {
       ...string_attribute_writable,
+      name: "ServerCertificateFile",
       configurable: true
       //   default: "/etc/ssl/certs/journal-upload.pem"
     },
     TrustedCertificateFile: {
       ...string_attribute_writable,
+      name: "TrustedCertificateFile",
       configurable: true
       //  default: "/etc/ssl/ca/trusted.pem"
     },
     MaxUse: {
       ...string_attribute_writable,
+      name: "MaxUse",
       configurable: true
     },
     KeepFree: {
       ...string_attribute_writable,
+      name: "KeepFree",
       configurable: true
     },
     MaxFileSize: {
       ...string_attribute_writable,
+      name: "MaxFileSize",
       configurable: true
     },
     MaxFiles: {
       ...integer_attribute_writable,
+      name: "MaxFiles",
       configurable: true
     },
     Compression: {
       ...string_collection_attribute_writable,
+      name: "Compression",
       configurable: true
       //   default: "zstd lz4 xz"
     }

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

@@ -13,31 +13,35 @@ import { filterConfigurable, sectionLines } from "../utils.mjs";
  */
 export class SystemdJournalUploadService extends Service {
   static name = "systemd-journal-upload";
-  static specializationOf = Service;
   static attributes = {
-    URL: { ...string_attribute_writable, configurable: true },
+    URL: { ...string_attribute_writable, name: "URL", configurable: true },
     ServerKeyFile: {
       ...string_attribute_writable,
+      name: "ServerKeyFile",
       configurable: true
       // default: "/etc/ssl/private/journal-upload.pem"
     },
     ServerCertificateFile: {
       ...string_attribute_writable,
+      name: "ServerCertificateFile",
       configurable: true
       // default: "/etc/ssl/certs/journal-upload.pem"
     },
     TrustedCertificateFile: {
       ...string_attribute_writable,
+      name: "TrustedCertificateFile",
       configurable: true
       // default: "/etc/ssl/ca/trusted.pem"
     },
     Compression: {
       ...string_collection_attribute_writable,
+      name: "Compression",
       configurable: true
       // default: "zstd lz4 xz"
     },
     ForceCompression: {
       ...boolean_attribute_writable,
+      name: "ForceCompression",
       configurable: true
       // default: false
     }
@@ -59,10 +63,12 @@ export class SystemdJournalUploadService extends Service {
    * @returns {Object}
    */
   systemdConfigs(name) {
+    /*
     console.log(this.fullName, this.owner.fullName);
     console.log(this.property("domainName"), this.name);
     console.log(this.property("certs_private_dir"));
     console.log("PROPS", this.expand(this.getAttributes(filterConfigurable)));
+    */
     return {
       serviceName: this.systemdService,
       configFileName: `etc/systemd/journal-upload.conf.d/${name}.conf`,