pmcf 3.0.0 → 3.1.1

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "pmcf",
-  "version": "3.0.0",
+  "version": "3.1.1",
   "publishConfig": {
     "access": "public"
   },
@@ -51,8 +51,8 @@
   },
   "dependencies": {
     "ip-utilties": "^1.4.7",
-    "npm-pkgbuild": "^18.2.12",
-    "pacc": "^3.13.2",
+    "npm-pkgbuild": "^18.2.16",
+    "pacc": "^4.0.0",
     "package-directory": "^8.1.0"
   },
   "devDependencies": {

package/src/base.mjs

@@ -8,23 +8,23 @@ const BaseTypeDefinition = {
   name: "base",
   owners: [],
   properties: {
-    owner: { type: "base", collection: false, writeable: false },
+    owner: { type: "base", collection: false, writable: false },
     type: default_attribute,
     name: {
       ...default_attribute,
       isKey: true,
-      writeable: true
+      writable: true
     },
-    description: { ...description_attribute, writeable: true },
-    priority: { type: "number", collection: false, writeable: true },
-    directory: { ...default_attribute, writeable: false },
-    packaging: { ...default_attribute, writeable: true },
+    description: { ...description_attribute, writable: true },
+    priority: { type: "number", collection: false, writable: true },
+    directory: { ...default_attribute, writable: false },
+    packaging: { ...default_attribute, writable: true },
     disabled: {
       ...boolean_attribute,
-      writeable: true,
+      writable: true,
       default: false
     },
-    tags: { ...default_attribute, collection: true, writeable: true }
+    tags: { ...default_attribute, collection: true, writable: true }
   }
 };
 
@@ -223,7 +223,7 @@ export class Base {
     }
 
     for (const property of Object.values(type.properties)) {
-      if (property.writeable) {
+      if (property.writable) {
         const value = this.expand(data[property.name]);
 
         if (property.collection) {

package/src/cluster.mjs

@@ -12,11 +12,11 @@ const ClusterTypeDefinition = {
   priority: 0.7,
   extends: Host.typeDefinition,
   properties: {
-    routerId: { type: "number", collection: false, writeable: true },
-    masters: { type: "network_interface", collection: true, writeable: true },
-    backups: { type: "network_interface", collection: true, writeable: true },
-    members: { type: "network_interface", collection: true, writeable: false },
-    checkInterval: { type: "number", collection: false, writeable: true }
+    routerId: { type: "number", collection: false, writable: true },
+    masters: { type: "network_interface", collection: true, writable: true },
+    backups: { type: "network_interface", collection: true, writable: true },
+    members: { type: "network_interface", collection: true, writable: false },
+    checkInterval: { type: "number", collection: false, writable: true }
   }
 };
 

package/src/extra-source-service.mjs

@@ -7,7 +7,7 @@ export const ExtraSourceServiceTypeDefinition = {
   extends: ServiceTypeDefinition,
   priority: 0.1,
   properties: {
-    source: { type: "network", collection: true, writeable: true }
+    source: { type: "network", collection: true, writable: true }
   }
 };
 

package/src/host.mjs

@@ -28,29 +28,29 @@ const HostTypeDefinition = {
     networkInterfaces: {
       type: "network_interface",
       collection: true,
-      writeable: true
+      writable: true
     },
-    services: { type: "service", collection: true, writeable: true },
-    aliases: { type: "string", collection: true, writeable: true },
+    services: { type: "service", collection: true, writable: true },
+    aliases: { type: "string", collection: true, writable: true },
     os: {
       ...default_attribute,
-      writeable: true,
+      writable: true,
       values: ["osx", "windows", "linux"]
     },
-    "machine-id": { ...default_attribute, writeable: true },
-    distribution: { ...default_attribute, writeable: true },
+    "machine-id": { ...default_attribute, writable: true },
+    distribution: { ...default_attribute, writable: true },
     deployment: {
       ...default_attribute,
-      writeable: true,
+      writable: true,
       values: ["production", "development"]
     },
-    weight: { type: "number", collection: false, writeable: true },
-    serial: { ...default_attribute, writeable: true },
-    vendor: { ...default_attribute, writeable: true },
-    keymap: { ...default_attribute, writeable: true },
+    weight: { type: "number", collection: false, writable: true },
+    serial: { ...default_attribute, writable: true },
+    vendor: { ...default_attribute, writable: true },
+    keymap: { ...default_attribute, writable: true },
     chassis: {
       ...default_attribute,
-      writeable: true,
+      writable: true,
       values: [
         "phone",
         "tablet",
@@ -68,15 +68,15 @@ const HostTypeDefinition = {
     },
     architecture: {
       ...default_attribute,
-      writeable: true,
+      writable: true,
       values: ["x86", "x86_64", "aarch64", "armv7"]
     },
-    replaces: { ...default_attribute, collection: true, writeable: true },
-    depends: { ...default_attribute, collection: true, writeable: true },
-    provides: { ...default_attribute, collection: true, writeable: true },
-    extends: { type: "host", collection: true, writeable: true },
-    model: { ...default_attribute, collection: false, writeable: false },
-    isModel: { type: "boolean", collection: false, writeable: false }
+    replaces: { ...default_attribute, collection: true, writable: true },
+    depends: { ...default_attribute, collection: true, writable: true },
+    provides: { ...default_attribute, collection: true, writable: true },
+    extends: { type: "host", collection: true, writable: true },
+    model: { ...default_attribute, collection: false, writable: false },
+    isModel: { type: "boolean", collection: false, writable: false }
   }
 };
 

package/src/location.mjs

@@ -10,7 +10,7 @@ const LocationTypeDefinition = {
   priority: 1.0,
   extends: Owner.typeDefinition,
   properties: {
-    locales: { ...default_attribute, collection: true, writeable: true }
+    locales: { ...default_attribute, collection: true, writable: true }
   }
 };
 

package/src/network-interfaces/ethernet.mjs

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

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

@@ -39,13 +39,13 @@ export const NetworkInterfaceTypeDefinition = {
     ...networkProperties,
     ...networkAddressProperties,
 
-    services: { type: "service", collection: true, writeable: true },
-    hostName: { ...hostname_attribute, writeable: true },
-    ipAddresses: { ...default_attribute, writeable: true },
+    services: { type: "service", collection: true, writable: true },
+    hostName: { ...hostname_attribute, writable: true },
+    ipAddresses: { ...default_attribute, writable: true },
 
-    hwaddr: { ...default_attribute, writeable: true },
-    network: { type: "network", collection: false, writeable: true },
-    destination: { ...default_attribute, writeable: true }
+    hwaddr: { ...default_attribute, writable: true },
+    network: { type: "network", collection: false, writable: true },
+    destination: { ...default_attribute, writable: true }
   }
 };
 

package/src/network-support.mjs

@@ -3,35 +3,35 @@ import { default_attribute, hostname_attribute, boolean_attribute } from "pacc";
 export const networkProperties = {
   scope: {
     ...default_attribute,
-    writeable: true,
+    writable: true,
     values: ["global", "site", "link", "host"],
     default: "global"
   },
   class: {
     ...default_attribute,
-    writeable: true,
+    writable: true,
     values: ["10GBASE-T", "1000BASE-T", "100BASE-T", "10BASE-T"]
   },
   kind: {
     ...default_attribute,
-    writeable: true,
+    writable: true,
     values: ["loopback", "ethernet", "wlan", "wireguard", "fiber", "dsl"]
   },
-  ssid: { ...default_attribute, writeable: true },
-  psk: { ...default_attribute, writeable: true },
-  metric: { type: "number", collection: false, writeable: true, default: 1004 },
-  mtu: { type: "number", collection: false, writeable: true, default: 1500 },
-  gateway: { type: "host", collection: false, writeable: true },
+  ssid: { ...default_attribute, writable: true },
+  psk: { ...default_attribute, writable: true },
+  metric: { type: "number", collection: false, writable: true, default: 1004 },
+  mtu: { type: "number", collection: false, writable: true, default: 1500 },
+  gateway: { type: "host", collection: false, writable: true },
   multicastDNS: {
     ...boolean_attribute,
-    writeable: true
+    writable: true
   }
 };
 
 export const networkAddressProperties = {
-  hostName: { ...hostname_attribute, writeable: true },
-  cidrAddresses: { ...default_attribute, collection: true, writeable: false },
-  cidrAddress: { ...default_attribute, writeable: false },
-  addresses: { ...default_attribute, collection: true, writeable: false },
-  address: { ...default_attribute, writeable: false }
+  hostName: { ...hostname_attribute, writable: true },
+  cidrAddresses: { ...default_attribute, collection: true, writable: false },
+  cidrAddress: { ...default_attribute, writable: false },
+  addresses: { ...default_attribute, collection: true, writable: false },
+  address: { ...default_attribute, writable: false }
 };

package/src/network.mjs

@@ -10,8 +10,8 @@ const NetworkTypeDefinition = {
   extends: Owner.typeDefinition,
   properties: {
     ...networkProperties,
-    bridge: { type: "network", collection: true, writeable: true },
-    gateway: { type: "host", collection: false, writeable: true }
+    bridge: { type: "network", collection: true, writable: true },
+    gateway: { type: "host", collection: false, writable: true }
   }
 };
 

package/src/owner.mjs

@@ -11,17 +11,17 @@ const OwnerTypeDefinition = {
   priority: 0.9,
   extends: Base.typeDefinition,
   properties: {
-    networks: { type: "network", collection: true, writeable: true },
-    hosts: { type: "host", collection: true, writeable: true },
-    clusters: { type: "cluster", collection: true, writeable: true },
-    subnets: { type: Subnet.typeDefinition, collection: true, writeable: true },
-    country: { ...default_attribute, writeable: true },
-    domain: { ...default_attribute, writeable: true },
-    domains: { ...default_attribute, collection: true, writeable: true },
-    timezone: { ...default_attribute, writeable: true },
-    architectures: { ...default_attribute, collection: true, writeable: true },
-    locales: { ...default_attribute, collection: true, writeable: true },
-    administratorEmail: { ...email_attribute, writeable: true }
+    networks: { type: "network", collection: true, writable: true },
+    hosts: { type: "host", collection: true, writable: true },
+    clusters: { type: "cluster", collection: true, writable: true },
+    subnets: { type: Subnet.typeDefinition, collection: true, writable: true },
+    country: { ...default_attribute, writable: true },
+    domain: { ...default_attribute, writable: true },
+    domains: { ...default_attribute, collection: true, writable: true },
+    timezone: { ...default_attribute, writable: true },
+    architectures: { ...default_attribute, collection: true, writable: true },
+    locales: { ...default_attribute, collection: true, writable: true },
+    administratorEmail: { ...email_attribute, writable: true }
   }
 };
 

package/src/service.mjs

@@ -20,17 +20,17 @@ import {
 } from "./dns-utils.mjs";
 
 export const endpointProperties = {
-  port: { type: "number", collection: false, writeable: true },
+  port: { type: "number", collection: false, writable: true },
   protocol: {
     ...default_attribute,
-    writeable: true,
+    writable: true,
     values: ["tcp", "udp"]
   },
-  type: { ...default_attribute, writeable: true },
+  type: { ...default_attribute, writable: true },
   types: { ...default_attribute, collection: true },
   tls: {
     ...boolean_attribute,
-    writeable: false
+    writable: false
   }
 };
 
@@ -62,9 +62,9 @@ export const ServiceTypeDefinition = {
   properties: {
     ...networkAddressProperties,
     ...endpointProperties,
-    alias: { ...default_attribute, writeable: true },
-    weight: { type: "number", collection: false, writeable: true, default: 1 },
-    systemd: { type: "string", collection: true, writeable: true }
+    alias: { ...default_attribute, writable: true },
+    weight: { type: "number", collection: false, writable: true, default: 1 },
+    systemd: { type: "string", collection: true, writable: true }
   }
 };
 

package/src/services/bind.mjs

@@ -28,52 +28,52 @@ const BindServiceTypeDefinition = {
     addresses: {
       type: ["network", "host", "network_interface", "location", "owner"],
       collection: true,
-      writeable: true
+      writable: true
     },
 
     trusted: {
       type: address_types,
       collection: true,
-      writeable: true
+      writable: true
     },
-    protected: { type: address_types, collection: true, writeable: true },
-    internal: { type: address_types, collection: true, writeable: true },
+    protected: { type: address_types, collection: true, writable: true },
+    internal: { type: address_types, collection: true, writable: true },
     hasSVRRecords: {
       ...boolean_attribute,
-      writeable: true
+      writable: true
     },
     hasCatalog: {
       ...boolean_attribute,
-      writeable: true
+      writable: true
     },
     hasLinkLocalAdresses: {
       ...boolean_attribute,
-      writeable: true
+      writable: true
     },
     hasLocationRecord: {
       ...boolean_attribute,
-      writeable: true,
+      writable: true,
       default: true
     },
     excludeInterfaceKinds: {
       ...default_attribute,
       collection: true,
-      writeable: true
+      writable: true
     },
 
-    exclude: { type: address_types, collection: true, writeable: true },
+    exclude: { type: address_types, collection: true, writable: true },
     notify: {
       ...boolean_attribute,
-      writeable: true,
+      writable: true,
       default: false
     },
-    recordTTL: { ...default_attribute, writeable: true },
-    serial: { type: "number", collection: false, writeable: true },
-    refresh: { ...default_attribute, writeable: true },
-    retry: { ...default_attribute, writeable: true },
-    expire: { ...default_attribute, writeable: true },
-    minimum: { ...default_attribute, writeable: true },
-    allowedUpdates: { ...default_attribute, collection: true, writeable: true }
+    recordTTL: { ...default_attribute, writable: true },
+    serial: { type: "number", collection: false, writable: true },
+    refresh: { ...default_attribute, writable: true },
+    retry: { ...default_attribute, writable: true },
+    expire: { ...default_attribute, writable: true },
+    minimum: { ...default_attribute, writable: true },
+    allowedUpdates: { ...default_attribute, collection: true, writable: true }
   },
 
   service: {

package/src/services/chrony.mjs

@@ -1,7 +1,6 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { isLinkLocal } from "ip-utilties";
-
 import { addType } from "../types.mjs";
 import {
   Service,

package/src/services/kea.mjs

@@ -1,6 +1,7 @@
 import { join } from "node:path";
 import { FileContentProvider } from "npm-pkgbuild";
 import { reverseArpa } from "ip-utilties";
+import { default_attribute, boolean_attribute_writeable_true } from "pacc";
 import {
   Service,
   sortDescendingByPriority,
@@ -18,7 +19,40 @@ const KeaServiceTypeDefinition = {
   owners: ServiceTypeDefinition.owners,
   extends: ServiceTypeDefinition,
   priority: 0.1,
-  properties: {},
+  properties: {
+    "ddns-send-updates": {
+      ...boolean_attribute_writeable_true,
+      isCommonOption: true
+    },
+    "renew-timer": {
+      ...default_attribute,
+      type: "number",
+      writable: true,
+      isCommonOption: true,
+      default: 900
+    },
+    "rebind-timer": {
+      ...default_attribute,
+      type: "number",
+      writable: true,
+      isCommonOption: true,
+      default: 1800
+    },
+    "valid-lifetime": {
+      ...default_attribute,
+      type: "number",
+      writable: true,
+      mandatory: true,
+      isCommonOption: true,
+      default: 86400
+    },
+    "ddns-conflict-resolution-mode": {
+      ...default_attribute,
+      writable: true,
+      isCommonOption: true
+      //values: ["check-exists-with-dhcid"]
+    }
+  },
   service: {
     extends: ["dhcp"],
     services: {
@@ -188,7 +222,7 @@ export class KeaService extends Service {
     ];
 
     const commonConfig = async family => {
-      return {
+      const cfg = {
         "interfaces-config": {
           interfaces: listenInterfaces(`IPv${family}`)
         },
@@ -210,9 +244,6 @@ export class KeaService extends Service {
           "max-reclaim-time": 250,
           "unwarned-reclaim-cycles": 5
         },
-        "renew-timer": 900,
-        "rebind-timer": 1800,
-        "valid-lifetime": 86400,
         "hooks-libraries": [
           /*{
             library: "/usr/lib/kea/hooks/libdhcp_ddns_tuning.so"
@@ -244,7 +275,6 @@ export class KeaService extends Service {
           }
         ],
         "dhcp-ddns": dhcpServerDdns,
-        "ddns-send-updates": true,
 
         loggers,
         "option-data": [
@@ -261,6 +291,17 @@ export class KeaService extends Service {
           }
         ]
       };
+
+      for (const [key] of Object.entries(
+        KeaServiceTypeDefinition.properties
+      ).filter(
+        ([key, attribute]) =>
+          attribute.isCommonOption && this[key] !== undefined
+      )) {
+        cfg[key] = this[key];
+      }
+
+      return cfg;
     };
 
     const toUnix = endpoint => {

package/src/services/openldap.mjs

@@ -15,15 +15,15 @@ const OpenLDAPServiceTypeDefinition = {
   properties: {
     baseDN: {
       ...default_attribute,
-      writeable: true
+      writable: true
     },
     rootDN: {
       ...default_attribute,
-      writeable: true
+      writable: true
     },
     uri: {
       ...default_attribute,
-      writeable: true
+      writable: true
     }
   },
   service: {

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

@@ -9,7 +9,7 @@ const SystemdJournalUploadServiceTypeDefinition = {
   extends: ServiceTypeDefinition,
   priority: 0.1,
   properties: {
-    url: { ...default_attribute, writeable: true }
+    url: { ...default_attribute, writable: true }
   },
   service: {}
 };

package/src/subnet.mjs

@@ -20,8 +20,8 @@ const SubnetTypeDefinition = {
       ...default_attribute,
       isKey: true
     },
-    networks: { type: "network", collection: true, writeable: true },
-    prefixLength: { type: "number", collection: false, writeable: false }
+    networks: { type: "network", collection: true, writable: true },
+    prefixLength: { type: "number", collection: false, writable: false }
   }
 };
 

package/types/base.d.mts

@@ -11,14 +11,13 @@ export class Base {
             owner: {
                 type: string;
                 collection: boolean;
-                writeable: boolean;
+                writable: boolean;
             };
             type: import("pacc").AttributeDefinition;
             name: {
                 isKey: boolean;
-                writeable: boolean;
-                type: string;
                 writable: boolean;
+                type: string;
                 mandatory: boolean;
                 collection: boolean;
                 private?: boolean;
@@ -31,10 +30,9 @@ export class Base {
                 env?: string[] | string;
             };
             description: {
-                writeable: boolean;
+                writable: boolean;
                 type: string;
                 isKey: boolean;
-                writable: boolean;
                 mandatory: boolean;
                 collection: boolean;
                 private?: boolean;
@@ -49,13 +47,12 @@ export class Base {
             priority: {
                 type: string;
                 collection: boolean;
-                writeable: boolean;
+                writable: boolean;
             };
             directory: {
-                writeable: boolean;
+                writable: boolean;
                 type: string;
                 isKey: boolean;
-                writable: boolean;
                 mandatory: boolean;
                 collection: boolean;
                 private?: boolean;
@@ -68,10 +65,9 @@ export class Base {
                 env?: string[] | string;
             };
             packaging: {
-                writeable: boolean;
+                writable: boolean;
                 type: string;
                 isKey: boolean;
-                writable: boolean;
                 mandatory: boolean;
                 collection: boolean;
                 private?: boolean;
@@ -84,11 +80,10 @@ export class Base {
                 env?: string[] | string;
             };
             disabled: {
-                writeable: boolean;
+                writable: boolean;
                 default: boolean;
                 type: string;
                 isKey: boolean;
-                writable: boolean;
                 mandatory: boolean;
                 collection: boolean;
                 private?: boolean;
@@ -101,10 +96,9 @@ export class Base {
             };
             tags: {
                 collection: boolean;
-                writeable: boolean;
+                writable: boolean;
                 type: string;
                 isKey: boolean;
-                writable: boolean;
                 mandatory: boolean;
                 private?: boolean;
                 depends?: string;