pmcf 3.10.0 → 3.10.2

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "3.10.0",
+  "version": "3.10.2",
   "publishConfig": {
     "access": "public"
   },
@@ -53,7 +53,7 @@
   "dependencies": {
     "ip-utilties": "^1.4.9",
     "npm-pkgbuild": "^18.2.30",
-    "pacc": "^4.16.0",
+    "pacc": "^4.16.1",
     "package-directory": "^8.1.0"
   },
   "devDependencies": {

package/src/base.mjs

@@ -17,7 +17,7 @@ import { asArray } from "./utils.mjs";
 const BaseTypeDefinition = {
   name: "base",
   owners: [],
-  properties: {
+  attributes: {
     owner: { type: "base", collection: false, writable: false },
     type: string_attribute,
     name: name_attribute_writable,
@@ -228,7 +228,7 @@ export class Base {
       this._properties = data.properties;
     }
 
-    for (const [name, attribute] of Object.entries(type.properties)) {
+    for (const [name, attribute] of Object.entries(type.attributes)) {
       if (attribute.writable) {
         const value = this.expand(data[name]);
 
@@ -616,7 +616,7 @@ export function extractFrom(
   const json = {};
 
   do {
-    for (const [name, def] of Object.entries(typeDefinition.properties)) {
+    for (const [name, def] of Object.entries(typeDefinition.attributes)) {
       let value = object[name];
 
       switch (typeof value) {

package/src/cluster.mjs

@@ -12,7 +12,7 @@ const ClusterTypeDefinition = {
   owners: [Owner.typeDefinition, "network", "location", "root"],
   priority: 0.7,
   extends: Host.typeDefinition,
-  properties: {
+  attributes: {
     routerId: { ...number_attribute_writable },
     masters: { type: "network_interface", collection: true, writable: true },
     backups: { type: "network_interface", collection: true, writable: true },

package/src/extra-source-service.mjs

@@ -7,7 +7,7 @@ export const ExtraSourceServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
-  properties: {
+  attributes: {
     source: { type: networkAddressType, collection: true, writable: true }
   }
 };

package/src/filter.mjs

@@ -55,7 +55,7 @@ export function* objectFilter(type, objects, filter) {
         return false;
       };
       for (let t = type; t; t = t.extends) {
-        for (const property of Object.values(t.properties)) {
+        for (const property of Object.values(t.attributes)) {
           switch (property.type[0]) {
             case "boolean":
               if (

package/src/host.mjs

@@ -9,7 +9,7 @@ import {
   boolean_attribute_false
 } from "pacc";
 import { ServiceOwner, Base, addresses } from "pmcf";
-import { networkAddressProperties } from "./network-support.mjs";
+import { networkAddressAttributes } from "./network-support.mjs";
 import { addHook } from "./hooks.mjs";
 import {
   domainFromDominName,
@@ -29,8 +29,8 @@ const HostTypeDefinition = {
   priority: 0.5,
   owners: ["owner", "network", "root"],
   extends: Base.typeDefinition,
-  properties: {
-    ...networkAddressProperties,
+  attributes: {
+    ...networkAddressAttributes,
     networkInterfaces: {
       type: "network_interface",
       collection: true,
@@ -107,11 +107,6 @@ export class Host extends ServiceOwner {
     return HostTypeDefinition;
   }
 
-  constructor(owner, data) {
-    super(owner, data);
-    owner.addObject(this);
-  }
-
   read(data, type) {
     super.read(data, type);
 

package/src/location.mjs

@@ -9,7 +9,7 @@ const LocationTypeDefinition = {
   owners: [Owner.typeDefinition, "location", "root"],
   priority: 1.0,
   extends: Owner.typeDefinition,
-  properties: {
+  attributes: {
     locales: { ...string_collection_attribute, writable: true }
   }
 };

package/src/network-interfaces/ethernet.mjs

@@ -10,7 +10,7 @@ export const EthernetNetworkInterfaceTypeDefinition = {
   owners: NetworkInterfaceTypeDefinition.owners,
   extends: NetworkInterfaceTypeDefinition,
   priority: 0.1,
-  properties: {
+  attributes: {
     arpbridge: { type: "network_interface", collection: true, writable: true }
   }
 };

package/src/network-interfaces/loopback.mjs

@@ -9,7 +9,7 @@ const LoopbackNetworkInterfaceTypeDefinition = {
   owners: NetworkInterfaceTypeDefinition.owners,
   extends: NetworkInterfaceTypeDefinition,
   priority: 0.1,
-  properties: {}
+  attributes: {}
 };
 
 const _localAddresses = new Map([

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

@@ -3,8 +3,8 @@ import { hasWellKnownSubnet, normalizeIP } from "ip-utilties";
 import { string_attribute_writable, hostname_attribute } from "pacc";
 import { Base, cidrAddresses } from "pmcf";
 import {
-  networkProperties,
-  networkAddressProperties
+  networkAttributes,
+  networkAddressAttributes
 } from "../network-support.mjs";
 import { asArray, writeLines, sectionLines } from "../utils.mjs";
 import { addType } from "../types.mjs";
@@ -35,9 +35,9 @@ export const NetworkInterfaceTypeDefinition = {
 
     return NetworkInterface;
   },
-  properties: {
-    ...networkProperties,
-    ...networkAddressProperties,
+  attributes: {
+    ...networkAttributes,
+    ...networkAddressAttributes,
 
     services: { type: "service", collection: true, writable: true },
     hostName: { ...hostname_attribute, writable: true },
@@ -133,7 +133,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
     return (
       this.extendedProperty("_scope") ??
       this.network?.scope ??
-      networkProperties.scope.default
+      networkAttributes.scope.default
     );
   }
 
@@ -153,7 +153,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
     return (
       this.extendedProperty("_metric") ??
       this.network?.metric ??
-      networkProperties.metric.default
+      networkAttributes.metric.default
     );
   }
 
@@ -162,7 +162,7 @@ export class NetworkInterface extends SkeletonNetworkInterface {
   }
 
   get mtu() {
-    return this.extendedProperty("_mtu"); // ?? networkProperties.mtu.default;
+    return this.extendedProperty("_mtu"); // ?? networkAttributes.mtu.default;
   }
 
   set class(value) {

package/src/network-interfaces/tun.mjs

@@ -8,7 +8,7 @@ const TUNdNetworkInterfaceTypeDefinition = {
   owners: NetworkInterfaceTypeDefinition.owners,
   extends: NetworkInterfaceTypeDefinition,
   priority: 0.1,
-  properties: {}
+  attributes: {}
 };
 
 export class TUNNetworkInterface extends NetworkInterface {

package/src/network-interfaces/wireguard.mjs

@@ -8,7 +8,7 @@ const WireguardNetworkInterfaceTypeDefinition = {
   owners: NetworkInterfaceTypeDefinition.owners,
   extends: NetworkInterfaceTypeDefinition,
   priority: 0.1,
-  properties: {}
+  attributes: {}
 };
 
 export class WireguardNetworkInterface extends SkeletonNetworkInterface {

package/src/network-interfaces/wlan.mjs

@@ -15,7 +15,7 @@ const WLANNetworkInterfaceTypeDefinition = {
   owners: EthernetNetworkInterfaceTypeDefinition.owners,
   extends: EthernetNetworkInterfaceTypeDefinition,
   priority: 0.1,
-  properties: {
+  attributes: {
     ssid: string_attribute_writable,
     psk: { ...secret_attribute, writable: true },
     secretName: string_attribute_writable

package/src/network-support.mjs

@@ -8,7 +8,7 @@ import {
 
 export const networkAddressType = ["network", "host", "network_interface"];
 
-export const networkProperties = {
+export const networkAttributes = {
   scope: {
     ...string_attribute_writable,
     values: ["global", "site", "link", "host"]
@@ -31,7 +31,7 @@ export const networkProperties = {
   multicastDNS: boolean_attribute_writable
 };
 
-export const networkAddressProperties = {
+export const networkAddressAttributes = {
   hostName: { ...hostname_attribute, writable: true },
   cidrAddresses: { ...string_collection_attribute_writable },
   cidrAddress: { ...string_attribute_writable },

package/src/network.mjs

@@ -2,15 +2,15 @@ import { default_attribute_writable } from "pacc";
 import { Owner } from "./owner.mjs";
 import { Subnet } from "./subnet.mjs";
 import { addType } from "./types.mjs";
-import { networkProperties } from "./network-support.mjs";
+import { networkAttributes } from "./network-support.mjs";
 
 const NetworkTypeDefinition = {
   name: "network",
   owners: ["location", "owner", "root"],
   priority: 0.8,
   extends: Owner.typeDefinition,
-  properties: {
-    ...networkProperties,
+  attributes: {
+    ...networkAttributes,
     bridge: {
       ...default_attribute_writable,
       type: "network",

package/src/owner.mjs

@@ -15,7 +15,7 @@ const OwnerTypeDefinition = {
   owners: ["location", "owner", "root"],
   priority: 0.9,
   extends: Base.typeDefinition,
-  properties: {
+  attributes: {
     networks: { type: "network", collection: true, writable: true },
     hosts: { type: "host", collection: true, writable: true },
     clusters: { type: "cluster", collection: true, writable: true },

package/src/root.mjs

@@ -8,7 +8,7 @@ const RootTypeDefinition = {
   owners: [],
   priority: 1000,
   extends: Location.typeDefinition,
-  properties: {}
+  attributes: {}
 };
 
 export class Root extends Location {

package/src/service.mjs

@@ -15,7 +15,7 @@ import {
 } from "pmcf";
 import { addType } from "./types.mjs";
 import { asArray } from "./utils.mjs";
-import { networkAddressProperties } from "./network-support.mjs";
+import { networkAddressAttributes } from "./network-support.mjs";
 import { serviceTypeEndpoints, ServiceTypes } from "./service-types.mjs";
 import {
   DNSRecord,
@@ -25,7 +25,7 @@ import {
   dnsPriority
 } from "./dns-utils.mjs";
 
-export const endpointProperties = {
+export const endpointAttributes = {
   port: { ...number_attribute_writable },
   protocol: {
     ...string_attribute_writable,
@@ -41,7 +41,7 @@ export const EndpointTypeDefinition = {
   owners: ["service", "network_interface"],
   priority: 0.4,
   specializations: {},
-  properties: endpointProperties
+  attributes: endpointAttributes
 };
 
 export const ServiceTypeDefinition = {
@@ -61,9 +61,9 @@ export const ServiceTypeDefinition = {
 
     return Service;
   },
-  properties: {
-    ...networkAddressProperties,
-    ...endpointProperties,
+  attributes: {
+    ...networkAddressAttributes,
+    ...endpointAttributes,
     alias: { ...string_attribute_writable },
     weight: { ...number_attribute_writable /*default: 1*/ },
     systemd: string_collection_attribute_writable

package/src/services/bind.mjs

@@ -16,7 +16,12 @@ import {
   dnsRecordTypeForAddressFamily,
   sortZoneRecords
 } from "../dns-utils.mjs";
-import { ExtraSourceService, serviceEndpoints, addresses, networkAddressType } from "pmcf";
+import {
+  ExtraSourceService,
+  serviceEndpoints,
+  addresses,
+  networkAddressType
+} from "pmcf";
 import { addType } from "../types.mjs";
 import { Service, ServiceTypeDefinition } from "../service.mjs";
 import { ExtraSourceServiceTypeDefinition } from "../extra-source-service.mjs";
@@ -28,8 +33,8 @@ const BindServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ExtraSourceServiceTypeDefinition,
   priority: 0.1,
-  properties: {
-    addresses: {
+  attributes: {
+    zones: {
       type: [...networkAddressType, "location", "owner"],
       collection: true,
       writable: true
@@ -104,10 +109,10 @@ export class BindService extends ExtraSourceService {
   hasSVRRecords = true;
   hasCatalog = true;
   hasLinkLocalAdresses =
-    BindServiceTypeDefinition.properties.hasLinkLocalAdresses.default;
+    BindServiceTypeDefinition.attributes.hasLinkLocalAdresses.default;
   hasLocationRecord = true;
   notify = true;
-  _addresses = [];
+  _zones = [];
   _trusted = [];
   _exclude = new Set([]);
   _excludeInterfaceKinds = new Set();
@@ -157,12 +162,12 @@ export class BindService extends ExtraSourceService {
     return [this.serial, this.refresh, this.retry, this.expire, this.minimum];
   }
 
-  set addresses(value) {
-    this._addresses.push(value);
+  set zones(value) {
+    this._zones.push(value);
   }
 
-  get addresses() {
-    return this._addresses;
+  get zones() {
+    return this._zones;
   }
 
   set protected(value) {
@@ -206,8 +211,8 @@ export class BindService extends ExtraSourceService {
   }
 
   async *preparePackages(dir) {
-    const sources = this.addresses.length ? this.addresses : [this.owner];
-    const names = sources.map(a => a.fullName).join(" ");
+    const zoneSources = this.zones.length ? this.zones : [this.owner];
+    const names = zoneSources.map(a => a.fullName).join(" ");
     const name = this.owner.owner.name || this.owner.name;
 
     const configPackageDir = join(dir, "config") + "/";
@@ -290,7 +295,7 @@ export class BindService extends ExtraSourceService {
       new FileContentProvider(zonesPackageDir, ...filePermissions)
     ];
 
-    yield this.generateZoneDefs(sources, packageData);
+    yield this.generateZoneDefs(zoneSources, packageData);
 
     const outfacingZonesPackageDir = join(dir, "outfacingZones") + "/";
 
@@ -307,7 +312,7 @@ export class BindService extends ExtraSourceService {
       new FileContentProvider(outfacingZonesPackageDir, ...filePermissions)
     ];
 
-    yield* this.generateOutfacingDefs(sources, packageData);
+    yield* this.generateOutfacingDefs(zoneSources, packageData);
   }
 
   async *generateOutfacingDefs(sources, packageData) {
@@ -338,18 +343,18 @@ export class BindService extends ExtraSourceService {
     }
   }
 
-  async generateZoneDefs(sources, packageData) {
+  async generateZoneDefs(zoneSources, packageData) {
     const configs = [];
 
-    for (const source of sources) {
+    for (const zoneSource of zoneSources) {
       console.log(
         "SOURCE",
-        source.toString(),
-        [...source.localDomains].join(" ")
+        zoneSource.toString(),
+        [...zoneSource.localDomains].join(" ")
       );
 
-      for (const domain of source.localDomains) {
-        const locationName = source.location.name;
+      for (const domain of zoneSource.localDomains) {
+        const locationName = zoneSource.location.name;
         const reverseZones = new Map();
 
         const config = {
@@ -402,7 +407,7 @@ export class BindService extends ExtraSourceService {
           networkInterface,
           domainNames,
           family
-        } of source.networkAddresses()) {
+        } of zoneSource.networkAddresses()) {
           if (
             !this.exclude.has(networkInterface.network) &&
             !this.excludeInterfaceKinds.has(networkInterface.kind)

package/src/services/chrony.mjs

@@ -19,7 +19,7 @@ const ChronyServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ExtraSourceServiceTypeDefinition,
   priority: 0.1,
-  properties: {},
+  attributes: {},
   service: {
     extends: ["ntp"],
     services: {

package/src/services/headscale.mjs

@@ -11,7 +11,7 @@ const HeadscaleServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ExtraSourceServiceTypeDefinition,
   priority: 0.1,
-  properties: {},
+  attributes: {},
   service: {
     endpoints: [
       {

package/src/services/influxdb.mjs

@@ -11,7 +11,7 @@ const InfluxdbServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
-  properties: {
+  attributes: {
     "metrics-disabled": {
       ...boolean_attribute_writable_true,
       isCommonOption: true
@@ -65,7 +65,7 @@ export class InfluxdbService extends Service {
       }
     };
 
-    const lines = Object.entries(InfluxdbServiceTypeDefinition.properties)
+    const lines = Object.entries(InfluxdbServiceTypeDefinition.attributes)
       .filter(
         ([key, attribute]) =>
           attribute.isCommonOption && this[key] !== undefined

package/src/services/kea.mjs

@@ -23,7 +23,7 @@ const KeaServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
-  properties: {
+  attributes: {
     "ddns-send-updates": {
       ...boolean_attribute_writable_true,
       isCommonOption: true
@@ -281,7 +281,7 @@ export class KeaService extends Service {
       };
 
       for (const [key] of Object.entries(
-        KeaServiceTypeDefinition.properties
+        KeaServiceTypeDefinition.attributes
       ).filter(
         ([key, attribute]) =>
           attribute.isCommonOption && this[key] !== undefined

package/src/services/mosquitto.mjs

@@ -11,7 +11,7 @@ const MosquittoServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
-  properties: {
+  attributes: {
     log_timestamp: {
       ...boolean_attribute_writable_true,
       isCommonOption: true
@@ -48,7 +48,7 @@ export class MosquittoService extends Service {
       dir,
       sources: [new FileContentProvider(dir + "/")],
       outputs: this.outputs,
-      properties: {
+      attributes: {
         name: `mosquitto-${this.location.name}-${host.name}`,
         description: `mosquitto definitions for ${this.fullName}@${name}`,
         access: "private",
@@ -56,7 +56,7 @@ export class MosquittoService extends Service {
       }
     };
 
-    const lines = Object.entries(MosquittoServiceTypeDefinition.properties)
+    const lines = Object.entries(MosquittoServiceTypeDefinition.attributes)
       .filter(
         ([key, attribute]) =>
           attribute.isCommonOption && this[key] !== undefined

package/src/services/openldap.mjs

@@ -12,7 +12,7 @@ const OpenLDAPServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
-  properties: {
+  attributes: {
     baseDN: {
       ...string_attribute,
       writable: true
@@ -110,7 +110,7 @@ export class OpenLDAPService extends Service {
       dir,
       sources: [new FileContentProvider(dir + "/", ...filePermissions)],
       outputs: this.outputs,
-      properties: {
+      attributes: {
         name: `openldap-${this.location.name}-${name}`,
         description: `openldap definitions for ${this.fullName}@${name}`,
         access: "private",
@@ -120,13 +120,13 @@ export class OpenLDAPService extends Service {
     };
 
     addHook(
-      packageData.properties.hooks,
+      packageData.attributes.hooks,
       "post_upgrade",
       "setfacl -m u:ldap:r /etc/letsencrypt/archive/*/privkey*.pem"
     );
 
     addHook(
-      packageData.properties.hooks,
+      packageData.attributes.hooks,
       "post_install",
       "setfacl -m u:ldap:r /etc/letsencrypt/archive/*/privkey*.pem"
     );

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

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

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

@@ -8,7 +8,7 @@ const SystemdJournalUploadServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
-  properties: {
+  attributes: {
     url: { ...string_attribute_writable }
   },
   service: {}

package/src/services/systemd-journal.mjs

@@ -7,7 +7,7 @@ const SystemdJournalServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
-  properties: {},
+  attributes: {},
   service: {}
 };
 

package/src/services/systemd-resolved.mjs

@@ -12,7 +12,7 @@ const SystemdResolvedServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ExtraSourceServiceTypeDefinition,
   priority: 0.1,
-  properties: {},
+  attributes: {},
   service: {}
 };
 

package/src/services/systemd-timesyncd.mjs

@@ -12,7 +12,7 @@ const SystemdTimesyncdServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ExtraSourceServiceTypeDefinition,
   priority: 0.1,
-  properties: {},
+  attributes: {},
   service: {}
 };
 

package/src/subnet.mjs

@@ -15,7 +15,7 @@ const SubnetTypeDefinition = {
   owners: ["location", "owner", "network", "root"],
   priority: 0.6,
   constructWithIdentifierOnly: true,
-  properties: {
+  attributes: {
     address: {
       ...string_attribute,
       isKey: true

package/src/types.mjs

@@ -26,15 +26,15 @@ export function resolveTypeLinks() {
       typeof owner === "string" ? types[owner] : owner
     );
 
-    for (const [name, property] of Object.entries(type.properties)) {
-      property.name = name;
-      if (property.isKey) {
-        type.identifier = property;
+    for (const [name, attribute] of Object.entries(type.attributes)) {
+      attribute.name = name;
+      if (attribute.isKey) {
+        type.identifier = attribute;
       }
 
       const ts = [];
 
-      for (const type of asArray(property.type)) {
+      for (const type of asArray(attribute.type)) {
         if (typeof type === "string") {
           if (baseTypes.has(type)) {
             ts.push(type);
@@ -45,7 +45,7 @@ export function resolveTypeLinks() {
             } else {
               console.error(
                 "Unknown type",
-                property.type,
+                attribute.type,
                 type.name,
                 name
               );
@@ -55,7 +55,7 @@ export function resolveTypeLinks() {
           ts.push(type);
         }
       }
-      property.type = ts;
+      attribute.type = ts;
 
       /*
       if (typeof property.type === "string") {
@@ -92,5 +92,6 @@ export function typeFactory(type, owner, data) {
   const factory = type.factoryFor?.(owner, data) || type.clazz;
   const object = new factory(owner);
   object.read(data);
+  owner.addObject(object);
   return object;
 }