pmcf 4.25.14 → 4.25.16

package/package.json

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

package/src/cluster.mjs

@@ -15,8 +15,8 @@ import { writeLines } from "./utils.mjs";
 export class Cluster extends Host {
   static name = "cluster";
   static priority = 1.5;
-  static owners = [Owner.typeDefinition, "network", "location", "root"];
-  static extends = Host.typeDefinition;
+  static owners = [Owner, "network", "location", "root"];
+  static extends = Host;
   static key = "name";
   static attributes = {
     routerId: { ...number_attribute_writable, default: 100 },

package/src/extra-source-service.mjs

@@ -1,23 +1,22 @@
 import { default_attribute_writable, addType } from "pacc";
-import { Service, ServiceTypeDefinition } from "./service.mjs";
+import { Service } from "./service.mjs";
 import { networkAddressType } from "pmcf";
 
-export const ExtraSourceServiceTypeDefinition = {
-  name: "extra-source-service",
-  extends: ServiceTypeDefinition,
-  specializationOf: ServiceTypeDefinition,
-  owners: ServiceTypeDefinition.owners,
-  attributes: {
+
+export class ExtraSourceService extends Service {
+  static name = "extra-source-service";
+  static extends = Service;
+  static specializationOf = Service;
+  static owners = Service.owners;
+  static attributes = {
     source: {
       ...default_attribute_writable,
       type: networkAddressType,
       collection: true
     }
-  }
-};
+  };
 
-export class ExtraSourceService extends Service {
-  static typeDefinition = ExtraSourceServiceTypeDefinition;
+  static typeDefinition = this;
 
   static {
     addType(this);
@@ -26,7 +25,7 @@ export class ExtraSourceService extends Service {
   source = [];
 
   get type() {
-    return ExtraSourceServiceTypeDefinition.name;
+    return this.constructor.name;
   }
 
   get services() {

package/src/host.mjs

@@ -10,7 +10,8 @@ import {
   boolean_attribute_false,
   addType
 } from "pacc";
-import { ServiceOwner, Base, addresses } from "pmcf";
+import {  Base, NetworkInterface, addresses } from "pmcf";
+import { ServiceOwner } from "./service-owner.mjs";
 import { networkAddressAttributes } from "./network-support.mjs";
 import { addHook } from "./hooks.mjs";
 import {
@@ -22,13 +23,12 @@ import {
 } from "./utils.mjs";
 import { loadHooks } from "./hooks.mjs";
 import { generateKnownHosts } from "./host-utils.mjs";
-import { NetworkInterfaceTypeDefinition } from "./network-interfaces/network-interface.mjs";
 
 export class Host extends ServiceOwner {
   static name = "host";
   static priority = 1.9;
   static owners = ["owner", "network", "root"];
-  static extends = Base.typeDefinition;
+  static extends = Base;
   static key = "name";
   static attributes = {
     ...networkAddressAttributes,
@@ -368,7 +368,7 @@ export class Host extends ServiceOwner {
   }
 
   typeNamed(typeName, name) {
-    if (typeName === NetworkInterfaceTypeDefinition.name) {
+    if (typeName === NetworkInterface.name) {
       const ni = this._networkInterfaces.get(name);
       if (ni) {
         return ni;

package/src/location.mjs

@@ -6,8 +6,8 @@ import { loadHooks } from "./hooks.mjs";
 export class Location extends Owner {
   static name = "location";
   static priority = 2;
-  static owners = [Owner.typeDefinition, "location", "root"];
-  static extends = Owner.typeDefinition;
+  static owners = [Owner, "location", "root"];
+  static extends = Owner;
   static key = "name";
   static attributes = {};
 

package/src/network-interfaces/ethernet.mjs

@@ -4,23 +4,21 @@ import {
   NetworkInterfaceTypeDefinition
 } from "./network-interface.mjs";
 
-export const EthernetNetworkInterfaceTypeDefinition = {
-  name: "ethernet",
-  extends: NetworkInterfaceTypeDefinition,
-  specializationOf: NetworkInterfaceTypeDefinition,
-  owners: NetworkInterfaceTypeDefinition.owners,
-  key: "name",
-  attributes: {
+export class EthernetNetworkInterface extends NetworkInterface {
+  static   name= "ethernet";
+  static extends= NetworkInterfaceTypeDefinition;
+  static specializationOf= NetworkInterfaceTypeDefinition;
+  static owners= NetworkInterfaceTypeDefinition.owners;
+  static key= "name";
+  static attributes= {
     arpbridge: {
       ...default_attribute_writable,
       type: "network_interface",
       collection: true
     }
-  }
-};
+  };
 
-export class EthernetNetworkInterface extends NetworkInterface {
-  static typeDefinition = EthernetNetworkInterfaceTypeDefinition;
+  static typeDefinition = this;
 
   static {
     addType(this);
@@ -33,6 +31,6 @@ export class EthernetNetworkInterface extends NetworkInterface {
   arpbridge;
 
   get kind() {
-    return EthernetNetworkInterfaceTypeDefinition.name;
+    return this.constructor.name;
   }
 }

package/src/network-interfaces/network-interface.mjs

@@ -226,8 +226,8 @@ export class NetworkInterface extends SkeletonNetworkInterface {
     const routeSectionExtra = this.destination
       ? { Destination: this.destination }
       : this.gateway
-      ? { Gateway: this.gatewayAddress }
-      : {};
+        ? { Gateway: this.gatewayAddress }
+        : {};
 
     const networkSectionExtra = this.arpbridge
       ? {

package/src/network-interfaces/wlan.mjs

@@ -8,15 +8,14 @@ import {
 import { writeLines, sectionLines } from "../utils.mjs";
 import { NetworkInterfaceTypeDefinition } from "./network-interface.mjs";
 import {
-  EthernetNetworkInterface,
-  EthernetNetworkInterfaceTypeDefinition
+  EthernetNetworkInterface
 } from "./ethernet.mjs";
 
 export class WLANNetworkInterface extends EthernetNetworkInterface {
   static name = "wlan";
-  static extends = EthernetNetworkInterfaceTypeDefinition;
+  static extends = EthernetNetworkInterface;
   static specializationOf = NetworkInterfaceTypeDefinition;
-  static owners = EthernetNetworkInterfaceTypeDefinition.owners;
+  static owners = EthernetNetworkInterface.owners;
   static key = "name";
   static attributes = {
     ssid: string_attribute_writable,

package/src/network.mjs

@@ -7,7 +7,7 @@ export class Network extends Owner {
   static name = "network";
   static priority = 2;
   static owners = ["location", "owner", "root"];
-  static extends = Owner.typeDefinition;
+  static extends = Owner;
   static key = "name";
   static attributes = {
     ...networkAttributes,

package/src/owner.mjs

@@ -19,7 +19,7 @@ export class Owner extends Base {
   static name = "owner";
   static priority = 2;
   static owners = ["location", "owner", "root"];
-  static extends = Base.typeDefinition;
+  static extends = Base;
   static key = "name";
   static attributes = {
     networks: networks_attribute,
@@ -31,7 +31,7 @@ export class Owner extends Base {
     },
     subnets: {
       ...default_attribute_writable,
-      type: Subnet.typeDefinition,
+      type: Subnet,
       collection: true
     },
     country: string_attribute_writable,

package/src/service.mjs

@@ -48,15 +48,15 @@ export const EndpointTypeDefinition = {
   attributes: endpointAttributes
 };
 
-export const ServiceTypeDefinition = {
-  name: "service",
-  priority: 1.1,
-  owners: [Host.typeDefinition, "cluster", "network_interface"],
-  extends: Base,
-  specializations: {},
-  factoryFor(owner, value) {
+export class Service extends Base {
+  static name = "service";
+  static priority = 1.1;
+  static owners = [Host, "cluster", "network_interface"];
+  static extends = Base;
+  static specializations = {};
+  static factoryFor(owner, value) {
     const type = value.type ?? value.name;
-    const t = ServiceTypeDefinition.specializations[type];
+    const t = this.specializations[type];
 
     if (t) {
       delete value.type;
@@ -64,19 +64,17 @@ export const ServiceTypeDefinition = {
     }
 
     return Service;
-  },
-  key: "name",
-  attributes: {
+  }
+  static key = "name";
+  static attributes = {
     ...networkAddressAttributes,
     ...endpointAttributes,
     alias: string_attribute_writable,
     weight: { ...number_attribute_writable /*default: 1*/ },
     systemdService: string_attribute_writable
-  }
-};
+  };
 
-export class Service extends Base {
-  static typeDefinition = ServiceTypeDefinition;
+  static typeDefinition = this;
 
   static {
     addType(this);
@@ -221,7 +219,10 @@ export class Service extends Base {
   }
 
   get port() {
-    return this.attribute("_port") ?? serviceTypeEndpoints(ServiceTypes[this.type])[0]?.port;
+    return (
+      this.attribute("_port") ??
+      serviceTypeEndpoints(ServiceTypes[this.type])[0]?.port
+    );
   }
 
   set weight(value) {

package/src/services/alpm.mjs

@@ -6,11 +6,11 @@ import {
   string_set_attribute_writable
 } from "pacc";
 import { addServiceType, Base } from "pmcf";
-import { ServiceTypeDefinition, Service } from "../service.mjs";
+import { Service } from "../service.mjs";
 
 class ALPMRepository extends Base {
   static name = "alpm_repository";
-  static extends = Base.typeDefinition;
+  static extends = Base;
   static key = "name";
   static attributes = {
     name: name_attribute_writable,
@@ -27,9 +27,9 @@ class ALPMRepository extends Base {
 export class ALPMService extends Service {
   static name = "alpm";
   static priority = 1;
-  static extends = ServiceTypeDefinition;
-  static specializationOf = ServiceTypeDefinition;
-  static owners = ServiceTypeDefinition.owners;
+  static extends = Service;
+  static specializationOf = Service;
+  static owners = Service.owners;
   static attributes = {
     repositories: {
       ...default_attribute_writable,

package/src/services/bind.mjs

@@ -27,8 +27,7 @@ import {
   dnsRecordTypeForAddressFamily,
   sortZoneRecords
 } from "../dns-utils.mjs";
-import { ServiceTypeDefinition } from "../service.mjs";
-import { ExtraSourceServiceTypeDefinition } from "../extra-source-service.mjs";
+import { Service } from "../service.mjs";
 import { addHook } from "../hooks.mjs";
 
 const bindNetworkAddressTypes = networkAddressType + "|bind_group";
@@ -400,9 +399,9 @@ function addressesStatement(prefix, objects, generateEmpty = false) {
 
 export class BindService extends ExtraSourceService {
   static name = "bind";
-  static extends = ExtraSourceServiceTypeDefinition;
-  static specializationOf = ServiceTypeDefinition;
-  static owners = ServiceTypeDefinition.owners;
+  static extends = ExtraSourceService;
+  static specializationOf = Service;
+  static owners = Service.owners;
   static key = "name";
   static attributes = {
     groups: {

package/src/services/chrony.mjs

@@ -2,20 +2,16 @@ import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { isLinkLocal } from "ip-utilties";
 import { addType } from "pacc";
-import { addServiceType } from "pmcf";
-import { ServiceTypeDefinition, serviceEndpoints } from "../service.mjs";
-import {
-  ExtraSourceService,
-  ExtraSourceServiceTypeDefinition
-} from "../extra-source-service.mjs";
+import { addServiceType, ExtraSourceService } from "pmcf";
+import { Service, serviceEndpoints } from "../service.mjs";
 import { writeLines } from "../utils.mjs";
 
 export class ChronyService extends ExtraSourceService {
   static name = "chrony";
   static priority = 1;
-  static extends = ExtraSourceServiceTypeDefinition;
-  static specializationOf = ServiceTypeDefinition;
-  static owners = ServiceTypeDefinition.owners;
+  static extends = ExtraSourceService;
+  static specializationOf = Service;
+  static owners = Service.owners;
   static key = "name";
   static service = {
     systemdService: "chronyd.service",

package/src/services/headscale.mjs

@@ -1,13 +1,13 @@
 import { addType } from "pacc";
 import { addServiceType } from "pmcf";
-import { ServiceTypeDefinition, Service } from "../service.mjs";
+import { Service } from "../service.mjs";
 
 export class HeadscaleService extends Service {
   static name = "headscale";
   static priority = 1;
-  static extends = ServiceTypeDefinition;
-  static specializationOf = ServiceTypeDefinition;
-  static owners = ServiceTypeDefinition.owners;
+  static extends = Service;
+  static specializationOf = Service;
+  static owners = Service.owners;
   static key = "name";
   static service = {
     endpoints: [

package/src/services/influxdb.mjs

@@ -7,14 +7,14 @@ import {
   setionLinesFromPropertyIterator,
   filterConfigurable
 } from "../utils.mjs";
-import { Service, ServiceTypeDefinition } from "../service.mjs";
+import { Service } from "../service.mjs";
 
 export class InfluxdbService extends Service {
   static name = "influxdb";
   static priority = 1;
-  static extends = ServiceTypeDefinition;
-  static specializationOf = ServiceTypeDefinition;
-  static owners = ServiceTypeDefinition.owners;
+  static extends = Service;
+  static specializationOf = Service;
+  static owners = Service.owners;
   static key = "name";
   static attributes = {
     metricsDisabled: {

package/src/services/kea.mjs

@@ -11,7 +11,6 @@ import {
   addServiceType,
   Service,
   sortDescendingByPriority,
-  ServiceTypeDefinition,
   serviceEndpoints,
   SUBNET_LOCALHOST_IPV4,
   SUBNET_LOCALHOST_IPV6
@@ -23,9 +22,9 @@ const keaVersion = "3.0.1";
 export class KeaService extends Service {
   static name = "kea";
   static priority = 1;
-  static extends = ServiceTypeDefinition;
-  static specializationOf = ServiceTypeDefinition;
-  static owners = ServiceTypeDefinition.owners;
+  static extends = Service;
+  static specializationOf = Service;
+  static owners = Service.owners;
   static key = "name";
   static attributes = {
     "ddns-send-updates": {
@@ -266,7 +265,7 @@ export class KeaService extends Service {
       };
 
       for (const [key] of Object.entries(
-        KeaServiceTypeDefinition.attributes
+        KeaService.attributes
       ).filter(
         ([key, attribute]) => attribute.configurable && this[key] !== undefined
       )) {

package/src/services/mosquitto.mjs

@@ -1,13 +1,13 @@
 import { port_attribute, string_attribute_writable, addType } from "pacc";
 import { addServiceType } from "pmcf";
-import { Service, ServiceTypeDefinition } from "../service.mjs";
+import { Service } from "../service.mjs";
 
 export class MosquittoService extends Service {
   static name = "mosquitto";
   static priority = 1;
-  static extends = ServiceTypeDefinition;
-  static specializationOf = ServiceTypeDefinition;
-  static owners = ServiceTypeDefinition.owners;
+  static extends = Service;
+  static specializationOf = Service;
+  static owners = Service.owners;
   static key = "name";
   static attributes = {
     listener: {

package/src/services/openldap.mjs

@@ -1,13 +1,13 @@
 import { string_attribute_writable, addType } from "pacc";
 import { addServiceType } from "pmcf";
-import { ServiceTypeDefinition, Service } from "../service.mjs";
+import { Service } from "../service.mjs";
 
 export class OpenLDAPService extends Service {
   static name = "openldap";
   static priority = 1;
-  static extends = ServiceTypeDefinition;
-  static specializationOf = ServiceTypeDefinition;
-  static owners = ServiceTypeDefinition.owners;
+  static extends = Service;
+  static specializationOf = Service;
+  static owners = Service.owners;
   static key = "name";
   static attributes = {
     base: string_attribute_writable,

package/src/services/postfix.mjs

@@ -1,13 +1,13 @@
 import { addType } from "pacc";
 import { addServiceType } from "pmcf";
-import { ServiceTypeDefinition, Service } from "../service.mjs";
+import { Service } from "../service.mjs";
 
 export class PostfixService extends Service {
   static name = "postfix";
   static priority = 1;
-  static extends = ServiceTypeDefinition;
-  static specializationOf = ServiceTypeDefinition;
-  static owners = ServiceTypeDefinition.owners;
+  static extends = Service;
+  static specializationOf = Service;
+  static owners = Service.owners;
   static key = "name";
   static attributes = {};
   static service = {

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

@@ -5,7 +5,7 @@ import {
   boolean_attribute_writable,
   integer_attribute_writable
 } from "pacc";
-import { Service, ServiceTypeDefinition, addServiceType } from "pmcf";
+import { Service, addServiceType } from "pmcf";
 import { filterConfigurable, sectionLines } from "../utils.mjs";
 
 /**
@@ -15,9 +15,9 @@ import { filterConfigurable, sectionLines } from "../utils.mjs";
 export class SystemdJournalRemoteService extends Service {
   static name = "systemd-journal-remote";
   static priority = 1;
-  static extends = ServiceTypeDefinition;
-  static specializationOf = ServiceTypeDefinition;
-  static owners = ServiceTypeDefinition.owners;
+  static extends = Service;
+  static specializationOf = Service;
+  static owners = Service.owners;
   static key = "name";
   static attributes = {
     Seal: {

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

@@ -4,7 +4,7 @@ import {
   boolean_attribute_writable,
   addType
 } from "pacc";
-import { Service, ServiceTypeDefinition, addServiceType } from "pmcf";
+import { Service, addServiceType } from "pmcf";
 import { filterConfigurable, sectionLines } from "../utils.mjs";
 
 /**
@@ -15,9 +15,9 @@ import { filterConfigurable, sectionLines } from "../utils.mjs";
 export class SystemdJournalUploadService extends Service {
   static name = "systemd-journal-upload";
   static priority = 1;
-  static extends = ServiceTypeDefinition;
-  static specializationOf = ServiceTypeDefinition;
-  static owners = ServiceTypeDefinition.owners;
+  static extends = Service;
+  static specializationOf = Service;
+  static owners = Service.owners;
   static key = "name";
   static attributes = {
     URL: { ...string_attribute_writable, configurable: true },

package/src/services/systemd-journald.mjs

@@ -3,15 +3,15 @@ import {
   string_attribute_writable,
   duration_attribute_writable
 } from "pacc";
-import { Service, ServiceTypeDefinition, addServiceType } from "pmcf";
+import { Service, addServiceType } from "pmcf";
 import { filterConfigurable, sectionLines } from "../utils.mjs";
 
 export class SystemdJournaldService extends Service {
   static name = "systemd-journald";
   static priority = 1;
-  static extends = ServiceTypeDefinition;
-  static specializationOf = ServiceTypeDefinition;
-  static owners = ServiceTypeDefinition.owners;
+  static extends = Service;
+  static specializationOf = Service;
+  static owners = Service.owners;
   static key = "name";
   static attributes = {
     Storage: {

package/src/services/systemd-resolved.mjs

@@ -1,6 +1,5 @@
 import {
   addType,
-  object_attribute,
   string_collection_attribute_writable,
   duration_attribute_writable,
   string_attribute_writable,
@@ -9,10 +8,9 @@ import {
 } from "pacc";
 import {
   ExtraSourceService,
-  ExtraSourceServiceTypeDefinition,
-  ServiceTypeDefinition,
   serviceEndpoints,
-  addServiceType
+  addServiceType,
+  Service
 } from "pmcf";
 import {
   filterConfigurable,
@@ -24,9 +22,9 @@ import {
 export class SystemdResolvedService extends ExtraSourceService {
   static name = "systemd-resolved";
   static priority = 1;
-  static extends = ExtraSourceServiceTypeDefinition;
-  static specializationOf = ServiceTypeDefinition;
-  static owners = ServiceTypeDefinition.owners;
+  static extends = ExtraSourceService;
+  static specializationOf = Service;
+  static owners = Service.owners;
   static key = "name";
   static attributes = {
     /* Resolve: {

package/src/services/systemd-timesyncd.mjs

@@ -5,8 +5,7 @@ import {
 } from "pacc";
 import {
   ExtraSourceService,
-  ExtraSourceServiceTypeDefinition,
-  ServiceTypeDefinition,
+  Service,
   serviceEndpoints,
   addServiceType
 } from "pmcf";
@@ -15,9 +14,9 @@ import { filterConfigurable, sectionLines } from "../utils.mjs";
 export class SystemdTimesyncdService extends ExtraSourceService {
   static name = "systemd-timesyncd";
   static priority = 1;
-  static extends = ExtraSourceServiceTypeDefinition;
-  static specializationOf = ServiceTypeDefinition;
-  static owners = ServiceTypeDefinition.owners;
+  static extends = ExtraSourceService;
+  static specializationOf = Service;
+  static owners = Service.owners;
 
   static attributes = {
     NTP: { ...string_attribute_writable, configurable: true },

package/src/services/tailscale.mjs

@@ -1,12 +1,12 @@
 import { addType } from "pacc";
-import { ServiceTypeDefinition, Service } from "../service.mjs";
+import { 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;
+  static extends = Service;
+  static specializationOf = Service;
+  static owners = Service.owners;
   static key = "name";
   static service = {
     endpoints: [